Merge branch 'main' into clip_face_integration

ente-io · Aug 6, 2024 · 67c2d94 · 67c2d94
2 parents 3cc05d5 + b8cb480
commit 67c2d94
Show file tree

Hide file tree

Showing 265 changed files with 10,055 additions and 4,161 deletions.
diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json
@@ -1,8 +1,6 @@
 {
   "icons": [
-    { "title": "1xBet",
-      "altNames": ["1x", "1x bet", "1x-bet"
-      ]
+    { "title": "1xBet"
     },
     {
       "title": "3Commas"
@@ -32,7 +30,12 @@
       "title": "bitget"
     },
     {
-      "title": "Bitmart"
+      "titile":"bitget wallet",
+      "slug":"bitget_wallet"
+    },
+    {
+      "title": "Bitmart",
+      "hex":"000000"
     },
     {
       "title": "BitMEX"
@@ -107,8 +110,7 @@
       "title": "Crowdpear"
     },
     {
-      "title": "crypto.com",
-      "altNames": ["crypto"]
+      "title": "crypto"
     },
     {
       "title": "DCS",
@@ -139,6 +141,10 @@
       "title": "dus.net",
       "slug": "dusnet"
     },
+    {
+      "title":"ecitizen kenya",
+      "slug":"ecitizen_kenya"
+    },
     {
       "title": "ente",
       "hex": "1DB954"
@@ -164,7 +170,7 @@
     },
     {
       "title": "GitHub",
-      "hex": "858585"
+      "hex": "000000"
     },
     {
       "title": "GitLab"
@@ -353,7 +359,7 @@
       "title": "Odido"
     },
     { "title": "okx",
-      "hex": "858585" },
+      "hex": "000000" },
     {
       "title": "Parsec"
     },

diff --git a/auth/assets/custom-icons/icons/1xBet.svg b/auth/assets/custom-icons/icons/1xBet.svg
diff --git a/auth/assets/custom-icons/icons/bitget_wallet.svg b/auth/assets/custom-icons/icons/bitget_wallet.svg
diff --git a/auth/assets/custom-icons/icons/crypto.com.svg b/auth/assets/custom-icons/icons/crypto.com.svg
diff --git a/auth/assets/custom-icons/icons/crypto.svg b/auth/assets/custom-icons/icons/crypto.svg
diff --git a/auth/assets/custom-icons/icons/deriv.svg b/auth/assets/custom-icons/icons/deriv.svg
diff --git a/auth/assets/custom-icons/icons/ecitizen_kenya.svg b/auth/assets/custom-icons/icons/ecitizen_kenya.svg
diff --git a/auth/lib/core/configuration.dart b/auth/lib/core/configuration.dart
@@ -13,6 +13,7 @@ import 'package:ente_auth/models/key_attributes.dart';
 import 'package:ente_auth/models/key_gen_result.dart';
 import 'package:ente_auth/models/private_key_attributes.dart';
 import 'package:ente_auth/store/authenticator_db.dart';
+import 'package:ente_auth/utils/lock_screen_settings.dart';
 import 'package:ente_crypto_dart/ente_crypto_dart.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logging/logging.dart';
@@ -140,6 +141,7 @@ class Configuration {
         iOptions: _secureStorageOptionsIOS,
       );
     }
+    await LockScreenSettings.instance.removePinAndPassword();
     await AuthenticatorDB.instance.clearTable();
     _key = null;
     _cachedToken = null;
@@ -469,15 +471,21 @@ class Configuration {
     await _preferences.setBool(hasOptedForOfflineModeKey, true);
   }
 
-  bool shouldShowLockScreen() {
+  Future<bool> shouldShowLockScreen() async {
+    final bool isPin = await LockScreenSettings.instance.isPinSet();
+    final bool isPass = await LockScreenSettings.instance.isPasswordSet();
+    return isPin || isPass || shouldShowSystemLockScreen();
+  }
+
+  bool shouldShowSystemLockScreen() {
     if (_preferences.containsKey(keyShouldShowLockScreen)) {
       return _preferences.getBool(keyShouldShowLockScreen)!;
     } else {
       return false;
     }
   }
 
-  Future<void> setShouldShowLockScreen(bool value) {
+  Future<void> setSystemLockScreen(bool value) {
     return _preferences.setBool(keyShouldShowLockScreen, value);
   }