From ba353b9f2b28b3a1bbd6441f94d24d61c76130ad Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 6 Apr 2017 10:11:59 +0100 Subject: [PATCH] List of wifi configs can be null. --- .../bramble/system/AndroidSecureRandomProvider.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java index 502e7b982..9a83f00a7 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidSecureRandomProvider.java @@ -15,6 +15,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import java.io.DataOutputStream; import java.io.IOException; +import java.util.List; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; @@ -49,8 +50,11 @@ class AndroidSecureRandomProvider extends LinuxSecureRandomProvider { Parcel parcel = Parcel.obtain(); WifiManager wm = (WifiManager) appContext.getSystemService(WIFI_SERVICE); - for (WifiConfiguration config : wm.getConfiguredNetworks()) - parcel.writeParcelable(config, 0); + List configs = wm.getConfiguredNetworks(); + if (configs != null) { + for (WifiConfiguration config : configs) + parcel.writeParcelable(config, 0); + } BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter(); if (bt != null) { for (BluetoothDevice device : bt.getBondedDevices())