mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-25 15:32:52 +00:00
Code Issues Releases Wiki Activity

Improved PIN/biometric handling

Browse source
This commit is contained in:
M66B 2020-10-30 18:07:32 +01:00
parent 23a99bd761
commit 8cb4c89c76
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
View file

@ -187,10 +187,11 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
try { try {
boolean pro = ActivityBilling.isPro(getContext()); boolean pro = ActivityBilling.isPro(getContext());
if (pro) { if (pro) {
prefs.edit().putBoolean("biometrics", !biometrics).apply(); SharedPreferences.Editor editor = prefs.edit();
btnBiometrics.setText(!biometrics if (!biometrics)
? R.string.title_setup_biometrics_disable editor.remove("pin");
: R.string.title_setup_biometrics_enable); editor.putBoolean("biometrics", !biometrics);
editor.apply();
} else } else
startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
} catch (Throwable ex) { } catch (Throwable ex) {
@ -357,6 +358,10 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
swDisableTracking.setChecked(prefs.getBoolean("disable_tracking", true)); swDisableTracking.setChecked(prefs.getBoolean("disable_tracking", true));
swHideTimeZone.setChecked(prefs.getBoolean("hide_timezone", true)); swHideTimeZone.setChecked(prefs.getBoolean("hide_timezone", true));
String pin = prefs.getString("pin", null);
btnPin.setCompoundDrawablesRelativeWithIntrinsicBounds(
0, 0, TextUtils.isEmpty(pin) ? 0 : R.drawable.twotone_check_12, 0);
boolean biometrics = prefs.getBoolean("biometrics", false); boolean biometrics = prefs.getBoolean("biometrics", false);
btnBiometrics.setText(biometrics btnBiometrics.setText(biometrics
? R.string.title_setup_biometrics_disable ? R.string.title_setup_biometrics_disable
@ -405,7 +410,10 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
boolean pro = ActivityBilling.isPro(getContext()); boolean pro = ActivityBilling.isPro(getContext());
if (pro) { if (pro) {
Helper.setAuthenticated(getContext()); Helper.setAuthenticated(getContext());
prefs.edit().putString("pin", pin).apply(); prefs.edit()
.remove("biometrics")
.putString("pin", pin)
.apply();
} else } else
startActivity(new Intent(getContext(), ActivityBilling.class)); startActivity(new Intent(getContext(), ActivityBilling.class));
} }

10
app/src/main/res/drawable/twotone_check_12.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="12dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41L9,16.17z"/>
</vector>

1
app/src/main/res/layout/fragment_options_privacy.xml
View file

@ -168,6 +168,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:drawablePadding="6dp"
android:text="@string/title_advanced_pin" android:text="@string/title_advanced_pin"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBiometrics" /> app:layout_constraintTop_toBottomOf="@id/tvBiometrics" />