Merge pull request #366 from apptentive/next

PR for 3.2.1

.gitignore

@@ -21,6 +21,7 @@ build/
 .idea/vcs.xml
 .idea/workspace.xml
 .idea/libraries
+projectFilesBackup/
 
 # Eclipse
 .settings

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

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).

apptentive/consumer-proguard-rules.pro

@@ -7,4 +7,5 @@
 
 -dontwarn com.apptentive.android.sdk.**
 -keepattributes SourceFile,LineNumberTable
--keep class com.apptentive.android.sdk.** { *; }
+-keep class com.apptentive.android.sdk.** { *; }
+-keep class android.support.v4.app.FragmentManagerImpl { *; }

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();
+								}
+							}
 						}
-					});
+					);
 				}
 			}
 		}

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;