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

prevent crash when starting swap in Android 6.0+

Browse Source 
This just stops the crash for now, it does not yet request the permission.
That'll be part of the big UX overhaul.

#656 https://gitlab.com/fdroid/fdroidclient/issues/656
This commit is contained in:
Hans-Christoph Steiner 2016-05-11 21:11:14 +02:00
parent e96dcd653d
commit 80ed1e7180
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -47,6 +47,7 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="18" /> android:maxSdkVersion="18" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="org.fdroid.fdroid.privileged.USE_SERVICE" /> <uses-permission android:name="org.fdroid.fdroid.privileged.USE_SERVICE" />

2
app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java
View File

@ -436,7 +436,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In
viewWifiId.setVisibility(TextUtils.isEmpty(FDroidApp.ipAddressString) ? View.GONE : View.VISIBLE); viewWifiId.setVisibility(TextUtils.isEmpty(FDroidApp.ipAddressString) ? View.GONE : View.VISIBLE);
WifiApControl wifiAp = WifiApControl.getInstance(getActivity()); WifiApControl wifiAp = WifiApControl.getInstance(getActivity());
if (wifiAp.isWifiApEnabled()) { if (wifiAp != null && wifiAp.isWifiApEnabled()) {
WifiConfiguration config = wifiAp.getConfiguration(); WifiConfiguration config = wifiAp.getConfiguration();
viewWifiNetwork.setText(getContext().getString(R.string.swap_active_hotspot, config.SSID)); viewWifiNetwork.setText(getContext().getString(R.string.swap_active_hotspot, config.SSID));
} else if (TextUtils.isEmpty(FDroidApp.ssid)) { } else if (TextUtils.isEmpty(FDroidApp.ssid)) {