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

Fixed crash and remembered location when there are multiple accounts

Browse source
This commit is contained in:
David A. Velasco 2014-10-31 15:08:08 +01:00
parent 9709593ccf
commit dbd981f012
1 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/com/owncloud/android/ui/activity/Uploader.java
View file

@ -125,31 +125,13 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
Log_OC.i(TAG, "More then one ownCloud is available"); Log_OC.i(TAG, "More then one ownCloud is available");
showDialog(DIALOG_MULTIPLE_ACCOUNT); showDialog(DIALOG_MULTIPLE_ACCOUNT);
} else { } else {
mAccount = accounts[0];
mAccount = accounts[0]; mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); initTargetFolder();
populateDirectoryList();
SharedPreferences appPreferences = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());
String last_path = appPreferences.getString("last_upload_path", "");
// "/" equals root-directory
if(last_path.equals("/")) {
mParents.add("");
}
else{
String[] dir_names = last_path.split("/");
for (String dir : dir_names)
mParents.add(dir);
}
//Make sure that path still exists, if it doesn't pop the stack and try the previous path
while(!mStorageManager.fileExists(generatePath(mParents))){
mParents.pop();
}
} }
populateDirectoryList();
} else { } else {
showDialog(DIALOG_NO_STREAM); showDialog(DIALOG_NO_STREAM);
} }
@ -211,6 +193,7 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
mAccount = mAccountManager.getAccountsByType(MainApp.getAccountType())[which]; mAccount = mAccountManager.getAccountsByType(MainApp.getAccountType())[which];
mStorageManager = new FileDataStorageManager(mAccount, getContentResolver()); mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
initTargetFolder();
populateDirectoryList(); populateDirectoryList();
} }
}); });
@ -479,5 +462,36 @@ public class Uploader extends SherlockListActivity implements OnItemClickListene
Toast.makeText(this, message, Toast.LENGTH_LONG).show(); Toast.makeText(this, message, Toast.LENGTH_LONG).show();
} }
} }
/**
* Loads the target folder initialize shown to the user.
*
* The target account has to be chosen before this method is called.
*/
private void initTargetFolder() {
if (mStorageManager == null) {
throw new IllegalStateException("Do not call this method before initializing mStorageManager");
}
SharedPreferences appPreferences = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());
String last_path = appPreferences.getString("last_upload_path", "");
// "/" equals root-directory
if(last_path.equals("/")) {
mParents.add("");
}
else{
String[] dir_names = last_path.split("/");
for (String dir : dir_names)
mParents.add(dir);
}
//Make sure that path still exists, if it doesn't pop the stack and try the previous path
while(!mStorageManager.fileExists(generatePath(mParents))){
mParents.pop();
}
}
} }