Merge pull request #2632 from nextcloud/develop

V 4.9.1

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 318
+let databaseSchemaVersion: UInt64   = 319

Nextcloud.xcodeproj/project.pbxproj

@@ -4670,7 +4670,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4696,7 +4696,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.9.0;
+				MARKETING_VERSION = 4.9.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -4735,7 +4735,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 0;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -4758,7 +4758,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.9.0;
+				MARKETING_VERSION = 4.9.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;

iOSClient/Data/NCDatabase.swift

@@ -83,7 +83,8 @@ class tableExternalSites: Object {
     @objc dynamic var url = ""
 }
 
-class tableGPS: Object {
+typealias tableGPS = tableGPSV2
+class tableGPSV2: Object {
     @objc dynamic var latitude: Double = 0
     @objc dynamic var longitude: Double = 0
     @objc dynamic var location = ""

iOSClient/Data/NCManageDatabase.swift

@@ -119,11 +119,12 @@ class NCManageDatabase: NSObject {
                         migration.deleteData(forType: tableVideo.className())
                     }
 
-                    if oldSchemaVersion < 306 {
+                    if oldSchemaVersion < 319 {
                         migration.deleteData(forType: tableChunk.className())
                         migration.deleteData(forType: tableMetadata.className())
                         migration.deleteData(forType: tableDirectory.className())
                         migration.deleteData(forType: tableE2eEncryptionLock.className())
+                        migration.deleteData(forType: tableGPS.className())
                     }
 
                 }, shouldCompactOnLaunch: { totalBytes, usedBytes in

iOSClient/Diagnostics/NCCapabilitiesView.swift

@@ -160,7 +160,7 @@ struct NCCapabilitiesView: View {
                     .foregroundColor(.green)
             } else {
                 Image(systemName: "multiply.circle.fill")
-                    .foregroundColor(.red)
+                    .foregroundColor(.gray)
             }
         }
     }

iOSClient/More/Cells/NCMoreAppSuggestionsCell.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import SafariServices
 
 class NCMoreAppSuggestionsCell: BaseNCMoreCell {
     @IBOutlet weak var talkView: UIStackView!
@@ -15,6 +16,8 @@ class NCMoreAppSuggestionsCell: BaseNCMoreCell {
 
     static let reuseIdentifier = "NCMoreAppSuggestionsCell"
 
+    weak var delegate: NCMoreAppSuggestionsCellDelegate?
+
     static func fromNib() -> UINib {
         return UINib(nibName: "NCMoreAppSuggestionsCell", bundle: nil)
     }
@@ -51,7 +54,10 @@ class NCMoreAppSuggestionsCell: BaseNCMoreCell {
     }
 
     @objc func moreAppsTapped() {
-        guard let url = URL(string: NCGlobal.shared.moreAppsUrl) else { return }
-        UIApplication.shared.open(url)
+        delegate?.moreAppsTapped()
     }
 }
+
+protocol NCMoreAppSuggestionsCellDelegate: AnyObject {
+    func moreAppsTapped()
+}

iOSClient/More/NCMore.swift

@@ -23,6 +23,7 @@
 
 import UIKit
 import NextcloudKit
+import SafariServices
 
 class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
@@ -359,6 +360,9 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
         } else if section.type == .moreApps {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: NCMoreAppSuggestionsCell.reuseIdentifier, for: indexPath) as? NCMoreAppSuggestionsCell else { return UITableViewCell() }
+
+            cell.delegate = self
+
             return cell
         } else {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: CCCellMore.reuseIdentifier, for: indexPath) as? CCCellMore else { return UITableViewCell() }
@@ -445,3 +449,12 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         }
     }
 }
+
+extension NCMore: NCMoreAppSuggestionsCellDelegate {
+    func moreAppsTapped() {
+        guard let url = URL(string: NCGlobal.shared.moreAppsUrl) else { return }
+        let safariViewController = SFSafariViewController(url: url)
+
+        present(safariViewController, animated: true, completion: nil)
+    }
+}