cordova-plugin-mserviceinterface-2.0 1.0.34 → 1.0.37

package/package.json

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

package/plugin.xml

@@ -2,7 +2,7 @@
 <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.34">
+    version="1.0.37">
     <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>

package/src/android/backgroundNotification.java

@@ -54,9 +54,9 @@ public class backgroundNotification extends NotificationExtenderService {
 				String key = msgBody.getString("key");
 				String subKey = msgBody.getString("subKey");
 				
-				if(scrID.equals("chat")) {
+				if(scrID.contains("_chat")) {
 					if (!subKey.equals("")) {
-						fileDirectory = new File(mInterfaceUtil.rootDirectory + "/" + baseDirectory[(baseDirectory.length - 1)] + "/" + clientID + "/" + countryCode + "/" + "content_store" + "/" + "msvMsg" + "/" + "history" + "/" + key + "/" + subKey);
+						fileDirectory = new File(mInterfaceUtil.rootDirectory + "/" + baseDirectory[(baseDirectory.length - 1)] + "/" + clientID + "/" + countryCode + "/" + "content_store" + "/" + "msvMsg" + "/" + "history"+ "/" + packageName + "/" + key + "/" + subKey);
 						if (!fileDirectory.exists()) {
 							fileDirectory.mkdirs();
 						}
@@ -76,7 +76,7 @@ public class backgroundNotification extends NotificationExtenderService {
 						System.out.println(line);
 					}
 					String notificationStr = decrypt(notificationDatas.toString());
-					notificationStr = notificationStr + msgBody.toString() + ",";
+					notificationStr = notificationStr + "," +msgBody.toString() ;
 					FileWriter fw = new FileWriter(notificationsFile);
 					fw.write(mInterfaceUtil.encrypt(notificationStr));
 					fw.close();
@@ -87,7 +87,7 @@ public class backgroundNotification extends NotificationExtenderService {
 				System.out.println("Does not Exists");
 				try {
 					FileWriter fw = new FileWriter(notificationsFile);
-					fw.write(mInterfaceUtil.encrypt(notification.payload.additionalData.getString("msgBody") + ","));
+					fw.write(mInterfaceUtil.encrypt(","+ notification.payload.additionalData.getString("msgBody")));
 					fw.close();
 				} catch (IOException e1) {
 					e1.printStackTrace();

package/src/android/mInterface.java

@@ -15,6 +15,7 @@ import android.content.IntentSender;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -1508,7 +1509,14 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
     //Rotate Screen plugin
     public void rotateScreen(JSONArray args, CallbackContext callbackContext) {
         String orientation = args.optString(0);
+        String currentOrientation = "";
         Activity activity = cordova.getActivity();
+        int orientation1 = activity.getResources().getConfiguration().orientation;
+        if (orientation1 == Configuration.ORIENTATION_LANDSCAPE) {
+            currentOrientation = "landscape";
+        } else {
+            currentOrientation = "portrait";
+        };
         if (orientation.equals(ANY)) {
             activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         } else if (orientation.equals(LANDSCAPE_PRIMARY)) {
@@ -1524,7 +1532,7 @@ public class mInterface extends CordovaPlugin implements com.google.android.gms.
         } else if (orientation.equals(PORTRAIT_SECONDARY)) {
             activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT);
         }
-        callbackContext.success();
+        callbackContext.success(currentOrientation);
     }
 
     public void deviceInfo(CallbackContext callbackContext) throws JSONException {

package/src/android/mInterfaceService.java

@@ -22,6 +22,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -295,7 +296,7 @@ public class mInterfaceService extends Service implements com.google.android.gms
 
             }
         }
-        PendingResult<Status> pendingResult = LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this);
+        PendingResult<Status> pendingResult = LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient, mLocationRequest, this, Looper.getMainLooper());
     }
 
     @Override