PawletOS/lineageos_setupwizard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetupWizard: Fix race conditions with async callbacks

Browse Source 
Change-Id: Ifeeec3ac74b4644bb26b9f90d0159a64b173785b
This commit is contained in:
cretin45
2015-02-23 15:58:21 -08:00
parent d7e70040b7
commit d385c7e906
4 changed files with 87 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java
View File

@@ -59,7 +59,7 @@ public class WifiSetupPage extends SetupPage {
private Runnable mFinishCaptivePortalCheckRunnable = new Runnable() {
@Override
public void run() {
final Activity activity = mContext;
final SetupWizardActivity activity = mContext;
if (mIsCaptivePortal) {
try {
int netId = ConnectivityManager.from(activity)
@@ -82,10 +82,14 @@ public class WifiSetupPage extends SetupPage {
} catch (Exception e) {
//Oh well
Log.e(TAG, "No captive portal activity found" + e);
getCallbacks().onNextPage();
if (activity.isCurrentPage(WifiSetupPage.this)) {
getCallbacks().onNextPage();
}
}
} else {
getCallbacks().onNextPage();
if (activity.isCurrentPage(WifiSetupPage.this)) {
getCallbacks().onNextPage();
}
}
}
};
@@ -147,7 +151,7 @@ public class WifiSetupPage extends SetupPage {
}
} else if (requestCode == SetupWizardApp.REQUEST_CODE_SETUP_CAPTIVE_PORTAL) {
if (resultCode == Activity.RESULT_CANCELED) {
SetupWizardUtils.launchWifiSetup((Activity)mContext);
SetupWizardUtils.launchWifiSetup(mContext);
} else {
getCallbacks().onNextPage();
}