Fix: Launching LauncherActivity & FirstRunActivity properly

[surinder-tsys]

This PR contains the following fixes:

1. Launching Launcher & FirstRun Activity Properly: account login screen opens again on back press #12652
2. Account login screen opens again on back press: account login screen opens again on back press #12652
3. Locking & Unlocking phone in FirstRunActivity redirects to AuthenticatorActivity: Weird state management in FirstRunActivity #4993

Previous Behaviour:

1. User is not logged In.
2. App launches and directly redirects to AuthenticatorActivity without showing Launcher and FirstRun Activity.
3. On doing successful authentication when user presses back button then AuthenticatorActivity shows again. (This happens only for First login but while adding account this works fine)

Modified Behaviour:

1. User is not logged In.
2. App launches and firstly shows LauncherActivity and then redirects to FirstRunActivity.
3. Now, from FirstRunActivity clicking on Login it opens AuthenticatorActivity and once user is authenticated, pressing back finishes the app instead of showing AuthenticatorActivity again.

Changes Explained:

• Starting any Activity checks for User and startAccountCreation() if user not found. This bypass showing Launcher and FirstRun Activity.

To avoid this I have added check for both Activities and skipping redirection to AuthenticatorActivity in UserAccountManagerImpl class.

public void startAccountCreation(final Activity activity) {
        // skipping AuthenticatorActivity redirection when user is on Launcher or FirstRun Activity
        if (activity instanceof LauncherActivity || activity instanceof FirstRunActivity) return;

        Intent intent = new Intent(context, AuthenticatorActivity.class);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        context.startActivity(intent);
    }

• Making the above change will directly finishes the app as AuthenticatorActivity doesn't shows from LauncherActivity.

To fix this I have added AuthenticatorActivity Intent in LauncherActivity if user is not present.

private fun scheduleSplashScreen() {
        Handler(Looper.getMainLooper()).postDelayed({
            if (user.isPresent) {
                startActivity(Intent(this, FileDisplayActivity::class.java))
            } else {
                startActivity(Intent(this, AuthenticatorActivity::class.java))
            }
            finish()
        }, SPLASH_DURATION)
    }

• To show the FirstRunActivity, under OnboardingServiceImpl -> isFirstRun flag which checks currentAccount as shown below always returns false as for no user we are returning Anonymous account.

override val isFirstRun: Boolean
        get() {
            return accountProvider.currentAccount == null
        }

To fix this I have updated the logic as below:

override val isFirstRun: Boolean
        get() {
            return accountProvider.user.isAnonymous
        }

• When user is on FirstRunActivity and locks his phone then unlocks , it redirected to AuthenticatorActivity (mentioned here: Weird state management in FirstRunActivity #4993). To avoid this we have add a check in BaseActivity for onRestart method.

@Override
    protected void onRestart() {
        Log_OC.v(TAG, "onRestart() start");
        super.onRestart();
        if (enableAccountHandling) {
            mixinRegistry.onRestart();
        }
    }

• Finally, to finish the AuthenticatorActivity after successful login at first time (Refer: account login screen opens again on back press #12652). I have updated logic as below:

private void endSuccess() {
        if (!onlyAdd) {
            Intent i = new Intent(this, FileDisplayActivity.class);
            i.setAction(FileDisplayActivity.RESTART);
            i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
            startActivity(i);
        }
        finish();
    }

• Tests written, or not not needed

[alperozturk96]

Tested working and thank you so much for this fix. 💯

[joshtrichards]

Related: #11392

[github-actions]

Codacy

Lint

Type	master	PR
Warnings	59	59
Errors	3	3

SpotBugs

[github-actions]

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)