react-native-notify-kit 9.1.21 → 9.2.0

package/android/src/main/java/app/notifee/core/utility/ResourceUtils.java

@@ -0,0 +1,308 @@
+package app.notifee.core.utility;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.util.TypedValue;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.notifee.core.ContextHolder;
+import app.notifee.core.Logger;
+import com.facebook.common.executors.CallerThreadExecutor;
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.DataSource;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber;
+import com.facebook.imagepipeline.image.CloseableImage;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ResourceUtils {
+  private static final String TAG = "ResourceUtils";
+  private static final String LOCAL_RESOURCE_SCHEME = "res";
+  private static volatile Map<String, Integer> sResourceIdCache;
+
+  public static Map<String, Integer> getResourceIdCache() {
+    if (sResourceIdCache == null) {
+      synchronized (ResourceUtils.class) {
+        if (sResourceIdCache == null) {
+          sResourceIdCache = new HashMap<>();
+        }
+      }
+    }
+    return sResourceIdCache;
+  }
+
+  public static Uri getImageSourceUri(String source) {
+    try {
+      Uri uri = Uri.parse(source);
+      // verify a scheme is set,
+      // so that relative uri (used by static resources) are not handled
+      if (uri.getScheme() == null) {
+        return getResourceDrawableUri(source);
+      }
+
+      return uri;
+    } catch (Exception e) {
+      return getResourceDrawableUri(source);
+    }
+  }
+
+  public static Uri getResourceDrawableUri(@Nullable String name) {
+    int resId = getResourceIdByName(name, "drawable");
+    return resId > 0
+        ? new Uri.Builder().scheme(LOCAL_RESOURCE_SCHEME).path(String.valueOf(resId)).build()
+        : Uri.EMPTY;
+  }
+
+  /**
+   * Returns a circular Bitmap from another bitmap. The original bitmap can be any shape.
+   *
+   * @param bitmap
+   * @return Bitmap
+   */
+  public static Bitmap getCircularBitmap(Bitmap bitmap) {
+    Bitmap output;
+    Rect srcRect, dstRect;
+    float r;
+    final int width = bitmap.getWidth();
+    final int height = bitmap.getHeight();
+
+    if (width > height) {
+      output = Bitmap.createBitmap(height, height, Bitmap.Config.ARGB_8888);
+      int left = (width - height) / 2;
+      int right = left + height;
+      srcRect = new Rect(left, 0, right, height);
+      dstRect = new Rect(0, 0, height, height);
+      r = height / 2;
+    } else {
+      output = Bitmap.createBitmap(width, width, Bitmap.Config.ARGB_8888);
+      int top = (height - width) / 2;
+      int bottom = top + width;
+      srcRect = new Rect(0, top, width, bottom);
+      dstRect = new Rect(0, 0, width, width);
+      r = width / 2;
+    }
+
+    final Canvas canvas = new Canvas(output);
+
+    final int color = Color.RED;
+    final Paint paint = new Paint();
+
+    paint.setAntiAlias(true);
+    canvas.drawARGB(0, 0, 0, 0);
+    paint.setColor(color);
+    canvas.drawCircle(r, r, r, paint);
+    paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+    canvas.drawBitmap(bitmap, srcRect, dstRect, paint);
+
+    return output;
+  }
+
+  /**
+   * Returns a Bitmap from any given HTTP image URL, or local resource.
+   *
+   * @param imageUrl
+   * @return Bitmap or null if the image failed to load
+   */
+  public static ListenableFuture<Bitmap> getImageBitmapFromUrl(String imageUrl) {
+    Uri imageUri;
+    final SettableFuture<Bitmap> bitmapTCS = SettableFuture.create();
+
+    if (!imageUrl.contains("/")) {
+      String imageResourceUrl = getImageResourceUrl(imageUrl);
+      if (imageResourceUrl == null) {
+        bitmapTCS.set(null);
+        return bitmapTCS;
+      }
+      imageUri = getImageSourceUri(imageResourceUrl);
+    } else {
+      imageUri = getImageSourceUri(imageUrl);
+    }
+
+    ImageRequest imageRequest = ImageRequestBuilder.newBuilderWithSource(imageUri).build();
+
+    // TODO(helenaford): handle destroying of fresco after use in background state
+    // Needed when the app is killed, and the Fresco hasn't yet been initialized by React Native
+    if (!Fresco.hasBeenInitialized()) {
+      Logger.w(TAG, "Fresco initializing natively by Notifee");
+
+      // TODO(helenaford): expand on this to initialize with a custom imagePipelineConfig
+      Fresco.initialize(ContextHolder.getApplicationContext());
+    }
+
+    DataSource<CloseableReference<CloseableImage>> dataSource =
+        Fresco.getImagePipeline()
+            .fetchDecodedImage(imageRequest, ContextHolder.getApplicationContext());
+
+    dataSource.subscribe(
+        new BaseBitmapDataSubscriber() {
+          @Override
+          protected void onNewResultImpl(@Nullable Bitmap bitmap) {
+            bitmapTCS.set(bitmap);
+          }
+
+          @Override
+          protected void onFailureImpl(
+              @NonNull DataSource<CloseableReference<CloseableImage>> dataSource) {
+            Logger.e(TAG, "Failed to load an image: " + imageUrl, dataSource.getFailureCause());
+            bitmapTCS.set(null);
+          }
+        },
+        CallerThreadExecutor.getInstance());
+
+    return bitmapTCS;
+  }
+
+  /**
+   * Returns a resource path for a local resource
+   *
+   * @param icon
+   * @return
+   */
+  private static String getImageResourceUrl(String icon) {
+    int resourceId = getResourceIdByName(icon, "mipmap");
+
+    if (resourceId == 0) {
+      resourceId = getResourceIdByName(icon, "drawable");
+    }
+
+    if (resourceId == 0) {
+      return null;
+    }
+
+    return resourceId > 0
+        ? new Uri.Builder()
+            .scheme(LOCAL_RESOURCE_SCHEME)
+            .path(String.valueOf(resourceId))
+            .build()
+            .toString()
+        : Uri.EMPTY.toString();
+  }
+
+  /**
+   * Gets a resource ID by name.
+   *
+   * @param resourceName
+   * @return integer or 0 if not found
+   */
+  public static int getImageResourceId(String resourceName) {
+    int resourceId = getResourceIdByName(resourceName, "mipmap");
+    if (resourceId == 0) {
+      resourceId = getResourceIdByName(resourceName, "drawable");
+    }
+
+    return resourceId;
+  }
+
+  /** Attempts to find a resource id by name and type */
+  private static int getResourceIdByName(String name, String type) {
+    if (name == null || name.isEmpty()) {
+      return 0;
+    }
+
+    name = name.toLowerCase().replace("-", "_");
+
+    String key = name + "_" + type;
+
+    synchronized (ResourceUtils.class) {
+      if (getResourceIdCache().containsKey(key)) {
+        // noinspection ConstantConditions
+        return getResourceIdCache().get(key);
+      }
+
+      Context context = ContextHolder.getApplicationContext();
+      String packageName = context.getPackageName();
+
+      int id = context.getResources().getIdentifier(name, type, packageName);
+      getResourceIdCache().put(key, id);
+      return id;
+    }
+  }
+
+  public static @Nullable String getSoundName(Uri sound) {
+    if (sound == null) return null;
+    if (sound.toString().contains("android.resource")) {
+      String soundFile = sound.getLastPathSegment();
+      try {
+        int resourceId = Integer.valueOf(soundFile);
+        Logger.e(
+            TAG,
+            "Loaded sound by resource id. New app builds will fail to play sound. Create a new"
+                + " channel to resolve. Issue #341");
+        if (resourceId != 0) {
+          TypedValue value = new TypedValue();
+          Context context = ContextHolder.getApplicationContext();
+          context.getResources().getValue(resourceId, value, true);
+
+          CharSequence soundString = value.string;
+          if (soundString != null || soundString.length() > 0) {
+            return soundString.toString().replace("res/raw/", "");
+          }
+        }
+      } catch (NumberFormatException nfe) {
+        // This implies the sound URI last path segment was by file name, not resourceId
+        // They were by resourceId prior to issue #341 where we learned that leads to unstable URIs
+        // Now we verify the file exists but use the file name from the raw directory
+        // We still attempt to resolve by resourceId above to gracefully handle URIs created via our
+        // previous behavior
+        return soundFile;
+      }
+    }
+
+    // TODO parse system sounds
+    return null;
+  }
+
+  public static @Nullable Uri getSoundUri(String sound) {
+    Context context = ContextHolder.getApplicationContext();
+    if (sound == null) {
+      return null;
+    } else if (sound.contains("://")) {
+      return Uri.parse(sound);
+    } else if (sound.equalsIgnoreCase("default")) {
+      return RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+    } else {
+      // The API user is attempting to set a sound by file name, verify it exists
+      int soundResourceId = getResourceIdByName(sound, "raw");
+      if (soundResourceId == 0 && sound.contains(".")) {
+        soundResourceId = getResourceIdByName(sound.substring(0, sound.lastIndexOf('.')), "raw");
+      }
+
+      if (soundResourceId == 0) {
+        return null;
+      }
+
+      // Use the actual sound name vs the resource ID, to obtain a stable URI, Issue #341
+      return Uri.parse("android.resource://" + context.getPackageName() + "/raw/" + sound);
+    }
+  }
+}

package/android/src/main/java/app/notifee/core/utility/TextUtils.java

@@ -0,0 +1,28 @@
+package app.notifee.core.utility;
+
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import android.text.Spanned;
+import androidx.core.text.HtmlCompat;
+
+public class TextUtils {
+
+  public static Spanned fromHtml(String text) {
+    return HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY);
+  }
+}

package/android/src/main/java/app/notifee/core/utility/package-info.java

@@ -0,0 +1,4 @@
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
+package app.notifee.core.utility;
+
+import androidx.annotation.RestrictTo;

package/android/src/test/java/app/notifee/core/model/NotificationAndroidPressActionModelTest.java

@@ -0,0 +1,56 @@
+package app.notifee.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import android.os.Bundle;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class NotificationAndroidPressActionModelTest {
+
+  @Test
+  public void getLaunchActivity_defaultId_noLaunchActivity_returnsDefault() {
+    Bundle bundle = new Bundle();
+    bundle.putString("id", "default");
+
+    NotificationAndroidPressActionModel model =
+        NotificationAndroidPressActionModel.fromBundle(bundle);
+
+    assertEquals(
+        "when id is 'default' and launchActivity is not set, should return 'default'",
+        "default",
+        model.getLaunchActivity());
+  }
+
+  @Test
+  public void getLaunchActivity_defaultId_explicitLaunchActivity_returnsExplicit() {
+    Bundle bundle = new Bundle();
+    bundle.putString("id", "default");
+    bundle.putString("launchActivity", "com.example.CustomActivity");
+
+    NotificationAndroidPressActionModel model =
+        NotificationAndroidPressActionModel.fromBundle(bundle);
+
+    assertEquals(
+        "when id is 'default' and launchActivity is explicitly set, should return the explicit"
+            + " value",
+        "com.example.CustomActivity",
+        model.getLaunchActivity());
+  }
+
+  @Test
+  public void getLaunchActivity_nonDefaultId_noLaunchActivity_returnsNull() {
+    Bundle bundle = new Bundle();
+    bundle.putString("id", "custom-action");
+
+    NotificationAndroidPressActionModel model =
+        NotificationAndroidPressActionModel.fromBundle(bundle);
+
+    assertNull(
+        "when id is not 'default' and launchActivity is not set, should return null",
+        model.getLaunchActivity());
+  }
+}

package/android/src/test/java/app/notifee/core/model/TimestampTriggerModelTest.java

@@ -0,0 +1,44 @@
+package app.notifee.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import android.os.Bundle;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TimestampTriggerModelTest {
+  private TimestampTriggerModel mTimestampTriggerModel = null;
+
+  @Before
+  public void before() {
+    Bundle trigger = new Bundle();
+    Bundle triggerComponents = new Bundle();
+    triggerComponents.putInt("minute", 1);
+    triggerComponents.putInt("hour", 1);
+    triggerComponents.putInt("day", 1);
+    triggerComponents.putInt("month", 12);
+    triggerComponents.putInt("weekday", 3);
+    triggerComponents.putInt("weekdayOrdinal", 2);
+
+    // The ISO 8601 week date of the year.
+    triggerComponents.putInt("weekOfYear", 24);
+    // The week number of the months.
+    triggerComponents.putInt("weekOfMonth", 2);
+
+    trigger.putBundle("components", triggerComponents);
+    mTimestampTriggerModel = TimestampTriggerModel.fromBundle(trigger);
+  }
+
+  @Test
+  public void testBundleValues() {
+    assertEquals(
+        "with no 'repeatFrequency', interval should be -1",
+        -1,
+        mTimestampTriggerModel.getInterval());
+    assertNull(
+        "with no 'repeatFrequency', TimeUnit should be null", mTimestampTriggerModel.getTimeUnit());
+    assertEquals(
+        "with no 'repeatFrequency', delay should be 0", 0, mTimestampTriggerModel.getDelay());
+  }
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "9.1.21";
+export declare const version = "9.2.0";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = '9.1.21';
+export const version = '9.2.0';
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notify-kit",
-  "version": "9.1.21",
+  "version": "9.2.0",
   "author": "Marco Crupi",
   "description": "Maintained Notifee-compatible fork for React Native — advanced local notifications for Android & iOS.",
   "main": "dist/index.js",
@@ -8,7 +8,7 @@
   "scripts": {
     "validate:all:ts": "tsc --project ./",
     "build": "genversion --es6 --semi src/version.ts && tsc",
-    "build:clean": "rimraf android/libs && rimraf android/build && rimraf ios/build && rimraf dist",
+    "build:clean": "rimraf android/build && rimraf ios/build && rimraf dist",
     "build:watch": "tsc --watch",
     "prepare": "yarn run build",
     "prepublishOnly": "cd ../.. && yarn run build:core",

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '9.1.21';
+export const version = '9.2.0';

package/android/libs/app/notifee/core/202108261754/core-202108261754.aar.md5

@@ -1 +0,0 @@
-6a7a27d06bb47e3256e43cf89f697a06

package/android/libs/app/notifee/core/202108261754/core-202108261754.aar.sha1

@@ -1 +0,0 @@
-1ebff59e51ed59546bebeda601ffa872dc45e282

package/android/libs/app/notifee/core/202108261754/core-202108261754.aar.sha256

@@ -1 +0,0 @@
-4f0ed80e12c0b1679841d2f61c273f67302ae5cae5a2ffdd8ed4dae8b21492e0

package/android/libs/app/notifee/core/202108261754/core-202108261754.aar.sha512

@@ -1 +0,0 @@
-3582b2abd061836f15873af1a2c01e234ff1b98162b39626befc7b1bbcb969e131c1ce9eed51a22d3dfc26cd135987a5846ed8a455dec89a51077d4d818ec590

package/android/libs/app/notifee/core/202108261754/core-202108261754.module

@@ -1,146 +0,0 @@
-{
-  "formatVersion": "1.1",
-  "component": {
-    "group": "app.notifee",
-    "module": "core",
-    "version": "202108261754",
-    "attributes": {
-      "org.gradle.status": "release"
-    }
-  },
-  "createdBy": {
-    "gradle": {
-      "version": "8.9"
-    }
-  },
-  "variants": [
-    {
-      "name": "releaseVariantReleaseApiPublication",
-      "attributes": {
-        "org.gradle.category": "library",
-        "org.gradle.dependency.bundling": "external",
-        "org.gradle.libraryelements": "aar",
-        "org.gradle.usage": "java-api"
-      },
-      "dependencies": [
-        {
-          "group": "androidx.annotation",
-          "module": "annotation",
-          "version": {
-            "requires": "1.3.0"
-          }
-        },
-        {
-          "group": "androidx.concurrent",
-          "module": "concurrent-futures",
-          "version": {
-            "requires": "1.1.0"
-          }
-        },
-        {
-          "group": "androidx.work",
-          "module": "work-runtime",
-          "version": {
-            "requires": "2.11.1"
-          }
-        },
-        {
-          "group": "org.greenrobot",
-          "module": "eventbus",
-          "version": {
-            "requires": "3.3.1"
-          }
-        }
-      ],
-      "files": [
-        {
-          "name": "core-202108261754.aar",
-          "url": "core-202108261754.aar",
-          "size": 111312,
-          "sha512": "3582b2abd061836f15873af1a2c01e234ff1b98162b39626befc7b1bbcb969e131c1ce9eed51a22d3dfc26cd135987a5846ed8a455dec89a51077d4d818ec590",
-          "sha256": "4f0ed80e12c0b1679841d2f61c273f67302ae5cae5a2ffdd8ed4dae8b21492e0",
-          "sha1": "1ebff59e51ed59546bebeda601ffa872dc45e282",
-          "md5": "6a7a27d06bb47e3256e43cf89f697a06"
-        }
-      ]
-    },
-    {
-      "name": "releaseVariantReleaseRuntimePublication",
-      "attributes": {
-        "org.gradle.category": "library",
-        "org.gradle.dependency.bundling": "external",
-        "org.gradle.libraryelements": "aar",
-        "org.gradle.usage": "java-runtime"
-      },
-      "dependencies": [
-        {
-          "group": "com.facebook.fresco",
-          "module": "fresco",
-          "version": {
-            "requires": "2.6.0"
-          }
-        },
-        {
-          "group": "com.google.guava",
-          "module": "guava",
-          "version": {
-            "requires": "33.5.0-android"
-          }
-        },
-        {
-          "group": "androidx.core",
-          "module": "core",
-          "version": {
-            "requires": "1.6.0"
-          }
-        },
-        {
-          "group": "androidx.room",
-          "module": "room-runtime",
-          "version": {
-            "requires": "2.8.4"
-          }
-        },
-        {
-          "group": "androidx.annotation",
-          "module": "annotation",
-          "version": {
-            "requires": "1.3.0"
-          }
-        },
-        {
-          "group": "androidx.concurrent",
-          "module": "concurrent-futures",
-          "version": {
-            "requires": "1.1.0"
-          }
-        },
-        {
-          "group": "androidx.work",
-          "module": "work-runtime",
-          "version": {
-            "requires": "2.11.1"
-          }
-        },
-        {
-          "group": "org.greenrobot",
-          "module": "eventbus",
-          "version": {
-            "requires": "3.3.1"
-          }
-        }
-      ],
-      "files": [
-        {
-          "name": "core-202108261754.aar",
-          "url": "core-202108261754.aar",
-          "size": 111312,
-          "sha512": "3582b2abd061836f15873af1a2c01e234ff1b98162b39626befc7b1bbcb969e131c1ce9eed51a22d3dfc26cd135987a5846ed8a455dec89a51077d4d818ec590",
-          "sha256": "4f0ed80e12c0b1679841d2f61c273f67302ae5cae5a2ffdd8ed4dae8b21492e0",
-          "sha1": "1ebff59e51ed59546bebeda601ffa872dc45e282",
-          "md5": "6a7a27d06bb47e3256e43cf89f697a06"
-        }
-      ]
-    }
-  ]
-}

package/android/libs/app/notifee/core/202108261754/core-202108261754.module.md5

@@ -1 +0,0 @@
-ec7b2604f6c5d14387879e78f32d6fb4

package/android/libs/app/notifee/core/202108261754/core-202108261754.module.sha1

@@ -1 +0,0 @@
-95aaa0381cd97f59c145f1c4f3468070cbd99ae4

package/android/libs/app/notifee/core/202108261754/core-202108261754.module.sha256

@@ -1 +0,0 @@
-5ba89e66e16caa67126861cdc91ea0331c68ed3bbd160ce8022ad1960e53644c

package/android/libs/app/notifee/core/202108261754/core-202108261754.module.sha512

@@ -1 +0,0 @@
-8ecfdf95ee33bebdef0a8a2864c0d2bc2b0f351d029ce17e03b700d15b254ce4f01463e251d9481e71066bb118bf23f806c02ac386e076af5088949f3802e137