From a78a235f87556072ffd19e54743f92964d014e3f Mon Sep 17 00:00:00 2001 From: skykelsey Date: Mon, 18 Jul 2016 20:19:39 -0700 Subject: [PATCH 1/5] Prevent NPE when animation runs after object is nulled. --- .../messagecenter/view/MessageAdapter.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/apptentive/src/main/java/com/apptentive/android/sdk/module/messagecenter/view/MessageAdapter.java b/apptentive/src/main/java/com/apptentive/android/sdk/module/messagecenter/view/MessageAdapter.java index 4d1ba0f4e..e85be720f 100644 --- a/apptentive/src/main/java/com/apptentive/android/sdk/module/messagecenter/view/MessageAdapter.java +++ b/apptentive/src/main/java/com/apptentive/android/sdk/module/messagecenter/view/MessageAdapter.java @@ -381,21 +381,25 @@ public void run() { } else if (nameEditText != null) { if (whoCardViewIndex != INVALID_POSITION && whoCardViewIndex == position) { if (focusOnNameField) { - nameEditText.post(new Runnable() - { - public void run() - { - nameEditText.requestFocus(); + nameEditText.post( + new Runnable() { + public void run() { + if (nameEditText != null) { + nameEditText.requestFocus(); + } + } } - }); + ); } else { - emailEditText.post(new Runnable() - { - public void run() - { - emailEditText.requestFocus(); + emailEditText.post( + new Runnable() { + public void run() { + if (emailEditText != null) { + emailEditText.requestFocus(); + } + } } - }); + ); } } } From fc62ccc34e61affe9ce9559571d23dd13acd4033 Mon Sep 17 00:00:00 2001 From: skykelsey Date: Wed, 20 Jul 2016 09:43:53 -0700 Subject: [PATCH 2/5] Add proguard rule to prevent obfuscating `android.support.v4.app.FragmentManagerImpl`, which we load via reflection in a workaround for a bug in the support library. --- apptentive/consumer-proguard-rules.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apptentive/consumer-proguard-rules.pro b/apptentive/consumer-proguard-rules.pro index ce3862f2b..7151c7035 100644 --- a/apptentive/consumer-proguard-rules.pro +++ b/apptentive/consumer-proguard-rules.pro @@ -7,4 +7,5 @@ -dontwarn com.apptentive.android.sdk.** -keepattributes SourceFile,LineNumberTable --keep class com.apptentive.android.sdk.** { *; } \ No newline at end of file +-keep class com.apptentive.android.sdk.** { *; } +-keep class android.support.v4.app.FragmentManagerImpl { *; } \ No newline at end of file From dbd241e9c5e5be9d588de64115c074388209f125 Mon Sep 17 00:00:00 2001 From: skykelsey Date: Tue, 26 Jul 2016 10:48:45 -0700 Subject: [PATCH 3/5] Update `.gitignore` and check in `runConfigurations.xml` --- .gitignore | 1 + .idea/runConfigurations.xml | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 .idea/runConfigurations.xml diff --git a/.gitignore b/.gitignore index fc3ddfb77..e013e50af 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ build/ .idea/vcs.xml .idea/workspace.xml .idea/libraries +projectFilesBackup/ # Eclipse .settings diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 000000000..7f68460d8 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file From b04ea6e28cf36f770cb7029f1393521e6ac53a7d Mon Sep 17 00:00:00 2001 From: skykelsey Date: Wed, 3 Aug 2016 16:08:54 -0700 Subject: [PATCH 4/5] Bump to 3.2.1 --- .../main/java/com/apptentive/android/sdk/util/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apptentive/src/main/java/com/apptentive/android/sdk/util/Constants.java b/apptentive/src/main/java/com/apptentive/android/sdk/util/Constants.java index 4b00dbe46..4aa294f9e 100644 --- a/apptentive/src/main/java/com/apptentive/android/sdk/util/Constants.java +++ b/apptentive/src/main/java/com/apptentive/android/sdk/util/Constants.java @@ -8,7 +8,7 @@ public class Constants { - public static final String APPTENTIVE_SDK_VERSION = "3.2.0"; + public static final String APPTENTIVE_SDK_VERSION = "3.2.1"; public static final int REQUEST_CODE_PHOTO_FROM_SYSTEM_PICKER = 10; From 7b6b03cc827c222424a00df0622ceec7323db9c3 Mon Sep 17 00:00:00 2001 From: skykelsey Date: Tue, 9 Aug 2016 10:38:44 -0700 Subject: [PATCH 5/5] Check in docs changes for 3.2.1 --- CHANGELOG.md | 8 ++++++++ README.md | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98df5fa0a..f8719e3dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 2016-08-09 - 3.2.1 + +#### Bugs Fixed + +* Add proguard rule to prevent obfuscating `android.support.v4.app.FragmentManagerImpl`, which we load via reflection in a workaround for a bug in the support library. +* Prevent NPE when animation runs after object is nulled. +* Fix a bug that sometimes prevented the Message Center Composing view from gaining focus on user touch. + # 2016-07-13 - 3.2.0 #### Improvements diff --git a/README.md b/README.md index b7156a53c..3c908cd5a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ use your app, to talk to them at the right time, and in the right way. ##### Version history is tracked [here](CHANGELOG.md) -##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|3.2.0|aar) +##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|3.2.1|aar) #### Reporting Bugs We encourage you to help us find and fix bugs. If you find a bug, please fill in the contributor agreement, then open a [github issue](https://github.com/apptentive/apptentive-android/issues?direction=desc&sort=created&state=open).