Issue #394: Show lock screen after 2 minutes being in background

SUPLA/AppDelegate.swift

@@ -19,18 +19,29 @@
 
 import Foundation
 
+private let BACKGROUND_UNLOCKED_TIME_DEBUG_S: Double = 10
+private let BACKGROUND_UNLOCKED_TIME_S: Double = 120
+
 class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate {
-
     var window: UIWindow? = nil
 
     @Singleton private var settings: GlobalSettings
     @Singleton private var insertNotificationUseCase: InsertNotificationUseCase
     @Singleton private var coordinator: SuplaAppCoordinator
     @Singleton private var suplaAppStateHolder: SuplaAppStateHolder
     @Singleton private var disconnectUseCase: DisconnectUseCase
+    @Singleton private var dateProvider: DateProvider
 
     private var clientStopWork: DispatchWorkItem? = nil
 
+    private var backgroundUnlockedTime: Double {
+        #if DEBUG
+        BACKGROUND_UNLOCKED_TIME_DEBUG_S
+        #else
+        BACKGROUND_UNLOCKED_TIME_S
+        #endif
+    }
+
     override init() {
         SALogWrapper.setup()
         DiContainer.start()
@@ -61,6 +72,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     }
 
     func applicationDidEnterBackground(_ application: UIApplication) {
+        var settings = settings
+        settings.backgroundEntryTime = dateProvider.currentTimestamp()
+
         disconnectUseCase.invokeSynchronous()
         suplaAppStateHolder.handle(event: .finish(reason: .appInBackground))
     }
@@ -72,7 +86,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         }
         #endif
 
-        suplaAppStateHolder.handle(event: .onStart)
+        if let backgroundEntryTime = settings.backgroundEntryTime,
+           dateProvider.currentTimestamp() - backgroundEntryTime > backgroundUnlockedTime
+        {
+            suplaAppStateHolder.handle(event: .lock)
+        } else {
+            suplaAppStateHolder.handle(event: .onStart)
+        }
     }
 
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {

SUPLA/Core/Config/GlobalSettings.swift

@@ -35,6 +35,7 @@ protocol GlobalSettings {
     var showOpeningPercent: Bool { get set }
     var darkMode: DarkModeSetting { get set }
     var lockScreenSettings: LockScreenSettings { get set }
+    var backgroundEntryTime: Double? { get set }
 }
 
 class GlobalSettingsImpl: GlobalSettings {
@@ -163,6 +164,20 @@ class GlobalSettingsImpl: GlobalSettings {
         get { return LockScreenSettings.from(string: defaults.string(forKey: lockScreenKey)) }
         set { defaults.set(newValue.asString(), forKey: lockScreenKey) }
     }
+
+    private let backgroundEntryTimeKey = "supla_background_entry_time"
+    var backgroundEntryTime: Double? {
+        get { return exists(backgroundEntryTimeKey) ? defaults.double(forKey: backgroundEntryTimeKey) : nil }
+        set {
+            if let time = newValue {
+                defaults.set(time, forKey: backgroundEntryTimeKey)
+            }
+        }
+    }
+
+    private func exists(_ key: String) -> Bool {
+        defaults.object(forKey: key) != nil
+    }
 }
 
 @objc class GlobalSettingsLegacy: NSObject {

SUPLATests/Mocks/GlobalSettingsMock.swift

@@ -117,4 +117,11 @@ class GlobalSettingsMock: GlobalSettings {
         get { lockScreenSettingsReturns }
         set { lockScreenSettingsValues.append(newValue) }
     }
+
+
+    var backgroundEntryMock: FunctionMock<Double?, Double?> = .init()
+    var backgroundEntryTime: Double? {
+        get { backgroundEntryMock.get() }
+        set { backgroundEntryMock.set(newValue) }
+    }
 }

SUPLATests/Tools/Core/FunctionMock.swift

@@ -28,6 +28,14 @@ class FunctionMock<Parameters, Returns> {
         return returns.next()
     }
 
+    func set(_ parameters: Parameters) {
+        self.parameters.append(parameters)
+    }
+
+    func get() -> Returns {
+        return returns.next()
+    }
+
     func verifyCalls(_ count: Int) {
         XCTAssertEqual(parameters.count, count)
     }