@dashx/react-native 0.1.15 → 0.1.18

package/android/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-15
-7
+18
+10

package/android/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-�D�G�<�6
+�D�G�<�6�6�.�*

package/android/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-15
-7
+18
+10

package/android/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-�D�G�<�6
+�D�G�<�6�6�.�*

package/android/build/reports/lint-results.html

@@ -173,16 +173,17 @@ document.getElementById(id).style.display = 'none';
 <div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
   <header class="mdl-layout__header">
     <div class="mdl-layout__header-row">
-      <span class="mdl-layout-title">Lint Report: 1 error</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 1 warning</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Wed Apr 27 10:59:29 IST 2022      </nav>
+Check performed at Thu Apr 28 08:53:55 IST 2022      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">
     <span class="mdl-layout-title">Issue Types</span>
     <nav class="mdl-navigation">
       <a class="mdl-navigation__link" href="#overview"><i class="material-icons">dashboard</i>Overview</a>
+      <a class="mdl-navigation__link" href="#InlinedApi"><i class="material-icons warning-icon">warning</i>Using inlined constants on older versions (1)</a>
       <a class="mdl-navigation__link" href="#NewApi"><i class="material-icons error-icon">error</i>Calling new methods on older versions (1)</a>
     </nav>
   </div>
@@ -199,6 +200,9 @@ Check performed at Wed Apr 27 10:59:29 IST 2022      </nav>
 <tr><td class="countColumn"></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>
 </td></tr>
 <tr>
+<td class="countColumn">1</td><td class="issueColumn"><i class="material-icons warning-icon">warning</i>
+<a href="#InlinedApi">InlinedApi</a>: Using inlined constants on older versions</td></tr>
+<tr>
 <td class="countColumn">1</td><td class="issueColumn"><i class="material-icons error-icon">error</i>
 <a href="#NewApi">NewApi</a>: Calling new methods on older versions</td></tr>
 <tr><td></td><td class="categoryColumn"><a href="#MissingIssues">Disabled Checks (32)</a>
@@ -210,7 +214,56 @@ Dismiss</button>            </div>
             </div>
           </section>
 <a name="Correctness"></a>
-<a name="NewApi"></a>
+<a name="InlinedApi"></a>
+<section class="section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp" id="InlinedApiCard" style="display: block;">
+            <div class="mdl-card mdl-cell mdl-cell--12-col">
+  <div class="mdl-card__title">
+    <h2 class="mdl-card__title-text">Using inlined constants on older versions</h2>
+  </div>
+              <div class="mdl-card__supporting-text">
+<div class="issue">
+<div class="warningslist">
+<span class="location"><a href="../../src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt">../../src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt</a>:107</span>: <span class="message">Field requires API level 23 (current min is 16): <code>android.app.PendingIntent#FLAG_IMMUTABLE</code></span><br /><pre class="errorlines">
+<span class="lineno"> 104 </span>
+<span class="lineno"> 105 </span>  private <span class="keyword">fun</span> getNewPendingIntent(): PendingIntent {
+<span class="lineno"> 106 </span>      <span class="keyword">val</span> context = getApplicationContext()
+<span class="caretline"><span class="lineno"> 107 </span>      <span class="keyword">val</span> pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT or <span class="warning">PendingIntent.FLAG_IMMUTABLE</span>&nbsp;&nbsp;</span>
+<span class="lineno"> 108 </span>
+<span class="lineno"> 109 </span>      <span class="keyword">val</span> intent = getNewBaseIntent()
+</pre>
+
+</div>
+<div class="metadata"><div class="explanation" id="explanationInlinedApi" style="display: none;">
+This check scans through all the Android API field references in the application and flags certain constants, such as static final integers and Strings, which were introduced in later versions. These will actually be copied into the class files rather than being referenced, which means that the value is available even when running on older devices. In some cases that's fine, and in other cases it can result in a runtime crash or incorrect behavior. It depends on the context, so consider the code carefully and decide whether it's safe and can be suppressed or whether the code needs to be guarded.<br/>
+<br/>
+If you really want to use this API and don't need to support older devices just set the <code>minSdkVersion</code> in your <code>build.gradle</code> or <code>AndroidManifest.xml</code> files.<br/>
+<br/>
+If your code is <b>deliberately</b> accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the <code>@TargetApi</code> annotation specifying the local minimum SDK to apply, such as <code>@TargetApi(11)</code>, such that this check considers 11 rather than your manifest file's minimum SDK as the required API level.<br/>Note: This issue has an associated quickfix operation in Android Studio and IntelliJ IDEA.<br>
+To suppress this error, use the issue id "InlinedApi" as explained in the <a href="#SuppressInfo">Suppressing Warnings and Errors</a> section.<br/>
+<br/></div>
+</div>
+</div>
+<div class="chips">
+<span class="mdl-chip">
+    <span class="mdl-chip__text">InlinedApi</span>
+</span>
+<span class="mdl-chip">
+    <span class="mdl-chip__text">Correctness</span>
+</span>
+<span class="mdl-chip">
+    <span class="mdl-chip__text">Warning</span>
+</span>
+<span class="mdl-chip">
+    <span class="mdl-chip__text">Priority 6/10</span>
+</span>
+</div>
+              </div>
+              <div class="mdl-card__actions mdl-card--border">
+<button class="mdl-button mdl-js-button mdl-js-ripple-effect" id="explanationInlinedApiLink" onclick="reveal('explanationInlinedApi');">
+Explain</button><button class="mdl-button mdl-js-button mdl-js-ripple-effect" id="InlinedApiCardLink" onclick="hideid('InlinedApiCard');">
+Dismiss</button>            </div>
+            </div>
+          </section><a name="NewApi"></a>
 <section class="section--center mdl-grid mdl-grid--no-spacing mdl-shadow--2dp" id="NewApiCard" style="display: block;">
             <div class="mdl-card mdl-cell mdl-cell--12-col">
   <div class="mdl-card__title">

package/android/build/reports/lint-results.xml

@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="5" by="lint 3.4.1">
 
+    <issue
+        id="InlinedApi"
+        severity="Warning"
+        message="Field requires API level 23 (current min is 16): `android.app.PendingIntent#FLAG_IMMUTABLE`"
+        category="Correctness"
+        priority="6"
+        summary="Using inlined constants on older versions"
+        explanation="This check scans through all the Android API field references in the application and flags certain constants, such as static final integers and Strings, which were introduced in later versions. These will actually be copied into the class files rather than being referenced, which means that the value is available even when running on older devices. In some cases that&apos;s fine, and in other cases it can result in a runtime crash or incorrect behavior. It depends on the context, so consider the code carefully and decide whether it&apos;s safe and can be suppressed or whether the code needs to be guarded.&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level."
+        errorLine1="        val pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE"
+        errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="/home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt"
+            line="107"
+            column="71"/>
+    </issue>
+
     <issue
         id="NewApi"
         severity="Error"

package/android/src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt

@@ -1,11 +1,11 @@
 package com.dashx.rn.sdk
 
 import android.app.Activity
+import android.app.ActivityManager
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -43,19 +43,26 @@ class DashXMessagingService : FirebaseMessagingService() {
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         super.onMessageReceived(remoteMessage)
 
-        val gson = Gson()
+        if (appInForeground()) {
+            return
+        }
+
         val dashxDataMap = remoteMessage.getData()["dashx"]
-        var dashxData = gson.fromJson(dashxDataMap, DashXPayload::class.java)
 
-        val id = dashxData.id
-        val title = dashxData.title
-        val body = dashxData.body
+        if (dashxDataMap != null) {
+            val gson = Gson()
+            var dashxData = gson.fromJson(dashxDataMap, DashXPayload::class.java)
+
+            val id = dashxData.id
+            val title = dashxData.title
+            val body = dashxData.body
 
-        if ((title != null) || (body != null)) {
-            createNotificationChannel()
+            if ((title != null) || (body != null)) {
+                createNotificationChannel()
 
-            NotificationManagerCompat.from(this)
-                .notify(id, 1, createNotification(id, title, body))
+                NotificationManagerCompat.from(this)
+                    .notify(id, 1, createNotification(id, title, body))
+            }
         }
 
         DashXClientInterceptor.instance.handleMessage(remoteMessage)
@@ -82,9 +89,7 @@ class DashXMessagingService : FirebaseMessagingService() {
         title: String?,
         body: String?
     ) : Notification {
-        val intent = getNewBaseIntent()
-
-        val pendingIntent = PendingIntent.getActivity(this, 1, intent, FLAG_UPDATE_CURRENT)
+        val pendingIntent = getNewPendingIntent()
 
         val notificationBuilder = NotificationCompat.Builder(this, CHANNEL_ID)
             .setSmallIcon(getSmallIcon())
@@ -97,6 +102,30 @@ class DashXMessagingService : FirebaseMessagingService() {
         return notificationBuilder.build()
     }
 
+    private fun getNewPendingIntent(): PendingIntent {
+        val context = getApplicationContext()
+        val pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+
+        val intent = getNewBaseIntent()
+
+        val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+
+        if (launchIntent == null) {
+            return PendingIntent.getActivity(context, 1, intent, pendingIntentFlags)
+        }
+
+        // Mimic launcher behaviour
+        launchIntent.setPackage(null)
+        launchIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
+
+        return PendingIntent.getActivities(
+            context,
+            1,
+            arrayOf(launchIntent, intent),
+            pendingIntentFlags
+        )
+    }
+
     private fun getNewBaseIntent(): Intent {
         return Intent(
             this,
@@ -132,6 +161,13 @@ class DashXMessagingService : FirebaseMessagingService() {
         return smallIconInt
     }
 
+    fun appInForeground(): Boolean {
+        val context = getApplicationContext()
+        val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+        val runningAppProcesses = activityManager.runningAppProcesses ?: return false
+        return runningAppProcesses.any { it.processName == context.packageName && it.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND }
+    }
+
     companion object {
         private const val CHANNEL_NAME = "DashX Notification"
         private const val CHANNEL_DESCRIPTION = "DashX's default notification channel"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "0.1.15",
+  "version": "0.1.18",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [