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

Commit d7e70040 authored by cretin45's avatar cretin45
Browse files

SetupWizard: Refactor context type 

Context is assumed to be SetupWizardActivity and blindly cast. Just make the Context reference a SetupWizardActivity.

Change-Id: I3d7ffd08980fbff0fbea51b45b28002b49813038
parent c4584a78

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

+4 −3
Original line number Diff line number Diff line
@@ -17,22 +17,23 @@ 
package com.cyanogenmod.setupwizard.setup;



import android.content.BroadcastReceiver;

import android.content.Context;

import android.os.Bundle;



import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;



import java.util.ArrayList;



public abstract class AbstractSetupData extends BroadcastReceiver implements SetupDataCallbacks {



    private static final String TAG = AbstractSetupData.class.getSimpleName();



    protected Context mContext;

    protected SetupWizardActivity mContext;

    private ArrayList<SetupDataCallbacks> mListeners = new ArrayList<SetupDataCallbacks>();

    private PageList mPageList;



    private int mCurrentPageIndex = 0;



    public AbstractSetupData(Context context) {

    public AbstractSetupData(SetupWizardActivity context) {

        mContext = context;

        mPageList = onNewPageList();

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.net.ConnectivityManager; 
import android.telephony.TelephonyManager;



import com.android.internal.telephony.TelephonyIntents;

import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;



import java.util.ArrayList;
@@ -34,7 +35,7 @@ public class CMSetupWizardData extends AbstractSetupData { 
    private boolean mTimeSet = false;

    private boolean mTimeZoneSet = false;



    public CMSetupWizardData(Context context) {

    public CMSetupWizardData(SetupWizardActivity context) {

        super(context);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.telephony.SubInfoRecord; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;

import android.util.SparseArray;

import android.view.LayoutInflater;

import android.view.View;
@@ -38,6 +37,7 @@ import android.widget.TextView; 


import com.cyanogenmod.setupwizard.R;

import com.cyanogenmod.setupwizard.ui.SetupPageFragment;

import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;



import java.util.List;
@@ -45,7 +45,7 @@ public class ChooseDataSimPage extends SetupPage { 


    public static final String TAG = "ChooseDataSimPage";



    public ChooseDataSimPage(Context context, SetupDataCallbacks callbacks) {

    public ChooseDataSimPage(SetupWizardActivity context, SetupDataCallbacks callbacks) {

        super(context, callbacks);

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -25,13 +25,13 @@ import android.app.Activity; 
import android.app.ActivityOptions;

import android.app.Fragment;

import android.app.FragmentManager;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;



import com.cyanogenmod.setupwizard.R;

import com.cyanogenmod.setupwizard.SetupWizardApp;

import com.cyanogenmod.setupwizard.ui.LoadingFragment;

import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;



import java.io.IOException;
@@ -40,7 +40,7 @@ public class CyanogenServicesPage extends SetupPage { 


    public static final String TAG = "CyanogenServicesPage";



    public CyanogenServicesPage(Context context, SetupDataCallbacks callbacks) {

    public CyanogenServicesPage(SetupWizardActivity context, SetupDataCallbacks callbacks) {

        super(context, callbacks);

    }
@@ -73,7 +73,7 @@ public class CyanogenServicesPage extends SetupPage { 
    }



    @Override

    public void doLoadAction(Activity context, int action) {

    public void doLoadAction(SetupWizardActivity context, int action) {

        if (action == Page.ACTION_PREVIOUS) {

            getCallbacks().onPreviousPage();

        } else {

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

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.widget.TextView; 


import com.cyanogenmod.setupwizard.R;

import com.cyanogenmod.setupwizard.ui.SetupPageFragment;

import com.cyanogenmod.setupwizard.ui.SetupWizardActivity;

import com.cyanogenmod.setupwizard.ui.WebViewDialogFragment;

import com.cyanogenmod.setupwizard.util.SetupWizardUtils;

import com.cyanogenmod.setupwizard.util.WhisperPushUtils;
@@ -59,7 +60,7 @@ public class CyanogenSettingsPage extends SetupPage { 
    public static final String SETTING_METRICS = "settings.cyanogen.allow_metrics";

    public static final String PRIVACY_POLICY_URI = "https://cyngn.com/legal/privacy-policy";



    public CyanogenSettingsPage(Context context, SetupDataCallbacks callbacks) {

    public CyanogenSettingsPage(SetupWizardActivity context, SetupDataCallbacks callbacks) {

        super(context, callbacks);

    }