UPDATE flutter-hms-push 6.12.0-302

Author: ozkulbeng

flutter-hms-push/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.12.0+302
+
+- Fixed stability and performance issues.
+  > You are advised to use this version. To use it, you only need to update the version number and do not need to modify any code for adaptation.
+
+## 6.12.0+301
+
+- Minor optimization.
+
 ## 6.12.0+300
 
 - To solve stability and performance problems, it is recommended that you use it integratedly. You only need to upgrade the version number, and no other code adaptation is required. 

flutter-hms-push/OpenSourceSoftwareNotice.html

@@ -14,7 +14,7 @@
 
 <p style="text-align:justify"><span style="font-size:10.5pt"><span style="font-family:&quot;Times New Roman&quot;,serif"><span style="color:#000000"><strong><span style="font-size:16pt"><span style="font-family:Arial,sans-serif">Copyright Notice and License Texts</span></span></strong></span></span></span></p>
 
-<h1 style="text-align:start"><span style="font-size:22pt"><span style="font-family:&quot;Times New Roman&quot;,serif"><strong><span style="color:#000000"><span style="font-size:10.5pt"><span style="font-family:Arial,sans-serif">Software: Fresco 2.6.0</span></span></span></strong></span></span></h1>
+<h1 style="text-align:start"><span style="font-size:22pt"><span style="font-family:&quot;Times New Roman&quot;,serif"><strong><span style="color:#000000"><span style="font-size:10.5pt"><span style="font-family:Arial,sans-serif">Software: Fresco 3.1.3</span></span></span></strong></span></span></h1>
 
 <p style="text-align:start"><span style="font-size:10.5pt"><span style="font-family:&quot;Times New Roman&quot;,serif"><span style="color:#000000"><strong><span style="font-family:Arial,sans-serif">Copyright notice:</span></strong></span></span></span></p>
 

flutter-hms-push/android/build.gradle

@@ -44,5 +44,5 @@ android {
 
 dependencies {
     implementation "com.huawei.hms:push:6.12.0.300"
-    implementation "com.facebook.fresco:fresco:2.6.0"
+    implementation "com.facebook.fresco:fresco:3.1.3"
 }

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/PushPlugin.java

@@ -69,15 +69,25 @@
 
 public class PushPlugin implements FlutterPlugin, MethodCallHandler, ActivityAware {
     private static final String TAG = "HmsFlutterPush";
+
     private MethodChannel channel;
+
     private Context context;
+
     private HmsLocalNotification hmsLocalNotification;
+
     private NotificationIntentListener notificationIntentListener;
+
     private FlutterHmsInstanceId hmsInstanceId;
+
     private FlutterHmsMessaging hmsMessaging;
+
     private FlutterHmsProfile hmsProfile;
+
     private FlutterHmsConsent hmsConsent;
+
     private Activity activity;
+
     private final List<EventChannel> eventChannels = new ArrayList<>();
 
     @Override
@@ -98,31 +108,31 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
     private void setStreamHandlers(BinaryMessenger messenger) {
         Map<String, EventChannel.StreamHandler> streams = new ConcurrentHashMap<>();
         streams.put(Channel.TOKEN_CHANNEL.id(),
-                new DefaultStreamHandler(context, TokenReceiver::new, PushIntent.TOKEN_INTENT_ACTION));
+            new DefaultStreamHandler(context, TokenReceiver::new, PushIntent.TOKEN_INTENT_ACTION));
 
         streams.put(Channel.MULTI_SENDER_TOKEN_CHANNEL.id(),
-                new DefaultStreamHandler(context, MultiSenderTokenReceiver::new,
-                        PushIntent.MULTI_SENDER_TOKEN_INTENT_ACTION));
+            new DefaultStreamHandler(context, MultiSenderTokenReceiver::new,
+                PushIntent.MULTI_SENDER_TOKEN_INTENT_ACTION));
 
         streams.put(Channel.REMOTE_MESSAGE_RECEIVE_CHANNEL.id(),
-                new DefaultStreamHandler(context, RemoteDataMessageReceiver::new,
-                        PushIntent.REMOTE_DATA_MESSAGE_INTENT_ACTION));
+            new DefaultStreamHandler(context, RemoteDataMessageReceiver::new,
+                PushIntent.REMOTE_DATA_MESSAGE_INTENT_ACTION));
 
         streams.put(Channel.REMOTE_MESSAGE_SEND_STATUS_CHANNEL.id(),
-                new DefaultStreamHandler(context, RemoteMessageSentDeliveredReceiver::new,
-                        PushIntent.REMOTE_MESSAGE_SENT_DELIVERED_ACTION));
+            new DefaultStreamHandler(context, RemoteMessageSentDeliveredReceiver::new,
+                PushIntent.REMOTE_MESSAGE_SENT_DELIVERED_ACTION));
 
         // For sending remote message notification's custom intent Uri events
         streams.put(Channel.REMOTE_MESSAGE_NOTIFICATION_INTENT_CHANNEL.id(),
-                new DefaultStreamHandler(context, RemoteMessageNotificationIntentReceiver::new,
-                        PushIntent.REMOTE_MESSAGE_NOTIFICATION_INTENT_ACTION));
+            new DefaultStreamHandler(context, RemoteMessageNotificationIntentReceiver::new,
+                PushIntent.REMOTE_MESSAGE_NOTIFICATION_INTENT_ACTION));
 
         streams.put(Channel.NOTIFICATION_OPEN_CHANNEL.id(),
-                new DefaultStreamHandler(context, NotificationOpenEventReceiver::new, PushIntent.NOTIFICATION_OPEN_ACTION));
+            new DefaultStreamHandler(context, NotificationOpenEventReceiver::new, PushIntent.NOTIFICATION_OPEN_ACTION));
 
         streams.put(Channel.LOCAL_NOTIFICATION_CLICK_CHANNEL.id(),
-                new DefaultStreamHandler(context, LocalNotificationClickEventReceiver::new,
-                        PushIntent.LOCAL_NOTIFICATION_CLICK_ACTION));
+            new DefaultStreamHandler(context, LocalNotificationClickEventReceiver::new,
+                PushIntent.LOCAL_NOTIFICATION_CLICK_ACTION));
 
         for (Map.Entry<String, EventChannel.StreamHandler> entry : streams.entrySet()) {
             EventChannel eventChannel = new EventChannel(messenger, entry.getKey());
@@ -177,7 +187,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                 break;
             case consentOff:
                 hmsConsent.consentOff(result);
-                break;        
+                break;
             default:
                 onMethodCallToken(call, result);
         }

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/config/NotificationAttributes.java

@@ -221,9 +221,7 @@ private NotificationAttributes(JSONObject json) {
                 NotificationConstants.ALLOW_WHILE_IDLE);
             dontNotifyInForeground = json.has(NotificationConstants.DONT_NOTIFY_IN_FOREGROUND) && json.getBoolean(
                 NotificationConstants.DONT_NOTIFY_IN_FOREGROUND);
-            data = json.has(NotificationConstants.DATA)
-                ? json.get(NotificationConstants.DATA).toString()
-                : null;
+            data = json.has(NotificationConstants.DATA) ? json.get(NotificationConstants.DATA).toString() : null;
         } catch (IllegalStateException | JSONException | NumberFormatException | NullPointerException e) {
             throw new IllegalStateException(Code.RESULT_ERROR.code(), e);
         }

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/constants/Code.java

@@ -163,7 +163,6 @@ public enum Code {
     // Invalid parameter.
     ERROR_PARAMETER_INVALID("1210");
 
-
     private String code;
 
     Code(String code) {

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/hms/FlutterHmsConsent.java

@@ -28,7 +28,9 @@
 
 public class FlutterHmsConsent {
     private static final String TAG = FlutterHmsConsent.class.getSimpleName();
+
     private final HMSLogger hmsLogger;
+
     private final Context context;
 
     public FlutterHmsConsent(@NonNull Context context) {
@@ -45,7 +47,8 @@ public void consentOn(final Result result) {
                     result.success(Code.RESULT_SUCCESS.code());
                 } else {
                     hmsLogger.sendSingleEvent("consentOn", Code.RESULT_UNKNOWN.code());
-                    result.error(Code.RESULT_UNKNOWN.code(), task.getException().getMessage(), task.getException().getCause());
+                    result.error(Code.RESULT_UNKNOWN.code(), task.getException().getMessage(),
+                        task.getException().getCause());
                 }
             });
         } catch (Exception e) {
@@ -63,7 +66,8 @@ public void consentOff(final Result result) {
                     result.success(Code.RESULT_SUCCESS.code());
                 } else {
                     hmsLogger.sendSingleEvent("consentOff", Code.RESULT_UNKNOWN.code());
-                    result.error(Code.RESULT_UNKNOWN.code(), task.getException().getMessage(), task.getException().getCause());
+                    result.error(Code.RESULT_UNKNOWN.code(), task.getException().getMessage(),
+                        task.getException().getCause());
                 }
             });
         } catch (Exception e) {

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/hms/FlutterHmsInstanceId.java

@@ -47,7 +47,9 @@
  */
 public class FlutterHmsInstanceId {
     private static final String TAG = FlutterHmsInstanceId.class.getSimpleName();
+
     private final HMSLogger hmsLogger;
+
     private final Context context;
 
     public FlutterHmsInstanceId(Context context) {
@@ -114,7 +116,8 @@ public void getToken(final String scope) {
                         hmsLogger.sendSingleEvent("getToken");
                         resolution.send();
                     } catch (PendingIntent.CanceledException ex) {
-                        HMSLogger.getInstance(PluginContext.getContext()).sendSingleEvent("onTokenError", ex.getMessage());
+                        HMSLogger.getInstance(PluginContext.getContext())
+                            .sendSingleEvent("onTokenError", ex.getMessage());
                     }
                 }
                 Intent resolutionIntent = e.getResolutionIntent();

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/hms/FlutterHmsMessageService.java

@@ -105,14 +105,16 @@ public void onTokenError(Exception e, Bundle bundle) {
         super.onTokenError(e, bundle);
         if (PluginContext.getContext() != null) {
             if (e instanceof ResolvableApiException) {
-                HMSLogger.getInstance(PluginContext.getContext()).sendSingleEvent("onTokenError", String.valueOf(((ResolvableApiException) e).getStatusCode()));
+                HMSLogger.getInstance(PluginContext.getContext())
+                    .sendSingleEvent("onTokenError", String.valueOf(((ResolvableApiException) e).getStatusCode()));
                 PendingIntent resolution = ((ResolvableApiException) e).getResolution();
                 if (resolution != null) {
                     try {
                         HMSLogger.getInstance(PluginContext.getContext()).sendSingleEvent("onTokenError");
                         resolution.send();
                     } catch (PendingIntent.CanceledException ex1) {
-                        HMSLogger.getInstance(PluginContext.getContext()).sendSingleEvent("onTokenError", ex1.getMessage());
+                        HMSLogger.getInstance(PluginContext.getContext())
+                            .sendSingleEvent("onTokenError", ex1.getMessage());
                     }
                 }
                 Intent resolutionIntent = ((ResolvableApiException) e).getResolutionIntent();

flutter-hms-push/android/src/main/java/com/huawei/hms/flutter/push/hms/FlutterHmsMessaging.java

@@ -37,6 +37,7 @@
  */
 public class FlutterHmsMessaging {
     private final HMSLogger hmsLogger;
+
     private final Context context;
 
     public FlutterHmsMessaging(@NonNull Context context) {