Merge pull request #12 from unity/develop

v4.13.3
deltaDNA · Dec 11, 2020 · d00b007 · d00b007
2 parents fe5195a + 4d031ee
commit d00b007
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [4.13.3](https://github.com/deltaDNA/android-sdk/releases/tag/4.13.3)
+
+### Fixed
+- Fixed a bug that caused the notificationOpened callback not to be called in some circumstances
+
 ## [4.13.2](https://github.com/deltaDNA/android-sdk/releases/tag/4.13.2)
 
 ### Fixed

diff --git a/README-CN.md b/README-CN.md
@@ -43,7 +43,7 @@ allprojects {
 ```
 在你APP的构建脚本
 ```groovy
-compile 'com.deltadna.android:deltadna-sdk:4.13.2'
+compile 'com.deltadna.android:deltadna-sdk:4.13.3'
 ```
 
 ## 初始化

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ allprojects {
 In your app's build script:
 ```groovy
 dependencies {
-    implementation 'com.deltadna.android:deltadna-sdk:4.13.2'
+    implementation 'com.deltadna.android:deltadna-sdk:4.13.3'
 }
 ```
 The Java source and target compatibility needs to be set to 1.8 in you app's build script:

diff --git a/...c/main/java/com/deltadna/android/sdk/notifications/example/StyledNotificationFactory.java b/...c/main/java/com/deltadna/android/sdk/notifications/example/StyledNotificationFactory.java
@@ -34,10 +34,10 @@ public StyledNotificationFactory(Context context) {
 
     @Override
     public NotificationCompat.Builder configure(
-            NotificationCompat.Builder builder,
+            Context context,
             PushMessage message){
 
-        return super.configure(builder, message);
+        return super.configure(context, message);
 
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.deltadna.android
-VERSION_NAME=4.13.2
+VERSION_NAME=4.13.3
 
 POM_DESCRIPTION=deltaDNA SDK for Android
 POM_URL=https://github.com/deltaDNA/android-sdk

diff --git a/library-notifications/README-CN.md b/library-notifications/README-CN.md
@@ -41,8 +41,8 @@ allprojects {
 ```
 在你APP的构建脚本
 ```groovy
-compile 'com.deltadna.android:deltadna-sdk:4.13.2'
-compile 'com.deltadna.android:deltadna-sdk-notifications:4.13.2'
+compile 'com.deltadna.android:deltadna-sdk:4.13.3'
+compile 'com.deltadna.android:deltadna-sdk-notifications:4.13.3'
 ```
 
 ## 整合

diff --git a/library-notifications/README.md b/library-notifications/README.md
@@ -41,8 +41,8 @@ allprojects {
 In your app's build script:
 ```groovy
 dependencies {
-    implementation 'com.deltadna.android:deltadna-sdk:4.13.2'
-    implementation 'com.deltadna.android:deltadna-sdk-notifications:4.13.2'
+    implementation 'com.deltadna.android:deltadna-sdk:4.13.3'
+    implementation 'com.deltadna.android:deltadna-sdk-notifications:4.13.3'
 }
 ```
 

diff --git a/...tifications/src/main/java/com/deltadna/android/sdk/notifications/NotificationFactory.java b/...tifications/src/main/java/com/deltadna/android/sdk/notifications/NotificationFactory.java
@@ -44,7 +44,7 @@
  * {@code Intent} of your application.
  * <p>
  * The default behaviour can be customised by extending the class and overriding
- * {@link #configure(NotificationCompat.Builder, PushMessage)}. The
+ * {@link #configure(Context, PushMessage)}. The
  * {@link NotificationListenerService} will then need to be extended in order
  * to define the new factory to be used for creating notifications.
  */
@@ -66,17 +66,20 @@ public NotificationFactory(Context context) {
      * Fills a {@link androidx.core.app.NotificationCompat.Builder}
      * with details from a {@link PushMessage}.
      *
-     * @param builder   the notification builder to be configured
+     * @param context   the context for the notification
      * @param message   the push message
      *
      * @return          configured notification builder
      */
     public NotificationCompat.Builder configure(
-            NotificationCompat.Builder builder,
+            Context context,
             PushMessage message){
-
+
+        NotificationCompat.Builder builder;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            builder.setChannelId(getChannel().getId());
+            builder = new NotificationCompat.Builder(context, getChannel().getId());
+        } else {
+            builder = new NotificationCompat.Builder(context);
         }
 
 

diff --git a/...ons/src/main/java/com/deltadna/android/sdk/notifications/NotificationListenerService.java b/...ons/src/main/java/com/deltadna/android/sdk/notifications/NotificationListenerService.java
@@ -118,7 +118,7 @@ public void onMessageReceived(RemoteMessage message) {
 
             final Notification notification = factory.create(
                     factory.configure(
-                            new NotificationCompat.Builder(this),
+                            this,
                             pushMessage),
                     info);
             if (notification != null) {