Skip to content

Commit 09183ce

Browse files
committed
Released 1.1.14
1 parent 2902391 commit 09183ce

16 files changed

+96
-60
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## Version 1.1.14
4+
5+
22-01-2016
6+
7+
* Reduced the initialization time by 50%
8+
* Fixed an NPE in our ConversationAdapter, [issue#164](https://github.com/intercom/intercom-android/issues/164)
9+
* Removed the remaining hard coded strings in the client, [issue#156](https://github.com/intercom/intercom-android/issues/156)
10+
* Fixed a crash caused when a video failed to load. We now always show an error image for failed videos.
11+
312
## Version 1.1.13
413

514
22-01-2016

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Intercom for Android 1.1.13
1+
# Intercom for Android 1.1.14
22

33
## Supported versions
44
Targets Android 2.3 (API 9) but *only* 4.0.3 (API 15) and above have tracking and messaging functionality.
Binary file not shown.
22.1 KB
Binary file not shown.

jar/intercom-sdk-base/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="io.intercom.android.sdk"
4-
android:versionCode="30"
5-
android:versionName="1.1.13" >
4+
android:versionCode="31"
5+
android:versionName="1.1.14" >
66

77
<uses-sdk
88
android:minSdkVersion="9"

jar/intercom-sdk-base/R.txt

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -257,29 +257,38 @@ int string intercomsdk_accessibility_powered_by 0x7f090002
257257
int string intercomsdk_accessibility_shadow 0x7f090003
258258
int string intercomsdk_accessibility_welcome 0x7f090004
259259
int string intercomsdk_activated_key_message 0x7f090005
260-
int string intercomsdk_close 0x7f090006
261-
int string intercomsdk_congratulations 0x7f090007
262-
int string intercomsdk_delivered 0x7f090008
263-
int string intercomsdk_empty_conversations 0x7f090009
264-
int string intercomsdk_facebook_like 0x7f09000a
265-
int string intercomsdk_failed_to_send 0x7f09000b
266-
int string intercomsdk_file_failed 0x7f09000c
267-
int string intercomsdk_file_too_big 0x7f09000d
268-
int string intercomsdk_image_attached 0x7f09000e
269-
int string intercomsdk_name 0x7f09000f
270-
int string intercomsdk_new_conversation_title 0x7f090010
271-
int string intercomsdk_pill_text 0x7f090011
272-
int string intercomsdk_powered_by 0x7f090012
273-
int string intercomsdk_reply_to_conversation 0x7f090013
274-
int string intercomsdk_sending 0x7f090014
275-
int string intercomsdk_sending_failure 0x7f090015
276-
int string intercomsdk_start_new_conversation 0x7f090016
277-
int string intercomsdk_title_activity_conversations 0x7f090017
278-
int string intercomsdk_try_again 0x7f090018
279-
int string intercomsdk_twitter_follow 0x7f090019
280-
int string intercomsdk_unable_to_load 0x7f09001a
281-
int string intercomsdk_write_a_reply 0x7f09001b
282-
int string intercomsdk_you 0x7f09001c
260+
int string intercomsdk_attachment_cancel 0x7f090006
261+
int string intercomsdk_attachment_send 0x7f090007
262+
int string intercomsdk_close 0x7f090008
263+
int string intercomsdk_congratulations 0x7f090009
264+
int string intercomsdk_delivered 0x7f09000a
265+
int string intercomsdk_empty_conversations 0x7f09000b
266+
int string intercomsdk_facebook_like 0x7f09000c
267+
int string intercomsdk_failed_to_send 0x7f09000d
268+
int string intercomsdk_file_failed 0x7f09000e
269+
int string intercomsdk_file_too_big 0x7f09000f
270+
int string intercomsdk_image_attached 0x7f090010
271+
int string intercomsdk_name 0x7f090011
272+
int string intercomsdk_new_conversation_title 0x7f090012
273+
int string intercomsdk_pill_text 0x7f090013
274+
int string intercomsdk_powered_by 0x7f090014
275+
int string intercomsdk_reply_to_conversation 0x7f090015
276+
int string intercomsdk_sending 0x7f090016
277+
int string intercomsdk_sending_failure 0x7f090017
278+
int string intercomsdk_start_new_conversation 0x7f090018
279+
int string intercomsdk_time_day_ago 0x7f090019
280+
int string intercomsdk_time_hour_ago 0x7f09001a
281+
int string intercomsdk_time_just_now 0x7f09001b
282+
int string intercomsdk_time_minute_ago 0x7f09001c
283+
int string intercomsdk_time_never 0x7f09001d
284+
int string intercomsdk_time_week_ago 0x7f09001e
285+
int string intercomsdk_time_year_ago 0x7f09001f
286+
int string intercomsdk_title_activity_conversations 0x7f090020
287+
int string intercomsdk_try_again 0x7f090021
288+
int string intercomsdk_twitter_follow 0x7f090022
289+
int string intercomsdk_unable_to_load 0x7f090023
290+
int string intercomsdk_write_a_reply 0x7f090024
291+
int string intercomsdk_you 0x7f090025
283292
int style IntercomSDK_AttachmentTheme 0x7f0a0000
284293
int style IntercomSDK_PanelTheme 0x7f0a0001
285294
int[] styleable MaxSizeLinearLayout { 0x7f010000, 0x7f010001 }

jar/intercom-sdk-base/aapt/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="io.intercom.android.sdk"
4-
android:versionCode="30"
5-
android:versionName="1.1.13" >
4+
android:versionCode="31"
5+
android:versionName="1.1.14" >
66

77
<uses-sdk
88
android:minSdkVersion="9"
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)