Skip to content

Commit b4e2c6b

Browse files
author
Soner Yuksel
committed
Merge branch 'fix-open-vpn-on-fresh-install' into 'main'
Open vpn on fresh install does not work See merge request ws/client/iosapp!1086 (cherry picked from commit 392935e)
1 parent 766747f commit b4e2c6b

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎Windscribe.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8187,7 +8187,7 @@
81878187
"$(PROJECT_DIR)/libs",
81888188
);
81898189
MACH_O_TYPE = mh_execute;
8190-
MARKETING_VERSION = 3.9.7;
8190+
MARKETING_VERSION = 3.9.8;
81918191
ONLY_ACTIVE_ARCH = YES;
81928192
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D WINDSCRIBE";
81938193
PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID)";
@@ -8240,7 +8240,7 @@
82408240
"$(PROJECT_DIR)/libs",
82418241
);
82428242
MACH_O_TYPE = mh_execute;
8243-
MARKETING_VERSION = 3.9.7;
8243+
MARKETING_VERSION = 3.9.8;
82448244
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
82458245
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D WINDSCRIBE";
82468246
PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID)";
@@ -8348,7 +8348,7 @@
83488348
"$(inherited)",
83498349
"$(PROJECT_DIR)/libs",
83508350
);
8351-
MARKETING_VERSION = 3.9.7;
8351+
MARKETING_VERSION = 3.9.8;
83528352
ONLY_ACTIVE_ARCH = YES;
83538353
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.PacketTunnel;
83548354
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8386,7 +8386,7 @@
83868386
"$(inherited)",
83878387
"$(PROJECT_DIR)/libs",
83888388
);
8389-
MARKETING_VERSION = 3.9.7;
8389+
MARKETING_VERSION = 3.9.8;
83908390
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.PacketTunnel;
83918391
PRODUCT_NAME = "$(TARGET_NAME)";
83928392
SKIP_INSTALL = YES;
@@ -8419,7 +8419,7 @@
84198419
"@executable_path/Frameworks",
84208420
"@executable_path/../../Frameworks",
84218421
);
8422-
MARKETING_VERSION = 3.9.7;
8422+
MARKETING_VERSION = 3.9.8;
84238423
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.SiriIntents;
84248424
PRODUCT_NAME = "$(TARGET_NAME)";
84258425
SKIP_INSTALL = YES;
@@ -8449,7 +8449,7 @@
84498449
"@executable_path/Frameworks",
84508450
"@executable_path/../../Frameworks",
84518451
);
8452-
MARKETING_VERSION = 3.9.7;
8452+
MARKETING_VERSION = 3.9.8;
84538453
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.SiriIntents;
84548454
PRODUCT_NAME = "$(TARGET_NAME)";
84558455
SKIP_INSTALL = YES;
@@ -8484,7 +8484,7 @@
84848484
"$(inherited)",
84858485
"$(PROJECT_DIR)",
84868486
);
8487-
MARKETING_VERSION = 3.9.7;
8487+
MARKETING_VERSION = 3.9.8;
84888488
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
84898489
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.WireGuardTunnel;
84908490
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8523,7 +8523,7 @@
85238523
"$(inherited)",
85248524
"$(PROJECT_DIR)",
85258525
);
8526-
MARKETING_VERSION = 3.9.7;
8526+
MARKETING_VERSION = 3.9.8;
85278527
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
85288528
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.WireGuardTunnel;
85298529
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8594,7 +8594,7 @@
85948594
"@executable_path/Frameworks",
85958595
"@executable_path/../../Frameworks",
85968596
);
8597-
MARKETING_VERSION = 3.9.7;
8597+
MARKETING_VERSION = 3.9.8;
85988598
OTHER_SWIFT_FLAGS = "";
85998599
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.HomeWidget;
86008600
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8627,7 +8627,7 @@
86278627
"@executable_path/Frameworks",
86288628
"@executable_path/../../Frameworks",
86298629
);
8630-
MARKETING_VERSION = 3.9.7;
8630+
MARKETING_VERSION = 3.9.8;
86318631
OTHER_SWIFT_FLAGS = "";
86328632
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.HomeWidget;
86338633
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8790,7 +8790,7 @@
87908790
"$(PROJECT_DIR)/libs",
87918791
);
87928792
MACH_O_TYPE = mh_execute;
8793-
MARKETING_VERSION = 3.9.7;
8793+
MARKETING_VERSION = 3.9.8;
87948794
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -D WINDSCRIBE";
87958795
PRODUCT_BUNDLE_IDENTIFIER = "$(APP_BUNDLE_ID)";
87968796
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8860,7 +8860,7 @@
88608860
"$(inherited)",
88618861
"$(PROJECT_DIR)/libs",
88628862
);
8863-
MARKETING_VERSION = 3.9.7;
8863+
MARKETING_VERSION = 3.9.8;
88648864
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.PacketTunnel;
88658865
PRODUCT_NAME = "$(TARGET_NAME)";
88668866
SKIP_INSTALL = YES;
@@ -8893,7 +8893,7 @@
88938893
"@executable_path/Frameworks",
88948894
"@executable_path/../../Frameworks",
88958895
);
8896-
MARKETING_VERSION = 3.9.7;
8896+
MARKETING_VERSION = 3.9.8;
88978897
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.SiriIntents;
88988898
PRODUCT_NAME = "$(TARGET_NAME)";
88998899
SKIP_INSTALL = YES;
@@ -8927,7 +8927,7 @@
89278927
"$(inherited)",
89288928
"$(PROJECT_DIR)",
89298929
);
8930-
MARKETING_VERSION = 3.9.7;
8930+
MARKETING_VERSION = 3.9.8;
89318931
OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS";
89328932
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.WireGuardTunnel;
89338933
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -8979,7 +8979,7 @@
89798979
"@executable_path/Frameworks",
89808980
"@executable_path/../../Frameworks",
89818981
);
8982-
MARKETING_VERSION = 3.9.7;
8982+
MARKETING_VERSION = 3.9.8;
89838983
OTHER_SWIFT_FLAGS = "";
89848984
PRODUCT_BUNDLE_IDENTIFIER = com.windscribe.HomeWidget;
89858985
PRODUCT_NAME = "$(TARGET_NAME)";

‎Windscribe/Repository/Credentials/CredentialsRepositoryImpl.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class CredentialsRepositoryImpl: CredentialsRepository {
131131
let config = try await self.apiManager.getOpenVPNServerConfig(openVPNVersion: APIParameterValues.openVPNVersion)
132132
if let data = Data(base64Encoded: config) {
133133
do {
134-
try await self.fileDatabase.removeFile(path: FilePaths.openVPN)
134+
try? await self.fileDatabase.removeFile(path: FilePaths.openVPN)
135135
try await self.fileDatabase.saveFile(data: data, path: FilePaths.openVPN)
136136
} catch {
137137
self.logger.logE("CredentialsRepositoryImpl", "Failed to save server config file: \(error.localizedDescription)")

0 commit comments

Comments
 (0)