From 55cd3b3fee6ed97527496b402f85f5ed77f0919f Mon Sep 17 00:00:00 2001 From: owner Date: Sun, 13 Jan 2013 11:21:57 -0800 Subject: Give empty menu until data is loaded to avoid pressing buttons early and getting licenseInvalid error --- subsonic-android/res/menu/empty.xml | 4 ++++ .../src/github/daneren2005/dsub/activity/SelectAlbumActivity.java | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 subsonic-android/res/menu/empty.xml diff --git a/subsonic-android/res/menu/empty.xml b/subsonic-android/res/menu/empty.xml new file mode 100644 index 00000000..9096a727 --- /dev/null +++ b/subsonic-android/res/menu/empty.xml @@ -0,0 +1,4 @@ + + + + diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java index d85545b0..08b7804f 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java @@ -51,7 +51,7 @@ public class SelectAlbumActivity extends SubsonicTabActivity { private View emptyView; private boolean hideButtons = false; private Button moreButton; - private boolean licenseValid; + private Boolean licenseValid; private boolean showHeader = true; /** @@ -112,7 +112,10 @@ public class SelectAlbumActivity extends SubsonicTabActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { com.actionbarsherlock.view.MenuInflater inflater = getSupportMenuInflater(); - if(hideButtons) { + if(licenseValid == null) { + inflater.inflate(R.menu.empty, menu); + } + else if(hideButtons) { String albumListType = getIntent().getStringExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE); if(albumListType != null) { inflater.inflate(R.menu.select_album_list, menu); -- cgit v1.2.3