indigitall-capacitor-plugin 2.0.1 → 2.0.3

package/README.md

@@ -21,7 +21,10 @@ npx cap sync
 * [`topicsSubscribe(...)`](#topicssubscribe)
 * [`topicsUnsubscribe(...)`](#topicsunsubscribe)
 * [`sendCustomEvent(...)`](#sendcustomevent)
-* [`getPush()`](#getpush)
+* [`getPush(...)`](#getpush)
+* [`onIndigitallGetPush(...)`](#onindigitallgetpush)
+* [`clearViewUrl()`](#clearviewurl)
+* [`setDefaultViewUrl(...)`](#setdefaultviewurl)
 * [`onMessageReceived(...)`](#onmessagereceived)
 * [`getToken()`](#gettoken)
 * [`isIndigitallPushNotification(...)`](#isindigitallpushnotification)
@@ -137,13 +140,56 @@ sendCustomEvent(params: { customEvent: any; }) => Promise<void>
 --------------------
 
 
-### getPush()
+### getPush(...)
 
 ```typescript
-getPush() => Promise<any>
+getPush(onSuccess: OnPushSuccessType, onError?: OnErrorCallbackType | undefined) => OnPushSuccessType
 ```
 
-**Returns:** <code>Promise&lt;any&gt;</code>
+| Param           | Type                                                                |
+| --------------- | ------------------------------------------------------------------- |
+| **`onSuccess`** | <code><a href="#onpushsuccesstype">OnPushSuccessType</a></code>     |
+| **`onError`**   | <code><a href="#onerrorcallbacktype">OnErrorCallbackType</a></code> |
+
+**Returns:** <code><a href="#onpushsuccesstype">OnPushSuccessType</a></code>
+
+--------------------
+
+
+### onIndigitallGetPush(...)
+
+```typescript
+onIndigitallGetPush(onSuccess: OnPushSuccessType, onError?: OnErrorCallbackType | undefined) => OnPushSuccessType
+```
+
+| Param           | Type                                                                |
+| --------------- | ------------------------------------------------------------------- |
+| **`onSuccess`** | <code><a href="#onpushsuccesstype">OnPushSuccessType</a></code>     |
+| **`onError`**   | <code><a href="#onerrorcallbacktype">OnErrorCallbackType</a></code> |
+
+**Returns:** <code><a href="#onpushsuccesstype">OnPushSuccessType</a></code>
+
+--------------------
+
+
+### clearViewUrl()
+
+```typescript
+clearViewUrl() => void
+```
+
+--------------------
+
+
+### setDefaultViewUrl(...)
+
+```typescript
+setDefaultViewUrl(params: { defaultView: string; }) => void
+```
+
+| Param        | Type                                  |
+| ------------ | ------------------------------------- |
+| **`params`** | <code>{ defaultView: string; }</code> |
 
 --------------------
 
@@ -232,6 +278,36 @@ An intrinsic object that provides functions to convert JavaScript values to and
 ### Type Aliases
 
 
+#### OnPushSuccessType
+
+<code>(push: <a href="#push">Push</a>): void</code>
+
+
+#### Push
+
+<code>{ title: string; body: string; image: string; data: string; securedData: string; action: <a href="#pushaction">PushAction</a>; buttons: [PushButton]; }</code>
+
+
+#### PushAction
+
+<code>{ url: string | null; app: string | null; market: string | null; share: string | null; call: string | null; noAction: string | null; }</code>
+
+
+#### PushButton
+
+<code>{ label: string; action: <a href="#pushaction">PushAction</a>; }</code>
+
+
+#### OnErrorCallbackType
+
+<code>(error: <a href="#errorcallback">ErrorCallback</a>): void</code>
+
+
+#### ErrorCallback
+
+<code>{ message: string; }</code>
+
+
 #### OnMessageReceivedSuccessType
 
 <code>(json: <a href="#json">JSON</a>): void</code>

package/android/build.gradle

@@ -55,7 +55,7 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation('com.indigitall:android:5.1.+'){
+    implementation('com.indigitall:android:5.2.+'){
          exclude group: "com.indigitall", module: "android-hms"
     }
 }

package/android/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         </intent-filter>
     </receiver>
         <activity
-            android:name="com.indigitall.android.HiddenActivity"
+            android:name=".models.CpIndigitallHiddenActivity"
             android:label="@string/app_name_sdk"
             android:screenOrientation="portrait"
             android:configChanges="orientation|keyboardHidden"

package/android/src/main/java/com/indigitall/capacitor/IndigitallCpPlugin.java

@@ -2,8 +2,12 @@ package com.indigitall.capacitor;
 
 import android.Manifest;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
+import android.os.Handler;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 
@@ -22,10 +26,12 @@ import com.indigitall.android.callbacks.TopicsCallback;
 import com.indigitall.android.commons.models.ErrorModel;
 import com.indigitall.android.models.Device;
 import com.indigitall.android.models.Permission;
+import com.indigitall.android.models.Push;
 import com.indigitall.android.models.PushErrorModel;
 import com.indigitall.android.models.Topic;
 import com.indigitall.android.utils.FirebaseUtils;
 import com.indigitall.capacitor.interfaces.IndigitallFirebaseInterface;
+import com.indigitall.capacitor.utils.CpPreferenceUtils;
 import com.indigitall.capacitor.utils.IndigitallParse;
 import com.indigitall.capacitor.implementations.IndigitallCp;
 
@@ -41,9 +47,11 @@ public class IndigitallCpPlugin extends Plugin implements IndigitallFirebaseInte
     private final String TOPICS = "topics";
     private final String TOKEN = "token";
     private final String NOTIFICATION = "notification";
+    private final String PUSH = "push";
 
     public static PluginCall notificationCall;
     public static IndigitallFirebaseInterface indigitallInterface;
+    public static PluginCall getPushCallback;
 
     @PluginMethod
     public void initialize(PluginCall call) {
@@ -228,10 +236,87 @@ public class IndigitallCpPlugin extends Plugin implements IndigitallFirebaseInte
         });
     }
 
-    @PluginMethod
+    @PluginMethod(returnType = PluginMethod.RETURN_NONE)
+    public void setDefaultViewUrl(PluginCall call) {
+        try{
+            String defaultView = call.getString("defaultView");
+            CpPreferenceUtils.setPushUrl(getContext(), defaultView);
+            CpPreferenceUtils.setNativePushUrl(getContext(), "");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    @PluginMethod(returnType = PluginMethod.RETURN_NONE)
+    public void clearViewUrl() {
+        CpPreferenceUtils.setPushUrl(getContext(), "");
+        CpPreferenceUtils.setNativePushUrl(getContext(), "");
+    }
+
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
+    public void onIndigitallGetPush(PluginCall call) throws JSONException {
+        onIndigitallGetPush(call, null);
+    }
+
+    @Override
+    public void onIndigitallGetPush(PluginCall call, JSONObject json) throws JSONException {
+        if (json != null) {
+            if (bridge != null) {
+                String url = CpPreferenceUtils.getPushUrl(getContext());
+                String urlNative = CpPreferenceUtils.getNativePushUrl(getContext());
+                if (urlNative != null && !urlNative.equals("")) {
+                    bridge.getWebView().post(new Runnable() {
+                        @Override
+                        public void run() {
+                            CpPreferenceUtils.setPushString(getContext(), new Push(getContext(), json).toString());
+                            bridge.getWebView().loadUrl(urlNative);
+                        }
+                    });
+                } else if (url != null && !url.equals("")) {
+                    bridge.getWebView().post(new Runnable() {
+                        @Override
+                        public void run() {
+                            String completeUrl = bridge.getLocalUrl()+"/"+url;
+                            //if (!completeUrl.equals(bridge.getLocalUrl())) {
+                            bridge.getWebView().loadUrl(completeUrl);
+                        }
+                    });
+                    //}
+                }
+            }
+        } else {
+            getPushCallback = call;
+            indigitallInterface = this;
+            bridge.getWebView().post(new Runnable() {
+                 @Override
+                 public void run() {
+                    String urlGetPushMethod = CpPreferenceUtils.getPushUrl(getContext());
+                    if (urlGetPushMethod == null || urlGetPushMethod.equals("")) {
+                        CpPreferenceUtils.setNativePushUrl(getContext(), bridge.getWebView().getUrl());
+                        Log.d("IndigigallCpPlugin", "set url to: " + bridge.getWebView().getUrl());
+                    }
+                    JSObject ret = new JSObject();
+                    if (CpPreferenceUtils.getPushString(getContext()) != null &&
+                            !CpPreferenceUtils.getPushString(getContext()).equals("")) {
+                        Push push = new Push(getContext(), CpPreferenceUtils.getPushString(getContext()));
+                        try {
+                            ret.put(PUSH, IndigitallParse.jsonFromPush(push));
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        getPushCallback.setKeepAlive(true);
+                        getPushCallback.resolve(ret);
+                        CpPreferenceUtils.setPushString(getContext(), "");
+                    }
+                 }
+            });
+            call.setKeepAlive(true);
+        }
+    }
+
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
     public void getPush(PluginCall call) throws JSONException {
         JSObject ret = new JSObject();
-        String PUSH = "push";
         ret.put(PUSH, IndigitallCp.getPush(getContext(), getActivity().getIntent()));
         call.resolve(ret);
     }

package/android/src/main/java/com/indigitall/capacitor/interfaces/IndigitallFirebaseInterface.java

@@ -5,8 +5,10 @@ import android.content.Context;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.PluginCall;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 public abstract interface IndigitallFirebaseInterface {
     public abstract void onMessageReceived(JSONObject messageJson);
+    public abstract void onIndigitallGetPush(PluginCall call, JSONObject json) throws JSONException;
 }

package/android/src/main/java/com/indigitall/capacitor/models/CpIndigitallHiddenActivity.java

@@ -0,0 +1,50 @@
+package com.indigitall.capacitor.models;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.indigitall.android.HiddenActivity;
+import com.indigitall.android.models.Push;
+import com.indigitall.capacitor.IndigitallCpPlugin;
+import com.indigitall.capacitor.utils.CpPreferenceUtils;
+
+import org.json.JSONObject;
+
+public class CpIndigitallHiddenActivity extends HiddenActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle bundle) {
+        super.onCreate(bundle);
+    }
+
+    @Override
+    protected void onHandleIntentAction(Intent intentAction) {
+        try{
+            if (IndigitallCpPlugin.indigitallInterface != null && IndigitallCpPlugin.getPushCallback != null) {
+                if (intentAction.hasExtra(Push.EXTRA_PUSH)) {
+                    JSONObject json = new JSONObject(intentAction.getStringExtra(Push.EXTRA_PUSH));
+                    IndigitallCpPlugin.indigitallInterface.onIndigitallGetPush(null, json);
+                    Context context = getApplicationContext();
+                    PackageManager manager = context.getPackageManager();
+
+                    Intent i = manager.getLaunchIntentForPackage(getPackageName());
+                    if (i != null) {
+                        i.addCategory(Intent.CATEGORY_LAUNCHER);
+                    }
+                    context.startActivity(i);
+                }
+            }  else {
+                if (intentAction.hasExtra(Push.EXTRA_PUSH)) {
+                    CpPreferenceUtils.setPushString(getApplicationContext(), intentAction.getStringExtra(Push.EXTRA_PUSH));
+                }
+                super.onHandleIntentAction(intentAction);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+
+    }
+}

package/android/src/main/java/com/indigitall/capacitor/models/CpPushNotification.java

@@ -0,0 +1,30 @@
+package com.indigitall.capacitor.models;
+
+import android.app.PendingIntent;
+import android.content.Context;
+
+import com.indigitall.android.commons.models.CorePushAction;
+import com.indigitall.android.models.Push;
+import com.indigitall.android.models.PushNotification;
+import com.indigitall.capacitor.utils.CpIndigitallUtils;
+
+public class CpPushNotification extends PushNotification {
+    Push push;
+    Context context;
+    public CpPushNotification(Push push) {
+        super(push);
+        this.push = push;
+    }
+
+    @Override
+    public void showNotification(Context context) {
+        this.context = context;
+        super.showNotification(context);
+    }
+
+    @Override
+    public PendingIntent getIntent(CorePushAction action, int clickedButton) {
+        return CpIndigitallUtils.getIntent(context, push, action, clickedButton);
+    }
+
+}

package/android/src/main/java/com/indigitall/capacitor/services/IndigitallFirebaseMessagingService.java

@@ -1,13 +1,16 @@
 package com.indigitall.capacitor.services;
 
+import android.content.Context;
 import android.util.Log;
 
 import com.getcapacitor.PluginCall;
 import com.google.firebase.messaging.RemoteMessage;
+import com.indigitall.android.models.Push;
 import com.indigitall.android.services.FirebaseMessagingService;
 import com.indigitall.android.utils.FirebaseUtils;
 import com.indigitall.capacitor.IndigitallCpPlugin;
 import com.indigitall.capacitor.implementations.IndigitallCp;
+import com.indigitall.capacitor.models.CpPushNotification;
 
 import org.json.JSONObject;
 import java.util.Map;
@@ -30,5 +33,8 @@ public class IndigitallFirebaseMessagingService extends FirebaseMessagingService
         super.onNewToken(s);
     }
 
-
+    @Override
+    protected void showNotification(Context context, Push push) {
+        new CpPushNotification(push).showNotification(context);
+    }
 }

package/android/src/main/java/com/indigitall/capacitor/utils/CpIndigitallUtils.java

@@ -0,0 +1,49 @@
+package com.indigitall.capacitor.utils;
+
+import android.app.PendingIntent;
+import android.app.TaskStackBuilder;
+import android.content.Context;
+import android.content.Intent;
+
+import com.indigitall.android.commons.models.CorePush;
+import com.indigitall.android.commons.models.CorePushAction;
+import com.indigitall.android.commons.utils.IntentUtils;
+import com.indigitall.android.models.Push;
+import com.indigitall.android.models.PushAction;
+import com.indigitall.android.services.StatisticService;
+import com.indigitall.android.utils.PushPreferenceUtils;
+import com.indigitall.capacitor.models.CpIndigitallHiddenActivity;
+
+public class CpIndigitallUtils {
+    public static PendingIntent getIntent(Context context, CorePush push, CorePushAction action, int clickedButton) {
+        try{
+            Intent intent = action.getIntent(context);
+            if (intent != null) {
+                if (action.getType() == PushAction.Type.APP) {
+                    intent.putExtra(Push.EXTRA_PUSH, push.toString());
+                }
+                Intent indigitallIntent = new Intent(context, CpIndigitallHiddenActivity.class);
+                indigitallIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                indigitallIntent.putExtra(StatisticService.EXTRA_APP_KEY, PushPreferenceUtils.getAppKey(context));
+                indigitallIntent.putExtra(StatisticService.EXTRA_PUSH_ID, push.getId());
+                indigitallIntent.putExtra(StatisticService.EXTRA_CLICKED_BUTTON, clickedButton);
+                indigitallIntent.putExtra(StatisticService.EXTRA_INTENT_ACTION, intent);
+                indigitallIntent.putExtra(Push.EXTRA_PUSH, push.toString());
+                if (action.getTopics() != null && action.getTopics().length>0){
+                    indigitallIntent.putExtra(StatisticService.EXTRA_ACTION_TOPICS, action.topicsToString());
+                }
+                TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
+                stackBuilder.addNextIntentWithParentStack(indigitallIntent);
+                if (action.isDestroy()){
+                    return stackBuilder.getPendingIntent((push.getId() * 10) + clickedButton,
+                            IntentUtils.getPendingIntentFlags(PendingIntent.FLAG_UPDATE_CURRENT));
+                }else{
+                    return PendingIntent.getActivity(context, 0, new Intent(), IntentUtils.getPendingIntentFlags(0));
+                }
+            }
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

package/android/src/main/java/com/indigitall/capacitor/utils/CpPreferenceUtils.java

@@ -0,0 +1,70 @@
+package com.indigitall.capacitor.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class CpPreferenceUtils {
+
+    private static final String SHARED_PREFERENCES_NAME = "IndigitallCordovaPreferences";
+    private static final String SHARED_PREFERENCES_URL_KEY = SHARED_PREFERENCES_NAME + ".getPushKey";
+    private static final String SHARED_PREFERENCES_NATIVE_URL_KEY = SHARED_PREFERENCES_NAME + ".getNativePushKey";
+    private static final String SHARED_PREFERENCES_PUSH_STRING = SHARED_PREFERENCES_NAME + ".getPushString";
+
+
+    private static boolean savePreferences(Context context, Object param, String key) {
+        SharedPreferences pref = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = null;
+        if (pref != null) editor = pref.edit();
+        if (editor != null) {
+            if (param instanceof String) {
+                return editor.putString (key,(String)param).commit();
+            } else if (param instanceof Boolean) {
+                return editor.putBoolean(key,(Boolean)param).commit();
+            }
+
+        }
+        return false;
+    }
+
+    private static String getSharedPreferencesString(Context context, String key) {
+        if (context != null){
+            SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+            if (prefs != null) return prefs.getString(key, null);
+        }
+        return null;
+    }
+
+    private static Boolean getSharedPreferencesBoolean(Context context, String key) {
+        if (context != null){
+            SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+            if (prefs != null) return prefs.getBoolean(key, false);
+        }
+        return null;
+    }
+
+    public static String getPushUrl(Context context) {
+        return getSharedPreferencesString(context, SHARED_PREFERENCES_URL_KEY);
+    }
+
+    public static void setPushUrl(Context context, String value) {
+        savePreferences(context, value, SHARED_PREFERENCES_URL_KEY);
+    }
+
+    public static String getNativePushUrl(Context context) {
+        return getSharedPreferencesString(context, SHARED_PREFERENCES_NATIVE_URL_KEY);
+    }
+
+    public static void setNativePushUrl(Context context, String value) {
+        savePreferences(context, value, SHARED_PREFERENCES_NATIVE_URL_KEY);
+    }
+
+    public static String getPushString(Context context) {
+        return getSharedPreferencesString(context, SHARED_PREFERENCES_PUSH_STRING);
+    }
+
+    public static void setPushString(Context context, String value) {
+        savePreferences(context, value, SHARED_PREFERENCES_PUSH_STRING);
+    }
+
+}
+

package/dist/docs.json

@@ -111,13 +111,77 @@
       },
       {
         "name": "getPush",
-        "signature": "() => Promise<any>",
+        "signature": "(onSuccess: OnPushSuccessType, onError?: OnErrorCallbackType | undefined) => OnPushSuccessType",
+        "parameters": [
+          {
+            "name": "onSuccess",
+            "docs": "",
+            "type": "OnPushSuccessType"
+          },
+          {
+            "name": "onError",
+            "docs": "",
+            "type": "OnErrorCallbackType | undefined"
+          }
+        ],
+        "returns": "OnPushSuccessType",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [
+          "OnPushSuccessType",
+          "OnErrorCallbackType"
+        ],
+        "slug": "getpush"
+      },
+      {
+        "name": "onIndigitallGetPush",
+        "signature": "(onSuccess: OnPushSuccessType, onError?: OnErrorCallbackType | undefined) => OnPushSuccessType",
+        "parameters": [
+          {
+            "name": "onSuccess",
+            "docs": "",
+            "type": "OnPushSuccessType"
+          },
+          {
+            "name": "onError",
+            "docs": "",
+            "type": "OnErrorCallbackType | undefined"
+          }
+        ],
+        "returns": "OnPushSuccessType",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [
+          "OnPushSuccessType",
+          "OnErrorCallbackType"
+        ],
+        "slug": "onindigitallgetpush"
+      },
+      {
+        "name": "clearViewUrl",
+        "signature": "() => void",
         "parameters": [],
-        "returns": "Promise<any>",
+        "returns": "void",
         "tags": [],
         "docs": "",
         "complexTypes": [],
-        "slug": "getpush"
+        "slug": "clearviewurl"
+      },
+      {
+        "name": "setDefaultViewUrl",
+        "signature": "(params: { defaultView: string; }) => void",
+        "parameters": [
+          {
+            "name": "params",
+            "docs": "",
+            "type": "{ defaultView: string; }"
+          }
+        ],
+        "returns": "void",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "setdefaultviewurl"
       },
       {
         "name": "onMessageReceived",
@@ -313,6 +377,81 @@
   ],
   "enums": [],
   "typeAliases": [
+    {
+      "name": "OnPushSuccessType",
+      "slug": "onpushsuccesstype",
+      "docs": "",
+      "types": [
+        {
+          "text": "(push: Push): void",
+          "complexTypes": [
+            "Push"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Push",
+      "slug": "push",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n    title: string;\n    body: string;\n    image: string;\n    data: string;\n    securedData: string;\n    action: PushAction;\n    buttons: [PushButton];\n  }",
+          "complexTypes": [
+            "PushAction",
+            "PushButton"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "PushAction",
+      "slug": "pushaction",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n    url: string | null;\n    app: string | null;\n    market: string | null;\n    share: string | null;\n    call: string | null;\n    noAction: string | null;\n  }",
+          "complexTypes": []
+        }
+      ]
+    },
+    {
+      "name": "PushButton",
+      "slug": "pushbutton",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n    label: string;\n    action: PushAction;\n  }",
+          "complexTypes": [
+            "PushAction"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "OnErrorCallbackType",
+      "slug": "onerrorcallbacktype",
+      "docs": "",
+      "types": [
+        {
+          "text": "(error: ErrorCallback): void",
+          "complexTypes": [
+            "ErrorCallback"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "ErrorCallback",
+      "slug": "errorcallback",
+      "docs": "",
+      "types": [
+        {
+          "text": "{\n  message: string;\n}",
+          "complexTypes": []
+        }
+      ]
+    },
     {
       "name": "OnMessageReceivedSuccessType",
       "slug": "onmessagereceivedsuccesstype",