MESSENGER Merge 1.9.5 buildfixes

Riot/Modules/SetPinCode/PinCodePreferences.swift

@@ -65,7 +65,7 @@ final class PinCodePreferences: NSObject {
                 //  clear old pin
                 try oldStore.removeObject(forKey: StoreKeys.pin)
             } catch let error {
-                MXLog.error("[PinCodePreferences] Error when migrating old user pin: \(error)")
+                MXLog.error("[PinCodePreferences] Error when migrating old user pin:")
             }
         }
         
@@ -168,7 +168,7 @@ final class PinCodePreferences: NSObject {
             let pin = try secureStore.string(forKey: StoreKeys.pin)
             return pinCode == pin
         } catch let error {
-            MXLog.error("[PinCodePreferences] Error when checking user pin: \(error)")
+            MXLog.error("[PinCodePreferences] Error when checking user pin")
             return false
         }
     }
@@ -181,20 +181,24 @@ final class PinCodePreferences: NSObject {
         }
     }
     
-    var canUseBiometricsToUnlock: Bool {
+    var canUseBiometricsToUnlock: Bool? {
         get {
             guard isBiometricsAvailable == true else {
                 return false
             }
             
             do {
-                return try store.bool(forKey: StoreKeys.canUseBiometricsToUnlock)
-            } catch let error {
-                MXLog.debug("[PinCodePreferences] Error when reading canUseBiometricsToUnlock from store: \(error)")
+                return try secureStore.bool(forKey: StoreKeys.canUseBiometricsToUnlock)
+            } catch {
+                MXLog.debug("[PinCodePreferences] Error when reading canUseBiometricsToUnlock from store")
                 return nil
             }
         } set {
-            RiotSettings.shared.canUseBiometricsToUnlock = newValue
+            do {
+                try secureStore.set(newValue, forKey: StoreKeys.canUseBiometricsToUnlock)
+            } catch {
+                MXLog.debug("[PinCodePreferences] Error when storing canUseBiometricsToUnlock to the store")
+            }
         }
     }
     
@@ -215,7 +219,7 @@ final class PinCodePreferences: NSObject {
     }
     
     var isBiometricsSet: Bool {
-        return biometricsEnabled && canUseBiometricsToUnlock && isBiometricsAvailable
+        return biometricsEnabled && (canUseBiometricsToUnlock ?? true) && isBiometricsAvailable
     }
 
     func localizedBiometricsName() -> String? {