Merge pull request #4689 from nextcloud/account-cleanup-folder-picker-activity

Remove onAccountSet from FolderPickerActivity
This commit is contained in:
Tobias Kaminsky 2019-10-17 11:38:08 +02:00 committed by GitHub
commit 64c986eaf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -32,6 +32,7 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Parcelable;
import android.util.Log;
import android.view.ActionMode;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@ -155,16 +156,8 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
}
@Override
protected void onStart() {
super.onStart();
}
/**
* Called when the ownCloud {@link Account} associated to the Activity was just updated.
*/
@Override
protected void onAccountSet(boolean stateWasRecovered) {
super.onAccountSet(stateWasRecovered);
public void onActionModeStarted(ActionMode mode) {
super.onActionModeStarted(mode);
if (getAccount() != null) {
updateFileFromDB();
@ -176,12 +169,9 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
folder = getFile();
}
if (!stateWasRecovered) {
OCFileListFragment listOfFolders = getListOfFilesFragment();
listOfFolders.listDirectory(folder, false, false);
startSyncFolderOperation(folder, false);
}
OCFileListFragment listOfFolders = getListOfFilesFragment();
listOfFolders.listDirectory(folder, false, false);
startSyncFolderOperation(folder, false);
updateNavigationElementsInActionBar();
}