Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when user selects WiFi over Hotspot, make sure WiFi is enabled

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2018-04-12 12:58:28 +02:00
parent 444ecd024b
commit f07e5c040c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
View File

@ -121,6 +121,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
private PrepareSwapRepo updateSwappableAppsTask; private PrepareSwapRepo updateSwappableAppsTask;
private NewRepoConfig confirmSwapConfig; private NewRepoConfig confirmSwapConfig;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private WifiManager wifiManager;
@NonNull @NonNull
private final ServiceConnection serviceConnection = new ServiceConnection() { private final ServiceConnection serviceConnection = new ServiceConnection() {
@ -186,6 +187,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
container = (ViewGroup) findViewById(R.id.fragment_container); container = (ViewGroup) findViewById(R.id.fragment_container);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
new SwapDebug().logStatus(); new SwapDebug().logStatus();
} }
@ -258,7 +260,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
.setPositiveButton(R.string.wifi, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.wifi, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
startActivity(new Intent(WifiManager.ACTION_PICK_WIFI_NETWORK)); SwapService.putWifiEnabledBeforeSwap(wifiManager.isWifiEnabled());
wifiManager.setWifiEnabled(true);
Intent intent = new Intent(WifiManager.ACTION_PICK_WIFI_NETWORK);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(intent);
} }
}) })
.setNegativeButton(R.string.wifi_ap, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.wifi_ap, new DialogInterface.OnClickListener() {
@ -277,7 +283,6 @@ public class SwapWorkflowActivity extends AppCompatActivity {
} }
private void setupWifiAP() { private void setupWifiAP() {
WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
WifiApControl ap = WifiApControl.getInstance(this); WifiApControl ap = WifiApControl.getInstance(this);
wifiManager.setWifiEnabled(false); wifiManager.setWifiEnabled(false);
if (ap.enable()) { if (ap.enable()) {