UPDATE Push plugin to 5.1.1+301

Author: fuatbakkal

flutter-hms-push/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 5.1.1+301
+* Updated Push SDK to the latest version 5.1.1+301.
+* Added Multi-Sender API.
+* Bug fixes and improvements.
+* **[Breaking Changes]**
+  * Migrated the plugin to Null-Safety.
+  * Folder structure updated, all library can be imported with a single line.
+  * Code constant renamed as ResultCodes.
+  * Push.deleteToken method's result will not be returned to the stream anymore, it can be obtained directly from the method.
+
 ## 5.0.2+304
 * Updated HMSLogger.
 * Changed lightSettings, vibrateConfig, titleLocalizationArgs and bodyLocalizationArgs fields of RemoteMessageNotification to type List\<dynamic> in order to support parsing for 3rd party integrations.

flutter-hms-push/README.md

@@ -2,41 +2,48 @@
   <h1 align="center">Huawei Push Kit Flutter Plugin</h1>
 </p>
 
+
+
+<p align="center">
+  <a href="https://pub.dev/packages/huawei_gameservice"><img src="https://img.shields.io/pub/v/huawei_push?style=for-the-badge" alt="pub.dev version"></a>
+</p>
+
+
 ----
 
 HUAWEI Push Kit is a messaging service provided by Huawei. It establishes a messaging channel from the cloud to devices. By integrating Push Kit, you can send messages to your apps on users' devices in real time. This helps you maintain closer ties with users and increases user awareness and engagement with your apps. 
 
 This plugin enables communication between HUAWEI Push Kit SDK and Flutter platform. It exposes all functionality provided by HUAWEI Push Kit SDK.
 
-[> Learn More](https://developer.huawei.com/consumer/en/doc/development/HMSCore-Guides-V5/service-introduction-0000001050040060-V5)
+[Learn More](https://developer.huawei.com/consumer/en/doc/development/HMSCore-Guides-V5/service-introduction-0000001050040060-V5?ha_source=hms1)
 
 ## Installation
 
-Please see [pub.dev](https://pub.dev/packages/huawei_push/install) and [AppGallery Connect Configuration](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/config-agc-0000001050178043).
+Please see [pub.dev](https://pub.dev/packages/huawei_push/install) and [AppGallery Connect Configuration](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/config-agc-0000001050178043?ha_source=hms1).
 
 ## Documentation
 
-- [Quick Start](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/basiccapabilities-0000001050417999)
-- [Reference](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-References/overview-0000001057463088)
+- [Quick Start](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/basiccapabilities-0000001050417999?ha_source=hms1)
+- [Reference](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-References/overview-0000001057463088?ha_source=hms1)
 
 ### Additional Topics
-- [Basic Capabilities](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/basiccapabilities-0000001050417999)
-- [Topic-based Message Sending](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/topicbased-message-0000001050190681)
-- [Receiving Data Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/receiving-data-messages-at-killed-state-0000001058199547)
-- [Deep Linking with Custom Intent URIs](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/deeplinking-custom-0000001055875857)
-- [Obtaining Initial Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/get-initial-notif-0000001056552970)
-- [Listening to Message Tap Events](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/listen-notif-message-0000001057481400)
-- [Sending Local Notification Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/send-local-notif-0000001057760996)
-- [Sending Uplink Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/send-uplink-0000001057200983)
+- [Basic Capabilities](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/basiccapabilities-0000001050417999?ha_source=hms1)
+- [Topic-based Message Sending](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/topicbased-message-0000001050190681?ha_source=hms1)
+- [Receiving Data Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/receiving-data-messages-at-killed-state-0000001058199547?ha_source=hms1)
+- [Deep Linking with Custom Intent URIs](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/deeplinking-custom-0000001055875857?ha_source=hms1)
+- [Obtaining Initial Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/get-initial-notif-0000001056552970?ha_source=hms1)
+- [Listening to Message Tap Events](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/listen-notif-message-0000001057481400?ha_source=hms1)
+- [Sending Local Notification Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/send-local-notif-0000001057760996?ha_source=hms1)
+- [Sending Uplink Messages](https://developer.huawei.com/consumer/en/doc/development/HMS-Plugin-Guides/send-uplink-0000001057200983?ha_source=hms1)
 
 ## Questions or Issues
 
 If you have questions about how to use HMS samples, try the following options:
 - [Stack Overflow](https://stackoverflow.com/questions/tagged/huawei-mobile-services) is the best place for any programming questions. Be sure to tag your question with 
 **huawei-mobile-services**.
 - [Github](https://github.com/HMS-Core/hms-flutter-plugin) is the official repository for these plugins, You can open an issue or submit your ideas.
-- [Huawei Developer Forum](https://forums.developer.huawei.com/forumPortal/en/home?fid=0101187876626530001) HMS Core Module is great for general questions, or seeking recommendations and opinions.
-- [Huawei Developer Docs](https://developer.huawei.com/consumer/en/doc/overview/HMS-Core-Plugin) is place to official documentation for all HMS Core Kits, you can find detailed documentations in there.
+- [Huawei Developer Forum](https://forums.developer.huawei.com/forumPortal/en/home?fid=0101187876626530001?ha_source=hms1) HMS Core Module is great for general questions, or seeking recommendations and opinions.
+- [Huawei Developer Docs](https://developer.huawei.com/consumer/en/doc/overview/HMS-Core-Plugin?ha_source=hms1) is place to official documentation for all HMS Core Kits, you can find detailed documentations in there.
 
 If you run into a bug in our samples, please submit an issue to the [GitHub repository](https://github.com/HMS-Core/hms-flutter-plugin).
 

flutter-hms-push/android/build.gradle

@@ -40,6 +40,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.huawei.hms:push:5.0.2.300'
+    implementation 'com.huawei.hms:push:5.1.1.301'
+    implementation 'com.huawei.hms:push-fcm:5.1.1.301'
     implementation 'com.facebook.fresco:fresco:2.2.0'
 }

flutter-hms-push/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

flutter-hms-push/android/gradlew

@@ -27,10 +27,6 @@
 import com.huawei.hms.flutter.push.utils.RemoteMessageUtils;
 import com.huawei.hms.push.RemoteMessage;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
@@ -39,25 +35,30 @@
 import io.flutter.view.FlutterNativeView;
 import io.flutter.view.FlutterRunArguments;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public class HeadlessPushPlugin implements MethodChannel.MethodCallHandler {
     private static final String TAG = HeadlessPushPlugin.class.getSimpleName();
 
-    public final static String KEY_HANDLER = "push_background_message_handler";
-    public final static String KEY_CALLBACK = "push_background_message_callback";
+    public static final String KEY_HANDLER = "push_background_message_handler";
+
+    public static final String KEY_CALLBACK = "push_background_message_callback";
 
-    private static MethodChannel methodBackgroundChannel;
     private static PluginRegistry.PluginRegistrantCallback pluginRegistrantCallback;
 
+    private MethodChannel methodBackgroundChannel;
+
     private Context context;
 
-    private static FlutterNativeView flutterNativeView;
+    private FlutterNativeView flutterNativeView;
 
     private static final AtomicBoolean SYNCHRONIZER = new AtomicBoolean(false);
 
     public HeadlessPushPlugin(Context context) {
         this.context = context;
-        if (flutterNativeView == null)
-            initFlutterNativeView();
+        initFlutterNativeView();
 
         // Queue events while background isolate is starting
         waitFlutterNativeView();
@@ -86,7 +87,6 @@ static void setPluginRegistrant(PluginRegistry.PluginRegistrantCallback callback
         pluginRegistrantCallback = callback;
     }
 
-
     public void handleBackgroundMessage(Context context, RemoteMessage remoteMessage) {
 
         SharedPreferences prefs = context.getSharedPreferences(Core.PREFERENCE_NAME, Context.MODE_PRIVATE);
@@ -106,24 +106,19 @@ private void initFlutterNativeView() {
         FlutterMain.ensureInitializationComplete(context, null);
 
         SharedPreferences prefs = context.getSharedPreferences(Core.PREFERENCE_NAME, Context.MODE_PRIVATE);
-        Long mCallbackHandle = prefs.getLong(KEY_HANDLER, -1);
+        long mCallbackHandle = prefs.getLong(KEY_HANDLER, -1);
 
-        FlutterCallbackInformation callbackInfo = FlutterCallbackInformation
-                .lookupCallbackInformation(mCallbackHandle);
-
-        if (callbackInfo == null) {
-            Log.e(TAG, "ERROR : failed to find callback");
-            return;
-        }
+        FlutterCallbackInformation callbackInfo = FlutterCallbackInformation.lookupCallbackInformation(mCallbackHandle);
 
         flutterNativeView = new FlutterNativeView(context.getApplicationContext(), true);
 
         // Create the Transmitter Channel
         methodBackgroundChannel = new MethodChannel(flutterNativeView, Channel.BACKGROUND_MESSAGE_CHANNEL.id());
         methodBackgroundChannel.setMethodCallHandler(this);
 
-        if (pluginRegistrantCallback == null)
+        if (pluginRegistrantCallback == null) {
             return;
+        }
 
         pluginRegistrantCallback.registerWith(flutterNativeView.getPluginRegistry());