Skip to content

Commit ae73986

Browse files
NMC 2575 - App update changes
1 parent 5fb9d75 commit ae73986

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

Nextcloud.xcodeproj/project.pbxproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
AFCE353527E4ED5900FEA6C2 /* DateFormatter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */; };
9393
AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */; };
9494
AFCE353927E5DE0500FEA6C2 /* Shareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* Shareable.swift */; };
95+
AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */; };
96+
B5D45E732DA5172900773929 /* AppUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D45E712DA5172900773929 /* AppUpdater.swift */; };
97+
C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
9598
D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
9699
D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
97100
F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
@@ -1326,6 +1329,8 @@
13261329
AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
13271330
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
13281331
AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
1332+
AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
1333+
B5D45E712DA5172900773929 /* AppUpdater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdater.swift; sourceTree = "<group>"; };
13291334
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13301335
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13311336
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
@@ -2153,6 +2158,14 @@
21532158
path = Advanced;
21542159
sourceTree = "<group>";
21552160
};
2161+
B5D45E722DA5172900773929 /* AppUpdate */ = {
2162+
isa = PBXGroup;
2163+
children = (
2164+
B5D45E712DA5172900773929 /* AppUpdater.swift */,
2165+
);
2166+
path = AppUpdate;
2167+
sourceTree = "<group>";
2168+
};
21562169
C0046CDB2A17B98400D87C9D /* NextcloudUITests */ = {
21572170
isa = PBXGroup;
21582171
children = (
@@ -3299,6 +3312,7 @@
32993312
isa = PBXGroup;
33003313
children = (
33013314
AA517BB42D66149900F8D37C /* .tx */,
3315+
B5D45E722DA5172900773929 /* AppUpdate */,
33023316
F702F2CC25EE5B4F008F8E80 /* AppDelegate.swift */,
33033317
F794E13E2BBC0F70003693D7 /* SceneDelegate.swift */,
33043318
F77DD6A72C5CC093009448FB /* NCSession.swift */,
@@ -4660,6 +4674,7 @@
46604674
F7D4BF402CA2E8D800A5E746 /* TOPasscodeButtonLabel.m in Sources */,
46614675
F7D4BF412CA2E8D800A5E746 /* TOPasscodeViewControllerAnimatedTransitioning.m in Sources */,
46624676
F7D4BF422CA2E8D800A5E746 /* TOPasscodeSettingsViewController.m in Sources */,
4677+
B5D45E732DA5172900773929 /* AppUpdater.swift in Sources */,
46634678
F7D4BF432CA2E8D800A5E746 /* TOPasscodeCircleImage.m in Sources */,
46644679
F7D4BF442CA2E8D800A5E746 /* TOPasscodeView.m in Sources */,
46654680
F7D4BF452CA2E8D800A5E746 /* TOPasscodeCircleButton.m in Sources */,

iOSClient/SceneDelegate.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
131131
// NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Initialize Auto upload with \(num) uploads")
132132
// }
133133
AppUpdater().checkForUpdate()
134+
134135
NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterRichdocumentGrabFocus)
135136
}
136137

@@ -139,6 +140,20 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
139140
let controller = SceneManager.shared.getController(scene: scene)
140141
NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Scene did become active")
141142

143+
let oldVersion = UserDefaults.standard.value(forKey: NCSettingsBundleHelper.SettingsBundleKeys.BuildVersionKey) as? String
144+
AppUpdater().checkForUpdate()
145+
AnalyticsHelper.shared.trackAppVersion(oldVersion: oldVersion)
146+
if let userAccount = NCManageDatabase.shared.getActiveTableAccount() {
147+
AnalyticsHelper.shared.trackUsedStorageData(quotaUsed: userAccount.quotaUsed)
148+
}
149+
150+
NCSettingsBundleHelper.setVersionAndBuildNumber()
151+
NCSettingsBundleHelper.checkAndExecuteSettings(delay: 0.5)
152+
153+
// if !NCAskAuthorization().isRequesting {
154+
// NCPasscode.shared.hidePrivacyProtectionWindow()
155+
// }
156+
142157
hidePrivacyProtectionWindow()
143158

144159
NCAutoUpload.shared.initAutoUpload(controller: nil, account: session.account) { num in

0 commit comments

Comments
 (0)