Add compile time checks to detect Android

Sources/ParseSwift/Coding/AnyEncodable.swift

@@ -98,7 +98,7 @@ extension _AnyEncodable {
         }
     }
 
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     private func encode(nsnumber: NSNumber, into container: inout SingleValueEncodingContainer) throws { // swiftlint:disable:this cyclomatic_complexity line_length
         switch CFNumberGetType(nsnumber) {
         case .charType:

Sources/ParseSwift/Internal/ParseHash.swift

@@ -5,7 +5,7 @@
 //  Created by Corey Baker on 12/22/20.
 //  Copyright © 2020 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 import CommonCrypto
 

Sources/ParseSwift/LiveQuery/LiveQuerySocket.swift

@@ -5,7 +5,7 @@
 //  Created by Corey Baker on 12/31/20.
 //  Copyright © 2020 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 #if canImport(FoundationNetworking)
 import FoundationNetworking

Sources/ParseSwift/LiveQuery/ParseLiveQuery.swift

@@ -5,7 +5,7 @@
 //  Created by Corey Baker on 1/2/21.
 //  Copyright © 2021 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 #if canImport(FoundationNetworking)
 import FoundationNetworking

Sources/ParseSwift/LiveQuery/Protocols/LiveQuerySocketDelegate.swift

@@ -5,7 +5,7 @@
 //  Created by Corey Baker on 1/4/21.
 //  Copyright © 2021 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 #if canImport(FoundationNetworking)
 import FoundationNetworking

Sources/ParseSwift/LiveQuery/Protocols/ParseLiveQueryDelegate.swift

@@ -5,7 +5,7 @@
 //  Created by Corey Baker on 1/4/21.
 //  Copyright © 2021 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 #if canImport(FoundationNetworking)
 import FoundationNetworking

Sources/ParseSwift/Objects/ParseInstallation.swift

@@ -121,7 +121,7 @@ extension ParseInstallation {
         get {
             guard let installationInMemory: CurrentInstallationContainer<Self> =
                 try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentInstallation) else {
-                #if !os(Linux)
+                #if !os(Linux) && !os(Android)
                     guard let installationFromKeyChain: CurrentInstallationContainer<Self> =
                         try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentInstallation)
                          else {
@@ -169,14 +169,14 @@ extension ParseInstallation {
             = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentInstallation) else {
             return
         }
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try? KeychainStore.shared.set(currentInstallationInMemory, for: ParseStorage.Keys.currentInstallation)
         #endif
     }
 
     internal static func deleteCurrentContainerFromKeychain() {
         try? ParseStorage.shared.delete(valueFor: ParseStorage.Keys.currentInstallation)
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try? KeychainStore.shared.delete(valueFor: ParseStorage.Keys.currentInstallation)
         #endif
     }
@@ -215,7 +215,6 @@ extension ParseInstallation {
     }
 
     mutating func updateDeviceTypeFromDevice() {
-
         if deviceType != ParseConstants.deviceType {
             deviceType = ParseConstants.deviceType
         }
@@ -255,7 +254,7 @@ extension ParseInstallation {
         guard let appInfo = Bundle.main.infoDictionary else {
             return
         }
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         #if TARGET_OS_MACCATALYST
         // If using an Xcode new enough to know about Mac Catalyst:
         // Mac Catalyst Apps use a prefix to the bundle ID. This should not be transmitted

Sources/ParseSwift/Objects/ParseUser.swift

@@ -88,7 +88,7 @@ extension ParseUser {
         get {
             guard let currentUserInMemory: CurrentUserContainer<Self>
                 = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentUser) else {
-                #if !os(Linux)
+                #if !os(Linux) && !os(Android)
                 return try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentUser)
                 #else
                 return nil
@@ -105,14 +105,14 @@ extension ParseUser {
             = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentUser) else {
             return
         }
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try? KeychainStore.shared.set(currentUserInMemory, for: ParseStorage.Keys.currentUser)
         #endif
     }
 
     internal static func deleteCurrentContainerFromKeychain() {
         try? ParseStorage.shared.delete(valueFor: ParseStorage.Keys.currentUser)
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try? KeychainStore.shared.delete(valueFor: ParseStorage.Keys.currentUser)
         #endif
         BaseParseUser.currentUserContainer = nil

Sources/ParseSwift/ParseConstants.swift

@@ -26,5 +26,7 @@ enum ParseConstants {
     static let deviceType = "applewatch"
     #elseif os(Linux)
     static let deviceType = "linux"
+    #elseif os(Android)
+    static let deviceType = "android"
     #endif
 }

Sources/ParseSwift/Protocols/Objectable.swift

@@ -53,7 +53,7 @@ extension Objectable {
 
     static func createHash(_ object: Encodable) throws -> String {
         let encoded = try ParseCoding.parseEncoder().encode(object)
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         return ParseHash.md5HashFromData(encoded)
         #else
         guard let hashString = String(data: encoded, encoding: .utf8) else {

Sources/ParseSwift/Storage/KeychainStore.swift

@@ -11,7 +11,7 @@ import Foundation
 import Security
 #endif
 
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 
 func getKeychainQueryTemplate(forService service: String) -> [String: String] {
     var query = [String: String]()

Sources/ParseSwift/Storage/ParseFileManager.swift

@@ -11,7 +11,7 @@ import Foundation
 internal struct ParseFileManager {
 
     private var defaultDirectoryAttributes: [FileAttributeKey: Any]? {
-        #if os(macOS) || os(Linux)
+        #if os(macOS) || os(Linux) || os(Android)
         return nil
         #else
         return [.protectionKey: FileProtectionType.completeUntilFirstUserAuthentication]
@@ -20,14 +20,14 @@ internal struct ParseFileManager {
 
     private var defaultDataWritingOptions: Data.WritingOptions {
         var options = Data.WritingOptions.atomic
-        #if !os(macOS) && !os(Linux)
+        #if !os(macOS) && !os(Linux) && !os(Android)
             options.insert(.completeFileProtectionUntilFirstUserAuthentication)
         #endif
         return options
     }
 
     private var localSandBoxDataDirectoryPath: URL? {
-        #if os(macOS) || os(Linux)
+        #if os(macOS) || os(Linux) || os(Android)
         return self.defaultDataDirectoryPath
         #else
         // swiftlint:disable:next line_length
@@ -49,7 +49,7 @@ internal struct ParseFileManager {
     private let applicationGroupIdentifer: String?
 
     public var defaultDataDirectoryPath: URL? {
-        #if os(macOS) || os(Linux)
+        #if os(macOS) || os(Linux) || os(Android)
         var directoryPath: String!
         let paths = NSSearchPathForDirectoriesInDomains(.applicationSupportDirectory, .userDomainMask, true)
         guard let directory = paths.first else {
@@ -83,7 +83,7 @@ internal struct ParseFileManager {
     }
 
     init?() {
-        #if os(Linux)
+        #if os(Linux) || os(Android)
         guard let applicationId = ParseConfiguration.applicationId else {
             return nil
         }

Sources/ParseSwift/Storage/ParseKeyValueStore.swift

@@ -55,7 +55,7 @@ struct InMemoryKeyValueStore: ParseKeyValueStore {
     }
 }
 
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 
 // MARK: KeychainStore + ParseKeyValueStore
 extension KeychainStore: ParseKeyValueStore {

Sources/ParseSwift/Types/ParseACL.swift

@@ -300,7 +300,7 @@ extension ParseACL {
 
         let aclController: DefaultACL?
 
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         aclController = try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.defaultACL)
         #else
         aclController = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.defaultACL)
@@ -380,7 +380,7 @@ extension ParseACL {
                            useCurrentUser: withAccessForCurrentUser)
         }
 
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.set(aclController, for: ParseStorage.Keys.defaultACL)
         #else
         try ParseStorage.shared.set(aclController, for: ParseStorage.Keys.defaultACL)

Sources/ParseSwift/Types/ParseConfig.swift

@@ -119,7 +119,7 @@ extension ParseConfig {
         get {
             guard let configInMemory: CurrentConfigContainer<Self> =
                 try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentConfig) else {
-                #if !os(Linux)
+                #if !os(Linux) && !os(Android)
                     return try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentConfig)
                 #else
                     return nil
@@ -151,14 +151,14 @@ extension ParseConfig {
             = try? ParseStorage.shared.get(valueFor: ParseStorage.Keys.currentConfig) else {
             return
         }
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try? KeychainStore.shared.set(currentConfigInMemory, for: ParseStorage.Keys.currentConfig)
         #endif
     }
 
     internal static func deleteCurrentContainerFromKeychain() {
         try? ParseStorage.shared.delete(valueFor: ParseStorage.Keys.currentConfig)
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try? KeychainStore.shared.delete(valueFor: ParseStorage.Keys.currentConfig)
         #endif
     }

Tests/ParseSwiftTests/APICommandTests.swift

@@ -40,7 +40,7 @@ class APICommandTests: XCTestCase {
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/AnyCodableTests/AnyCodableTests.swift

@@ -40,7 +40,7 @@ class AnyCodableTests: XCTestCase {
     }
 
     //Test has objective-c
-    #if !os(Linux)
+    #if !os(Linux) && !os(Android)
     func testJSONEncoding() {
         let dictionary: [String: AnyCodable] = [
             "boolean": true,

Tests/ParseSwiftTests/AnyCodableTests/AnyEncodableTests.swift

@@ -2,7 +2,7 @@ import XCTest
 @testable import ParseSwift
 
 //Test has objective-c
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 class AnyEncodableTests: XCTestCase {
     func testJSONEncoding() {
         let dictionary: [String: AnyEncodable] = [

Tests/ParseSwiftTests/HashTests.swift

@@ -5,7 +5,7 @@
 //  Created by Corey Baker on 12/22/20.
 //  Copyright © 2020 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 import XCTest
 @testable import ParseSwift

Tests/ParseSwiftTests/KeychainStoreTests.swift

@@ -5,7 +5,7 @@
 //  Created by Florent Vilmart on 17-09-25.
 //  Copyright © 2020 Parse Community. All rights reserved.
 //
-#if !os(Linux)
+#if !os(Linux) && !os(Android)
 import Foundation
 import XCTest
 @testable import ParseSwift

Tests/ParseSwiftTests/ParseACLTests.swift

@@ -27,7 +27,7 @@ class ParseACLTests: XCTestCase {
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseAnonymousCombineTests.swift

@@ -76,7 +76,7 @@ class ParseAnonymousCombineTests: XCTestCase { // swiftlint:disable:this type_bo
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseAnonymousTests.swift

@@ -79,7 +79,7 @@ class ParseAnonymousTests: XCTestCase {
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()
@@ -430,7 +430,7 @@ class ParseAnonymousTests: XCTestCase {
                 XCTAssertEqual(User.current?.updatedAt, becomeUpdatedAt)
                 XCTAssertFalse(User.anonymous.isLinked)
 
-                #if !os(Linux)
+                #if !os(Linux) && !os(Android)
                 //Should be updated in Keychain
                 guard let keychainUser: CurrentUserContainer<BaseParseUser>
                     = try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentUser) else {

Tests/ParseSwiftTests/ParseAppleCombineTests.swift

@@ -77,7 +77,7 @@ class ParseAppleCombineTests: XCTestCase { // swiftlint:disable:this type_body_l
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseAppleTests.swift

@@ -73,7 +73,7 @@ class ParseAppleTests: XCTestCase {
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseAuthenticationTests.swift

@@ -88,7 +88,7 @@ class ParseAuthenticationTests: XCTestCase {
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseCloudCombineTests.swift

@@ -43,7 +43,7 @@ class ParseCloudCombineTests: XCTestCase { // swiftlint:disable:this type_body_l
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseCloudTests.swift

@@ -56,7 +56,7 @@ class ParseCloudTests: XCTestCase { // swiftlint:disable:this type_body_length
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()

Tests/ParseSwiftTests/ParseConfigCombineTests.swift

@@ -85,7 +85,7 @@ class ParseConfigCombineTests: XCTestCase { // swiftlint:disable:this type_body_
     override func tearDownWithError() throws {
         try super.tearDownWithError()
         MockURLProtocol.removeAll()
-        #if !os(Linux)
+        #if !os(Linux) && !os(Android)
         try KeychainStore.shared.deleteAll()
         #endif
         try ParseStorage.shared.deleteAll()
@@ -147,7 +147,7 @@ class ParseConfigCombineTests: XCTestCase { // swiftlint:disable:this type_body_
             XCTAssertEqual(fetched.welcomeMessage, configOnServer.welcomeMessage)
             XCTAssertEqual(Config.current?.welcomeMessage, configOnServer.welcomeMessage)
 
-            #if !os(Linux)
+            #if !os(Linux) && !os(Android)
             //Should be updated in Keychain
             guard let keychainConfig: CurrentConfigContainer<Config>
                 = try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentConfig) else {
@@ -196,7 +196,7 @@ class ParseConfigCombineTests: XCTestCase { // swiftlint:disable:this type_body_
             XCTAssertTrue(saved)
             XCTAssertEqual(Config.current?.welcomeMessage, config.welcomeMessage)
 
-            #if !os(Linux)
+            #if !os(Linux) && !os(Android)
             //Should be updated in Keychain
             guard let keychainConfig: CurrentConfigContainer<Config>
                 = try? KeychainStore.shared.get(valueFor: ParseStorage.Keys.currentConfig) else {