mirror of https://github.com/M66B/FairEmail.git
Prevent importing biometrics without available sensor
This commit is contained in:
parent
04286e9175
commit
830c05839a
|
@ -881,20 +881,26 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
|
||||||
for (int s = 0; s < jsettings.length(); s++) {
|
for (int s = 0; s < jsettings.length(); s++) {
|
||||||
JSONObject jsetting = (JSONObject) jsettings.get(s);
|
JSONObject jsetting = (JSONObject) jsettings.get(s);
|
||||||
String key = jsetting.getString("key");
|
String key = jsetting.getString("key");
|
||||||
if (!"pro".equals(key) || BuildConfig.DEBUG) {
|
|
||||||
Object value = jsetting.get("value");
|
if ("pro".equals(key) && !BuildConfig.DEBUG)
|
||||||
if (value instanceof Boolean)
|
continue;
|
||||||
editor.putBoolean(key, (Boolean) value);
|
|
||||||
else if (value instanceof Integer)
|
if ("biometrics".equals(key) && !Helper.canAuthenticate(context))
|
||||||
editor.putInt(key, (Integer) value);
|
continue;
|
||||||
else if (value instanceof Long)
|
|
||||||
editor.putLong(key, (Long) value);
|
Object value = jsetting.get("value");
|
||||||
else if (value instanceof String)
|
if (value instanceof Boolean)
|
||||||
editor.putString(key, (String) value);
|
editor.putBoolean(key, (Boolean) value);
|
||||||
else
|
else if (value instanceof Integer)
|
||||||
throw new IllegalArgumentException("Unknown settings type key=" + key);
|
editor.putInt(key, (Integer) value);
|
||||||
Log.i("Imported setting=" + key);
|
else if (value instanceof Long)
|
||||||
}
|
editor.putLong(key, (Long) value);
|
||||||
|
else if (value instanceof String)
|
||||||
|
editor.putString(key, (String) value);
|
||||||
|
else
|
||||||
|
throw new IllegalArgumentException("Unknown settings type key=" + key);
|
||||||
|
|
||||||
|
Log.i("Imported setting=" + key);
|
||||||
}
|
}
|
||||||
editor.apply();
|
editor.apply();
|
||||||
ApplicationEx.upgrade(context);
|
ApplicationEx.upgrade(context);
|
||||||
|
|
Loading…
Reference in New Issue