Merge pull request #524 from OneSignal/release/3.0.3

jkasten2 · web-flow · commit d1ff77cb8628 · 2022-07-20T13:30:32.000-07:00
Release 3.0.3
diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [3.0.3]
+### Changed
+- Added support for OneSignal Android functionality `promptForPushNotifications`
+- Updated included Android SDK to [4.8.1](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/4.8.1)
+- Updated included iOS SDK to [3.11.2](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/3.11.2)
+- Added support for OneSignal Android `setLanguage` callbacks
+
 ## [3.0.2]
 ### Changed
 - Updated included Android SDK to [4.7.1](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/4.7.1)
@@ -147,7 +154,8 @@ If you run into any problems, please don’t hesitate to [open an issue](https:/
   - If you are updating from a previous version of the OneSignal Unity SDK please follow the Unity Asset Store instructions in
       the [README](https://github.com/OneSignal/OneSignal-Unity-SDK/README.md#unity-asset-store) to ensure a smooth transition.
 
-[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.2...HEAD
+[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.3...HEAD
+[3.0.3]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.2...3.0.3
 [3.0.2]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.1...3.0.2
 [3.0.1]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.0-beta.6...3.0.0
diff --git a/OneSignalExample/Assets/OneSignal/VERSION b/OneSignalExample/Assets/OneSignal/VERSION
@@ -1 +1 @@
-3.0.2
+3.0.3
diff --git a/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle b/OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle
@@ -11,7 +11,6 @@
             url "https://repo.maven.apache.org/maven2" // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:5
         }
         mavenLocal()
-        jcenter()
         mavenCentral()
     }
 }
@@ -22,7 +21,7 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
-    implementation 'com.onesignal:OneSignal:4.6.5' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
+    implementation 'com.onesignal:OneSignal:4.8.1' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
 // Android Resolver Dependencies End
 **DEPS**}
 
diff --git a/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml b/OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml
@@ -1,6 +1,6 @@
 <dependencies>
   <packages>
-    <package>com.onesignal:OneSignal:4.6.5</package>
+    <package>com.onesignal:OneSignal:4.8.1</package>
   </packages>
   <files />
   <settings>
diff --git a/OneSignalExample/ProjectSettings/ProjectSettings.asset b/OneSignalExample/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 3.0.2
+  bundleVersion: 3.0.3
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -525,7 +525,9 @@ PlayerSettings:
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
   switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -675,6 +677,7 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
+  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 
diff --git a/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml b/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml
@@ -3,6 +3,6 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.onesignal:OneSignal:4.7.1" />
+    <androidPackage spec="com.onesignal:OneSignal:4.8.1" />
   </androidPackages>
 </dependencies>
diff --git a/com.onesignal.unity.android/Runtime/OneSignalAndroid.Callbacks.cs b/com.onesignal.unity.android/Runtime/OneSignalAndroid.Callbacks.cs
@@ -254,6 +254,19 @@ public void onFailure(AndroidJavaObject error) {
             }
         }
 
+        private sealed class OSSetLanguageCompletionHandler : OneSignalAwaitableAndroidJavaProxy<bool> {
+            public OSSetLanguageCompletionHandler() : base("OSSetLanguageCompletionHandler") { }
+
+            /// <param name="results">string</param>
+            public void onSuccess(AndroidJavaObject results) => _complete(true);
+
+            /// <param name="error">OSLanguageError</param>
+            public void onFailure(AndroidJavaObject error) {
+                _handleError(error);
+                _complete(false);
+            }
+        }
+
         private sealed class OutcomeCallback : OneSignalAwaitableAndroidJavaProxy<bool> {
             public OutcomeCallback() : base("OutcomeCallback") { }
 
@@ -274,5 +287,12 @@ public void onFailure(AndroidJavaObject response) {
                 _complete(null);
             }
         }
+
+        private sealed class PromptForPushNotificationPermissionResponseHandler : OneSignalAwaitableAndroidJavaProxy<bool> {
+            public PromptForPushNotificationPermissionResponseHandler() : base("PromptForPushNotificationPermissionResponseHandler") { }
+
+            /// <param name="accepted">boolean</param>
+            public void response(bool accepted) => _complete(accepted);
+        }
     }
 }
diff --git a/com.onesignal.unity.android/Runtime/OneSignalAndroid.cs b/com.onesignal.unity.android/Runtime/OneSignalAndroid.cs
@@ -137,8 +137,11 @@ public override void Initialize(string appId) {
             _completedInit(appId);
         }
 
-        public override Task<NotificationPermission> PromptForPushNotificationsWithUserResponse()
-            => Task.FromResult(NotificationPermission.NotDetermined);
+        public override async Task<NotificationPermission> PromptForPushNotificationsWithUserResponse() {
+            var proxy = new PromptForPushNotificationPermissionResponseHandler();
+            _sdkClass.CallStatic("promptForPushNotifications", true, proxy);
+            return await proxy ? NotificationPermission.Authorized : NotificationPermission.Denied;
+        }
 
         public override void ClearOneSignalNotifications()
             => _sdkClass.CallStatic("clearOneSignalNotifications");
@@ -248,8 +251,9 @@ public override async Task<bool> LogOutSMS() {
         }
         
         public override async Task<bool> SetLanguage(string languageCode) {
-            _sdkClass.CallStatic("setLanguage", languageCode);
-            return await Task.FromResult(true); // no callback currently available on Android
+            var proxy = new OSSetLanguageCompletionHandler();
+            _sdkClass.CallStatic("setLanguage", languageCode, proxy);
+            return await proxy;
         }
 
         public override void PromptLocation()
diff --git a/com.onesignal.unity.android/package.json b/com.onesignal.unity.android/package.json
@@ -1,11 +1,11 @@
 {
   "name": "com.onesignal.unity.android",
   "displayName": "OneSignal Unity SDK - Android",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
-    "com.onesignal.unity.core": "3.0.2"
+    "com.onesignal.unity.core": "3.0.3"
   },
   "keywords": [
     "push-notifications",
diff --git a/com.onesignal.unity.core/package.json b/com.onesignal.unity.core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.onesignal.unity.core",
   "displayName": "OneSignal Unity SDK - Core",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
diff --git a/com.onesignal.unity.ios/Editor/OneSignalIOSDependencies.xml b/com.onesignal.unity.ios/Editor/OneSignalIOSDependencies.xml
@@ -1,5 +1,5 @@
 ﻿<dependencies>
     <iosPods>
-        <iosPod name="OneSignalXCFramework" version="3.10.0" addToAllTargets="true" />
+        <iosPod name="OneSignalXCFramework" version="3.11.2" addToAllTargets="true" />
     </iosPods>
 </dependencies>
diff --git a/com.onesignal.unity.ios/package.json b/com.onesignal.unity.ios/package.json
@@ -1,11 +1,11 @@
 {
   "name": "com.onesignal.unity.ios",
   "displayName": "OneSignal Unity SDK - iOS",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
-    "com.onesignal.unity.core": "3.0.2"
+    "com.onesignal.unity.core": "3.0.3"
   },
   "keywords": [
     "push-notifications",

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`url "https://repo.maven.apache.org/maven2" // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:5`
`12`	`12`	`}`
`13`	`13`	`mavenLocal()`
`14`		`- jcenter()`
`15`	`14`	`mavenCentral()`
`16`	`15`	`}`
`17`	`16`	`}`
`@@ -22,7 +21,7 @@ apply plugin: 'com.android.library'`
`22`	`21`	`dependencies {`
`23`	`22`	`implementation fileTree(dir: 'libs', include: ['*.jar'])`
`24`	`23`	`// Android Resolver Dependencies Start`
`25`		`- implementation 'com.onesignal:OneSignal:4.6.5' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6`
	`24`	`+ implementation 'com.onesignal:OneSignal:4.8.1' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6`
`26`	`25`	`// Android Resolver Dependencies End`
`27`	`26`	`DEPS}`
`28`	`27`
Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,19 @@ public void onFailure(AndroidJavaObject error) {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
	`257`	`+ private sealed class OSSetLanguageCompletionHandler : OneSignalAwaitableAndroidJavaProxy<bool> {`
	`258`	`+ public OSSetLanguageCompletionHandler() : base("OSSetLanguageCompletionHandler") { }`
	`259`	`+`
	`260`	`+ /// <param name="results">string</param>`
	`261`	`+ public void onSuccess(AndroidJavaObject results) => _complete(true);`
	`262`	`+`
	`263`	`+ /// <param name="error">OSLanguageError</param>`
	`264`	`+ public void onFailure(AndroidJavaObject error) {`
	`265`	`+ _handleError(error);`
	`266`	`+ _complete(false);`
	`267`	`+ }`
	`268`	`+ }`
	`269`	`+`
`257`	`270`	`private sealed class OutcomeCallback : OneSignalAwaitableAndroidJavaProxy<bool> {`
`258`	`271`	`public OutcomeCallback() : base("OutcomeCallback") { }`
`259`	`272`
`@@ -274,5 +287,12 @@ public void onFailure(AndroidJavaObject response) {`
`274`	`287`	`_complete(null);`
`275`	`288`	`}`
`276`	`289`	`}`
	`290`	`+`
	`291`	`+ private sealed class PromptForPushNotificationPermissionResponseHandler : OneSignalAwaitableAndroidJavaProxy<bool> {`
	`292`	`+ public PromptForPushNotificationPermissionResponseHandler() : base("PromptForPushNotificationPermissionResponseHandler") { }`
	`293`	`+`
	`294`	`+ /// <param name="accepted">boolean</param>`
	`295`	`+ public void response(bool accepted) => _complete(accepted);`
	`296`	`+ }`
`277`	`297`	`}`
`278`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.onesignal.unity.core",`
`3`	`3`	`"displayName": "OneSignal Unity SDK - Core",`
`4`		`- "version": "3.0.2",`
	`4`	`+ "version": "3.0.3",`
`5`	`5`	`"unity": "2018.4",`
`6`	`6`	`"description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",`
`7`	`7`	`"dependencies": {`