mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 22:25:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4693 from nextcloud/account-cleanup-file-display-activity

Browse source 
Remove onAccountSet from FileDisplayActivity
This commit is contained in:
Tobias Kaminsky 2019-10-17 14:58:13 +02:00 committed by GitHub
commit f4a27cc5dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -214,6 +214,7 @@ public class FileDisplayActivity extends FileActivity
private SearchView searchView; private SearchView searchView;
private PlayerServiceConnection mPlayerConnection; private PlayerServiceConnection mPlayerConnection;
private Account mLastDisplayedAccount;
@Inject @Inject
AppPreferences preferences; AppPreferences preferences;
@ -231,7 +232,7 @@ public class FileDisplayActivity extends FileActivity
// Set the default theme to replace the launch screen theme. // Set the default theme to replace the launch screen theme.
setTheme(R.style.Theme_ownCloud_Toolbar_Drawer); setTheme(R.style.Theme_ownCloud_Toolbar_Drawer);
super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid super.onCreate(savedInstanceState);
/// Load of saved instance state /// Load of saved instance state
if (savedInstanceState != null) { if (savedInstanceState != null) {
@ -418,56 +419,6 @@ public class FileDisplayActivity extends FileActivity
} }
} }
/**
* Called when the ownCloud {@link Account} associated to the Activity was just updated.
*/
@Override
protected void onAccountSet(boolean stateWasRecovered) {
super.onAccountSet(stateWasRecovered);
final Account account = getAccount();
if (account != null) {
/// Check whether the 'main' OCFile handled by the Activity is contained in the
// current Account
OCFile file = getFile();
// get parent from path
String parentPath = "";
if (file != null) {
if (file.isDown() && file.getLastSyncDateForProperties() == 0) {
// upload in progress - right now, files are not inserted in the local
// cache until the upload is successful get parent from path
parentPath = file.getRemotePath().substring(0,
file.getRemotePath().lastIndexOf(file.getFileName()));
if (getStorageManager().getFileByPath(parentPath) == null) {
file = null; // not able to know the directory where the file is uploading
}
} else {
file = getStorageManager().getFileByPath(file.getRemotePath());
// currentDir = null if not in the current Account
}
}
if (file == null) {
// fall back to root folder
file = getStorageManager().getFileByPath(OCFile.ROOT_PATH); // never returns null
}
setFile(file);
setAccountInDrawer(account);
setupDrawer();
if (!stateWasRecovered) {
Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
initFragmentsWithFile();
if (file.isFolder() && TextUtils.isEmpty(searchQuery)) {
startSyncFolderOperation(file, false);
}
} else {
updateFragmentsVisibility(!file.isFolder());
updateActionBarTitleAndHomeButton(file.isFolder() ? null : file);
}
}
}
private void switchToSearchFragment(Bundle savedInstanceState) { private void switchToSearchFragment(Bundle savedInstanceState) {
if (savedInstanceState == null) { if (savedInstanceState == null) {
OCFileListFragment listOfFiles = new OCFileListFragment(); OCFileListFragment listOfFiles = new OCFileListFragment();
@ -2594,8 +2545,51 @@ public class FileDisplayActivity extends FileActivity
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
EventBus.getDefault().post(new TokenPushEvent()); final Account account = getAccount();
if (account != null) {
/// Check whether the 'main' OCFile handled by the Activity is contained in the
// current Account
OCFile file = getFile();
// get parent from path
String parentPath = "";
if (file != null) {
if (file.isDown() && file.getLastSyncDateForProperties() == 0) {
// upload in progress - right now, files are not inserted in the local
// cache until the upload is successful get parent from path
parentPath = file.getRemotePath().substring(0,
file.getRemotePath().lastIndexOf(file.getFileName()));
if (getStorageManager().getFileByPath(parentPath) == null) {
file = null; // not able to know the directory where the file is uploading
}
} else {
file = getStorageManager().getFileByPath(file.getRemotePath());
// currentDir = null if not in the current Account
}
}
if (file == null) {
// fall back to root folder
file = getStorageManager().getFileByPath(OCFile.ROOT_PATH); // never returns null
}
setFile(file);
setAccountInDrawer(account);
setupDrawer();
final boolean accountChanged = !account.equals(mLastDisplayedAccount);
if (accountChanged) {
Log_OC.d(TAG, "Initializing Fragments in onAccountChanged..");
initFragmentsWithFile();
if (file.isFolder() && TextUtils.isEmpty(searchQuery)) {
startSyncFolderOperation(file, false);
}
} else {
updateFragmentsVisibility(!file.isFolder());
updateActionBarTitleAndHomeButton(file.isFolder() ? null : file);
}
}
mLastDisplayedAccount = account;
EventBus.getDefault().post(new TokenPushEvent());
checkForNewDevVersionNecessary(findViewById(R.id.root_layout), getApplicationContext()); checkForNewDevVersionNecessary(findViewById(R.id.root_layout), getApplicationContext());
} }