Marshall86 patch ios

.all-contributorsrc

@@ -94,6 +94,79 @@
         "code",
         "maintenance"
       ]
+    },
+    {
+      "login": "ramikhafagi96",
+      "name": "Rami Khafagi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38646828?v=4",
+      "profile": "https://github.com/ramikhafagi96",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rdlabo",
+      "name": "Masahiko Sakakibara",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9690024?v=4",
+      "profile": "https://rdlabo.jp/",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "camdjn",
+      "name": "Dejardin Camille",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7116085?v=4",
+      "profile": "https://github.com/camdjn",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "scr2em",
+      "name": "Mohamed Abdelgwad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4671486?v=4",
+      "profile": "https://scr2em.github.io/portfolio/",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "shark404",
+      "name": "Nathan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4898049?v=4",
+      "profile": "https://github.com/shark404",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "cwoebker",
+      "name": "Cecil Wöbker",
+      "avatar_url": "https://avatars.githubusercontent.com/u/885085?v=4",
+      "profile": "https://cwoebker.com/",
+      "contributions": [
+        "code",
+        "maintenance"
+      ]
+    },
+    {
+      "login": "pavloPyrig0",
+      "name": "Pavlo Pyrig",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10965335?v=4",
+      "profile": "https://github.com/pavloPyrig0",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dupiesdupreez",
+      "name": "Ruan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6910085?v=4",
+      "profile": "https://github.com/dupiesdupreez",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [5.0.0](https://github.com/capacitor-community/intercom/compare/v4.0.2...v5.0.0) (2023-05-18)
+
+### [4.0.2](https://github.com/capacitor-community/intercom/compare/v4.0.1...v4.0.2) (2022-12-14)
+
+### [4.0.1](https://github.com/capacitor-community/intercom/compare/v4.0.0...v4.0.1) (2022-11-09)
+
+
+### Bug Fixes
+
+* Cann't resolve io.intercom.android:intercom-sdk ([50f18ff](https://github.com/capacitor-community/intercom/commit/50f18ffc02281a379b6100bccae1c17bd5958e2e))
+
 ### [3.0.3](https://github.com/capacitor-community/intercom/compare/v3.0.1...v3.0.3) (2022-05-10)
 
 

README.md

@@ -12,7 +12,7 @@
   <a href="https://www.npmjs.com/package/@capacitor-community/intercom"><img src="https://img.shields.io/npm/dw/@capacitor-community/intercom?style=flat-square" /></a>
   <a href="https://www.npmjs.com/package/@capacitor-community/intercom"><img src="https://img.shields.io/npm/v/@capacitor-community/intercom?style=flat-square" /></a>
   <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors"><img src="https://img.shields.io/badge/all%20contributors-9-orange?style=flat-square" /></a>
+<a href="#contributors"><img src="https://img.shields.io/badge/all%20contributors-17-orange?style=flat-square" /></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -216,6 +216,16 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/Jealvia"><img src="https://avatars.githubusercontent.com/u/28424830?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Jealvia</b></sub></a><br /><a href="#maintenance-Jealvia" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://adamduren.com/"><img src="https://avatars.githubusercontent.com/u/581097?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Adam Duren</b></sub></a><br /><a href="https://github.com/capacitor-community/intercom/commits?author=adamduren" title="Code">💻</a> <a href="#maintenance-adamduren" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/ramikhafagi96"><img src="https://avatars.githubusercontent.com/u/38646828?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Rami Khafagi</b></sub></a><br /><a href="https://github.com/capacitor-community/intercom/commits?author=ramikhafagi96" title="Code">💻</a></td>
+    <td align="center"><a href="https://rdlabo.jp/"><img src="https://avatars.githubusercontent.com/u/9690024?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Masahiko Sakakibara</b></sub></a><br /><a href="#maintenance-rdlabo" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/camdjn"><img src="https://avatars.githubusercontent.com/u/7116085?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Dejardin Camille</b></sub></a><br /><a href="https://github.com/capacitor-community/intercom/commits?author=camdjn" title="Code">💻</a></td>
+    <td align="center"><a href="https://scr2em.github.io/portfolio/"><img src="https://avatars.githubusercontent.com/u/4671486?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Mohamed Abdelgwad</b></sub></a><br /><a href="#maintenance-scr2em" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/shark404"><img src="https://avatars.githubusercontent.com/u/4898049?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Nathan</b></sub></a><br /><a href="#maintenance-shark404" title="Maintenance">🚧</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://cwoebker.com/"><img src="https://avatars.githubusercontent.com/u/885085?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Cecil Wöbker</b></sub></a><br /><a href="https://github.com/capacitor-community/intercom/commits?author=cwoebker" title="Code">💻</a> <a href="#maintenance-cwoebker" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/pavloPyrig0"><img src="https://avatars.githubusercontent.com/u/10965335?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Pavlo Pyrig</b></sub></a><br /><a href="https://github.com/capacitor-community/intercom/commits?author=pavloPyrig0" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/dupiesdupreez"><img src="https://avatars.githubusercontent.com/u/6910085?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Ruan</b></sub></a><br /><a href="https://github.com/capacitor-community/intercom/commits?author=dupiesdupreez" title="Code">💻</a></td>
   </tr>
 </table>
 

android/build.gradle

@@ -1,8 +1,9 @@
 ext {
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
+    intercomSdkVersion = project.hasProperty('intercomSdkVersion') ? rootProject.ext.intercomSdkVersion : '12.5.0'
 }
 
 buildscript {
@@ -11,17 +12,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
+    namespace "com.getcapacitor.community.intercom.intercom"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -36,14 +38,13 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 
 repositories {
     google()
-        mavenCentral()
     mavenCentral()
 }
 
@@ -55,6 +56,6 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation 'io.intercom.android:intercom-sdk:10.+'
+    implementation "io.intercom.android:intercom-sdk:$intercomSdkVersion"
     implementation 'com.google.firebase:firebase-messaging:20.2.+'
 }

android/gradle.properties

@@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.getcapacitor.community.intercom.intercom">
+    >
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.VIBRATE"/>

android/src/main/java/com/getcapacitor/community/intercom/intercom/IntercomPlugin.java

@@ -10,6 +10,8 @@
 import com.getcapacitor.annotation.CapacitorPlugin;
 import com.getcapacitor.annotation.Permission;
 
+import org.json.JSONException;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -34,6 +36,17 @@ public void load() {
         // load parent
         super.load();
     }
+
+    @PluginMethod()
+    public void loadWithKeys(PluginCall call) {
+        String appId = call.getString("appId", "NO_APP_ID_PASSED");
+        String apiKey = call.getString("apiKeyAndroid", "NO_API_KEY_PASSED");
+
+        Intercom.initialize(this.getActivity().getApplication(), apiKey, appId);
+
+        // load parent
+        super.load();
+    }
 
     @Override
     public void handleOnStart() {
@@ -51,7 +64,7 @@ public void run() {
     @PluginMethod
     public void registerIdentifiedUser(PluginCall call) {
         String email = call.getString("email");
-        String userId = call.getString("userId");
+        String userId = call.getData().getString("userId");
 
         Registration registration = new Registration();
 
@@ -218,6 +231,13 @@ public void receivePush(PluginCall call) {
         }
     }
 
+    @PluginMethod
+    public void displayArticle(PluginCall call) {
+        String articleId = call.getString("articleId");
+        Intercom.client().displayArticle(articleId);
+        call.resolve();
+    }
+
     private void setUpIntercom() {
         try {
             // get config

ios/Plugin/IntercomPlugin.m

@@ -4,6 +4,7 @@
 // Define the plugin using the CAP_PLUGIN Macro, and
 // each method the plugin supports using the CAP_PLUGIN_METHOD macro.
 CAP_PLUGIN(IntercomPlugin, "Intercom",
+           CAP_PLUGIN_METHOD(loadWithKeys, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(registerIdentifiedUser, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(registerUnidentifiedUser, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(updateUser, CAPPluginReturnPromise);
@@ -20,4 +21,5 @@
            CAP_PLUGIN_METHOD(displayCarousel, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setUserHash, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(setBottomPadding, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(displayArticle, CAPPluginReturnPromise);
 )