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

Fix SimMissingActivity never showing

Browse Source 
Change-Id: I1a9d2539db96046c472f17a21932bc720c00eb26
This commit is contained in:
Oliver Scott
2020-12-28 20:53:59 -05:00
committed by Timi Rautamäki
parent c5232fcebd
commit 1167c047be
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/raw/lineage_wizard_script.xml
View File

@@ -36,8 +36,7 @@
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WIFI_SETUP;end" id="wifi_setup">
<result wizard:resultCode="1" wizard:action="sim_missing" wizard:name="no_sim" />
<result wizard:action="choose_data_sim" />
<result wizard:action="sim_missing" />
</WizardAction>
<WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">

14
src/org/lineageos/setupwizard/SimMissingActivity.java
View File

@@ -23,6 +23,7 @@ import android.widget.ImageView;
import com.google.android.setupcompat.util.ResultCodes;
import org.lineageos.setupwizard.util.PhoneMonitor;
import org.lineageos.setupwizard.util.SetupWizardUtils;
public class SimMissingActivity extends BaseSetupWizardActivity {
@@ -58,13 +59,20 @@ public class SimMissingActivity extends BaseSetupWizardActivity {
}
}
@Override
protected void onResume() {
super.onResume();
SetupWizardUtils.enableComponent(this, ChooseDataSimActivity.class);
SetupWizardUtils.enableComponent(this, MobileDataActivity.class);
}
@Override
public void onNavigateNext() {
if (mPhoneMonitor.simMissing()) {
nextAction(ResultCodes.RESULT_SKIP);
} else {
super.onNavigateNext();
SetupWizardUtils.disableComponent(this, ChooseDataSimActivity.class);
SetupWizardUtils.disableComponent(this, MobileDataActivity.class);
}
super.onNavigateNext();
}
@Override

5
src/org/lineageos/setupwizard/util/SetupWizardUtils.java
View File

@@ -290,12 +290,11 @@ public class SetupWizardUtils {
disableComponent(context, MobileDataActivity.class);
disableComponent(context, SimMissingActivity.class);
disableComponent(context, ChooseDataSimActivity.class);
} else if (!simMissing()) {
disableComponent(context, SimMissingActivity.class);
}
if (!isMultiSimDevice()) {
disableComponent(context, ChooseDataSimActivity.class);
} else if (simMissing()) {
disableComponent(context, MobileDataActivity.class);
disableComponent(context, ChooseDataSimActivity.class);
}
if (!SetupWizardUtils.hasWifi(context) ||
isEthernetConnected(context)) {