Skip to content

Commit 58ef4d8

Browse files
committed
fix bug
1 parent c2e5637 commit 58ef4d8

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<activity
4646
android:name="ly.priv.mobile.gui.MainActivity"
47-
android:label="@string/privly_home"
47+
android:label="@string/app_name"
4848
android:configChanges="keyboardHidden|orientation|screenSize"
4949
>
5050
<intent-filter>

res/values/strings.xml

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<string name="createListViewLabel"> Create New Privly Content </string>
1212
<string name="newUrlLabel">Here\'s your new Privly Url</string>
1313
<string name="shareButtonLabel">Share Url</string>
14-
<string name="headerDescription">Privly</string>
1514
<string name="settingsMenuLabel">Change Content Server</string>
1615
<string name="logoutMenuLabel">Logout From Application</string>
1716
<string name="baseUrlHeading">Content Server Location</string>
@@ -22,7 +21,6 @@
2221
<string name="app_id">1412217835697847</string>
2322
<string name="logout_twitter"> Logout From Twitter</string>
2423
<string name="logout_facebook"> Logout From Facebook</string>
25-
<string name="privly_home">Privly Home</string>
2624
<string name="set_content_server">Content Server Location</string>
2725
<string name="drawer_open">Drawer Open</string>
2826
<string name="drawer_close">Drawer Close</string>

src/ly/priv/mobile/api/gui/microblogs/MicroblogListPostsFragment.java

-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
7474
*/
7575
private void initializeComponent(View view) {
7676
setHasOptionsMenu(true);
77-
ActionBar actionBar = getSherlockActivity().getSupportActionBar();
78-
actionBar.setTitle(R.string.privly_Twitter);
7977
mListViewPosts = ((ListView) view.findViewById(R.id.lView));
8078
mListViewPosts.addFooterView(mFooterView);
8179
mProgressBar = (ProgressBar) view.findViewById(R.id.pbLoadingData);

src/ly/priv/mobile/api/gui/socialnetworks/ListUsersFragment.java

-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
5656
Log.d(TAG, "Creating ListUsersFragment");
5757
View view = inflater.inflate(R.layout.activity_list, container, false);
5858
setHasOptionsMenu(true);
59-
ActionBar actionBar = getSherlockActivity().getSupportActionBar();
60-
actionBar.setTitle(R.string.privly_Facebook);
6159
mListViewUsers = ((ListView) view.findViewById(R.id.lView));
6260
mProgressBar = (ProgressBar) view.findViewById(R.id.pbLoadingData);
6361
mProgressBar.setVisibility(View.VISIBLE);

src/ly/priv/mobile/grabbers/FaceBookGrabberService.java

+2
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ public void call(Session session, SessionState state,
109109
*/
110110
private void runSocialGui() {
111111
Log.d(TAG, "runSocialGui");
112+
ActionBar actionBar = getSherlockActivity().getSupportActionBar();
113+
actionBar.setTitle(R.string.privly_Facebook);
112114
FragmentTransaction transaction = getActivity()
113115
.getSupportFragmentManager().beginTransaction();
114116
mSListUsersActivity = new ListUsersFragment();

src/ly/priv/mobile/grabbers/TwitterGrabberService.java

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
102102
*/
103103
private void runSocialGui() {
104104
Log.d(TAG, "runSocialGui");
105+
ActionBar actionBar = getSherlockActivity().getSupportActionBar();
106+
actionBar.setTitle(R.string.privly_Twitter);
105107
FragmentTransaction transaction = getActivity()
106108
.getSupportFragmentManager().beginTransaction();
107109
MicroblogListPostsFragment microblogListPostsFragment = new MicroblogListPostsFragment();

0 commit comments

Comments
 (0)