npe fix for file upload on instance saving since actionbar in list mode doesn't habe...

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 7cfb123..a3e895e 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -527,7 +527,11 @@ public class FileActivity extends AppCompatActivity
         outState.putBoolean(FileActivity.EXTRA_FROM_NOTIFICATION, mFromNotification);
         outState.putLong(KEY_WAITING_FOR_OP_ID, mFileOperationsHelper.getOpIdWaitingFor());
         outState.putBoolean(KEY_TRY_SHARE_AGAIN, mTryShareAgain);
         outState.putBoolean(FileActivity.EXTRA_FROM_NOTIFICATION, mFromNotification);
         outState.putLong(KEY_WAITING_FOR_OP_ID, mFileOperationsHelper.getOpIdWaitingFor());
         outState.putBoolean(KEY_TRY_SHARE_AGAIN, mTryShareAgain);

-        outState.putString(KEY_ACTION_BAR_TITLE, getSupportActionBar().getTitle().toString());
+        if(getSupportActionBar().getTitle() != null) {
+            // Null check in case the actionbar is used in ActionBar.NAVIGATION_MODE_LIST
+            // since it doesn't have a title then
+            outState.putString(KEY_ACTION_BAR_TITLE, getSupportActionBar().getTitle().toString());
+        }

     }
 
 
     }
 
 

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 1509797..9a3ce17 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -20,8 +20,6 @@
 
 package com.owncloud.android.ui.activity;
 
 
 package com.owncloud.android.ui.activity;
 

-import java.io.File;
-

 import android.accounts.Account;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.accounts.Account;
 import android.content.Intent;
 import android.os.AsyncTask;


@@ -40,12 +38,13 @@ import android.widget.TextView;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.R;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;

-import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;

 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;

+import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;

 import com.owncloud.android.ui.fragment.LocalFileListFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;

-import com.owncloud.android.utils.DisplayUtils;

 import com.owncloud.android.utils.FileStorageUtils;
 
 import com.owncloud.android.utils.FileStorageUtils;
 

+import java.io.File;
+

 
 /**
  * Displays local files and let the user choose what of them wants to upload
 
 /**
  * Displays local files and let the user choose what of them wants to upload