norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

get rid of mLastActedId

Browse Source 
This was always somewhat buggy and is very buggy in File views
This commit is contained in:
Adrian Ulrich 2017-03-04 20:13:54 +01:00
parent d0ff23a824
commit 51ded9bee3
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ch/blinkenlights/android/vanilla/LibraryActivity.java
View File

@ -143,11 +143,6 @@ public class LibraryActivity
* The last used action from the menu. Used with ACTION_LAST_USED. * The last used action from the menu. Used with ACTION_LAST_USED.
*/ */
private int mLastAction = ACTION_PLAY; private int mLastAction = ACTION_PLAY;
/**
* The id of the media that was last pressed in the current adapter. Used to
* open the playback activity when an item is pressed twice.
*/
private long mLastActedId;
/** /**
* Holds last intent that was passed to the context menu * Holds last intent that was passed to the context menu
*/ */
@ -269,7 +264,6 @@ public class LibraryActivity
SharedPreferences settings = PlaybackService.getSettings(this); SharedPreferences settings = PlaybackService.getSettings(this);
mDefaultAction = Integer.parseInt(settings.getString(PrefKeys.DEFAULT_ACTION_INT, PrefDefaults.DEFAULT_ACTION_INT)); mDefaultAction = Integer.parseInt(settings.getString(PrefKeys.DEFAULT_ACTION_INT, PrefDefaults.DEFAULT_ACTION_INT));
mLastActedId = LibraryAdapter.INVALID_ID;
updateHeaders(); updateHeaders();
} }
@ -459,8 +453,6 @@ public class LibraryActivity
query.mode = modeForAction[mode]; query.mode = modeForAction[mode];
PlaybackService.get(this).addSongs(query); PlaybackService.get(this).addSongs(query);
mLastActedId = id;
if (mDefaultAction == ACTION_LAST_USED && mLastAction != action) { if (mDefaultAction == ACTION_LAST_USED && mLastAction != action) {
mLastAction = action; mLastAction = action;
updateHeaders(); updateHeaders();
@ -510,8 +502,6 @@ public class LibraryActivity
if (action == ACTION_EXPAND && rowData.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false)) { if (action == ACTION_EXPAND && rowData.getBooleanExtra(LibraryAdapter.DATA_EXPANDABLE, false)) {
onItemExpanded(rowData); onItemExpanded(rowData);
} else if (rowData.getLongExtra(LibraryAdapter.DATA_ID, LibraryAdapter.INVALID_ID) == mLastActedId) {
openPlaybackActivity();
} else if (action != ACTION_DO_NOTHING) { } else if (action != ACTION_DO_NOTHING) {
if (action == ACTION_EXPAND) { if (action == ACTION_EXPAND) {
// default to playing when trying to expand something that can't // default to playing when trying to expand something that can't
@ -1004,7 +994,6 @@ public class LibraryActivity
public void onPageChanged(int position, LibraryAdapter adapter) public void onPageChanged(int position, LibraryAdapter adapter)
{ {
mCurrentAdapter = adapter; mCurrentAdapter = adapter;
mLastActedId = LibraryAdapter.INVALID_ID;
updateLimiterViews(); updateLimiterViews();
if (adapter != null && (adapter.getLimiter() == null || adapter.getMediaType() == MediaUtils.TYPE_FILE)) { if (adapter != null && (adapter.getLimiter() == null || adapter.getMediaType() == MediaUtils.TYPE_FILE)) {
// Save current page so it is opened on next startup. Don't save if // Save current page so it is opened on next startup. Don't save if