diff options
| author | Álvaro Brey Vilas <alvaro.brey@nextcloud.com> | 2022-03-23 20:23:57 +0300 |
|---|---|---|
| committer | Álvaro Brey Vilas <alvaro.brey@nextcloud.com> | 2022-03-23 20:23:57 +0300 |
| commit | a1901ca3e8837b7ad42123352c4e26e453913eb5 (patch) | |
| tree | d057ba4be8bff2ec0babdd8a854502739e5e2a78 | |
| parent | 95046c4b5d4e41d4c25b41296e8da3a12efcb1b0 (diff) | |
ManageAccountsActivity: go back to AuthenticatorActivity after removing last accountfix/login-after-logout
Instead of waiting for FileDisplayActivity to make a network request and fail
Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
| -rw-r--r-- | app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java index 9565216704..b13e340019 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java @@ -45,6 +45,7 @@ import com.nextcloud.client.onboarding.FirstRunActivity; import com.nextcloud.java.util.Optional; import com.owncloud.android.MainApp; import com.owncloud.android.R; +import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.ArbitraryDataProvider; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.files.services.FileDownloader; @@ -180,11 +181,18 @@ public class ManageAccountsActivity extends FileActivity implements UserListAdap @Override public void onBackPressed() { Intent resultIntent = new Intent(); - resultIntent.putExtra(KEY_ACCOUNT_LIST_CHANGED, hasAccountListChanged()); - resultIntent.putExtra(KEY_CURRENT_ACCOUNT_CHANGED, hasCurrentAccountChanged()); - setResult(RESULT_OK, resultIntent); + if (accountManager.getAllUsers().size() > 0) { + resultIntent.putExtra(KEY_ACCOUNT_LIST_CHANGED, hasAccountListChanged()); + resultIntent.putExtra(KEY_CURRENT_ACCOUNT_CHANGED, hasCurrentAccountChanged()); + setResult(RESULT_OK, resultIntent); - super.onBackPressed(); + super.onBackPressed(); + } else { + final Intent intent = new Intent(this, AuthenticatorActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(intent); + finish(); + } } /** |