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

Check wifi/telephony/ethernet status when relevant

Browse Source 
Change-Id: I5d34b0fc5059f2b2eaceaf459180002b525c4249
This commit is contained in:
Oliver Scott
2024-07-16 21:23:46 -04:00
committed by Bruno Martins
parent 2db34a23d7
commit 5584669c2e
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/lineageos/setupwizard/NetworkSetupActivity.java
View File

@@ -6,6 +6,8 @@
package org.lineageos.setupwizard;
import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ENABLE_NEXT_ON_CONNECT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT;
import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_PREFS_SHOW_BUTTON_BAR;
@@ -23,6 +25,11 @@ public class NetworkSetupActivity extends SubBaseActivity {
@Override
protected void onStartSubactivity() {
if ((!SetupWizardUtils.hasWifi(this) && !SetupWizardUtils.hasTelephony(this)) ||
SetupWizardUtils.isNetworkConnectedToInternetViaEthernet(this)) {
finishAction(RESULT_SKIP);
return;
}
if (SetupWizardUtils.isOwner()) {
tryEnablingWifi();
}

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

@@ -7,6 +7,7 @@
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 android.content.Intent;
@@ -19,8 +20,8 @@ import org.lineageos.setupwizard.util.SetupWizardUtils;
public class SimMissingActivity extends SubBaseActivity {
protected void onStartSubactivity() {
if (!SetupWizardUtils.simMissing(this)) {
nextAction(RESULT_OK);
if (!SetupWizardUtils.simMissing(this) || !SetupWizardUtils.hasTelephony(this)) {
finishAction(RESULT_SKIP);
return;
}
getGlifLayout().setDescriptionText(getString(R.string.sim_missing_summary));

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

@@ -52,9 +52,7 @@ import android.util.Log;
import org.lineageos.setupwizard.BaseSetupWizardActivity;
import org.lineageos.setupwizard.BluetoothSetupActivity;
import org.lineageos.setupwizard.NetworkSetupActivity;
import org.lineageos.setupwizard.SetupWizardApp;
import org.lineageos.setupwizard.SimMissingActivity;
import java.io.File;
import java.util.List;
@@ -209,7 +207,7 @@ public class SetupWizardUtils {
return SystemProperties.getBoolean("config.disable_bluetooth", false);
}
private static boolean isNetworkConnectedToInternetViaEthernet(Context context) {
public static boolean isNetworkConnectedToInternetViaEthernet(Context context) {
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
return networkCapabilities != null &&
@@ -238,13 +236,6 @@ public class SetupWizardUtils {
if (!hasLeanback(context) || isBluetoothDisabled()) {
disableComponent(context, BluetoothSetupActivity.class);
}
if (!hasTelephony(context)) {
disableComponent(context, SimMissingActivity.class);
}
if ((!hasWifi(context) && !hasTelephony(context)) ||
isNetworkConnectedToInternetViaEthernet(context)) {
disableComponent(context, NetworkSetupActivity.class);
}
}
/**