Merge pull request #168 from hugeBlack/main

AltStore support & bug fixes
khanhduytran0 · Sep 25, 2024 · e5cf20b · e5cf20b
2 parents 76a6643 + e828cf3
commit e5cf20b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 32 deletions.
diff --git a/LiveContainerSwiftUI/LCAppBanner.swift b/LiveContainerSwiftUI/LCAppBanner.swift
@@ -72,8 +72,9 @@ struct LCAppBanner : View {
                                 )
                         }
                         if model.uiIsLocked && !model.uiIsHidden {
-                            Text("lc.appBanner.locked".loc).font(.system(size: 8)).bold().padding(2)
-                                .frame(width: 50, height:16)
+                            Image(systemName: "lock.fill")
+                                .font(.system(size: 8))
+                                .frame(width: 16, height:16)
                                 .background(
                                     Capsule().fill(Color("BadgeColor"))
                                 )

diff --git a/LiveContainerSwiftUI/LCAppListView.swift b/LiveContainerSwiftUI/LCAppListView.swift
@@ -150,7 +150,7 @@ struct LCAppListView : View, LCAppBannerDelegate, LCAppModelDelegate {
                         }
                 }.animation(.easeInOut, value: LCUtils.appGroupUserDefault.bool(forKey: "LCStrictHiding"))
 
-                if LCUtils.multiLCStatus == 2 {
+                if sharedModel.multiLCStatus == 2 {
                     Text("lc.appList.manageInPrimaryTip".loc).foregroundStyle(.gray).padding()
                 }
 

diff --git a/LiveContainerSwiftUI/LCAppModel.swift b/LiveContainerSwiftUI/LCAppModel.swift
@@ -128,17 +128,32 @@ class LCAppModel: ObservableObject, Hashable {
 
     }
 
-    func toggleLock() async {
-        if appInfo.isLocked {
+    func setLocked(newLockState: Bool) async {
+        // if locked state in appinfo already match with the new state, we just the change
+        if appInfo.isLocked == newLockState {
+            return
+        }
+
+        if newLockState {
+            appInfo.isLocked = true
+        } else {
+            // authenticate before cancelling locked state
+            do {
+                let result = try await LCUtils.authenticateUser()
+                if !result {
+                    uiIsLocked = true
+                    return
+                }
+            } catch {
+                uiIsLocked = true
+                return
+            }
+
+            // auth pass, we need to cancel app's lock and hidden state
             appInfo.isLocked = false
-            uiIsLocked = false
-
             if appInfo.isHidden {
                 await toggleHidden()
             }
-        } else {
-            appInfo.isLocked = true
-            uiIsLocked = true
         }
     }
 

diff --git a/LiveContainerSwiftUI/LCAppSettingsView.swift b/LiveContainerSwiftUI/LCAppSettingsView.swift
@@ -159,21 +159,7 @@ struct LCAppSettingsView : View{
                     Text("lc.appSettings.lockApp".loc)
                 }
                 .onChange(of: model.uiIsLocked, perform: { newValue in
-                    Task {
-                        if !newValue {
-                            do {
-                                let result = try await LCUtils.authenticateUser()
-                                if !result {
-                                    model.uiIsLocked = true
-                                    return
-                                }
-                            } catch {
-                                return
-                            }
-                        }
-
-                        await model.toggleLock()
-                    }
+                    Task { await model.setLocked(newLockState: newValue) }
                 })
 
                 if model.uiIsLocked {

diff --git a/LiveContainerSwiftUI/LCSettingsView.swift b/LiveContainerSwiftUI/LCSettingsView.swift
@@ -177,15 +177,16 @@ struct LCSettingsView: View {
                 } footer: {
                     Text("lc.settings.injectLCItselfDesc".loc)
                 }
-
-                Section {
-                    Toggle(isOn: $strictHiding) {
-                        Text("lc.settings.strictHiding".loc)
+                if sharedModel.isHiddenAppUnlocked {
+                    Section {
+                        Toggle(isOn: $strictHiding) {
+                            Text("lc.settings.strictHiding".loc)
+                        }
+                    } footer: {
+                        Text("lc.settings.strictHidingDesc".loc)
                     }
-                } footer: {
-                    Text("lc.settings.strictHidingDesc".loc)
                 }
-
+                    
                 Section {
                     if sharedModel.multiLCStatus != 2 {
                         Button {