Replace serverInfo from VPN to session model, due to go model changes.

getlantern · Oct 5, 2023 · 8b569c7 · 8b569c7
1 parent 7a90c8d
commit 8b569c7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -316,4 +316,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0cfe0e959396ac6aad61f61d0b82005395de9d66
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3
diff --git a/ios/Runner/Lantern/Models/SessionModel.swift b/ios/Runner/Lantern/Models/SessionModel.swift
@@ -30,6 +30,7 @@ class SessionModel: BaseModel {
     }
     try super.init(flutterBinary, model)
     getBandwidth()
+    startService()
   }
 
   func startService() {

diff --git a/lib/common/session_model.dart b/lib/common/session_model.dart
@@ -322,6 +322,17 @@ class SessionModel extends Model {
     );
   }
 
+
+  Widget serverInfo(ValueWidgetBuilder<ServerInfo> builder) {
+    return subscribedSingleValueBuilder<ServerInfo>(
+      '/server_info',
+      builder: builder,
+      deserialize: (Uint8List serialized) {
+        return ServerInfo.fromBuffer(serialized);
+      },
+    );
+  }
+
   Future<String> requestLinkCode() {
     return methodChannel
         .invokeMethod('requestLinkCode')

diff --git a/lib/vpn/vpn_model.dart b/lib/vpn/vpn_model.dart
@@ -23,15 +23,17 @@ class VpnModel extends Model {
     return vpnStatus == 'connected';
   }
 
-  Widget serverInfo(ValueWidgetBuilder<ServerInfo> builder) {
-    return subscribedSingleValueBuilder<ServerInfo>(
-      '/server_info',
-      builder: builder,
-      deserialize: (Uint8List serialized) {
-        return ServerInfo.fromBuffer(serialized);
-      },
-    );
-  }
+  //This method has moved to Session model
+  // Due to go model changes
+  // Widget serverInfo(ValueWidgetBuilder<ServerInfo> builder) {
+  //   return subscribedSingleValueBuilder<ServerInfo>(
+  //     '/server_info',
+  //     builder: builder,
+  //     deserialize: (Uint8List serialized) {
+  //       return ServerInfo.fromBuffer(serialized);
+  //     },
+  //   );
+  // }
 
   Widget bandwidth(ValueWidgetBuilder<Bandwidth> builder) {
     return subscribedSingleValueBuilder<Bandwidth>(

diff --git a/lib/vpn/vpn_server_location.dart b/lib/vpn/vpn_server_location.dart
@@ -30,7 +30,7 @@ class ServerLocationWidget extends StatelessWidget {
           const Spacer(),
           vpnModel.vpnStatus(
               (BuildContext context, String vpnStatus, Widget? child) {
-            return vpnModel.serverInfo(
+            return sessionModel.serverInfo(
                 (BuildContext context, ServerInfo serverInfo, Widget? child) {
               if (vpnStatus == 'connected' || vpnStatus == 'disconnecting') {
                 return Row(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -316,4 +316,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 0cfe0e959396ac6aad61f61d0b82005395de9d66

		COCOAPODS: 1.12.1
		COCOAPODS: 1.11.3