Merge pull request #13 from oracle-samples/feature/6.56.3

Feature/6.56.3

.gitignore

@@ -1,6 +1,6 @@
 .DS_Store
 .dart_tool/
-
+*.aar
 .packages
 .pub/
 
@@ -10,4 +10,6 @@ build/
 pubspec.lock
 .flutter-plugins-dependencies
 .flutter-plugins
-.vscode/
+.vscode/
+ios/PushIOManager
+example/android/app/src/main/assets/

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 6.56.3
+- Fixed issues related to push-permission prompt in Android 13 and later.
+- Fixed issue with few APIs not returning Result object from native to dart.
+- Additional error scenarios added to Result callbacks.
+
 ## 6.56.1
 - Updated for compatibility with [Responsys Mobile SDK 6.56.1](https://www.oracle.com/downloads/applications/cx/responsys-mobile-sdk.html)
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2023 Oracle and/or its affiliates.
+Copyright (c) 2024 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 

README.md

@@ -50,7 +50,7 @@ Before installing the plugin, you must setup your app to receive push notificati
 
 	```gradle
 	configurations.maybeCreate("default")
-	artifacts.add("default", file('PushIOManager-6.56.1.aar'))
+	artifacts.add("default", file('PushIOManager-6.56.3.aar'))
 	```		
 
 - Add the following to your project-wide `settings.gradle` file:
@@ -390,7 +390,7 @@ PushIOManager.setNotificationDeepLinkHandler((String url) {
 
 ```
 
-
+2024
 
 ## Support
 

android/build.gradle

@@ -1,8 +1,8 @@
-// Copyright © 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2024, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 group 'com.pushio.manager.flutter'
-version '6.56.1'
+version '6.56.3'
 
 buildscript {
     repositories {

android/settings.gradle

@@ -1,4 +1,4 @@
-// Copyright © 2023, Oracle and/or its affiliates. All rights reserved.
+// Copyright © 2024, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 rootProject.name = 'pushiomanager_flutter'

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <!-- 
-  Copyright © 2023, Oracle and/or its affiliates. All rights reserved.
+  Copyright © 2024, Oracle and/or its affiliates. All rights reserved.
   Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 -->
 

android/src/main/java/com/pushio/manager/flutter/PIOUtils.java

@@ -1,5 +1,5 @@
 /**
-* Copyright © 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright © 2024, Oracle and/or its affiliates. All rights reserved.
 *
 * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */

android/src/main/java/com/pushio/manager/flutter/PushIOManagerFlutterPlugin.java

@@ -1,5 +1,5 @@
 /**
-* Copyright © 2023, Oracle and/or its affiliates. All rights reserved.
+* Copyright © 2024, Oracle and/or its affiliates. All rights reserved.
 *
 * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 */
@@ -524,6 +524,8 @@ private void setMessageCenterEnabled(MethodCall call, Result result) {
         PIOLogger.v("setMessageCenterEnabled called");
 
         mPushIOManager.setMessageCenterEnabled(isEnabled);
+
+        result.success(null);
     }
 
     private void unregisterApp(MethodCall call, final Result result) {
@@ -548,12 +550,16 @@ private void setDefaultSmallIcon(MethodCall call, Result result) {
         int resId = call.arguments();
 
         mPushIOManager.setDefaultSmallIcon(resId);
+
+        result.success(null);
     }
 
     private void setDefaultLargeIcon(MethodCall call, Result result) {
         int resId = call.arguments();
 
         mPushIOManager.setDefaultLargeIcon(resId);
+
+        result.success(null);
     }
 
     private void setNotificationSmallIcon(MethodCall call, Result result) {
@@ -635,12 +641,16 @@ private void setInAppFetchEnabled(MethodCall call, Result result) {
         boolean isEnabled = call.arguments();
 
         mPushIOManager.setInAppFetchEnabled(isEnabled);
+
+        result.success(null);
     }
 
     private void setCrashLoggingEnabled(MethodCall call, Result result) {
         boolean isEnabled = call.arguments();
 
         mPushIOManager.setCrashLoggingEnabled(isEnabled);
+
+        result.success(null);
     }
 
     private void isCrashLoggingEnabled(MethodCall call, Result result) {
@@ -658,6 +668,8 @@ private void setMessageCenterBadgingEnabled(MethodCall call, Result result) {
         boolean isEnabled = call.arguments();
 
         mPushIOManager.setMessageCenterBadgingEnabled(isEnabled);
+
+        result.success(null);
     }
 
     private void setBadgeCount(MethodCall call, final Result result) {
@@ -799,6 +811,8 @@ private void handleMessage(MethodCall call, Result result) {
         RemoteMessage remoteMessage = PIOUtils.remoteMessageFromMap(message);
 
         mPushIOManager.handleMessage(remoteMessage);
+
+        result.success(null);
     }
 
     private void getExecuteRsysWebUrl(MethodCall call, Result result) {
@@ -960,18 +974,22 @@ public void onFailure(String requestUrl, String reason) {
                 channel.invokeMethod("setIAMUrlResolveLinkHandler", response);
             }
         });
+
+        result.success(null);
     }
 
     private void setInterceptDeepLink(MethodCall call, Result result) {
         boolean isEnabled = call.arguments();
         PIOLogger.v("is Intercept DeepLink enabled: " + isEnabled);
         mPreferences.edit().putBoolean("handlePushDeepLink", isEnabled).commit();
         PIOLogger.v("is Intercept DeepLink enabled done: " + mPreferences.getBoolean("handlePushDeepLink", false));
+        result.success(null);
     }
 
     private void setInterceptAppOpenLink(MethodCall call, Result result) {
         boolean isEnabled = call.arguments();
         mPreferences.edit().putBoolean("handleAppOpenLink", isEnabled).commit();
+        result.success(null);
     }
 
     private void trackEmailConversion(Intent intent) {

example/android/PushIOManager/build.gradle

@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('PushIOManager-6.56.1.aar'))
+artifacts.add("default", file('PushIOManager-6.56.3.aar'))

example/android/app/build.gradle

@@ -25,12 +25,11 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
-
     defaultConfig {
         applicationId "com.pushio.flutter.sample"
         minSdkVersion 21
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdk 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Mar 10 14:03:13 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

example/ios/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Flutter (1.0.0)
-  - pushiomanager_flutter (6.54.0):
+  - pushiomanager_flutter (6.56.3):
     - Flutter
 
 DEPENDENCIES:
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  pushiomanager_flutter: 758d960c7e0529868b0bacbbdc638555c3ddde08
+  pushiomanager_flutter: 1f4b750d85d8f64e21e702a738fd340493b793e3
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

example/ios/Runner.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		27AC264A2B74B68B007712AF /* qa70_pushio_config.json in Resources */ = {isa = PBXBuildFile; fileRef = 27AC26492B74B68B007712AF /* qa70_pushio_config.json */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -32,6 +33,7 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		27AC26492B74B68B007712AF /* qa70_pushio_config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = qa70_pushio_config.json; path = ../../../../../Downloads/qa70_pushio_config.json; sourceTree = "<group>"; };
 		39E2D71A162BE4ED85F2332B /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		45D48B12EED2E3EB5E842E4D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
@@ -113,6 +115,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				27AC26492B74B68B007712AF /* qa70_pushio_config.json */,
 				7DDBD9C429A60A1C0055A698 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
@@ -189,6 +192,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				27AC264A2B74B68B007712AF /* qa70_pushio_config.json in Resources */,
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
@@ -360,19 +364,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 6.56.3;
 				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = VYAKS7W7VC;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 6.56.3;
+				FLUTTER_BUILD_NUMBER = 6.56.3;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 6.54.1;
-				PRODUCT_BUNDLE_IDENTIFIER = com.pushio.flutter.flutterSampleApp;
+				MARKETING_VERSION = 6.56.3;
+				PRODUCT_BUNDLE_IDENTIFIER = com.oraclecorp.internal.ent2.pushio5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "PushIO 5";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -493,19 +503,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 6.56.3;
 				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = VYAKS7W7VC;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 6.56.3;
+				FLUTTER_BUILD_NUMBER = 6.56.3;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 6.54.1;
-				PRODUCT_BUNDLE_IDENTIFIER = com.pushio.flutter.flutterSampleApp;
+				MARKETING_VERSION = 6.56.3;
+				PRODUCT_BUNDLE_IDENTIFIER = com.oraclecorp.internal.ent2.pushio5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "PushIO 5";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -521,19 +537,25 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 6.56.3;
 				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = VYAKS7W7VC;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 6.56.3;
+				FLUTTER_BUILD_NUMBER = 6.56.3;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 6.54.1;
-				PRODUCT_BUNDLE_IDENTIFIER = com.pushio.flutter.flutterSampleApp;
+				MARKETING_VERSION = 6.56.3;
+				PRODUCT_BUNDLE_IDENTIFIER = com.oraclecorp.internal.ent2.pushio5;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "PushIO 5";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,11 +36,11 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"