public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix indexing in FolderListAdapter. Fix title for GlobalSharedStoriesReading.

Browse source
This commit is contained in:
Mark Anderson 2015-02-04 20:20:33 +00:00
parent 4a81d2963a
commit 131d987246
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/android/NewsBlur/src/com/newsblur/activity/GlobalSharedStoriesReading.java
View file

@ -11,7 +11,7 @@ public class GlobalSharedStoriesReading extends Reading {
protected void onCreate(Bundle savedInstanceBundle) {
super.onCreate(savedInstanceBundle);
setTitle(getResources().getString(R.string.all_shared_stories));
setTitle(getResources().getString(R.string.global_shared_stories));
readingAdapter = new MixedFeedsReadingAdapter(getFragmentManager(), defaultFeedView, null);
getLoaderManager().initLoader(0, null, this);

4
clients/android/NewsBlur/src/com/newsblur/database/FolderListAdapter.java
View file

@ -79,7 +79,7 @@ public class FolderListAdapter extends BaseExpandableListAdapter {
@Override
public void onClick(View v) {
Intent i = new Intent(context, GlobalSharedStoriesItemsList.class);
i.putExtra(AllStoriesItemsList.EXTRA_STATE, currentState);
i.putExtra(GlobalSharedStoriesItemsList.EXTRA_STATE, currentState);
((Activity) context).startActivityForResult(i, Activity.RESULT_OK);
}
});
@ -183,7 +183,7 @@ public class FolderListAdapter extends BaseExpandableListAdapter {
posCounter.setVisibility(View.GONE);
}
} else {
Feed f = activeFolderChildren.get(groupPosition-2).get(childPosition);
Feed f = activeFolderChildren.get(convertGroupPositionToActiveFolderIndex(groupPosition)).get(childPosition);
if (convertView == null) {
v = inflater.inflate(R.layout.row_feed, parent, false);
} else {