mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1408 from nextcloud/fixUploadFilesActivityNPE

Browse source 
Prevent NPE for menuItem state
This commit is contained in:
Mario Đanić 2017-08-23 14:19:08 +02:00 committed by GitHub
commit 1e7f609812
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file

@ -319,10 +319,12 @@ public class UploadFilesActivity extends FileActivity implements
popDirname();
mFileListFragment.onNavigateUp();
mCurrentDir = mFileListFragment.getCurrentDirectory();
if(mCurrentDir.getParentFile() == null){
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(false);
if (mCurrentDir.getParentFile() == null) {
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(false);
}
}
// invalidate checked state when navigating directories
@ -338,8 +340,12 @@ public class UploadFilesActivity extends FileActivity implements
Log_OC.d(TAG, "onSaveInstanceState() start");
super.onSaveInstanceState(outState);
outState.putString(UploadFilesActivity.KEY_DIRECTORY_PATH, mCurrentDir.getAbsolutePath());
outState.putBoolean(UploadFilesActivity.KEY_ALL_SELECTED,
mOptionsMenu.findItem(R.id.action_select_all).isChecked());
if (mOptionsMenu != null && mOptionsMenu.findItem(R.id.action_select_all) != null) {
outState.putBoolean(UploadFilesActivity.KEY_ALL_SELECTED,
mOptionsMenu.findItem(R.id.action_select_all).isChecked());
} else {
outState.putBoolean(UploadFilesActivity.KEY_ALL_SELECTED, false);
}
Log_OC.d(TAG, "onSaveInstanceState() end");
}