From 04e68a81a3c734356cb1d4b801db17db1784ebb3 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 12 Mar 2015 11:16:00 -0700 Subject: Fix crash if title is null --- src/github/daneren2005/dsub/fragments/SubsonicFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java index 0cb044e3..3a703b89 100644 --- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -137,7 +137,9 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR @Override public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putString(Constants.FRAGMENT_NAME, title.toString()); + if(title != null) { + outState.putString(Constants.FRAGMENT_NAME, title.toString()); + } } @Override -- cgit v1.2.3 From 6e340110d8211de2dfc76edf72c3043869862503 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 12 Mar 2015 11:22:50 -0700 Subject: Fix crash on selecting spinner if title is null --- src/github/daneren2005/dsub/activity/SubsonicActivity.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index 20ff568f..dab46779 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -670,9 +670,18 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte if(backStack.size() > 0) { spinnerAdapter.clear(); for(int i = 0; i < backStack.size(); i++) { - spinnerAdapter.add(backStack.get(i).getTitle()); + CharSequence title = backStack.get(i).getTitle(); + if(title != null) { + spinnerAdapter.add(title); + } else { + spinnerAdapter.add("null"); + } + } + if(currentFragment.getTitle() != null) { + spinnerAdapter.add(currentFragment.getTitle()); + } else { + spinnerAdapter.add("null"); } - spinnerAdapter.add(currentFragment.getTitle()); spinnerAdapter.notifyDataSetChanged(); actionBarSpinner.setSelection(spinnerAdapter.getCount() - 1); getSupportActionBar().setDisplayShowCustomEnabled(true); -- cgit v1.2.3 From d93bf9f00bfb7f30938b856fff7bec527fd9fe9c Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 12 Mar 2015 11:24:22 -0700 Subject: Fix alphabetical list not having title --- src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index 1791cc49..aa34ca4b 100644 --- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -644,7 +644,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter setTitle(R.string.main_albums_starred); } else if("genres".equals(albumListType) || "years".equals(albumListType)) { setTitle(albumListExtra); - } else if("albumsAlphabeticalButton".equals(albumListType)) { + } else if("alphabeticalByName".equals(albumListType)) { setTitle(R.string.main_albums_alphabetical); } -- cgit v1.2.3