Skip to content

[stable-3.10] show first run again #5147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Jan 10, 2020
Merged

[stable-3.10] show first run again #5147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh

@Override
protected void onCreate(Bundle savedInstanceState) {
enableAccountHandling = false;

super.onCreate(savedInstanceState);
setContentView(R.layout.first_run_activity);

Expand Down
17 changes: 12 additions & 5 deletions src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.PersistableBundle;

import com.nextcloud.client.account.User;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.di.Injectable;
import com.nextcloud.client.preferences.AppPreferences;
import com.nextcloud.java.util.Optional;
import com.nextcloud.client.preferences.DarkMode;
import com.nextcloud.java.util.Optional;
import com.owncloud.android.MainApp;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
Expand Down Expand Up @@ -54,6 +53,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
*/
private boolean themeChangePending;
private boolean paused;
protected boolean enableAccountHandling = true;

@Inject UserAccountManager accountManager;
@Inject AppPreferences preferences;
Expand All @@ -72,8 +72,11 @@ public UserAccountManager getUserAccountManager() {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Account account = accountManager.getCurrentAccount();
setAccount(account, false);

if (enableAccountHandling) {
Account account = accountManager.getCurrentAccount();
setAccount(account, false);
}
}

@Override
Expand Down Expand Up @@ -175,10 +178,14 @@ protected void setUser(User user) {
protected void swapToDefaultAccount() {
// default to the most recently used account
Account newAccount = accountManager.getCurrentAccount();

if (newAccount == null) {
/// no account available: force account creation
createAccount(true);
finish();

if (enableAccountHandling) {
finish();
}
} else {
currentAccount = newAccount;
}
Expand Down