react-native-mapp-plugin 1.0.4-beta1 → 1.0.4-beta10

package/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="8b4f258a-c093-494f-afe5-5f5a25c90893" name="Default Changelist" comment="">
+    <list default="true" id="8b4f258a-c093-494f-afe5-5f5a25c90893" name="Default Changelist" comment="new version">
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -42,8 +42,18 @@
       <workItem from="1625580406053" duration="4000" />
       <workItem from="1625659434437" duration="279000" />
       <workItem from="1632413120138" duration="665000" />
-      <workItem from="1632874987690" duration="479000" />
+      <workItem from="1632874987690" duration="1182000" />
+      <workItem from="1632917248275" duration="2037000" />
+      <workItem from="1632991423561" duration="7319000" />
     </task>
+    <task id="LOCAL-00001" summary="new version">
+      <created>1632917445507</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1632917445507</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -54,10 +64,22 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ID_WIDTH">
+                <map>
+                  <entry key="Table.Default.Author.ColumnIdWidth" value="129" />
+                  <entry key="Table.Default.Date.ColumnIdWidth" value="129" />
+                </map>
+              </option>
+            </State>
           </value>
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="new version" />
+    <option name="LAST_COMMIT_MESSAGE" value="new version" />
   </component>
 </project>

package/__package.json

@@ -0,0 +1,37 @@
+{
+  "name": "react-native-mapp-plugin",
+  "version": "1.0.3beta12",
+  "description": "Mapp SDK for React Native.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "postinstall": "./iospatch.sh"
+  },
+  "keywords": [
+    "react-native",
+    "react",
+    "react-component",
+    "ios",
+    "android",
+    "mapp"
+  ],
+  "author": "Mapp",
+  "license": "MIT",
+  "peerDependencies": {
+    "react": "^16.8.1",
+    "react-native": ">=0.60.0-rc.0 <1.0.x"
+  },
+  "devDependencies": {
+    "jest": "^24.9.0",
+    "react": "^16.9.0",
+    "react-native": "^0.61.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/MappCloud/React-native-plugin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/MappCloud/React-native-plugin/issues"
+  },
+  "homepage": "https://github.com/MappCloud/React-native-plugin#readme"
+}

package/android/build.gradle

@@ -72,5 +72,5 @@ dependencies {
     api('com.google.android.gms:play-services-location:16.0.0')
     implementation 'androidx.media:media:1.0.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'com.mapp.sdk:mapp-android:6.0.17-special2'
+    implementation 'com.mapp.sdk:mapp-android:6.0.17-special8'
 }

package/android/src/main/java/com/reactlibrary/RNMappPluginModule.java

@@ -21,6 +21,7 @@ import com.appoxee.internal.inapp.model.InAppStatistics;
 import com.appoxee.internal.inapp.model.MessageContext;
 import com.appoxee.internal.inapp.model.Tracking;
 import com.appoxee.internal.inapp.model.TrackingAttributes;
+import com.appoxee.internal.service.AppoxeeServiceAdapter;
 import com.appoxee.push.NotificationMode;
 import com.appoxee.push.PushData;
 import com.facebook.react.bridge.Arguments;
@@ -48,6 +49,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * Created by Aleksandar Marinkovic on 2019-05-15.
  * Copyright (c) 2019 MAPP.
  */
+@SuppressWarnings("ALL")
 public class RNMappPluginModule extends ReactContextBaseJavaModule {
 
     private final ReactApplicationContext reactContext;
@@ -69,8 +71,9 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
     @Override
     public void initialize() {
         super.initialize();
-        if (getCurrentActivity() != null)
-            application = (Application) getCurrentActivity().getApplication();
+        // application is initialized in constructor
+/*        if (getCurrentActivity() != null)
+            application = (Application) getCurrentActivity().getApplication();*/
         getReactApplicationContext().addLifecycleEventListener(new LifecycleEventListener() {
             @Override
             public void onHostResume() {
@@ -109,7 +112,6 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         RemoteMessage remoteMessage = getRemoteMessage(msgJson);
         if (remoteMessage != null){
             Appoxee.instance().setRemoteMessage(remoteMessage);
-            Log.d(this.getClass().getName(),remoteMessage.toString());
         }
     }
 
@@ -147,12 +149,22 @@ public class RNMappPluginModule extends ReactContextBaseJavaModule {
         opt.sdkKey = sdkKey;
         opt.googleProjectId = googleProjectId;
         opt.server = AppoxeeOptions.Server.valueOf(server);
-        if (server.equals("TEST") || server.equals("TEST55")) {
+        if (server.equals("TEST") || server.equals("TEST55") || server.equals("TEST_55")) {
             opt.cepURL = "https://jamie-test.shortest-route.com";
         }
         opt.notificationMode = NotificationMode.BACKGROUND_AND_FOREGROUND;
         opt.tenantID = tenantID;
         Appoxee.engage(Objects.requireNonNull(application), opt);
+        Appoxee.instance().addInitListener(new Appoxee.OnInitCompletedListener() {
+            @Override
+            public void onInitCompleted(boolean successful, Exception failReason) {
+                /**
+                 * OnInitCompleteListener must be attached;
+                 * Internally {@link AppoxeeServiceAdapter#getDeviceInfoDMC()} is called and "user_id" created.
+                 * If "user_id" is null InApp messages are not working.
+                 */
+            }
+        });
         Appoxee.setOrientation(application, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
     }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "react-native-mapp-plugin",
-  "version": "1.0.4beta1",
+  "version": "1.0.4beta10",
   "description": "Mapp SDK for React Native.",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "postinstall": "node -e \"process.platform === 'darwin' && require('child_process').spawn('sh', ['./iospatch.sh'], { stdio: 'inherit'})\""
   },
   "keywords": [
     "react-native",
@@ -27,7 +28,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/MappCloud/React-native-plugin.git"
+    "url": "git+https://github.com/MappCloud/React-native-plugin/tree/push_messages_fix"
   },
   "bugs": {
     "url": "https://github.com/MappCloud/React-native-plugin/issues"