From 41bf8f8c6b0c007ff1a37b9c22dd66544c279e5c Mon Sep 17 00:00:00 2001 From: Domino987 Date: Mon, 6 Nov 2017 10:34:23 +0100 Subject: [PATCH 1/6] Create values-de\strings.xml --- "lib/src/main/res/values-de\\strings.xml" | 1 + 1 file changed, 1 insertion(+) create mode 100644 "lib/src/main/res/values-de\\strings.xml" diff --git "a/lib/src/main/res/values-de\\strings.xml" "b/lib/src/main/res/values-de\\strings.xml" new file mode 100644 index 00000000..b4785957 --- /dev/null +++ "b/lib/src/main/res/values-de\\strings.xml" @@ -0,0 +1 @@ +s From ea9f5ae8b401bb7453bb4a45adeb6a060b6d5635 Mon Sep 17 00:00:00 2001 From: Domino987 Date: Mon, 6 Nov 2017 10:34:47 +0100 Subject: [PATCH 2/6] Delete values-de\strings.xml --- "lib/src/main/res/values-de\\strings.xml" | 1 - 1 file changed, 1 deletion(-) delete mode 100644 "lib/src/main/res/values-de\\strings.xml" diff --git "a/lib/src/main/res/values-de\\strings.xml" "b/lib/src/main/res/values-de\\strings.xml" deleted file mode 100644 index b4785957..00000000 --- "a/lib/src/main/res/values-de\\strings.xml" +++ /dev/null @@ -1 +0,0 @@ -s From 1f1b0e4ffb7200b3f6d2ab4371ba59512f63c944 Mon Sep 17 00:00:00 2001 From: Domino987 Date: Mon, 6 Nov 2017 10:35:02 +0100 Subject: [PATCH 3/6] Create strings.xml --- lib/src/main/res/values-de/strings.xml | 1 + 1 file changed, 1 insertion(+) create mode 100644 lib/src/main/res/values-de/strings.xml diff --git a/lib/src/main/res/values-de/strings.xml b/lib/src/main/res/values-de/strings.xml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/src/main/res/values-de/strings.xml @@ -0,0 +1 @@ + From c4192806889e5c09fd7321ee1ff91f9893e00fdc Mon Sep 17 00:00:00 2001 From: Domino987 Date: Mon, 6 Nov 2017 10:38:24 +0100 Subject: [PATCH 4/6] Update strings.xml --- lib/src/main/res/values-de/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/src/main/res/values-de/strings.xml b/lib/src/main/res/values-de/strings.xml index 8b137891..3b298cca 100644 --- a/lib/src/main/res/values-de/strings.xml +++ b/lib/src/main/res/values-de/strings.xml @@ -1 +1,14 @@ + + Vergessen? + Entferne deinen %d-Zahlen Pin + Erstelle einen %d-Zahlen Pin + Gib deinen %d-Zahlen Pin ein + Gib deinen %d-Zahlen Pin ein + Bestätige deinen %d-Zahlen Pin + + Fingerabdruck + Fingerabdruck erkannt + Fingerabdruck nicht erkannt. Versuche es erneut + + From fc340c1dfb317be1565ed60699d5ab37c5ea0bc5 Mon Sep 17 00:00:00 2001 From: Domino987 Date: Mon, 6 Nov 2017 10:39:11 +0100 Subject: [PATCH 5/6] Add german as Language --- lib/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/res/values-de/strings.xml b/lib/src/main/res/values-de/strings.xml index 3b298cca..e743104a 100644 --- a/lib/src/main/res/values-de/strings.xml +++ b/lib/src/main/res/values-de/strings.xml @@ -3,7 +3,7 @@ Vergessen? Entferne deinen %d-Zahlen Pin Erstelle einen %d-Zahlen Pin - Gib deinen %d-Zahlen Pin ein + Gib deinen aktuellen %d-Zahlen Pin ein Gib deinen %d-Zahlen Pin ein Bestätige deinen %d-Zahlen Pin From cdaa871c462551f73426104ee17ce2581eb28db6 Mon Sep 17 00:00:00 2001 From: Domino987 Date: Sat, 11 Nov 2017 14:19:58 +0100 Subject: [PATCH 6/6] NullpointerException fix App crashes if no fingerprint sensor is installed. VERSION >= 23 --- .../omadahealth/lollipin/lib/managers/AppLockActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java b/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java index c2c72574..57be6f73 100644 --- a/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java +++ b/lib/src/main/java/com/github/omadahealth/lollipin/lib/managers/AppLockActivity.java @@ -144,7 +144,7 @@ private void initLayoutForFingerprint() { mFingerprintManager = (FingerprintManager) getSystemService(Context.FINGERPRINT_SERVICE); mFingerprintUiHelper = new FingerprintUiHelper.FingerprintUiHelperBuilder(mFingerprintManager).build(mFingerprintImageView, mFingerprintTextView, this); try { - if (mFingerprintManager.isHardwareDetected() && mFingerprintUiHelper.isFingerprintAuthAvailable() + if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected() && mFingerprintUiHelper.isFingerprintAuthAvailable() && mLockManager.getAppLock().isFingerprintAuthEnabled()) { mFingerprintImageView.setVisibility(View.VISIBLE); mFingerprintTextView.setVisibility(View.VISIBLE);