eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Set ios target version 12

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit 8ff76350eacc720c422954647682caac9da53618)
This commit is contained in:
dab246
2024-01-10 23:45:34 +07:00
committed by Dat Vu
parent 1a20180ae5
commit 2a1c5cd72f
5 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/Podfile
+1 -1
View File
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project # Uncomment this line to define a global platform for your project
platform :ios, '11.0' platform :ios, '12.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency. # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true' ENV['COCOAPODS_DISABLE_STATS'] = 'true'
ios/Podfile.lock
+1 -1
View File
@@ -331,6 +331,6 @@ SPEC CHECKSUMS:
url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86 url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86
workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6 workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
PODFILE CHECKSUM: e209bf81fb4facf3f68c43dbffa0b2d05ff63db0 PODFILE CHECKSUM: 91d9116a6c482e0d0b230a68097981fae7e4d07a
COCOAPODS: 1.14.3 COCOAPODS: 1.14.3
ios/Runner.xcodeproj/project.pbxproj
+9 -9
View File
@@ -840,7 +840,7 @@
DEVELOPMENT_TEAM = KUT463DS29; DEVELOPMENT_TEAM = KUT463DS29;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -978,7 +978,7 @@
DEVELOPMENT_TEAM = KUT463DS29; DEVELOPMENT_TEAM = KUT463DS29;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1008,7 +1008,7 @@
DEVELOPMENT_TEAM = KUT463DS29; DEVELOPMENT_TEAM = KUT463DS29;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1041,7 +1041,7 @@
INFOPLIST_FILE = TeamMailShareExtension/Info.plist; INFOPLIST_FILE = TeamMailShareExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TeamMailShareExtension; INFOPLIST_KEY_CFBundleDisplayName = TeamMailShareExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 15.2; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1081,7 +1081,7 @@
INFOPLIST_FILE = TeamMailShareExtension/Info.plist; INFOPLIST_FILE = TeamMailShareExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TeamMailShareExtension; INFOPLIST_KEY_CFBundleDisplayName = TeamMailShareExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 15.2; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1118,7 +1118,7 @@
INFOPLIST_FILE = TeamMailShareExtension/Info.plist; INFOPLIST_FILE = TeamMailShareExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TeamMailShareExtension; INFOPLIST_KEY_CFBundleDisplayName = TeamMailShareExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 15.2; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1159,7 +1159,7 @@
INFOPLIST_FILE = TwakeMailNSE/Info.plist; INFOPLIST_FILE = TwakeMailNSE/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TwakeMailNSE; INFOPLIST_KEY_CFBundleDisplayName = TwakeMailNSE;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.2; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1203,7 +1203,7 @@
INFOPLIST_FILE = TwakeMailNSE/Info.plist; INFOPLIST_FILE = TwakeMailNSE/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TwakeMailNSE; INFOPLIST_KEY_CFBundleDisplayName = TwakeMailNSE;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.2; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
@@ -1245,7 +1245,7 @@
INFOPLIST_FILE = TwakeMailNSE/Info.plist; INFOPLIST_FILE = TwakeMailNSE/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = TwakeMailNSE; INFOPLIST_KEY_CFBundleDisplayName = TwakeMailNSE;
INFOPLIST_KEY_NSHumanReadableCopyright = ""; INFOPLIST_KEY_NSHumanReadableCopyright = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.2; IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
ios/TwakeCore/Network/Model/AuthenticationSSO.swift
+7
View File
@@ -23,10 +23,17 @@ struct AuthenticationSSO: Authentication {
return false return false
} }
if #available(iOSApplicationExtension 15, *) {
guard let expireDate = expireTime.convertISO8601StringToDate(), guard let expireDate = expireTime.convertISO8601StringToDate(),
expireDate.isBefore(Date.now) else { expireDate.isBefore(Date.now) else {
return true return true
} }
} else {
guard let expireDate = expireTime.convertISO8601StringToDate(),
expireDate.isBefore(Date()) else {
return true
}
}
return false return false
} }
ios/TwakeMailNSE/NotificationService.swift
+5
View File
@@ -25,9 +25,13 @@ class NotificationService: UNNotificationServiceExtension {
return self.notify() return self.notify()
} }
if #available(iOSApplicationExtension 13.0, *) {
Task { Task {
await handleGetNewEmails(payloadData: payloadData) await handleGetNewEmails(payloadData: payloadData)
} }
} else {
return self.notify()
}
} }
override func serviceExtensionTimeWillExpire() { override func serviceExtensionTimeWillExpire() {
@@ -36,6 +40,7 @@ class NotificationService: UNNotificationServiceExtension {
notify() notify()
} }
@available(iOSApplicationExtension 13.0.0, *)
private func handleGetNewEmails(payloadData: [String: Any]) async { private func handleGetNewEmails(payloadData: [String: Any]) async {
let mapStateChanges: [String: [TypeName: String]] = PayloadParser.shared.parsingPayloadNotification(payloadData: payloadData) let mapStateChanges: [String: [TypeName: String]] = PayloadParser.shared.parsingPayloadNotification(payloadData: payloadData)