Fix for #2555 - can't open Preferences activity when there are stored WiFi connections with null SSID.

This commit is contained in:
Oliver Crow 2018-01-28 18:05:35 -08:00
parent 287bb5f7e1
commit 8090431d30

View File

@ -764,6 +764,10 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
}
}
private static String blankIfNull(String val) {
return val == null ? "" : val;
}
private void buildAutodownloadSelectedNetworsPreference() {
final Activity activity = ui.getActivity();
@ -778,7 +782,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
Log.e(TAG, "Couldn't get list of configure Wi-Fi networks");
return;
}
Collections.sort(networks, (x, y) -> x.SSID.compareTo(y.SSID));
Collections.sort(networks, (x, y) ->
blankIfNull(x.SSID).compareTo(blankIfNull(y.SSID)));
selectedNetworks = new CheckBoxPreference[networks.size()];
List<String> prefValues = Arrays.asList(UserPreferences
.getAutodownloadSelectedNetworks());