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

SimMissingActivity is a regular SUW activity

Browse Source 
Remove unused subactivity code and change to BaseSetupWizardActivity.

Change-Id: I50492f6d533543ae1ea46965b299a20ee44d0ca0
This commit is contained in:
Tommy Webb
2024-07-25 13:45:20 +00:00
parent 5948809bb4
commit 1d833219d8
1 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,18 +6,19 @@
package org.lineageos.setupwizard; package org.lineageos.setupwizard;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP; import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
import android.annotation.Nullable;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle;
import androidx.activity.result.ActivityResult;
import org.lineageos.setupwizard.util.SetupWizardUtils; import org.lineageos.setupwizard.util.SetupWizardUtils;
public class SimMissingActivity extends SubBaseActivity { public class SimMissingActivity extends BaseSetupWizardActivity {
protected void onStartSubactivity() { @Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!SetupWizardUtils.simMissing(this) || !SetupWizardUtils.hasTelephony(this)) { if (!SetupWizardUtils.simMissing(this) || !SetupWizardUtils.hasTelephony(this)) {
finishAction(RESULT_SKIP); finishAction(RESULT_SKIP);
return; return;
@@ -26,25 +27,6 @@ public class SimMissingActivity extends SubBaseActivity {
setNextAllowed(true); setNextAllowed(true);
} }
@Override
protected void onSubactivityResult(ActivityResult activityResult) {
int resultCode = activityResult.getResultCode();
Intent data = activityResult.getData();
if (resultCode != RESULT_CANCELED) {
nextAction(resultCode, data);
} else if (mIsSubactivityNotFound) {
finishAction(RESULT_ACTIVITY_NOT_FOUND);
} else if (data != null && data.getBooleanExtra("onBackPressed", false)) {
if (SetupWizardUtils.simMissing(this)) {
onStartSubactivity();
} else {
finishAction(RESULT_CANCELED, data);
}
} else if (!SetupWizardUtils.simMissing(this)) {
nextAction(RESULT_OK);
}
}
@Override @Override
protected int getLayoutResId() { protected int getLayoutResId() {
return R.layout.sim_missing_page; return R.layout.sim_missing_page;