Skip to content

Commit 0679d94

Browse files
Andre FonsecaGinder-Singh
Andre Fonseca
authored andcommitted
updating the tv app with:
1. Fixed the small setting crash where its trying to remove from empty collection. 2. getLogdata move it to background thread. 3. send debug log moved to background thread. 4. There is file Managers > Language > String_Localise add this to tv target as well.
1 parent 366e800 commit 0679d94

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

Windscribe.xcodeproj/project.pbxproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
1E49334D2BF3C6A100C853AF /* MainViewController+StaticIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E49334C2BF3C6A100C853AF /* MainViewController+StaticIP.swift */; };
122122
1E4933502BF4E43F00C853AF /* FavNodesListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E49334F2BF4E43F00C853AF /* FavNodesListViewModel.swift */; };
123123
1E4933532BF50BC200C853AF /* ServerListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E4933522BF50BC200C853AF /* ServerListViewModel.swift */; };
124+
1E5553982D8098FD00F16AF0 /* String+Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DB35A2817F53400C3EC1C /* String+Localized.swift */; };
124125
1E60DFEB2CA471B800623CD5 /* ShowLocationIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E60DFEA2CA471B800623CD5 /* ShowLocationIntentHandler.swift */; };
125126
1E60E00E2CAC53DB00623CD5 /* ShortcutProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E60E00D2CAC53DB00623CD5 /* ShortcutProvider.swift */; };
126127
1E60E00F2CAC54F800623CD5 /* Connect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E60DFF82CAB061800623CD5 /* Connect.swift */; };
@@ -1783,7 +1784,7 @@
17831784
C535D29B27E4F96C00C08345 /* WireGuardTunnelProduction.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuardTunnelProduction.entitlements; sourceTree = "<group>"; };
17841785
C5387E982CD46C07008A26EE /* VPNManager+Connect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VPNManager+Connect.swift"; sourceTree = "<group>"; };
17851786
C538B1582AB1A33D00E12CE2 /* proxy.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = proxy.xcframework; sourceTree = "<group>"; };
1786-
C545A0DB2D47638F00F3333E /* Completable+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Completable+Extension.swift"; sourceTree = "<group>"; };
1787+
C545A0DB2D47638F00F3333E /* Completable+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Completable+Ext.swift"; sourceTree = "<group>"; };
17871788
C54AE8712B8E5BEF00646529 /* LoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; };
17881789
C553E34D2C25ABE900A2C027 /* LICENCE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENCE.md; sourceTree = "<group>"; };
17891790
C5592B752B37F3F200F2F110 /* WSNetErrors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WSNetErrors.swift; sourceTree = "<group>"; };
@@ -5007,7 +5008,8 @@
50075008
599BA2A72C5B1E6E00F0D1E4 /* ForgotPasswordViewController.swift in Sources */,
50085009
59FC74522C515E7300021CD1 /* SKPaymentTransaction+Ext.swift in Sources */,
50095010
59FC73FB2C51538F00021CD1 /* Group.swift in Sources */,
5010-
C545A0DC2D47639500F3333E /* Completable+Extension.swift in Sources */,
5011+
C545A0DC2D47639500F3333E /* Completable+Ext.swift in Sources */,
5012+
1E5553982D8098FD00F16AF0 /* String+Localized.swift in Sources */,
50115013
59DA7FC22C3DAD3800042E57 /* WelcomeViewController.swift in Sources */,
50125014
1EA9D72A2C87375200566A93 /* AccountPopupModel.swift in Sources */,
50135015
1EF7BB482C74CD9D0032A4DF /* ConfirmEmailPopupViewController.swift in Sources */,
@@ -6057,7 +6059,7 @@
60576059
CODE_SIGN_IDENTITY = "Apple Development";
60586060
CODE_SIGN_STYLE = Automatic;
60596061
COPY_PHASE_STRIP = NO;
6060-
CURRENT_PROJECT_VERSION = 5;
6062+
CURRENT_PROJECT_VERSION = 12;
60616063
DEBUG_INFORMATION_FORMAT = dwarf;
60626064
DEVELOPMENT_TEAM = GYZJYS7XUG;
60636065
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -6153,7 +6155,7 @@
61536155
CODE_SIGN_IDENTITY = "Apple Development";
61546156
CODE_SIGN_STYLE = Automatic;
61556157
COPY_PHASE_STRIP = NO;
6156-
CURRENT_PROJECT_VERSION = 5;
6158+
CURRENT_PROJECT_VERSION = 12;
61576159
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
61586160
DEVELOPMENT_TEAM = GYZJYS7XUG;
61596161
ENABLE_NS_ASSERTIONS = NO;
@@ -6247,7 +6249,7 @@
62476249
CODE_SIGN_IDENTITY = "Apple Development";
62486250
CODE_SIGN_STYLE = Automatic;
62496251
COPY_PHASE_STRIP = NO;
6250-
CURRENT_PROJECT_VERSION = 5;
6252+
CURRENT_PROJECT_VERSION = 12;
62516253
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
62526254
DEVELOPMENT_TEAM = GYZJYS7XUG;
62536255
ENABLE_NS_ASSERTIONS = NO;
@@ -7389,7 +7391,7 @@
73897391
repositoryURL = "https://github.com/realm/realm-swift.git";
73907392
requirement = {
73917393
kind = exactVersion;
7392-
version = 10.33.0;
7394+
version = 10.46.0;
73937395
};
73947396
};
73957397
1E0A6DAD2D7884530075B8F5 /* XCRemoteSwiftPackageReference "SimpleKeychain" */ = {
@@ -7461,7 +7463,7 @@
74617463
repositoryURL = "https://github.com/ReactiveX/RxSwift.git";
74627464
requirement = {
74637465
kind = exactVersion;
7464-
version = 6.6.0;
7466+
version = 6.8.0;
74657467
};
74667468
};
74677469
1ED33DCC2D7B38A200B980D3 /* XCRemoteSwiftPackageReference "RxDataSources" */ = {

Windscribe/Managers/Logger/FileLoggerImpl.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ class FileLoggerImpl: FileLogger {
9797
let middle = result.isEmpty ? result : " "
9898
return result + middle + String(value)
9999
}
100-
100+
101101
guard !message.isEmpty else { return nil }
102-
102+
103103
if !message.contains("DeviceInfo") {
104104
message.removeLast()
105105
}

Windscribe/ViewControllers/Preferences/Help/HelpViewModel.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ class HelpViewModelImpl: HelpViewModel {
5151
}
5252

5353
func submitDebugLog(username: String? = nil, completion: @escaping (_ result: Bool?, _ error: String?) -> Void) {
54-
logger.getLogData().flatMap { fileData in
55-
var debugUsername = "user435"
54+
logger.getLogData()
55+
.subscribe(on: SerialDispatchQueueScheduler(qos: DispatchQoS.background))
56+
.observe(on: MainScheduler.asyncInstance)
57+
.flatMap { fileData in
58+
var debugUsername = ""
5659
if let session = self.sessionManager.session {
5760
debugUsername = session.username
5861
}

Windscribe/ViewControllers/Preferences/ViewLog/ViewLogViewModel.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ class ViewLogViewModelImpl: ViewLogViewModel {
3131

3232
private func load() {
3333
showProgress.onNext(true)
34-
logger.getLogData().subscribe(onSuccess: { [weak self] content in
34+
logger.getLogData()
35+
.subscribe(on: SerialDispatchQueueScheduler(qos: DispatchQoS.background))
36+
.observe(on: MainScheduler.asyncInstance)
37+
.subscribe(onSuccess: { [weak self] content in
3538
guard let self = self else { return }
3639
self.showProgress.onNext(false)
3740
self.logContent.onNext(content)

0 commit comments

Comments
 (0)