Merge pull request #1460 from microsoft/develop

Version 3.3.1

Author: zhangcc01

.gitignore

@@ -29,6 +29,9 @@ proguard/
 # Log Files
 *.log
 
+# NDK temp files
+.cxx/
+
 # Android Studio Navigation editor temp files
 .navigation/
 

CHANGELOG.md

@@ -1,16 +1,27 @@
 # App Center SDK for Android Change Log
 
+## Version 3.3.1
+
+### App Center Crashes
+
+* **[Fix]** Fix sending attachments with a `null` text value.
+
+___
+
 ## Version 3.3.0
 
 ### App Center
 
 * **[Fix]** Fix an `IncorrectContextUseViolation` warning when calculating screen size on Android 11.
 * **[Fix]** All SQL commands used in SDK are presented as raw strings to avoid any possible static analyzer's SQL injection false alarms.
+
+### App Center Distribute
+
 * **[Fix]** Fix Distribute can't get updates for Realme devices which use Realme UI.
 
 ### App Center Distribute Play
 
-App Center Distribute Play is a package with stubbed APIs for Distribute module to avoid Google Play flagging the application for malicious behavior. It must be used only for build variants which are going to be published on Google Play. See the [public documentation](https://docs.microsoft.com/en-us/appcenter/sdk/distribute/android) for more details about this change.
+App Center Distribute Play is a package with stubbed APIs for Distribute module to avoid Google Play flagging the application for malicious behavior. It must be used only for build variants which are going to be published on Google Play. See the [public documentation](https://docs.microsoft.com/en-us/appcenter/sdk/distribute/android#remove-in-app-updates-for-google-play-builds) for more details about this change.
 
 ___
 

README.md

@@ -14,11 +14,17 @@ The App Center SDK uses a modular architecture so you can use any or all of the
 
 2. **App Center Crashes**: App Center Crashes will automatically generate a crash log every time your app crashes. The log is first written to the device's storage and when the user starts the app again, the crash report will be sent to App Center. Collecting crashes works for both beta and live apps, i.e. those submitted to the App Store. Crash logs contain valuable information for you to help fix the crash.
 
-3. **App Center Distribute**: App Center Distribute will let your users install a new version of the app when you distribute it via the App Center. With a new version of the app available, the SDK will present an update dialog to the users to either download or postpone the new version. Once they choose to update, the SDK will start to update your application. This feature will NOT work if your app is deployed to the app store.
+3. **App Center Distribute**: App Center Distribute will let your users install a new version of the app when you distribute it via the App Center. With a new version of the app available, the SDK will present an update dialog to the users to either download or postpone the new version. Once they choose to update, the SDK will start to update your application.
 
-4. **App Center Push**: App Center Push enables you to send push notifications to users of your app from the App Center portal. To do that, the App Center SDK and portal integrate with [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/). You can also segment your user base based on a set of properties and send them targeted notifications.
+    > **Google Play considers the in-app update code as malicious behavior even if it isn’t used at runtime. Please use App Center Distribute Play instead before submitting your app to Google Play. Failure to not remove the in-app update code can lead to noncompliance and removal of the app from Google Play.**
+    > See [Remove in-app updates for Google Play builds](https://docs.microsoft.com/en-us/appcenter/sdk/distribute/android#remove-in-app-updates-for-google-play-builds) documentation for details.
+
+4. **App Center Distribute Play**: App Center Distribute Play is stubbing the Distribute package's APIs to avoid Google Play rejecting the application for malicious behavior. It must be used only for build variants which are going to be published on Google Play.
+
+5. **App Center Push**: App Center Push enables you to send push notifications to users of your app from the App Center portal. To do that, the App Center SDK and portal integrate with [Firebase Cloud Messaging](https://firebase.google.com/docs/cloud-messaging/). You can also segment your user base based on a set of properties and send them targeted notifications.
 
 ## 1. Get started
+
 It is super easy to use App Center. Have a look at our [get started documentation](https://docs.microsoft.com/en-us/appcenter/sdk/getting-started/android) and onboard your app within minutes. Our [detailed documentation](https://docs.microsoft.com/en-us/appcenter/sdk/) is available as well.
 
 ## 2. Contributing
@@ -40,4 +46,5 @@ You must sign a [Contributor License Agreement](https://cla.microsoft.com/) befo
 App Center SDK support is provided directly within the App Center portal. Any time you need help, just log in to [App Center](https://appcenter.ms), then click the blue chat button in the lower-right corner of any page and our dedicated support team will respond to your questions and feedback. For additional information, see the [App Center Help Center](https://intercom.help/appcenter/getting-started/welcome-to-app-center-support).
 
 ### 3.2 Twitter
+
 We're on Twitter as [@vsappcenter](https://www.twitter.com/vsappcenter).

apps/appcenter-post-clone.sh

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 echo "Executing post clone script in `pwd`"
 echo "dimension.dependency=$DIMENSION_DEPENDENCY" >> $APPCENTER_SOURCE_DIRECTORY/local.properties
+../scripts/set-ndk-version.sh

build.gradle

@@ -18,7 +18,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

gradle/wrapper/gradle-wrapper.properties

@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

scripts/set-ndk-version.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+PROJECT_DIR="$(dirname "$0")/.."
+PROPERTY_FILE="$ANDROID_HOME/ndk-bundle/source.properties"
+
+echo "Reading ndk version from source.properties file..."
+VERSION=$(cat $PROPERTY_FILE | sed 's/ //g' | grep "Pkg.Revision" | cut -d'=' -f2)
+echo $VERSION
+GRADLE_FILE="$PROJECT_DIR/apps/sasquatch/build.gradle"
+
+if [ -z $VERSION ]; then
+  echo "No NDK found in the default location. Proceeding..."
+else
+
+  # Insert ndkVersion = 'x.x.x' in the android section.
+  NDK_VERSION_LINE="ndkVersion = '$VERSION'"
+  echo "$(sed "s/android {/android {\\`echo -e '\n\r    '`$NDK_VERSION_LINE/g" "$GRADLE_FILE")" > $GRADLE_FILE
+fi

sdk/appcenter-crashes/src/main/java/com/microsoft/appcenter/crashes/ingestion/models/ErrorAttachmentLog.java

@@ -79,6 +79,9 @@ public class ErrorAttachmentLog extends AbstractLog {
      * @return ErrorAttachmentLog built attachment.
      */
     public static ErrorAttachmentLog attachmentWithText(String text, String fileName) {
+        if (text == null) {
+            text = "";
+        }
         return attachmentWithBinary(text.getBytes(CHARSET), fileName, CONTENT_TYPE_TEXT_PLAIN);
     }
 

sdk/appcenter-crashes/src/test/java/com/microsoft/appcenter/crashes/ingestion/models/ErrorAttachmentLogTest.java

@@ -30,6 +30,17 @@ public void attachmentWithText() {
         assertEquals(ErrorAttachmentLog.CONTENT_TYPE_TEXT_PLAIN, attachment.getContentType());
     }
 
+    @Test
+    public void attachmentWithNullText() {
+        String text = null;
+        String fileName = "1";
+        ErrorAttachmentLog attachment = ErrorAttachmentLog.attachmentWithText(text, fileName);
+        assertNotNull(attachment);
+        assertEquals("", new String(attachment.getData(), CHARSET));
+        assertEquals(fileName, attachment.getFileName());
+        assertEquals(ErrorAttachmentLog.CONTENT_TYPE_TEXT_PLAIN, attachment.getContentType());
+    }
+
     @Test
     public void attachmentWithBinary() {
         byte[] data = "Hello Binary!".getBytes();

versions.gradle

@@ -6,10 +6,10 @@
 // Version constants
 
 ext {
-    versionCode = 58
-    versionName = '3.3.0'
+    versionCode = 59
+    versionName = '3.3.1'
     minSdkVersion = 16
-    targetSdkVersion = 29
-    compileSdkVersion = 29
+    targetSdkVersion = 30
+    compileSdkVersion = 30
     supportLibVersion = '28.0.0'
 }