@takeoffmedia/react-native-penthera 0.4.7 → 0.4.9

package/android/src/main/AndroidManifest.xml

@@ -11,24 +11,10 @@
     android:supportsRtl="true"
     android:theme="@style/AppTheme">
 
-    <!-- The below two meta data values will be provided by penthera. Add these to the manifest
-    rather than the code -->
-    <meta-data
-      android:name="PENTHERA_PUBLIC_KEY"
-      android:value="${pentheraPublicKey}"
-    />
-    <meta-data
-      android:name="PENTHERA_SERVER_URL"
-      android:value="${pentheraServerUrl}"
-    />
-
-    <meta-data android:name="com.penthera.virtuososdk.notification.provider.impl"
-      android:value="com.takeoffmediareactnativepenthera.virtuoso.notification.ServiceForegroundNotificationProvider" />
+    <meta-data android:name="com.penthera.virtuososdk.notification.provider.impl" android:value="com.takeoffmediareactnativepenthera.virtuoso.notification.ServiceForegroundNotificationProvider" />
 
     <!-- Meta Data to configure license manager for DRM -->
-    <meta-data tools:replace="android:value"
-      android:name="com.penthera.virtuososdk.license.manager.impl"
-      android:value="com.takeoffmediareactnativepenthera.virtuoso.DemoLicenseManager" />
+    <meta-data tools:replace="android:value" android:name="com.penthera.virtuososdk.license.manager.impl" android:value="com.takeoffmediareactnativepenthera.virtuoso.DemoLicenseManager"/>
 
     <!-- Service Starter -->
     <receiver android:name=".virtuoso.ServiceStarter"
@@ -37,14 +23,14 @@
       android:label="SDKDemoKotlin Service Starter"
       android:directBootAware="true">
       <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-        <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+        <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        <action android:name="android.intent.action.QUICKBOOT_POWERON"/>
+        <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
         <action android:name="android.intent.action.PACKAGE_REMOVED" />
-        <data android:scheme="package" />
+        <data android:scheme="package"/>
       </intent-filter>
       <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
+        <action android:name="android.intent.action.BOOT_COMPLETED"/>
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
 
@@ -58,7 +44,7 @@
     <provider
       android:name="com.takeoffmediareactnativepenthera.virtuoso.PentheraContentProvider"
       android:authorities="${applicationId}.virtuoso.provider"
-      android:process=":vservice" />
+      android:process=":vservice"/>
 
   </application>
 

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/notification/NotificationFactory.kt

@@ -206,10 +206,7 @@ class NotificationFactory(private val applicationName: String) {
       PAUSED_NOTIFICATION -> title += "paused downloads."
 
       //RESTART_NOTIFICATION -> title += "is starting up..."
-      RESTART_NOTIFICATION -> {
-        title = ""
-        Log.d(TAG_DEV, "RESTART_NOTIFICATION")
-      }
+      RESTART_NOTIFICATION -> Log.d(TAG_DEV, "RESTART_NOTIFICATION")
 
       FAILED_NOTIFICATION -> title += " asset could not be queued"
     }
@@ -240,22 +237,17 @@ class NotificationFactory(private val applicationName: String) {
 
     }
 
-    val launchNotification =  NotificationCompat.Builder(context, channelId())
-      .setSmallIcon(R.drawable.small_logo)
-      .setContentTitle(title)
-      .setContentIntent(pendingIntent)
-      .setColor(ContextCompat.getColor(getApplicationContext(), R.color.primary))
-      .setContentText(contentText)
-      .apply {
-        if (progress >= 0) {
-          setProgress(100, progress, false)
-        }
-        setWhen(System.currentTimeMillis())
-        setOngoing(true)
-      }
-      .build()
-
-    return launchNotification
+    return compatNotificationBuilder!!.apply {
+      setSmallIcon(R.drawable.small_logo)
+      setContentTitle(title)
+      setContentIntent(pendingIntent)
+      // The color of notification. This requires Android 21 or higher.
+      color = ContextCompat.getColor(getApplicationContext(), R.color.primary)
+      setContentText(contentText)
+      if(progress >= 0)setProgress(100, progress, false)
+      setWhen(System.currentTimeMillis())
+      setOngoing(true)
+    }.build()
 
   }
 

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/notification/ServiceForegroundNotificationProvider.kt

@@ -47,6 +47,7 @@ class ServiceForegroundNotificationProvider : IForegroundNotificationProvider{
    * @return true if the notification should be updated, false otherwise.
    */
   override fun shouldUpdateForegroundServiceNotificationOnIntent(context: Context?, reasonIntent: Intent?): Boolean {
+
     if(context != null) {
       reasonIntent?.let {
         val action = it.action
@@ -72,13 +73,9 @@ class ServiceForegroundNotificationProvider : IForegroundNotificationProvider{
         return
       }
       val manager = context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      val titleNotification = notification?.extras?.getString("android.title")
-      if(!titleNotification?.isEmpty()!!){
-        notificationChannel = manager.getNotificationChannel(channelId)
-        this.channelId = channelId
-        currentNotification = notification
-      }else {
-      }
+      notificationChannel = manager.getNotificationChannel(channelId)
+      this.channelId = channelId
+      currentNotification = notification
     } else {
       currentNotification = notification
     }
@@ -92,11 +89,11 @@ class ServiceForegroundNotificationProvider : IForegroundNotificationProvider{
    * @return The notification
    */
   override fun getForegroundServiceNotification(context: Context?, file: IAsset?, reasonIntent: Intent?): Notification {
-    if (reasonIntent == null) return currentNotification!!
-
-    //Name notification channel
-    currentNotification = NotificationFactory("Britbox").getNotification(context!!, reasonIntent )
-
+//    if (reasonIntent == null) return currentNotification!!
+//
+//    //Name notification channel
+//    currentNotification = NotificationFactory("Britbox").getNotification(context!!, reasonIntent )
+//
     return currentNotification!!
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",