Release 1.8.0 (310)

nicegram · Sep 11, 2024 · 5a45879 · 5a45879
1 parent 83a9c42
commit 5a45879
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,3 +75,4 @@ ci/working_dir
 .build
 Telegram/Telegram-iOS/FirebaseRemoteConfigDefaults.plist
 *telegram-bazel-cache*
+Package_local.swift
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -2,7 +2,6 @@ bazel_dep(
     name = "rules_swift_package_manager",
     version = "0.36.0",
 )
-
 bazel_dep(
     name = "apple_support",
     version = "0.0.0",

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/Package.resolved b/Package.resolved
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/scenee/FloatingPanel",
       "state" : {
-        "revision" : "71f419a3cd212afc7615e2179c2fec1df1aa74da",
-        "version" : "2.8.5"
+        "revision" : "b6e8928b1a3ad909e6db6a0278d286c33cfd0dc3",
+        "version" : "2.8.6"
       }
     },
     {
@@ -87,7 +87,7 @@
       "location" : "https://github.com/denis15yo/GRDB.swift.git",
       "state" : {
         "branch" : "master",
-        "revision" : "afc958017ee4feefd3c61c8e2cddf81d079d2e39"
+        "revision" : "156d630c7a4175ddf4d529244f4672428cc6e2fc"
       }
     },
     {
@@ -123,7 +123,7 @@
       "location" : "[email protected]:mobyrix/nicegram-assistant-ios.git",
       "state" : {
         "branch" : "master",
-        "revision" : "ae5eb736957ce58b2d3e876df90ecbd252d13fe4"
+        "revision" : "576a005d81774db47ff572bcecb257d4b31d2da5"
       }
     },
     {
@@ -132,7 +132,7 @@
       "location" : "[email protected]:mobyrix/nicegram-wallet-ios.git",
       "state" : {
         "branch" : "master",
-        "revision" : "435678b5aa662b6482f1b56ba904d64526e4b9c6"
+        "revision" : "d2655c574276adaf88ffd8d618b766a8d308c027"
       }
     },
     {
@@ -230,8 +230,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
-        "version" : "1.1.2"
+        "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
+        "version" : "1.1.3"
       }
     },
     {
@@ -294,7 +294,7 @@
       "location" : "https://github.com/denis15yo/SwiftUI-Flow.git",
       "state" : {
         "branch" : "main",
-        "revision" : "9d122ace53e143dc3e1bf61c01a024535b0c7ab7"
+        "revision" : "3086a602b98155eec28b4be79210d6cb1a43e339"
       }
     },
     {
@@ -356,17 +356,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/trustwallet/wallet-core.git",
       "state" : {
-        "revision" : "160a6e6275d25c0edb91823ae62c605d3d66c013",
-        "version" : "4.1.5"
+        "revision" : "db50956fe49d7feb5aca3a4406f49b722e5cfab5",
+        "version" : "4.1.7"
       }
     },
     {
       "identity" : "walletconnectswiftv2",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/WalletConnect/WalletConnectSwiftV2.git",
       "state" : {
-        "revision" : "1427dcb1514e5d6f167ee7a41478ea1d6a6d8cc5",
-        "version" : "1.19.6"
+        "revision" : "2d0c59f682f1c1395b3c2f6e27eb020087952df3",
+        "version" : "1.20.2"
       }
     },
     {

diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -6311,7 +6311,6 @@ private final class ChatListLocationContext {
     // MARK: Nicegram Assistant
     var nicegramButton: AnyComponentWithIdentity<NavigationButtonComponentEnvironment>?
     //
-
     var leftButton: AnyComponentWithIdentity<NavigationButtonComponentEnvironment>?
     var rightButton: AnyComponentWithIdentity<NavigationButtonComponentEnvironment>?
     var proxyButton: AnyComponentWithIdentity<NavigationButtonComponentEnvironment>?
@@ -6332,7 +6331,7 @@ private final class ChatListLocationContext {
         if let nicegramButton = self.nicegramButton {
             result.append(nicegramButton)
         }
-        //
+
         return result
     }
 
@@ -6901,6 +6900,12 @@ private final class ChatListLocationContext {
             }
             self.parentController?.maybeDisplayStoryTooltip()
         })
+
+        // MARK: Nicegram waiting network bug
+        if case .waitingForNetwork = networkState {
+            context.account.network.simulateDisconnection()
+        }
+        //
     }
 
     private func updateForum(

diff --git a/submodules/TelegramCore/Sources/Network/Network.swift b/submodules/TelegramCore/Sources/Network/Network.swift
@@ -514,8 +514,8 @@ func initializedNetwork(accountId: AccountRecordId, arguments: NetworkInitializa
                 } else {
                     useNetworkFramework = false
                 }
-
-                if useNetworkFramework {
+                // MARK: Nicegram waiting network bug
+                if useNetworkFramework || true {
                     if #available(iOS 12.0, macOS 14.0, *) {
                         context.makeTcpConnectionInterface = { delegate, delegateQueue in
                             return NetworkFrameworkTcpConnectionInterface(delegate: delegate, delegateQueue: delegateQueue)
@@ -1199,6 +1199,13 @@ public final class Network: NSObject, MTRequestMessageServiceDelegate {
             return state.markNotifyTimestamp()
         }
     }
+
+    // MARK: Nicegram waiting network bug    
+    public func simulateDisconnection() {
+        mtProto.simulateDisconnection()
+        mtProto.resume()
+    }
+    //
 }
 
 public func retryRequest<T>(signal: Signal<T, MTRpcError>) -> Signal<T, NoError> {

diff --git a/versions.json b/versions.json
@@ -1,5 +1,5 @@
 {
-    "app": "1.7.6",
+    "app": "1.8.0",
     "xcode": "15.2",
     "bazel": "7.1.1",
     "macos": "13.0"