Skip to content

Commit

Permalink
Released version 3.0.12 (#96)
Browse files Browse the repository at this point in the history
  • Loading branch information
DaleCantwell authored Oct 10, 2016
1 parent 4c61e7b commit b9bfcd0
Show file tree
Hide file tree
Showing 49 changed files with 100 additions and 70 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Intercom for Cordova/PhoneGap

## 3.0.12 (2016-10-10)

* Added a new method `displayMessageComposerWithInitialMessage` which opens up the message composer and takes in a string to pre-populate the message composer with. Example usage `intercom.displayMessageComposerWithInitialMessage("Question asked from the FAQ page: ");`
* Updated Intercom for Android to [3.0.10](https://github.com/intercom/intercom-android/releases/tag/3.0.10).
* Updated Intercom for iOS to [3.0.13](https://github.com/intercom/intercom-ios/releases/tag/3.0.13).

## 3.0.11 (2016-09-16)

* Updated Intercom for Android to [3.0.9](https://github.com/intercom/intercom-android/releases/tag/3.0.9).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ To install the plugin in your Cordova app, run the following:

To add the plugin to your PhoneGap app, add the following to your `config.xml`:

<plugin name="cordova-plugin-intercom" version="~3.0.11" />
<plugin name="cordova-plugin-intercom" version="~3.0.12" />

## Configuring Intercom

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-intercom",
"version": "3.0.11",
"version": "3.0.12",
"description": "Official Cordova/PhoneGap plugin for Intercom",
"cordova": {
"id": "cordova-plugin-intercom",
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<plugin id="cordova-plugin-intercom" version="3.0.11" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<plugin id="cordova-plugin-intercom" version="3.0.12" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
<name>Intercom</name>
<author>Intercom</author>
<license>MIT License</license>
Expand Down
10 changes: 9 additions & 1 deletion src/android/IntercomBridge.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private void setUpIntercom() {
try {
Context context = IntercomBridge.this.cordova.getActivity().getApplicationContext();

CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.11");
CordovaHeaderInterceptor.setCordovaVersion(context, "3.0.12");

switch (IntercomPushManager.getInstalledModuleType()) {
case GCM: {
Expand Down Expand Up @@ -156,6 +156,14 @@ private enum Action {
callbackContext.success();
}
},
displayMessageComposerWithInitialMessage {
@Override void performAction(JSONArray args, CallbackContext callbackContext, CordovaInterface cordova) {
String initialMessage = args.optString(0);

Intercom.client().displayMessageComposer(initialMessage);
callbackContext.success();
}
},
displayConversationsList {
@Override void performAction(JSONArray args, CallbackContext callbackContext, CordovaInterface cordova) {
Intercom.client().displayConversationsList();
Expand Down
2 changes: 1 addition & 1 deletion src/android/intercom.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ repositories {
}
}
dependencies {
compile 'io.intercom.android:intercom-sdk:3.0.9'
compile 'io.intercom.android:intercom-sdk:3.0.10'
}
9 changes: 7 additions & 2 deletions src/ios/Intercom.framework/Versions/A/Headers/Intercom.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Intercom.h
// Intercom for iOS - Version 3.0.12
// Intercom for iOS - Version 3.0.13
//
// Created by Intercom on 8/01/2015.
// Copyright (c) 2014 Intercom. All rights reserved.
Expand All @@ -10,7 +10,7 @@
#import <UIKit/UIKit.h>

#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0
#error This version (3.0.12) of Intercom for iOS supports iOS 8.0 upwards.
#error This version (3.0.13) of Intercom for iOS supports iOS 8.0 upwards.
#endif

NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -257,6 +257,11 @@ typedef NS_ENUM(NSUInteger, ICMPreviewPosition){
*/
+ (void)presentMessageComposer;

/*!
Present the message composer with a message to pre-populate the composer.
*/
+ (void)presentMessageComposerWithInitialMessage:(NSString *)message;

/*!
Present the conversation list.
*/
Expand Down
Binary file modified src/ios/Intercom.framework/Versions/A/Intercom
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
"error.loading.conversation" = "تعذر تحميل المحادثة";
"actionsheet.message.failed.delivery" = "تعذر تسليم الرسالة";
"message.delivered" = "تم التسليم";
"alert.new.sdk.user.button" = "شكرًا";
"message.delivered" = "تم تسليمها";
"alert.new.sdk.user.button" = "شكرًا لك";
"profile.time.location.format" = "{time} في {location}";
"message.state.sending" = "إرسال";
"message.placeholder.write.reply" = "كتابة رد";
"message.placeholder.write.reply" = "اكتب ردًا";
"twitter.follow.us" = "تابعنا على Twitter";
"alert.new.sdk.user.message" = "تم دمج تطبيقك على iOS مع نظام Intercom الأساسي الآن";
"error.title" = "حدث خطأ ما";
"error.no_conversations.message.no_app_name" = "ليس هناك أي محادثات إلى الآن";
"facebook.like.us" = "أبد إعجابك بنا على Facebook";
"alert.new.sdk.user.message" = "تطبيق iOS الخاص بك مدمج الآن مع نظام Intercom";
"error.title" = "حدث خطأ";
"error.no_conversations.message.no_app_name" = "لم يتم إجراء أي محادثات بعد";
"facebook.like.us" = "تابعنا على Facebook";
"from.app" = "من {name}";
"error.loading.conversations.fallback" = "تعذر تحميل محادثاتك مع فريق {name}";
"message.placeholder.start.conversation" = "بدء محادثة";
"navigation.back" = "رجوع";
"admin.from.app" = "{name} من {company}";
"message.not.seen" = "لم تتم رؤيتها بعد";
"error.no_conversations.title" = "ليس هناك أي محادثات";
"time.difference.delivered" = "تم التسليم";
"actionsheet.try.again" = "إعادة المحاولة";
"error.no_conversations.title" = "لم يتم إجراء محادثات";
"time.difference.delivered" = "تم تسليمها";
"actionsheet.try.again" = "حاول مرة أخرى";
"alert.new.sdk.user.title" = "تهانينا";
"app_team" = "فربق {name}";
"navbar.title.conversations" = "المحادثات مع {name}";
"app_team" = "فريق {name}";
"navbar.title.conversations" = "المحادثات\nمع {name}";
"actionsheet.cancel" = "إلغاء";
"navigation.close" = "إغلاق";
"message.send" = "إرسال";
"time.difference.format.hours.ago" = "قبل {delta} س";
"time.difference.format.weeks.ago" = "قبل {delta} أ";
"last_active.format.hours.ago" = "نشط قبل {hours} س";
"time.difference.format.hours.ago" = "منذ {delta} س";
"time.difference.format.weeks.ago" = "منذ {delta} أ";
"last_active.format.hours.ago" = "نشط منذ {hours} س";
"actionsheet.delete" = "حذف";
"navbar.title.new.conversation" = "محادثة جديدة";
"last_active.over_week_ago" = "نشط قبل أكثر من ساعة";
"time.difference.just.now" = "توًا";
"last_active.minutes.ago" = "نشط قبل {minutes} د";
"last_active.15_minutes" = "نشط خلال آخر {minutes} د";
"last_active.over_week_ago" = "نشط منذ أكثر من أسبوع";
"time.difference.just.now" = "الآن";
"last_active.minutes.ago" = "نشط منذ {minutes} د";
"last_active.15_minutes" = "نشط في {minutes} د الأخيرة";
"message.seen" = "تمت رؤيتها";
"last_active.format.days.ago" = "نشط قبل {days} ي";
"last_active.format.days.ago" = "نشط منذ {days} ي";
"error.starting.conversation.fallback" = "تعذر بدء محادثة جديدة";
"error.no_conversations.message" = "ليس هناك أي محادثات مع فريق {name} إلى الآن";
"time.difference.format.days.ago" = "قبل {delta} ي";
"error.no_conversations.message" = "لم يتم إجراء محادثات مع فريق {name} بعد";
"time.difference.format.days.ago" = "منذ {delta} ي";
"error.loading.conversations.fallback.no_app_name" = "تعذر تحميل محادثاتك";
"we.run.on.intercom" = "نحن نعمل على Intercom";
"we.run.on.intercom" = "يتم إجراء المحادثة من Intercom";
"navbar.title.conversations.no_app_name" = "المحادثات";
"time.difference.format.minutes.ago" = "قبل {delta} د";
"time.difference.format.minutes.ago" = "منذ {delta} د";
"error.tap.to.retry" = "إعادة المحاولة";
"reply_from_admin" = "{name} الرد من";
"reply_from_admin" = "رد من {name}";
"inbox.you" = "أنت";
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Опитайте отново";
"alert.new.sdk.user.title" = "Поздравления";
"app_team" = "{name} Екип";
"navbar.title.conversations" = "Разговори с {name}";
"navbar.title.conversations" = "Разговори\nс {name}";
"actionsheet.cancel" = "Отказ";
"navigation.close" = "Затваряне";
"message.send" = "Изпращане";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Pokušajte ponovno";
"alert.new.sdk.user.title" = "Čestitamo";
"app_team" = "{name} tim";
"navbar.title.conversations" = "Razgovori s {name}";
"navbar.title.conversations" = "Razgovori\ns {name}";
"actionsheet.cancel" = "Otkaži";
"navigation.close" = "Zatvori";
"message.send" = "Pošalji";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Torna-ho a provar";
"alert.new.sdk.user.title" = "Felicitats";
"app_team" = "Equip {name}";
"navbar.title.conversations" = "Converses amb {name}";
"navbar.title.conversations" = "Converses\namb {name}";
"actionsheet.cancel" = "Cancel·la";
"navigation.close" = "Tanca";
"message.send" = "Envia";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Zkuste to znovu";
"alert.new.sdk.user.title" = "Blahopřejeme";
"app_team" = "Tým {name}";
"navbar.title.conversations" = "Konverzace s {name}";
"navbar.title.conversations" = "Konverzace\ns {name}";
"actionsheet.cancel" = "Zrušit";
"navigation.close" = "Zavřít";
"message.send" = "Odeslat";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Prøv igen";
"alert.new.sdk.user.title" = "Tillykke";
"app_team" = "Team {name}";
"navbar.title.conversations" = "Samtaler med {name}";
"navbar.title.conversations" = "Samtaler\nmed {name}";
"actionsheet.cancel" = "Annuller";
"navigation.close" = "Luk";
"message.send" = "Send";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Versuchen Sie es noch mal.";
"alert.new.sdk.user.title" = "Herzlichen Glückwunsch";
"app_team" = "{name} Team";
"navbar.title.conversations" = "Unterhaltungen mit {name}";
"navbar.title.conversations" = "Unterhaltungen\nmit {name}";
"actionsheet.cancel" = "Abbrechen";
"navigation.close" = "Schließen";
"message.send" = "Senden";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Versuch es noch mal.";
"alert.new.sdk.user.title" = "Herzlichen Glückwunsch";
"app_team" = "{name} Team";
"navbar.title.conversations" = "Unterhaltungen mit {name}";
"navbar.title.conversations" = "Unterhaltungen\nmit {name}";
"actionsheet.cancel" = "Abbrechen";
"navigation.close" = "Schließen";
"message.send" = "Senden";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Προσπαθήστε ξανά";
"alert.new.sdk.user.title" = "Συγχαρητήρια";
"app_team" = "Ομάδα {name}";
"navbar.title.conversations" = "Συζητήσεις με {name}";
"navbar.title.conversations" = "Συζητήσεις\nμε {name}";
"actionsheet.cancel" = "Ακύρωση";
"navigation.close" = "Κλείσιμο";
"message.send" = "Αποστολή";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Try Again";
"alert.new.sdk.user.title" = "Congratulations";
"app_team" = "{name} Team";
"navbar.title.conversations" = "Conversations with {name}";
"navbar.title.conversations" = "Conversations\nwith {name}";
"actionsheet.cancel" = "Cancel";
"navigation.close" = "Close";
"message.send" = "Send";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Inténtalo de nuevo";
"alert.new.sdk.user.title" = "Enhorabuena";
"app_team" = "Equipo {name}";
"navbar.title.conversations" = "Conversaciones con {name}";
"navbar.title.conversations" = "Conversaciones\ncon {name}";
"actionsheet.cancel" = "Cancelar";
"navigation.close" = "Cerrar";
"message.send" = "Enviar";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Proovi uuesti";
"alert.new.sdk.user.title" = "Õnnitleme";
"app_team" = "{name} meeskond";
"navbar.title.conversations" = "Vestlused kasutajaga {name}";
"navbar.title.conversations" = "Vestlused\nkasutajaga {name}";
"actionsheet.cancel" = "Tühista";
"navigation.close" = "Sule";
"message.send" = "Saada";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Yritä uudelleen";
"alert.new.sdk.user.title" = "Onnittelut";
"app_team" = "{name}-tiimi";
"navbar.title.conversations" = "Keskustelut{name}";
"navbar.title.conversations" = "Keskustelut\n{name}";
"actionsheet.cancel" = "Peruuta";
"navigation.close" = "Sulje";
"message.send" = "Lähetä";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Réessayer";
"alert.new.sdk.user.title" = "Félicitations";
"app_team" = "{name}";
"navbar.title.conversations" = "Conversations avec {name}";
"navbar.title.conversations" = "Conversations\navec {name}";
"actionsheet.cancel" = "Annuler";
"navigation.close" = "Fermer";
"message.send" = "Envoyer";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "נסה שוב";
"alert.new.sdk.user.title" = "ברכותינו";
"app_team" = "צוות {name}";
"navbar.title.conversations" = "שיחות עם {name}";
"navbar.title.conversations" = "שיחות\nעם {name}";
"actionsheet.cancel" = "בטל";
"navigation.close" = "סגור";
"message.send" = "שלח";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Pokušaj ponovno";
"alert.new.sdk.user.title" = "Čestitke";
"app_team" = "tim {name}";
"navbar.title.conversations" = "Razgovori s {name}";
"navbar.title.conversations" = "Razgovori\ns {name}";
"actionsheet.cancel" = "Odustani";
"navigation.close" = "Zatvori";
"message.send" = "Pošalji";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Próbáld újra";
"alert.new.sdk.user.title" = "Gratulálunk";
"app_team" = "{name} csapat";
"navbar.title.conversations" = "Beszélgetések ({name})";
"navbar.title.conversations" = "Beszélgetések\n{name}";
"actionsheet.cancel" = "Mégse";
"navigation.close" = "Bezárás";
"message.send" = "Küldés";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Coba Lagi";
"alert.new.sdk.user.title" = "Selamat";
"app_team" = "Tim {name}";
"navbar.title.conversations" = "Percakapan dengan {name}";
"navbar.title.conversations" = "Percakapan\ndengan {name}";
"actionsheet.cancel" = "Batal";
"navigation.close" = "Tutup";
"message.send" = "Kirim";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Riprova";
"alert.new.sdk.user.title" = "Congratulazioni";
"app_team" = "Team {name}";
"navbar.title.conversations" = "Conversazioni con {name}";
"navbar.title.conversations" = "Conversazioni\ncon {name}";
"actionsheet.cancel" = "Annulla";
"navigation.close" = "Chiudi";
"message.send" = "Invia";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "再度お試しください";
"alert.new.sdk.user.title" = "おめでとうございます";
"app_team" = "{name}チーム";
"navbar.title.conversations" = "{name}との会話";
"navbar.title.conversations" = "{name}\nとの会話";
"actionsheet.cancel" = "キャンセル";
"navigation.close" = "クローズ";
"message.send" = "送信";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "다시 시도하기";
"alert.new.sdk.user.title" = "축하드립니다";
"app_team" = "{name} 팀";
"navbar.title.conversations" = "{name}님과의 대화 내용";
"navbar.title.conversations" = "대화 내용\n{name}님";
"actionsheet.cancel" = "취소하기";
"navigation.close" = "닫기";
"message.send" = "전송하기";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Bandyti dar kartą";
"alert.new.sdk.user.title" = "Sveikiname";
"app_team" = "„{name}“ komanda";
"navbar.title.conversations" = "Pokalbiai su: „{name}“";
"navbar.title.conversations" = "Pokalbiai\nsu „{name}“";
"actionsheet.cancel" = "Atšaukti";
"navigation.close" = "Uždaryti";
"message.send" = "Siųsti";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Mēģiniet vēlreiz";
"alert.new.sdk.user.title" = "Apsveicam!";
"app_team" = "Komanda {name}";
"navbar.title.conversations" = "Sarunas ar lietotāju {name}";
"navbar.title.conversations" = "Sarunas\nar lietotāju {name}";
"actionsheet.cancel" = "Atcelt";
"navigation.close" = "Aizvērt";
"message.send" = "Sūtīt";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Дахин оролдох";
"alert.new.sdk.user.title" = "Баяр хүргэе";
"app_team" = "{name} баг";
"navbar.title.conversations" = "{name}-тай хийсэн чат";
"navbar.title.conversations" = "{name} тай\nхийсэн чат";
"actionsheet.cancel" = "Цуцлах";
"navigation.close" = "Хаах";
"message.send" = "Илгээх";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Prøv igjen";
"alert.new.sdk.user.title" = "Gratulerer";
"app_team" = "{name}-teamet";
"navbar.title.conversations" = "Samtaler med {name}";
"navbar.title.conversations" = "Samtaler\nmed {name}";
"actionsheet.cancel" = "Avbryt";
"navigation.close" = "Lukk";
"message.send" = "Send";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"actionsheet.try.again" = "Opnieuw proberen";
"alert.new.sdk.user.title" = "Gefeliciteerd";
"app_team" = "Team van {name}";
"navbar.title.conversations" = "Gesprekken met {name}";
"navbar.title.conversations" = "Gesprekken\nmet {name}";
"actionsheet.cancel" = "Annuleren";
"navigation.close" = "Sluiten";
"message.send" = "Versturen";
Expand Down
Loading

0 comments on commit b9bfcd0

Please sign in to comment.