cordova-plugin-mserviceinterface-2.0 1.0.83 → 1.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.83">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.85">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>
@@ -53,7 +53,6 @@
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <service android:name="com.selfservit.util.mInterfaceService" android:foregroundServiceType="location" android:enabled="true" android:exported="true"/>
-            <meta-data android:name="com.onesignal.NotificationServiceExtension" android:value="com.selfservit.util.backgroundNotification" />
             <receiver android:name="com.selfservit.util.mInterfaceReceiver" android:enabled="true" android:exported="true">
                 <intent-filter>
                     <action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -70,7 +69,6 @@
             </provider>
         </config-file>
         <source-file src="src/android/mInterfaceService.java" target-dir="src/com/selfservit/util/" />
-        <source-file src="src/android/backgroundNotification.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/mInterfaceReceiver.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/mInterface.java" target-dir="src/com/selfservit/util/" />
         <source-file src="src/android/GeofenceBroadcastReceiver.java" target-dir="src/com/selfservit/util/" />

package/src/android/mInterface.java

@@ -69,7 +69,6 @@ import com.google.android.gms.location.LocationSettingsStatusCodes;
 import com.google.android.gms.location.Priority;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
-import com.onesignal.OSDeviceState;
 import com.onesignal.OneSignal;
 
 import org.apache.cordova.CallbackContext;
@@ -195,9 +194,6 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                     boolean appInfoUpdated = new mInterfaceUtil().updateAppInfo(args);
                     System.out.println("appInfoUpdated: " + appInfoUpdated);
                     //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    if (!isServiceRunning(backgroundNotification.class)) {
-                        cordova.getActivity().startService(new Intent(cordova.getActivity().getApplicationContext(), backgroundNotification.class));
-                    }
                     if (!isServiceRunning(mInterfaceService.class)) {
                         cordova.getActivity().startService(new Intent(cordova.getActivity().getApplicationContext(), mInterfaceService.class));
                     } else {
@@ -237,18 +233,13 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
                 }
             } else if (action.equals("GetFCMUtils")) {
                 try {
-                    OSDeviceState device = OneSignal.getDeviceState();
-                    if (device != null) {
-                        String userId = device.getUserId();
-                        //Get device's push token identifier
-                        String pushToken = device.getPushToken();
-                        JSONObject progressObj = new JSONObject();
-                        progressObj.put("userId", userId);
-                        progressObj.put("pushToken", pushToken);
-                        callbackContext.success(progressObj);
-                    } else {
-                        callbackContext.error("Error occurred");
-                    }
+                    String userId = OneSignal.getUser().getOnesignalId();
+                    String pushToken = OneSignal.getUser().getPushSubscription().getToken();
+
+                    JSONObject progressObj = new JSONObject();
+                    progressObj.put("userId", userId);
+                    progressObj.put("pushToken", pushToken);
+                    callbackContext.success(progressObj);
                 } catch (Exception e) {
                     System.out.println("GetFCMUtils: Exception is: " + e.getMessage());
                     callbackContext.error(e.getMessage());

package/src/ios/mInterface.m

@@ -11,7 +11,6 @@
 #include <sys/sysctl.h>
 #include "TargetConditionals.h"
 #import "OneSignalPush.h"
-#import <OneSignal/OneSignal.h>
 #import <objc/runtime.h>
 #import <AVFoundation/AVFoundation.h>
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
@@ -344,11 +343,7 @@
     
 }
 - (void)GetFCMUtils:(CDVInvokedUrlCommand *)command {
-    OSDeviceState *deviceState = [OneSignal getDeviceState];
-    NSMutableDictionary * deviceDict = [[NSMutableDictionary alloc] init];
-    [deviceDict setValue:deviceState.userId forKey:@"userId"];
-    [deviceDict setValue:deviceState.pushToken forKey:@"pushToken"];
-    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:deviceDict];
+    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsBool:YES];
     [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
 }
 

package/src/android/backgroundNotification.java

@@ -1,75 +0,0 @@
-package com.selfservit.util;
-
-import static com.selfservit.util.mInterfaceUtil.decrypt;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.onesignal.OSNotification;
-import com.onesignal.OSNotificationReceivedEvent;
-import com.onesignal.OneSignal;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Locale;
-
-public class backgroundNotification implements OneSignal.OSRemoteNotificationReceivedHandler {
-
-
-    String[] baseDirectory;
-    File notificationsFile, fileDirectory;
-    JSONObject msgBody, msgHeader;
-    public static final Locale locale = Locale.US;
-
-
-    @Override
-    public void remoteNotificationReceived(Context context, OSNotificationReceivedEvent osNotificationReceivedEvent) {
-        /* Do something with notification payload */
-        OSNotification notification = osNotificationReceivedEvent.getNotification();
-        try {
-            msgHeader = (JSONObject) notification.getAdditionalData().get("msgHeader");
-            String packageName = msgHeader.getString("appID");
-            baseDirectory = packageName.split("\\.");
-            String clientID = msgHeader.getString("clientID");
-            String countryCode = msgHeader.getString("countryCode");
-            msgBody = (JSONObject) notification.getAdditionalData().get("msgBody");
-            msgBody.put("notificationID", notification.getNotificationId());
-            String scrID = msgBody.getString("scrID");
-            String key = msgBody.getString("key");
-            String subKey = msgBody.getString("subKey");
-
-            if (!scrID.contains("_chat")) {
-                fileDirectory = new File(mInterfaceUtil.rootDirectory + "/" + baseDirectory[(baseDirectory.length - 1)] + "/" + clientID + "/" + countryCode + "/" + "notifications" + "/" + "unread");
-                if (!fileDirectory.exists()) {
-                    boolean success = fileDirectory.mkdirs();
-                    if (!success) {
-                        System.out.println("Directory not created");
-                    }
-                }
-                notificationsFile = new File(fileDirectory, notification.getNotificationId() + ".json");
-                Date date = new Date();
-                msgBody.put("dateTime", Date.parse(date.toString()));
-                JSONObject jsonObj = notification.toJSONObject();
-                jsonObj.remove("rawPayload");
-                FileWriter fw = new FileWriter(notificationsFile);
-                fw.write(mInterfaceUtil.encrypt(jsonObj.toString()));
-                fw.close();
-            }
-        } catch (JSONException | IOException e) {
-            e.printStackTrace();
-        }
-        JSONObject data = notification.getAdditionalData();
-        Log.i("OneSignalExample", "Received Notification Data: " + data);
-
-        // If complete isn't call within a time period of 25 seconds, OneSignal internal logic will show the original notification
-        // To omit displaying a notification, pass `null` to complete()
-        osNotificationReceivedEvent.complete(notification);
-    }
-}