From b7762ff96205184b2b9a86ea8de62ae5656ef33f Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Sat, 8 Aug 2020 12:52:31 +0800
Subject: [PATCH] Rename fingerprint to biometric

---
 app/src/main/AndroidManifest.xml                       | 8 ++------
 app/src/main/res/layout-land/activity_set_security.xml | 2 +-
 app/src/main/res/layout/activity_set_security.xml      | 2 +-
 app/src/main/res/values-de/strings.xml                 | 1 -
 app/src/main/res/values-es/strings.xml                 | 1 -
 app/src/main/res/values-fr/strings.xml                 | 1 -
 app/src/main/res/values-ja/strings.xml                 | 1 -
 app/src/main/res/values-ko/strings.xml                 | 1 -
 app/src/main/res/values-th/strings.xml                 | 1 -
 app/src/main/res/values-zh-rCN/strings.xml             | 2 +-
 app/src/main/res/values-zh-rHK/strings.xml             | 1 -
 app/src/main/res/values-zh-rTW/strings.xml             | 1 -
 app/src/main/res/values/strings.xml                    | 2 +-
 13 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eefaa1ce6..9ef28d619 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,8 +20,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
@@ -38,15 +36,13 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:appCategory="image"
+        android:hasFragileUserData="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme"
         tools:ignore="UnusedAttribute">
 
-        <uses-library
-            android:name="org.apache.http.legacy"
-            android:required="false" />
-
         <activity
             android:name="com.hippo.ehviewer.ui.MainActivity"
             android:configChanges="screenSize|uiMode"
diff --git a/app/src/main/res/layout-land/activity_set_security.xml b/app/src/main/res/layout-land/activity_set_security.xml
index c9fa2f3f8..a9a318d4d 100755
--- a/app/src/main/res/layout-land/activity_set_security.xml
+++ b/app/src/main/res/layout-land/activity_set_security.xml
@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="20dp"
-            android:text="@string/enable_fingerprint"
+            android:text="@string/enable_biometric"
             android:visibility="gone" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml
index deb842287..aba393d75 100755
--- a/app/src/main/res/layout/activity_set_security.xml
+++ b/app/src/main/res/layout/activity_set_security.xml
@@ -54,7 +54,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="20dp"
-        android:text="@string/enable_fingerprint"
+        android:text="@string/enable_biometric"
         android:visibility="gone" />
 
     <LinearLayout
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d3f48f544..80f093e98 100755
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -287,7 +287,6 @@
     <string name="set_pattern_protection">Sperrmuster festlegen</string>
     <string name="set_pattern_protection_tip">Zeichne ein Muster, um es als Sperrmuster festzulegen.\nLasse frei, um das Sperrmuster zu entfernen.</string>
     <string name="set">Festlegen</string>
-    <string name="enable_fingerprint">Mit Fingerabdrücke entsperren</string>
     <string name="u_config">EHentai-Einstellungen</string>
     <string name="apply">Übernehmen</string>
     <string name="apply_tip">Zum Speichern der Einstellungen auf Häkchen tippen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d553e1cbd..810de0d06 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -619,7 +619,6 @@
     <string name="settings_privacy_secure">Impedir capturas de pantalla</string>
     <string name="settings_privacy_secure_summary">Si habilitas esta opción no podrás hacer captura de pantalla y el sistema no mostrará una previsualización en el multitareas.\n\nDeberás reiniciar la aplicación para activar esta función.</string>
     <string name="page_menu_save_to">Guardar en…</string>
-    <string name="enable_fingerprint">Usar huellas digitales para desbloquear</string>
     <string name="u_config">Ajustes EHentai</string>
     <string name="apply">Aplicar</string>
     <string name="apply_tip">Toca la marca de verificación para guardar los cambios</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3d0d95629..8b4ee34e3 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -358,7 +358,6 @@
     <string name="set_pattern_protection">Définir le modéle de déverrouillage</string>
     <string name="set_pattern_protection_tip">Déssinez un modéle pour définir le modéle de déverrouillage\nContinuer sans rien déssiner pour effacer le modéle</string>
     <string name="set">Définir</string>
-    <string name="enable_fingerprint">Permettre le déverrouillage avec l\'empreinte digitale</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">Paramètres EHentai</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a078671e3..b14989af8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -355,7 +355,6 @@
     <string name="set_pattern_protection">パターン保護を設定</string>
     <string name="set_pattern_protection_tip">パターンを描いてパターン保護を設定します\n空白のまま続行してパターン保護をクリアします</string>
     <string name="set">設定</string>
-    <string name="enable_fingerprint">指紋でロックを解除</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">EHentaiの設定</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index a2ea4f63b..a4d05787f 100755
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -326,7 +326,6 @@
     <string name="set_pattern_protection">패턴 보호 사용</string>
     <string name="set_pattern_protection_tip">패턴 보호를 사용하려면 패턴을 그리세요.\n비워두면 패턴 보호가 해제됩니다.</string>
     <string name="set">지정</string>
-    <string name="enable_fingerprint">지문으로 잠금 해제 허용</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">E-Hentai 설정</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index a29453af8..ec387536a 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -341,7 +341,6 @@
     <string name="set_pattern_protection">ตั้้งการป้องกันแบบรูปแบบ</string>
     <string name="set_pattern_protection_tip">ลากรูปแบบเพื่อตั้งค่าการป้องกันแบบรูปแบบ\nเว้นว้างไว้เพื่อลบการป้องกันแบบรูปแบบ</string>
     <string name="set">กำหนด</string>
-    <string name="enable_fingerprint">อนุญาตใช้สแกนลายนิ้วมือเพื่อปลดล็อกเช่นกัน</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">การตั้งค่า EHentai</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7bd409270..215741ad8 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -375,7 +375,7 @@
     <string name="set_pattern_protection">设置图案保护</string>
     <string name="set_pattern_protection_tip">绘制图案来设置图案保护\n留空来取消图案保护</string>
     <string name="set">设置</string>
-    <string name="enable_fingerprint">允许使用指纹解锁</string>
+    <string name="enable_biometric">允许使用生物特征解锁</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">EHentai 设置</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 27ea88deb..3f35aa8de 100755
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -374,7 +374,6 @@
     <string name="set_pattern_protection">設置圖案保護</string>
     <string name="set_pattern_protection_tip">繪製圖案來設置圖案保護\n留空來取消圖案保護</string>
     <string name="set">設置</string>
-    <string name="enable_fingerprint">允許使用指紋解鎖</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">EHentai 設置</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2aaa07c1e..9c0729b64 100755
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -373,7 +373,6 @@
     <string name="set_pattern_protection">設定圖形解鎖</string>
     <string name="set_pattern_protection_tip">繪製圖案來設定繪圖解鎖\n留白以取消圖案保護</string>
     <string name="set">設定</string>
-    <string name="enable_fingerprint">啟用指紋解鎖</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">EHentai 設定</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 677b3c117..5727ead50 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -421,7 +421,7 @@
     <string name="set_pattern_protection">Set pattern protection</string>
     <string name="set_pattern_protection_tip">Draw a pattern to set pattern protection\nLeave blank to clear pattern protection</string>
     <string name="set">Set</string>
-    <string name="enable_fingerprint">Also allow fingerprint unlock</string>
+    <string name="enable_biometric">Also allow biometric unlock</string>
 
     <!-- UConfig Activity -->
     <string name="u_config">EHentai settings</string>