Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7e0ddb2 authored by cretin45's avatar cretin45
Browse files

SetupWizard: Fix double advance after adding account 

Change-Id: I039f0c290c4ef539df16374cb1e6f2e7b49e41cd
parent dc8c56ba

src/com/cyanogenmod/setupwizard/setup/CyanogenServicesPage.java

+4 −1
Original line number Diff line number Diff line
@@ -76,7 +76,10 @@ public class CyanogenServicesPage extends SetupPage { 
        if (action == Page.ACTION_PREVIOUS) {

            getCallbacks().onPreviousPage();

        } else {

            if (!SetupWizardUtils.accountExists(mContext,

                    mContext.getString(R.string.cm_account_type))) {

                launchCyanogenAccountSetup(context);

            }

            super.doLoadAction(context, action);

        }

    }

src/com/cyanogenmod/setupwizard/setup/CyanogenSettingsPage.java

+1 −13
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.Activity; 
import android.app.Fragment;

import android.app.FragmentManager;

import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.os.Bundle;

import android.os.Handler;
@@ -38,7 +37,6 @@ import android.widget.CheckBox; 
import android.widget.TextView;



import com.cyanogenmod.setupwizard.R;

import com.cyanogenmod.setupwizard.SetupWizardApp;

import com.cyanogenmod.setupwizard.ui.SetupPageFragment;

import com.cyanogenmod.setupwizard.ui.WebViewDialogFragment;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;
@@ -50,7 +48,7 @@ import org.cyanogenmod.hardware.KeyDisabler; 


public class CyanogenSettingsPage extends SetupPage {



    public static final String TAG = "CyanogenServicesPage";

    public static final String TAG = "CyanogenSettingsPage";



    public static final String KEY_SEND_METRICS = "send_metrics";

    public static final String KEY_REGISTER_WHISPERPUSH = "register";
@@ -85,16 +83,6 @@ public class CyanogenSettingsPage extends SetupPage { 
        return R.string.setup_services;

    }



    @Override

    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CYANOGEN) {

            if (resultCode == Activity.RESULT_CANCELED) {

                getCallbacks().onPreviousPage();

            }

        }

        return true;

    }



    private static void writeDisableNavkeysOption(Context context, boolean enabled) {

        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        final int defaultBrightness = context.getResources().getInteger(

src/com/cyanogenmod/setupwizard/setup/SetupPage.java

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ public abstract class SetupPage implements Page { 
    @Override

    public void setCompleted(boolean completed) {

        mCompleted = completed;

        mCallbacks.onNextPage();

    }



    @Override