expo-notifications 0.15.0 → 0.15.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.15.1 — 2022-04-27
+
+### 💡 Others
+
+- Remove badge deadcode ([#17205](https://github.com/expo/expo/pull/17205) by [@wschurman](https://github.com/wschurman))
+
 ## 0.15.0 — 2022-04-18
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.15.0'
+version = '0.15.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 21
-    versionName '0.15.0'
+    versionName '0.15.1'
   }
 
   lintOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Notifications module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -58,5 +58,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
+  "gitHead": "be6e0e7ea3f7fd1ab8368137260a7ad1b1bf12a8"
 }

package/android/src/main/java/expo/modules/notifications/badge/SetBadgeCountNotificationEffect.java

@@ -1,56 +0,0 @@
-package expo.modules.notifications.badge;
-
-import android.app.Notification;
-import android.content.Context;
-import android.util.Log;
-
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.errors.CodedRuntimeException;
-
-import androidx.annotation.Nullable;
-import expo.modules.notifications.badge.interfaces.BadgeManager;
-import expo.modules.notifications.notifications.presentation.builders.BadgeSettingNotificationBuilder;
-import expo.modules.notifications.notifications.presentation.effects.BaseNotificationEffect;
-
-public class SetBadgeCountNotificationEffect extends BaseNotificationEffect {
-  private static final String EXTRAS_BADGE_KEY = BadgeSettingNotificationBuilder.EXTRAS_BADGE_KEY;
-
-  private BadgeManager mBadgeManager;
-
-  public SetBadgeCountNotificationEffect(Context context) {
-    super(context);
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    super.onCreate(moduleRegistry);
-    mBadgeManager = moduleRegistry.getSingletonModule("BadgeManager", BadgeManager.class);
-  }
-
-  @Override
-  public boolean onNotificationPresented(@Nullable String tag, int id, Notification notification) {
-    return applyBadgeFromNotification(notification);
-  }
-
-  @Override
-  public boolean onNotificationPresentationFailed(@Nullable String tag, int id, Notification notification) {
-    // We could also just return false here. Then, notifications that failed to be presented
-    // wouldn't affect badge count. Applying badge count from failed notifications lets us
-    // properly handle badge-update-only notifications.
-    return applyBadgeFromNotification(notification);
-  }
-
-  private boolean applyBadgeFromNotification(Notification notification) {
-    try {
-      if (notification.extras.get(EXTRAS_BADGE_KEY) != null && mBadgeManager != null) {
-        mBadgeManager.setBadgeCount(notification.extras.getInt(EXTRAS_BADGE_KEY));
-        return true;
-      }
-    } catch (CodedRuntimeException e) {
-      // We can't do anything but log the error and return false.
-      Log.e(e.getCode(), e.getMessage());
-    }
-
-    return false;
-  }
-}

package/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/BadgeSettingNotificationBuilder.java

@@ -1,66 +0,0 @@
-package expo.modules.notifications.notifications.presentation.builders;
-
-import android.app.Notification;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.core.app.NotificationCompat;
-import expo.modules.notifications.notifications.model.NotificationContent;
-import me.leolin.shortcutbadger.ShortcutBadger;
-
-public class BadgeSettingNotificationBuilder extends ExpoNotificationBuilder {
-  public static final String EXTRAS_BADGE_KEY = "badge";
-
-  public BadgeSettingNotificationBuilder(Context context) {
-    super(context);
-  }
-
-  @Override
-  protected NotificationCompat.Builder createBuilder() {
-    NotificationCompat.Builder builder = super.createBuilder();
-
-    if (shouldSetBadge()) {
-      // Forward information about badge count to set
-      // to SetBadgeCountNotificationEffect.
-      Bundle extras = builder.getExtras();
-      extras.putInt(EXTRAS_BADGE_KEY, getBadgeCount());
-      builder.setExtras(extras);
-    }
-
-    return builder;
-  }
-
-  @Override
-  public Notification build() {
-    Notification notification = super.build();
-
-    if (shouldSetBadge()) {
-      // Xiaomi devices require this extra notification configuration step
-      // https://github.com/leolin310148/ShortcutBadger/wiki/Xiaomi-Device-Support
-      // Badge for other devices is set as an effect in SetBadgeCountNotificationEffect
-      ShortcutBadger.applyNotification(getContext(), notification, getBadgeCount());
-    }
-
-    return notification;
-  }
-
-  private boolean shouldSetBadge() {
-    boolean behaviorAllowsBadge = getNotificationBehavior() == null || getNotificationBehavior().shouldSetBadge();
-
-    NotificationContent content = getNotificationContent();
-    boolean contentDefinesBadge = content.getBadgeCount() != null;
-
-    return behaviorAllowsBadge && contentDefinesBadge;
-  }
-
-  private int getBadgeCount() {
-    Number badgeCount = getNotificationContent().getBadgeCount();
-    if (badgeCount == null) {
-      // We should never end up here, since getBadgeCount is guarded by
-      // shouldSetBadge, which checks if badgeCount is null, but in case
-      // this is ever called, let's not crash the application.
-      return 0;
-    }
-    return badgeCount.intValue();
-  }
-}