Rename app id to org.openhab.app

OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift

@@ -71,7 +71,7 @@ public struct UserDefaultURL {
 }
 
 public enum Preferences {
-    fileprivate static let sharedDefaults = UserDefaults(suiteName: "group.es.spaphone.openhab")!
+    fileprivate static let sharedDefaults = UserDefaults(suiteName: "group.org.openhab.app")!
 
     // MARK: - Public
 

OpenHABCore/Sources/OpenHABCore/Util/ServerCertificateManager.swift

@@ -70,7 +70,7 @@ public class ServerCertificateManager: ServerTrustManager, ServerTrustEvaluating
         let documentsDirectory = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0]
         return URL(fileURLWithPath: documentsDirectory).appendingPathComponent("trustedCertificates")
         #else
-        FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.es.spaphone.openhab")!.appendingPathComponent("trustedCertificates")
+        FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.org.openhab.app")!.appendingPathComponent("trustedCertificates")
         #endif
     }
 

OpenHABCore/Tests/OpenHABCoreTests/UserDefaultsTests.swift

@@ -14,7 +14,7 @@
 import XCTest
 
 final class UserDefaultsTests: XCTestCase {
-    let data = UserDefaults(suiteName: "group.es.spaphone.openhab")!
+    let data = UserDefaults(suiteName: "group.org.openhab.app")!
 
     override func setUpWithError() throws {
         super.setUp()

fastlane/Appfile

@@ -1,4 +1,4 @@
-app_identifier("es.spaphone.openhab") # The bundle identifier of your app
+app_identifier("org.openhab.app") # The bundle identifier of your app
 # apple_id("[[APPLE_ID]]") # Your Apple email address
 itc_team_id "118429042"
 

fastlane/Fastfile

@@ -235,7 +235,7 @@ platform :ios do
             Spaceship::ConnectAPI::login(portal_team_id: "PBAPXHRAM9", tunes_team_id: "118429042")
         end
 
-        app = Spaceship::ConnectAPI::App.find("es.spaphone.openhab")
+        app = Spaceship::ConnectAPI::App.find("org.openhab.app")
         UI.message("Found app: #{app.name}")
 
         platform = Spaceship::ConnectAPI::Platform::IOS

fastlane/Matchfile

@@ -4,7 +4,7 @@ storage_mode("git")
 
 type("appstore") # The default type, can be: appstore, adhoc, enterprise or development
 
-app_identifier(["es.spaphone.openhab", "es.spaphone.openhab.*", "es.spaphone.openhab.openHABIntents"])
+app_identifier(["org.openhab.app", "org.openhab.app.*", "org.openhab.app.openHABIntents"])
 # username("user@fastlane.tools") # Your Apple Developer Portal username
 
 # For all available options run `fastlane match --help`

openHAB.xcodeproj/project.pbxproj

@@ -1561,7 +1561,7 @@
 				MARKETING_VERSION = 2.4.60;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.openHABIntents;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openhab.app.openHABIntents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -1602,7 +1602,7 @@
 				MARKETING_VERSION = 2.4.60;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.openHABIntents;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openhab.app.openHABIntents;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -1723,7 +1723,7 @@
 				MARKETING_VERSION = 2.4.60;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.watchkitapp;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openhab.app.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = watchos;
@@ -1768,7 +1768,7 @@
 				MARKETING_VERSION = 2.4.60;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.watchkitapp;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openhab.app.watchkitapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = watchos;
@@ -2015,7 +2015,7 @@
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MARKETING_VERSION = 2.4.60;
 				OTHER_SWIFT_FLAGS = "$(inherited) -DDEBUG -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";
-				PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openhab.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2057,7 +2057,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MARKETING_VERSION = 2.4.60;
-				PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openhab.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";

openHAB/GoogleService-Info.plist

@@ -2,28 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
-	<string>ca-app-pub-3940256099942544/2934735716</string>
-	<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
-	<string>ca-app-pub-3940256099942544/4411468910</string>
-	<key>CLIENT_ID</key>
-	<string>849058498762-3m681ei7b78ajqt9gmvt2gumah724v7q.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.849058498762-3m681ei7b78ajqt9gmvt2gumah724v7q</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>849058498762-079qmadgd5f5hkdve7lkrbubfi842afj.apps.googleusercontent.com</string>
 	<key>API_KEY</key>
-	<string>AIzaSyCU_oi_VOMmun7l9dIJoG7osVUz2fhjswQ</string>
+	<string>AIzaSyASE-IB3CX5wxPMLw1MKBwQQfjG9__JY0I</string>
 	<key>GCM_SENDER_ID</key>
 	<string>849058498762</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>es.spaphone.openhab</string>
+	<string>org.openhab.app</string>
 	<key>PROJECT_ID</key>
 	<string>openhab-mobile</string>
 	<key>STORAGE_BUCKET</key>
 	<string>openhab-mobile.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
-	<true></true>
+	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
 	<false></false>
 	<key>IS_APPINVITE_ENABLED</key>
@@ -33,7 +27,7 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:849058498762:ios:79e207cc62959234</string>
+	<string>1:849058498762:ios:6d4b5c9e93b983a3618c33</string>
 	<key>DATABASE_URL</key>
 	<string>https://openhab-mobile.firebaseio.com</string>
 </dict>

openHAB/openHAB.entitlements

@@ -10,7 +10,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.es.spaphone.openhab</string>
+		<string>group.org.openhab.app</string>
 	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>

openHABIntents/openHABIntents.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.es.spaphone.openhab</string>
+		<string>group.org.openhab.app</string>
 	</array>
 </dict>
 </plist>

openHABWatch Extension/Info.plist

@@ -32,7 +32,7 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>WKAppBundleIdentifier</key>
-			<string>es.spaphone.openhab.watchkitapp</string>
+			<string>org.openhab.app.watchkitapp</string>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.watchkit</string>

openHABWatch Extension/openHABWatch Extension/Info.plist

@@ -46,7 +46,7 @@
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>WKAppBundleIdentifier</key>
-			<string>es.spaphone.openhab.watchkitapp</string>
+			<string>org.openhab.app.watchkitapp</string>
 		</dict>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.watchkit</string>

openHABWatch/Info.plist

@@ -35,6 +35,6 @@
 	<key>WKApplication</key>
 	<true/>
 	<key>WKCompanionAppBundleIdentifier</key>
-	<string>es.spaphone.openhab</string>
+	<string>org.openhab.app</string>
 </dict>
 </plist>