From 7c49aa940d8c6de3bef2e064d93d747e491c0c57 Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 23 Mar 2015 15:01:17 +0100 Subject: [PATCH] fix bug:When rotating the device, alert to choose the account is shown again --- src/com/owncloud/android/ui/activity/Uploader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java index 452647d3..55e7b62b 100644 --- a/src/com/owncloud/android/ui/activity/Uploader.java +++ b/src/com/owncloud/android/ui/activity/Uploader.java @@ -91,7 +91,7 @@ public class Uploader extends FileActivity private String mUploadPath; //private FileDataStorageManager mStorageManager; private OCFile mFile; - private boolean mAccountSelected = false; + private boolean mAccountSelected; private final static int DIALOG_NO_ACCOUNT = 0; private final static int DIALOG_WAITING = 1; @@ -109,10 +109,9 @@ public class Uploader extends FileActivity protected void onCreate(Bundle savedInstanceState) { prepareStreamsToUpload(); - super.onCreate(savedInstanceState); - if (savedInstanceState == null) { mParents = new Stack(); + mAccountSelected = false; } else { mParents = (Stack) savedInstanceState.getSerializable(KEY_PARENTS); // mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT); @@ -120,6 +119,7 @@ public class Uploader extends FileActivity // mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); mAccountSelected = savedInstanceState.getBoolean(KEY_ACCOUNT_SELECTED); } + super.onCreate(savedInstanceState); ActionBar actionBar = getSupportActionBar(); actionBar.setIcon(DisplayUtils.getSeasonalIconId()); @@ -361,7 +361,8 @@ public class Uploader extends FileActivity // click on button switch (v.getId()) { case R.id.uploader_choose_folder: - mUploadPath = ""; // first element in mParents is root dir, represented by ""; init mUploadPath with "/" results in a "//" prefix + mUploadPath = ""; // first element in mParents is root dir, represented by ""; + // init mUploadPath with "/" results in a "//" prefix for (String p : mParents) mUploadPath += p + OCFile.PATH_SEPARATOR; Log_OC.d(TAG, "Uploading file to dir " + mUploadPath); -- 2.11.0