capacitor/ios upgrade 5.0.5 => 5.7.2; onesignal-cordova-plugin upgrade 5.0.0-beta-02 => 5.1.0

android/app/capacitor.build.gradle

@@ -11,14 +11,19 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-community-apple-sign-in')
     implementation project(':capacitor-community-barcode-scanner')
+    implementation project(':capacitor-community-contacts')
     implementation project(':capacitor-community-facebook-login')
     implementation project(':capacitor-app')
+    implementation project(':capacitor-camera')
+    implementation project(':capacitor-filesystem')
+    implementation project(':capacitor-geolocation')
+    implementation project(':capacitor-google-maps')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-preferences')
     implementation project(':capacitor-status-bar')
     implementation project(':codetrix-studio-capacitor-google-auth')
-    implementation "com.onesignal:OneSignal:5.0.0-beta4"
+    implementation "com.onesignal:OneSignal:5.1.6"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10"
 }
 apply from: "../../node_modules/onesignal-cordova-plugin/build-extras-onesignal.gradle"

android/capacitor.settings.gradle

@@ -8,12 +8,27 @@ project(':capacitor-community-apple-sign-in').projectDir = new File('../node_mod
 include ':capacitor-community-barcode-scanner'
 project(':capacitor-community-barcode-scanner').projectDir = new File('../node_modules/@capacitor-community/barcode-scanner/android')
 
+include ':capacitor-community-contacts'
+project(':capacitor-community-contacts').projectDir = new File('../node_modules/@capacitor-community/contacts/android')
+
 include ':capacitor-community-facebook-login'
 project(':capacitor-community-facebook-login').projectDir = new File('../node_modules/@capacitor-community/facebook-login/android')
 
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 
+include ':capacitor-camera'
+project(':capacitor-camera').projectDir = new File('../node_modules/@capacitor/camera/android')
+
+include ':capacitor-filesystem'
+project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+
+include ':capacitor-geolocation'
+project(':capacitor-geolocation').projectDir = new File('../node_modules/@capacitor/geolocation/android')
+
+include ':capacitor-google-maps'
+project(':capacitor-google-maps').projectDir = new File('../node_modules/@capacitor/google-maps/android')
+
 include ':capacitor-haptics'
 project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/haptics/android')
 

android/gradle.properties

@@ -20,3 +20,6 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+
+
+

ios/App/App.xcodeproj/project.pbxproj

@@ -14,30 +14,30 @@
 		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
+		77371A734A4C589BBBA0EAD0 /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1BEB56DE09C9CA0A39814AF3 /* Pods_OneSignalNotificationServiceExtension.framework */; };
 		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
-		A5C1E8DC008081658B0C47EF /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BA7E8C1DA4655170F257A87 /* Pods_OneSignalNotificationServiceExtension.framework */; };
+		B258A2C52BA68F3A002EB092 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B258A2C42BA68F3A002EB092 /* NotificationService.swift */; };
-		B21168CA2A9ACC7800EB0133 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21168C92A9ACC7800EB0133 /* NotificationService.swift */; };
+		B258A2C92BA68F3A002EB092 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = B258A2C22BA68F3A002EB092 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		B21168CE2A9ACC7800EB0133 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = B21168C72A9ACC7800EB0133 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B21168CC2A9ACC7800EB0133 /* PBXContainerItemProxy */ = {
+		B258A2C72BA68F3A002EB092 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 504EC2FC1FED79650016851F /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = B21168C62A9ACC7800EB0133;
+			remoteGlobalIDString = B258A2C12BA68F3A002EB092;
 			remoteInfo = OneSignalNotificationServiceExtension;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		B21168D22A9ACC7800EB0133 /* Embed Foundation Extensions */ = {
+		B258A2CD2BA68F3A002EB092 /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
-				B21168CE2A9ACC7800EB0133 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */,
+				B258A2C92BA68F3A002EB092 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */,
 			);
 			name = "Embed Foundation Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -45,7 +45,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2BA7E8C1DA4655170F257A87 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		1BEB56DE09C9CA0A39814AF3 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		23F3F7E8BD670330D3C6A652 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = "<group>"; };
 		2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = "<group>"; };
 		50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
 		504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -55,15 +56,14 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
+		80862567F4D6C96F65E71FD3 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; sourceTree = "<group>"; };
 		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
-		B21168C72A9ACC7800EB0133 /* OneSignalNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OneSignalNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
+		B258A2BD2BA68EDC002EB092 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
-		B21168C92A9ACC7800EB0133 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
+		B258A2C22BA68F3A002EB092 /* OneSignalNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OneSignalNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
-		B21168CB2A9ACC7800EB0133 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B258A2C42BA68F3A002EB092 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
-		B2E036EA2A9ACE8900DBD763 /* App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = App.entitlements; sourceTree = "<group>"; };
+		B258A2C62BA68F3A002EB092 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B2E036EB2A9ACED400DBD763 /* OneSignalNotificationServiceExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OneSignalNotificationServiceExtension.entitlements; sourceTree = "<group>"; };
+		B258A2CE2BA68FCD002EB092 /* OneSignalNotificationServiceExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OneSignalNotificationServiceExtension.entitlements; sourceTree = "<group>"; };
-		BD7F38B0645B9AE288B99E2D /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = "<group>"; };
-		CF3624420AAA8F3E8393C58E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Pods/Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; sourceTree = "<group>"; };
 		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -76,11 +76,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		B21168C42A9ACC7800EB0133 /* Frameworks */ = {
+		B258A2BF2BA68F3A002EB092 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A5C1E8DC008081658B0C47EF /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */,
+				77371A734A4C589BBBA0EAD0 /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -91,7 +91,7 @@
 			isa = PBXGroup;
 			children = (
 				AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
-				2BA7E8C1DA4655170F257A87 /* Pods_OneSignalNotificationServiceExtension.framework */,
+				1BEB56DE09C9CA0A39814AF3 /* Pods_OneSignalNotificationServiceExtension.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -100,7 +100,7 @@
 			isa = PBXGroup;
 			children = (
 				504EC3061FED79650016851F /* App */,
-				B21168C82A9ACC7800EB0133 /* OneSignalNotificationServiceExtension */,
+				B258A2C32BA68F3A002EB092 /* OneSignalNotificationServiceExtension */,
 				504EC3051FED79650016851F /* Products */,
 				7F8756D8B27F46E3366F6CEA /* Pods */,
 				27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
@@ -111,7 +111,7 @@
 			isa = PBXGroup;
 			children = (
 				504EC3041FED79650016851F /* App.app */,
-				B21168C72A9ACC7800EB0133 /* OneSignalNotificationServiceExtension.appex */,
+				B258A2C22BA68F3A002EB092 /* OneSignalNotificationServiceExtension.appex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -119,7 +119,7 @@
 		504EC3061FED79650016851F /* App */ = {
 			isa = PBXGroup;
 			children = (
-				B2E036EA2A9ACE8900DBD763 /* App.entitlements */,
+				B258A2BD2BA68EDC002EB092 /* App.entitlements */,
 				50379B222058CBB4000EE86E /* capacitor.config.json */,
 				504EC3071FED79650016851F /* AppDelegate.swift */,
 				504EC30B1FED79650016851F /* Main.storyboard */,
@@ -137,18 +137,18 @@
 			children = (
 				FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
 				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
-				BD7F38B0645B9AE288B99E2D /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */,
+				23F3F7E8BD670330D3C6A652 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */,
-				CF3624420AAA8F3E8393C58E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */,
+				80862567F4D6C96F65E71FD3 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
 		};
-		B21168C82A9ACC7800EB0133 /* OneSignalNotificationServiceExtension */ = {
+		B258A2C32BA68F3A002EB092 /* OneSignalNotificationServiceExtension */ = {
 			isa = PBXGroup;
 			children = (
-				B2E036EB2A9ACED400DBD763 /* OneSignalNotificationServiceExtension.entitlements */,
+				B258A2CE2BA68FCD002EB092 /* OneSignalNotificationServiceExtension.entitlements */,
-				B21168C92A9ACC7800EB0133 /* NotificationService.swift */,
+				B258A2C42BA68F3A002EB092 /* NotificationService.swift */,
-				B21168CB2A9ACC7800EB0133 /* Info.plist */,
+				B258A2C62BA68F3A002EB092 /* Info.plist */,
 			);
 			path = OneSignalNotificationServiceExtension;
 			sourceTree = "<group>";
@@ -165,26 +165,27 @@
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
 				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
-				B21168D22A9ACC7800EB0133 /* Embed Foundation Extensions */,
+				F600F95592FD6ED542643A9F /* [CP] Copy Pods Resources */,
+				B258A2CD2BA68F3A002EB092 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				B21168CD2A9ACC7800EB0133 /* PBXTargetDependency */,
+				B258A2C82BA68F3A002EB092 /* PBXTargetDependency */,
 			);
 			name = App;
 			productName = App;
 			productReference = 504EC3041FED79650016851F /* App.app */;
 			productType = "com.apple.product-type.application";
 		};
-		B21168C62A9ACC7800EB0133 /* OneSignalNotificationServiceExtension */ = {
+		B258A2C12BA68F3A002EB092 /* OneSignalNotificationServiceExtension */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = B21168CF2A9ACC7800EB0133 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */;
+			buildConfigurationList = B258A2CA2BA68F3A002EB092 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */;
 			buildPhases = (
-				2A2D72D3D296214238651E86 /* [CP] Check Pods Manifest.lock */,
+				68CDF4D6C7D96504A76D89F5 /* [CP] Check Pods Manifest.lock */,
-				B21168C32A9ACC7800EB0133 /* Sources */,
+				B258A2BE2BA68F3A002EB092 /* Sources */,
-				B21168C42A9ACC7800EB0133 /* Frameworks */,
+				B258A2BF2BA68F3A002EB092 /* Frameworks */,
-				B21168C52A9ACC7800EB0133 /* Resources */,
+				B258A2C02BA68F3A002EB092 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -192,7 +193,7 @@
 			);
 			name = OneSignalNotificationServiceExtension;
 			productName = OneSignalNotificationServiceExtension;
-			productReference = B21168C72A9ACC7800EB0133 /* OneSignalNotificationServiceExtension.appex */;
+			productReference = B258A2C22BA68F3A002EB092 /* OneSignalNotificationServiceExtension.appex */;
 			productType = "com.apple.product-type.app-extension";
 		};
 /* End PBXNativeTarget section */
@@ -201,16 +202,16 @@
 		504EC2FC1FED79650016851F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 1430;
+				LastSwiftUpdateCheck = 1530;
-				LastUpgradeCheck = 920;
+				LastUpgradeCheck = 0920;
 				TargetAttributes = {
 					504EC3031FED79650016851F = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 1100;
 						ProvisioningStyle = Automatic;
 					};
-					B21168C62A9ACC7800EB0133 = {
+					B258A2C12BA68F3A002EB092 = {
-						CreatedOnToolsVersion = 14.3.1;
+						CreatedOnToolsVersion = 15.3;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -229,7 +230,7 @@
 			projectRoot = "";
 			targets = (
 				504EC3031FED79650016851F /* App */,
-				B21168C62A9ACC7800EB0133 /* OneSignalNotificationServiceExtension */,
+				B258A2C12BA68F3A002EB092 /* OneSignalNotificationServiceExtension */,
 			);
 		};
 /* End PBXProject section */
@@ -248,7 +249,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		B21168C52A9ACC7800EB0133 /* Resources */ = {
+		B258A2C02BA68F3A002EB092 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -258,7 +259,25 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2A2D72D3D296214238651E86 /* [CP] Check Pods Manifest.lock */ = {
+		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		68CDF4D6C7D96504A76D89F5 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -280,24 +299,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -313,6 +314,21 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		F600F95592FD6ED542643A9F /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -324,21 +340,21 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		B21168C32A9ACC7800EB0133 /* Sources */ = {
+		B258A2BE2BA68F3A002EB092 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B21168CA2A9ACC7800EB0133 /* NotificationService.swift in Sources */,
+				B258A2C52BA68F3A002EB092 /* NotificationService.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		B21168CD2A9ACC7800EB0133 /* PBXTargetDependency */ = {
+		B258A2C82BA68F3A002EB092 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = B21168C62A9ACC7800EB0133 /* OneSignalNotificationServiceExtension */;
+			target = B258A2C12BA68F3A002EB092 /* OneSignalNotificationServiceExtension */;
-			targetProxy = B21168CC2A9ACC7800EB0133 /* PBXContainerItemProxy */;
+			targetProxy = B258A2C72BA68F3A002EB092 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -482,7 +498,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 42.4.1;
+				MARKETING_VERSION = 1.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.wrenchboard.users;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -505,7 +521,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 42.4.1;
+				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wrenchboard.users;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
@@ -514,10 +530,11 @@
 			};
 			name = Release;
 		};
-		B21168D02A9ACC7800EB0133 /* Debug */ = {
+		B258A2CB2BA68F3A002EB092 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BD7F38B0645B9AE288B99E2D /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */;
+			baseConfigurationReference = 23F3F7E8BD670330D3C6A652 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
@@ -527,28 +544,33 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = JR363FEY8R;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = OneSignalNotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wrenchboard.users.OneSignalNotificationServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
-		B21168D12A9ACC7800EB0133 /* Release */ = {
+		B258A2CC2BA68F3A002EB092 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CF3624420AAA8F3E8393C58E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */;
+			baseConfigurationReference = 80862567F4D6C96F65E71FD3 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
@@ -558,12 +580,15 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = JR363FEY8R;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = OneSignalNotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.wrenchboard.users.OneSignalNotificationServiceExtension;
@@ -596,11 +621,11 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		B21168CF2A9ACC7800EB0133 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */ = {
+		B258A2CA2BA68F3A002EB092 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				B21168D02A9ACC7800EB0133 /* Debug */,
+				B258A2CB2BA68F3A002EB092 /* Debug */,
-				B21168D12A9ACC7800EB0133 /* Release */,
+				B258A2CC2BA68F3A002EB092 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

ios/App/App/App.entitlements

@@ -4,10 +4,6 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.com.wrenchboard.users.onesignal</string>

ios/App/App/AppDelegate.swift

@@ -9,10 +9,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-
+        // Override point for customization after application launch.
+        
         // Remove this method to stop OneSignal Debugging
         //OneSignal.Debug.setLogLevel(.LL_VERBOSE)
-        
+
         // Override point for customization after application launch.
         FBSDKCoreKit.ApplicationDelegate.shared.application(
             application,
@@ -45,7 +46,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
-        
         // Called when the app was launched with a url. Feel free to add additional processing here,
         // but if you want the App API to support tracking app url opens, make sure to keep this call
         if (FBSDKCoreKit.ApplicationDelegate.shared.application(

ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,14 @@
 {
-  "images": [
+  "images" : [
     {
-      "filename": "AppIcon-512@2x.png",
+      "filename" : "AppIcon-512@2x.png",
-      "idiom": "universal",
+      "idiom" : "universal",
-      "platform": "ios",
+      "platform" : "ios",
-      "size": "1024x1024"
+      "size" : "1024x1024"
-    },
-    {
-      "idiom": "ipad",
-      "size": "20x20",
-      "scale": "1x",
-      "filename": "AppIcon-20x20@1x.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "20x20",
-      "scale": "2x",
-      "filename": "AppIcon-20x20@2x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "20x20",
-      "scale": "2x",
-      "filename": "AppIcon-20x20@2x-1.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "20x20",
-      "scale": "3x",
-      "filename": "AppIcon-20x20@3x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "29x29",
-      "scale": "1x",
-      "filename": "AppIcon-29x29@1x.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "29x29",
-      "scale": "2x",
-      "filename": "AppIcon-29x29@2x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "29x29",
-      "scale": "2x",
-      "filename": "AppIcon-29x29@2x-1.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "29x29",
-      "scale": "3x",
-      "filename": "AppIcon-29x29@3x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "40x40",
-      "scale": "1x",
-      "filename": "AppIcon-40x40@1x.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "40x40",
-      "scale": "2x",
-      "filename": "AppIcon-40x40@2x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "40x40",
-      "scale": "2x",
-      "filename": "AppIcon-40x40@2x-1.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "40x40",
-      "scale": "3x",
-      "filename": "AppIcon-40x40@3x.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "60x60",
-      "scale": "2x",
-      "filename": "AppIcon-60x60@2x.png"
-    },
-    {
-      "idiom": "iphone",
-      "size": "60x60",
-      "scale": "3x",
-      "filename": "AppIcon-60x60@3x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "76x76",
-      "scale": "1x",
-      "filename": "AppIcon-76x76@1x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "76x76",
-      "scale": "2x",
-      "filename": "AppIcon-76x76@2x.png"
-    },
-    {
-      "idiom": "ipad",
-      "size": "83.5x83.5",
-      "scale": "2x",
-      "filename": "AppIcon-83.5x83.5@2x.png"
-    },
-    {
-      "idiom": "ios-marketing",
-      "size": "1024x1024",
-      "scale": "1x",
-      "filename": "AppIcon-512@2x.png"
     }
   ],
-  "info": {
+  "info" : {
-    "author": "xcode",
+    "author" : "xcode",
-    "version": 1
+    "version" : 1
   }
-}
+}

ios/App/App/Assets.xcassets/Splash.imageset/Contents.json

@@ -1,56 +1,23 @@
 {
-  "images": [
+  "images" : [
     {
-      "idiom": "universal",
+      "idiom" : "universal",
-      "filename": "Default@1x~universal~anyany.png",
+      "filename" : "splash-2732x2732-2.png",
-      "scale": "1x"
+      "scale" : "1x"
     },
     {
-      "idiom": "universal",
+      "idiom" : "universal",
-      "filename": "Default@2x~universal~anyany.png",
+      "filename" : "splash-2732x2732-1.png",
-      "scale": "2x"
+      "scale" : "2x"
     },
     {
-      "idiom": "universal",
+      "idiom" : "universal",
-      "filename": "Default@3x~universal~anyany.png",
+      "filename" : "splash-2732x2732.png",
-      "scale": "3x"
+      "scale" : "3x"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "universal",
-      "scale": "1x",
-      "filename": "Default@1x~universal~anyany-dark.png"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "universal",
-      "scale": "2x",
-      "filename": "Default@2x~universal~anyany-dark.png"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "universal",
-      "scale": "3x",
-      "filename": "Default@3x~universal~anyany-dark.png"
     }
   ],
-  "info": {
+  "info" : {
-    "version": 1,
+    "version" : 1,
-    "author": "xcode"
+    "author" : "xcode"
   }
 }

ios/App/App/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>WrenchBoard</string>
+        <string>WrenchBoard</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -19,58 +19,58 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
-	<array>
+        <array>
-		<dict>
+                <dict>
-			<key>CFBundleURLSchemes</key>
+                        <key>CFBundleURLSchemes</key>
-			<array>
+                        <array>
-				<string>fb390204307987009</string>
+                                <string>fb390204307987009</string>
-				<string>com.googleusercontent.apps.817021856543-khlurl8ifdr0sd2cvekn167d02mk9dlg</string>
+                                <string>com.googleusercontent.apps.817021856543-khlurl8ifdr0sd2cvekn167d02mk9dlg</string>
-			</array>
+                        </array>
-		</dict>
+                </dict>
-	</array>
+        </array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>FacebookAppID</key>
+        <key>FacebookAppID</key>
-	<string>390204307987009</string>
+        <string>390204307987009</string>
-	<key>FacebookClientToken</key>
+        <key>FacebookClientToken</key>
-	<string>70e8f7ea883417e96f137e0bd025bfce</string>
+        <string>70e8f7ea883417e96f137e0bd025bfce</string>
-	<key>FacebookDisplayName</key>
+        <key>FacebookDisplayName</key>
-	<string>WrenchBoard</string>
+        <string>WrenchBoard</string>
-	<key>LSApplicationQueriesSchemes</key>
+        <key>LSApplicationQueriesSchemes</key>
-	<array>
+        <array>
-		<string>fbapi</string>
+                <string>fbapi</string>
-		<string>fbapi20130214</string>
+                <string>fbapi20130214</string>
-		<string>fbapi20130410</string>
+                <string>fbapi20130410</string>
-		<string>fbapi20130702</string>
+                <string>fbapi20130702</string>
-		<string>fbapi20131010</string>
+                <string>fbapi20131010</string>
-		<string>fbapi20131219</string>
+                <string>fbapi20131219</string>
-		<string>fbapi20140410</string>
+                <string>fbapi20140410</string>
-		<string>fbapi20140116</string>
+                <string>fbapi20140116</string>
-		<string>fbapi20150313</string>
+                <string>fbapi20150313</string>
-		<string>fbapi20150629</string>
+                <string>fbapi20150629</string>
-		<string>fbapi20160328</string>
+                <string>fbapi20160328</string>
-		<string>fbauth</string>
+                <string>fbauth</string>
-		<string>fb-messenger-share-api</string>
+                <string>fb-messenger-share-api</string>
-		<string>fbauth2</string>
+                <string>fbauth2</string>
-		<string>fbshareextension</string>
+                <string>fbshareextension</string>
-	</array>
+        </array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
+        <key>NSCameraUsageDescription</key>
-	<string>Scan QR Code to login</string>
+        <string>Scan QR Code to login</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+        <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
+        <string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
-	<key>NSLocationAlwaysUsageDescription</key>
+        <key>NSLocationAlwaysUsageDescription</key>
-	<string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
+        <string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
-	<key>NSLocationUsageDescription</key>
+        <key>NSLocationUsageDescription</key>
-	<string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
+        <string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
+        <key>NSLocationWhenInUseUsageDescription</key>
-	<string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
+        <string>We need to enable geotagging to send you notifications and messages based on your location, so you will get the relevant ones only</string>
-	<key>UIBackgroundModes</key>
+        <key>UIBackgroundModes</key>
-	<array>
+        <array>
-		<string>remote-notification</string>
+                <string>remote-notification</string>
-		<string>location</string>
+                <string>location</string>
-	</array>
+        </array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -81,16 +81,16 @@
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
+		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>

ios/App/OneSignalNotificationServiceExtension/NotificationService.swift

@@ -9,9 +9,6 @@ class NotificationService: UNNotificationServiceExtension {
     var bestAttemptContent: UNMutableNotificationContent?
     
     override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
-        
-        print("Running NotificationServiceExtension")
-        
         self.receivedRequest = request
         self.contentHandler = contentHandler
         self.bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
@@ -20,8 +17,8 @@ class NotificationService: UNNotificationServiceExtension {
             /* DEBUGGING: Uncomment the 2 lines below to check this extension is executing
                           Note, this extension only runs when mutable-content is set
                           Setting an attachment or action buttons automatically adds this */
-            print("Running NotificationServiceExtension")
+            // print("Running NotificationServiceExtension")
-            bestAttemptContent.body = "[Modified] " + bestAttemptContent.body
+            // bestAttemptContent.body = "[Modified] " + bestAttemptContent.body
             
             OneSignalExtension.didReceiveNotificationExtensionRequest(self.receivedRequest, with: bestAttemptContent, withContentHandler: self.contentHandler)
         }

ios/App/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>aps-environment</key>
-	<string>development</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.com.wrenchboard.users.onesignal</string>

ios/App/Podfile

@@ -8,13 +8,12 @@ use_frameworks!
 # Requires CocoaPods 1.6 or newer
 install! 'cocoapods', :disable_input_output_paths => true
 
-gem 'activesupport', '~> 7.0', '<= 7.0.8'
-
 def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCommunityAppleSignIn', :path => '../../node_modules/@capacitor-community/apple-sign-in'
   pod 'CapacitorCommunityBarcodeScanner', :path => '../../node_modules/@capacitor-community/barcode-scanner'
+  pod 'CapacitorCommunityContacts', :path => '../../node_modules/@capacitor-community/contacts'
   pod 'CapacitorCommunityFacebookLogin', :path => '../../node_modules/@capacitor-community/facebook-login'
   pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
   pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
@@ -32,13 +31,13 @@ end
 target 'App' do
   capacitor_pods
   # Add your Pods here
+  # Add your Pods here
   pod 'FBSDKCoreKit', '16.1.3'
   pod 'FBSDKLoginKit', '16.1.3'
 end
 
 target 'OneSignalNotificationServiceExtension' do
-  use_frameworks!
+  pod 'OneSignalXCFramework', '>= 5.0', '< 6.0'
-  pod 'OneSignalXCFramework', '5.0.0-beta-04'
 end
 
 post_install do |installer|

ios/App/Podfile.lock

@@ -1,37 +1,49 @@
 PODS:
-  - AppAuth (1.6.2):
+  - AppAuth (1.7.3):
-    - AppAuth/Core (= 1.6.2)
+    - AppAuth/Core (= 1.7.3)
-    - AppAuth/ExternalUserAgent (= 1.6.2)
+    - AppAuth/ExternalUserAgent (= 1.7.3)
-  - AppAuth/Core (1.6.2)
+  - AppAuth/Core (1.7.3)
-  - AppAuth/ExternalUserAgent (1.6.2):
+  - AppAuth/ExternalUserAgent (1.7.3):
     - AppAuth/Core
-  - Capacitor (5.0.5):
+  - Capacitor (5.7.2):
     - CapacitorCordova
-  - CapacitorApp (5.0.3):
+  - CapacitorApp (5.0.7):
+    - Capacitor
+  - CapacitorCamera (5.0.9):
     - Capacitor
   - CapacitorCommunityAppleSignIn (5.0.0):
     - Capacitor
   - CapacitorCommunityBarcodeScanner (4.0.1):
     - Capacitor
+  - CapacitorCommunityContacts (5.0.4):
+    - Capacitor
   - CapacitorCommunityFacebookLogin (5.0.3):
     - Capacitor
     - FBSDKCoreKit (= 16.1.3)
     - FBSDKLoginKit (= 16.1.3)
-  - CapacitorCordova (5.0.5)
+  - CapacitorCordova (5.7.2)
-  - CapacitorHaptics (5.0.4):
+  - CapacitorFilesystem (5.2.1):
     - Capacitor
-  - CapacitorKeyboard (5.0.4):
+  - CapacitorGeolocation (5.0.7):
     - Capacitor
-  - CapacitorPreferences (5.0.6):
+  - CapacitorGoogleMaps (5.4.1):
     - Capacitor
-  - CapacitorStatusBar (5.0.4):
+    - Google-Maps-iOS-Utils (~> 4.1)
+    - GoogleMaps (~> 7.3)
+  - CapacitorHaptics (5.0.7):
+    - Capacitor
+  - CapacitorKeyboard (5.0.8):
+    - Capacitor
+  - CapacitorPreferences (5.0.7):
+    - Capacitor
+  - CapacitorStatusBar (5.0.7):
     - Capacitor
   - CodetrixStudioCapacitorGoogleAuth (0.0.1):
     - Capacitor
     - GoogleSignIn (~> 6.2.4)
-  - CordovaPluginsStatic (5.0.5):
+  - CordovaPluginsStatic (5.7.2):
     - CapacitorCordova
-    - OneSignalXCFramework (= 5.0.0-beta-04)
+    - OneSignalXCFramework (= 5.1.3)
   - FBAEMKit (16.1.3):
     - FBSDKCoreKit_Basics (= 16.1.3)
   - FBSDKCoreKit (16.1.3):
@@ -40,6 +52,30 @@ PODS:
   - FBSDKCoreKit_Basics (16.1.3)
   - FBSDKLoginKit (16.1.3):
     - FBSDKCoreKit (= 16.1.3)
+  - Google-Maps-iOS-Utils (4.2.2):
+    - Google-Maps-iOS-Utils/Clustering (= 4.2.2)
+    - Google-Maps-iOS-Utils/Geometry (= 4.2.2)
+    - Google-Maps-iOS-Utils/GeometryUtils (= 4.2.2)
+    - Google-Maps-iOS-Utils/Heatmap (= 4.2.2)
+    - Google-Maps-iOS-Utils/QuadTree (= 4.2.2)
+    - GoogleMaps (~> 7.3)
+  - Google-Maps-iOS-Utils/Clustering (4.2.2):
+    - Google-Maps-iOS-Utils/QuadTree
+    - GoogleMaps (~> 7.3)
+  - Google-Maps-iOS-Utils/Geometry (4.2.2):
+    - GoogleMaps (~> 7.3)
+  - Google-Maps-iOS-Utils/GeometryUtils (4.2.2):
+    - GoogleMaps (~> 7.3)
+  - Google-Maps-iOS-Utils/Heatmap (4.2.2):
+    - Google-Maps-iOS-Utils/QuadTree
+    - GoogleMaps (~> 7.3)
+  - Google-Maps-iOS-Utils/QuadTree (4.2.2):
+    - GoogleMaps (~> 7.3)
+  - GoogleMaps (7.4.0):
+    - GoogleMaps/Maps (= 7.4.0)
+  - GoogleMaps/Base (7.4.0)
+  - GoogleMaps/Maps (7.4.0):
+    - GoogleMaps/Base
   - GoogleSignIn (6.2.4):
     - AppAuth (~> 1.5)
     - GTMAppAuth (~> 1.3)
@@ -48,26 +84,43 @@ PODS:
     - AppAuth/Core (~> 1.6)
     - GTMSessionFetcher/Core (< 3.0, >= 1.5)
   - GTMSessionFetcher/Core (2.3.0)
-  - OneSignalXCFramework (5.0.0-beta-04):
+  - OneSignalXCFramework (5.1.3):
-    - OneSignalXCFramework/OneSignalCore (= 5.0.0-beta-04)
+    - OneSignalXCFramework/OneSignalComplete (= 5.1.3)
-    - OneSignalXCFramework/OneSignalExtension (= 5.0.0-beta-04)
+  - OneSignalXCFramework/OneSignal (5.1.3):
-    - OneSignalXCFramework/OneSignalNotifications (= 5.0.0-beta-04)
+    - OneSignalXCFramework/OneSignalCore
-    - OneSignalXCFramework/OneSignalOSCore (= 5.0.0-beta-04)
+    - OneSignalXCFramework/OneSignalExtension
-    - OneSignalXCFramework/OneSignalOutcomes (= 5.0.0-beta-04)
+    - OneSignalXCFramework/OneSignalNotifications
-    - OneSignalXCFramework/OneSignalUser (= 5.0.0-beta-04)
+    - OneSignalXCFramework/OneSignalOSCore
-  - OneSignalXCFramework/OneSignalCore (5.0.0-beta-04)
+    - OneSignalXCFramework/OneSignalOutcomes
-  - OneSignalXCFramework/OneSignalExtension (5.0.0-beta-04):
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalComplete (5.1.3):
+    - OneSignalXCFramework/OneSignal
+    - OneSignalXCFramework/OneSignalInAppMessages
+    - OneSignalXCFramework/OneSignalLocation
+  - OneSignalXCFramework/OneSignalCore (5.1.3)
+  - OneSignalXCFramework/OneSignalExtension (5.1.3):
     - OneSignalXCFramework/OneSignalCore
     - OneSignalXCFramework/OneSignalOutcomes
-  - OneSignalXCFramework/OneSignalNotifications (5.0.0-beta-04):
+  - OneSignalXCFramework/OneSignalInAppMessages (5.1.3):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalNotifications
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalOutcomes
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalLocation (5.1.3):
+    - OneSignalXCFramework/OneSignalCore
+    - OneSignalXCFramework/OneSignalNotifications
+    - OneSignalXCFramework/OneSignalOSCore
+    - OneSignalXCFramework/OneSignalUser
+  - OneSignalXCFramework/OneSignalNotifications (5.1.3):
     - OneSignalXCFramework/OneSignalCore
     - OneSignalXCFramework/OneSignalExtension
     - OneSignalXCFramework/OneSignalOutcomes
-  - OneSignalXCFramework/OneSignalOSCore (5.0.0-beta-04):
+  - OneSignalXCFramework/OneSignalOSCore (5.1.3):
     - OneSignalXCFramework/OneSignalCore
-  - OneSignalXCFramework/OneSignalOutcomes (5.0.0-beta-04):
+  - OneSignalXCFramework/OneSignalOutcomes (5.1.3):
     - OneSignalXCFramework/OneSignalCore
-  - OneSignalXCFramework/OneSignalUser (5.0.0-beta-04):
+  - OneSignalXCFramework/OneSignalUser (5.1.3):
     - OneSignalXCFramework/OneSignalCore
     - OneSignalXCFramework/OneSignalNotifications
     - OneSignalXCFramework/OneSignalOSCore
@@ -76,10 +129,15 @@ PODS:
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
+  - "CapacitorCamera (from `../../node_modules/@capacitor/camera`)"
   - "CapacitorCommunityAppleSignIn (from `../../node_modules/@capacitor-community/apple-sign-in`)"
   - "CapacitorCommunityBarcodeScanner (from `../../node_modules/@capacitor-community/barcode-scanner`)"
+  - "CapacitorCommunityContacts (from `../../node_modules/@capacitor-community/contacts`)"
   - "CapacitorCommunityFacebookLogin (from `../../node_modules/@capacitor-community/facebook-login`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
+  - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)"
+  - "CapacitorGeolocation (from `../../node_modules/@capacitor/geolocation`)"
+  - "CapacitorGoogleMaps (from `../../node_modules/@capacitor/google-maps`)"
   - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)"
   - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)"
   - "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)"
@@ -88,7 +146,7 @@ DEPENDENCIES:
   - CordovaPluginsStatic (from `../capacitor-cordova-ios-plugins`)
   - FBSDKCoreKit (= 16.1.3)
   - FBSDKLoginKit (= 16.1.3)
-  - OneSignalXCFramework (= 5.0.0-beta-04)
+  - OneSignalXCFramework (< 6.0, >= 5.0)
 
 SPEC REPOS:
   trunk:
@@ -97,6 +155,8 @@ SPEC REPOS:
     - FBSDKCoreKit
     - FBSDKCoreKit_Basics
     - FBSDKLoginKit
+    - Google-Maps-iOS-Utils
+    - GoogleMaps
     - GoogleSignIn
     - GTMAppAuth
     - GTMSessionFetcher
@@ -107,14 +167,24 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorApp:
     :path: "../../node_modules/@capacitor/app"
+  CapacitorCamera:
+    :path: "../../node_modules/@capacitor/camera"
   CapacitorCommunityAppleSignIn:
     :path: "../../node_modules/@capacitor-community/apple-sign-in"
   CapacitorCommunityBarcodeScanner:
     :path: "../../node_modules/@capacitor-community/barcode-scanner"
+  CapacitorCommunityContacts:
+    :path: "../../node_modules/@capacitor-community/contacts"
   CapacitorCommunityFacebookLogin:
     :path: "../../node_modules/@capacitor-community/facebook-login"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
+  CapacitorFilesystem:
+    :path: "../../node_modules/@capacitor/filesystem"
+  CapacitorGeolocation:
+    :path: "../../node_modules/@capacitor/geolocation"
+  CapacitorGoogleMaps:
+    :path: "../../node_modules/@capacitor/google-maps"
   CapacitorHaptics:
     :path: "../../node_modules/@capacitor/haptics"
   CapacitorKeyboard:
@@ -129,28 +199,35 @@ EXTERNAL SOURCES:
     :path: "../capacitor-cordova-ios-plugins"
 
 SPEC CHECKSUMS:
-  AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
+  AppAuth: a13994980c1ec792f7e2e665acd4d4aa6be43240
-  Capacitor: b1248915663add1bd6567e2b67c1c1fa3abcf5e8
+  Capacitor: fc7ef6d935eafb0df9eaaf109ca69be16c51a2d2
-  CapacitorApp: 7a5dec8b33573707164b293475d5c89ba684364a
+  CapacitorApp: 17fecd0e6cb23feafac7eb0939417389038b0979
+  CapacitorCamera: 4892c5c392f60039d853dde78bc50ba19fbd113e
   CapacitorCommunityAppleSignIn: eafdd59b18b38161fa5cceee7b0e31312b122958
   CapacitorCommunityBarcodeScanner: 7feb206489c8555a8ca0c74c57ddf49ead774eb8
+  CapacitorCommunityContacts: 45de2477f7dc6265d267677939a2c75465d2ed87
   CapacitorCommunityFacebookLogin: c0e2bb54cb567d90443a80ae20569fdac0df3f89
-  CapacitorCordova: f8c06b897c74ee8f7701fe10e6443b40822bc83a
+  CapacitorCordova: 70b13b8fddb6f35d8adcfe06cb5045c07f35f6de
-  CapacitorHaptics: e36653b37326d71bb35ae42b944124037dbc3d97
+  CapacitorFilesystem: 9f3e3c7fea2fff12f46dd5b07a2914f2103e4cfc
-  CapacitorKeyboard: d1b25fde6f19744ad09c890862aefc6e2a7ded3d
+  CapacitorGeolocation: 918a292459542bcce98433f9e7c7909f8c72838a
-  CapacitorPreferences: f03954bcb0ff09c792909e46bff88e3183c16b10
+  CapacitorGoogleMaps: 7764613bb8eab28f290c1ca76b6ff4ee32d3c50f
-  CapacitorStatusBar: 190e0321b8734f4244d0c81baa183a00d5806ddf
+  CapacitorHaptics: 7c7c206f0c96a628fed073830c96d28c4b2e772e
+  CapacitorKeyboard: aec619a578235c6ce279075009a2689c2cf5c42c
+  CapacitorPreferences: 77ac427e98db83bace772455f8ba447430382c4c
+  CapacitorStatusBar: f390fbb49b82ffb754ea4b3cf71dc8b048baf3e7
   CodetrixStudioCapacitorGoogleAuth: fcce058390347c1ce5d8ac4764bdf1f5c1ee233b
-  CordovaPluginsStatic: c1b87170d7e6c70c473250768081e07414af3879
+  CordovaPluginsStatic: 057e657cea61738027d294d9539976450944740b
   FBAEMKit: af2972f39bb0f3f7c45998f435b007833c32ffb2
   FBSDKCoreKit: 19e2e18b3be578d7a51fed8fdd8c152bef0b9511
   FBSDKCoreKit_Basics: dd9826ce3c9fd9f8cdf8dbbd0ef0a53e6c0c9e7e
   FBSDKLoginKit: c395c63a1a6cf4a8a1e6103fd94b8c46329ee81c
+  Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
+  GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
   GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a
   GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
   GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
-  OneSignalXCFramework: 0225dc78b9c611be84733e5adc9b68638632c1e8
+  OneSignalXCFramework: 613f696d70d7e544b9f99e7a21c8b49fa47d7942
 
-PODFILE CHECKSUM: 6f3fca74c9da63a49dc76a4a79d1ca8197e91f23
+PODFILE CHECKSUM: 83ca3c115ed805bf2ea5f00ff755a07fd899b51d
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2

package.json

@@ -31,7 +31,7 @@
     "@capacitor/geolocation": "^5.0.6",
     "@capacitor/google-maps": "^5.3.3",
     "@capacitor/haptics": "^5.0.0",
-    "@capacitor/ios": "5.0.5",
+    "@capacitor/ios": "5.7.2",
     "@capacitor/keyboard": "^5.0.0",
     "@capacitor/preferences": "^5.0.6",
     "@capacitor/status-bar": "^5.0.0",
@@ -41,9 +41,9 @@
     "bn-ng-idle": "^2.0.5",
     "flutterwave-angular-v3": "^1.2.1",
     "jwt-decode": "^3.1.2",
-    "onesignal-cordova-plugin": "^5.0.0-beta-02",
+    "onesignal-cordova-plugin": "^5.1.0",
     "rxjs": "~6.6.0",
-    "socket.io-client": "^4.7.4",
+    "socket.io-client": "^4.5.4",
     "tslib": "^2.2.0",
     "zone.js": "~0.11.4"
   },

src/app/services/onesignal.service.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 //import 'rxjs/add/operator/map';
 import { environment } from 'src/environments/environment';
 import { SessionDataProviderService } from '../store/session-data-provider.service';
-import {Router} from "@angular/router";
+import { Router } from "@angular/router";
 import OneSignal from 'onesignal-cordova-plugin';
 
 @Injectable({
@@ -46,7 +46,8 @@ export class OnesignalService {
         OneSignal.Debug.setAlertLevel(0);
 
         // NOTE: Update the init value below with your OneSignal AppId.
-        OneSignal.init(this.AppId);
+        //OneSignal.init(this.AppId);
+        OneSignal.initialize(this.AppId);
 
         // Location permissions enable geotagging in the OneSignal dashboard to send notifications to users based on their location
         OneSignal.Location.setShared(true);
@@ -74,11 +75,12 @@ export class OnesignalService {
 
         // Prompts the user for notification permissions.
         //    * Since this shows a generic native prompt, we recommend instead using an In-App Message to prompt for notification permission (See step 7) to better communicate to your users what notifications they will get.
-        OneSignal.Notifications.requestPermission(function(accepted) {
+        /*OneSignal.Notifications.requestPermission(function(accepted) {
             console.log("User accepted notifications: " + accepted);
-        });
+        });*/
+        OneSignal.Notifications.requestPermission(true); // @param  {boolean} fallbackToSettings
 
-        //OneSignal.User.addAlias("external_id", member_uid);
+      //OneSignal.User.addAlias("external_id", member_uid);
         OneSignal.login(member_uid);
         // OneSignal.getUser().addEmail(emailAddress, emailAuthHash);
         // Auth hashes are expected to be a HMAC on a SHA-256 of the OneSignal REST API Key and the <protected_field_value>
@@ -102,4 +104,4 @@ export class OnesignalService {
         }
         */
     }    
-}
+}