@appboxo/react-native-sdk 1.0.27 → 1.0.31

package/android/build.gradle

@@ -10,10 +10,9 @@
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
+def DEFAULT_COMPILE_SDK_VERSION = 30
 def DEFAULT_MIN_SDK_VERSION = 21
-def DEFAULT_TARGET_SDK_VERSION = 28
+def DEFAULT_TARGET_SDK_VERSION = 30
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -33,7 +32,7 @@ buildscript {
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.6.4'
+            classpath 'com.android.tools.build:gradle:4.1.3'
         }
     }
 }
@@ -43,7 +42,7 @@ apply plugin: 'maven'
 
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
-    buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
+
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
         targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION)
@@ -56,7 +55,6 @@ android {
 }
 
 repositories {
-    // ref: https://www.baeldung.com/maven-local-repository
     mavenLocal()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -67,14 +65,26 @@ repositories {
         url "$rootDir/../node_modules/jsc-android/dist"
     }
     google()
-    maven { url "https://jitpack.io" }
     jcenter()
 }
 
+rootProject.allprojects {
+    repositories {
+        maven { url "https://jitpack.io" }
+        maven {
+            url "https://maven.pkg.github.com/Appboxo/android-sdk-packages"
+            credentials {
+                username = "appboxoandroidsdk"
+                password = "\u0037\u0039\u0064\u0031\u0065\u0064\u0061\u0036\u0030\u0034\u0063\u0061\u0031\u0066\u0030\u0032\u0066\u0031\u0037\u0066\u0032\u0061\u0039\u0033\u0064\u0035\u0039\u0039\u0061\u0035\u0035\u0062\u0066\u0065\u0031\u0064\u0066\u0064\u0038\u0038"
+            }
+        }
+    }
+}
+
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation 'com.appboxo:sdk:1.3.36'
+    implementation 'com.appboxo:miniapp-sdk:1.4.13'
 }
 
 def configureReactNativePom(def pom) {

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

package/android/src/main/java/com/appboxo/RnappboxosdkModule.java

@@ -20,6 +20,8 @@ import android.app.Application;
 import android.os.Handler;
 import android.os.Looper;
 
+import androidx.annotation.NonNull;
+
 import com.appboxo.js.params.CustomEvent;
 import com.appboxo.sdk.Appboxo;
 import com.appboxo.sdk.Config;
@@ -83,7 +85,7 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
 
     @ReactMethod
     public void openMiniapp(String appId, String payload, ReadableMap data, String theme, ReadableMap customUrlParams) {
-        Miniapp miniapp = Appboxo.INSTANCE.getMiniapp(appId, payload, null, data != null ? MapUtil.toMap(data) : null)
+        Miniapp miniapp = Appboxo.INSTANCE.getMiniapp(appId)
                 .setCustomEventListener(this)
                 .setLifecycleListener(this);
 
@@ -126,13 +128,13 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     @Override
     public void handle(@NotNull AppboxoActivity appboxoActivity, @NotNull Miniapp miniApp, @NotNull CustomEvent customEvent) {
         WritableMap params = Arguments.createMap();
-        params.putString("app_id", miniApp.appId);
+        params.putString("app_id", miniApp.getAppId());
         WritableMap event = Arguments.createMap();
         try {
-            event.putString("request_id", customEvent.requestId);
-            event.putString("type", customEvent.type);
-            event.putString("error_type", customEvent.errorType);
-            event.putMap("payload", MapUtil.toWritableMap((Map<String, Object>) customEvent.payload));
+            event.putInt("request_id", customEvent.getRequestId());
+            event.putString("type", customEvent.getType());
+            event.putString("error_type", customEvent.getErrorType());
+            event.putMap("payload", MapUtil.toWritableMap((Map<String, Object>) customEvent.getPayload()));
 
             params.putMap("custom_event", event);
             sendEvent(CUSTOM_EVENTS_EVENT_NAME, params);
@@ -144,7 +146,7 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     @Override
     public void onLaunch(@NotNull Miniapp miniapp) {
         WritableMap params = Arguments.createMap();
-        params.putString("app_id", miniapp.appId);
+        params.putString("app_id", miniapp.getAppId());
         params.putString("lifecycle", "onLaunch");
         sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
     }
@@ -152,7 +154,7 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     @Override
     public void onResume(@NotNull Miniapp miniapp) {
         WritableMap params = Arguments.createMap();
-        params.putString("app_id", miniapp.appId);
+        params.putString("app_id", miniapp.getAppId());
         params.putString("lifecycle", "onResume");
         sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
     }
@@ -160,7 +162,7 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     @Override
     public void onPause(@NotNull Miniapp miniapp) {
         WritableMap params = Arguments.createMap();
-        params.putString("app_id", miniapp.appId);
+        params.putString("app_id", miniapp.getAppId());
         params.putString("lifecycle", "onPause");
         sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
     }
@@ -168,7 +170,7 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     @Override
     public void onClose(@NotNull Miniapp miniapp) {
         WritableMap params = Arguments.createMap();
-        params.putString("app_id", miniapp.appId);
+        params.putString("app_id", miniapp.getAppId());
         params.putString("lifecycle", "onClose");
         sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
     }
@@ -176,18 +178,26 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
     @Override
     public void onError(@NotNull Miniapp miniapp, @NotNull String s) {
         WritableMap params = Arguments.createMap();
-        params.putString("app_id", miniapp.appId);
+        params.putString("app_id", miniapp.getAppId());
         params.putString("lifecycle", "onError");
         params.putString("error", s);
         sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
     }
 
+    @Override
+    public void onUserInteraction(@NonNull Miniapp miniapp) {
+        WritableMap params = Arguments.createMap();
+        params.putString("app_id", miniapp.getAppId());
+        params.putString("lifecycle", "onUserInteraction");
+        sendEvent(MINIAPP_LIFECYCLE_EVENT_NAME, params);
+    }
+
     @ReactMethod
     void sendCustomEvent(ReadableMap map) {
         try {
             String appId = map.getString("app_id");
             ReadableMap customEventMap = map.getMap("custom_event");
-            final CustomEvent event = new CustomEvent(customEventMap.getString("request_id"),
+            final CustomEvent event = new CustomEvent(customEventMap.getInt("request_id"),
                     customEventMap.getString("type"),
                     customEventMap.hasKey("error_type") ? customEventMap.getString("error_type") : null,
                     MapUtil.toMap(customEventMap.getMap("payload")));
@@ -220,5 +230,4 @@ public class RnappboxosdkModule extends ReactContextBaseJavaModule
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(name, params);
     }
-
 }

package/android/src/main/java/com/appboxo/RnappboxosdkPackage.java

@@ -20,14 +20,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import android.app.Activity;
-import com.appboxo.sdk.Appboxo;
-import com.appboxo.sdk.Config;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
 
 public class RnappboxosdkPackage implements ReactPackage {
     @Override

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@appboxo/react-native-sdk",
   "title": "Appboxo react native sdk",
-  "version": "1.0.27",
+  "version": "1.0.31",
   "description": "Appboxo react native sdk",
   "main": "index.js",
   "files": [

package/android/build/.transforms/777a7887febe88b5ef18bed9d1456e0b.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/generated/source/buildConfig/debug/com/appboxo/BuildConfig.java

@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.appboxo;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.appboxo";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.appboxo";
-  public static final String BUILD_TYPE = "debug";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.appboxo"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="29" />
-
-</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"appboxo_react-native-sdk-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.appboxo","split":""}}]

package/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}

package/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/debug/jniLibs"/></dataSet></merger>

package/android/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/debug/shaders"/></dataSet></merger>

package/android/build/intermediates/incremental/packageDebugAssets/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/assets"/><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/debug/assets"/></dataSet></merger>

package/android/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +0,0 @@
-#Thu Jul 23 21:07:35 KGT 2020

package/android/build/intermediates/incremental/packageDebugResources/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/res"/><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/build/generated/res/rs/debug"/><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/res"/><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/build/generated/res/rs/debug"/><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/debug/res"/></dataSet><mergedItems/></merger>

package/android/build/intermediates/library_manifest/debug/AndroidManifest.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.appboxo"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="29" />
-
-</manifest>

package/android/build/intermediates/local_only_symbol_list/debug/parseDebugLibraryResources/R-def.txt

@@ -1,2 +0,0 @@
-R_DEF: Internal format may change without notice
-local

package/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -1,13 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.appboxo"
-4    android:versionCode="1"
-5    android:versionName="1.0" >
-6
-7    <uses-sdk
-8        android:minSdkVersion="21"
-8-->/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/AndroidManifest.xml
-9        android:targetSdkVersion="29" />
-9-->/Users/vladimir/Documents/work/Appboxo/react-native-sdk/android/src/main/AndroidManifest.xml
-10
-11</manifest>

package/android/build/intermediates/merged_manifests/debug/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"appboxo_react-native-sdk-debug.aar","fullName":"debug","baseName":"debug"},"path":"../../library_manifest/debug/AndroidManifest.xml","properties":{"packageId":"com.appboxo","split":""}}]