Merge pull request #1424 from microsoft/develop

Version 3.2.2

Author: zhangcc01

.github/workflows/codeql.yml

@@ -0,0 +1,44 @@
+name: "Code Scanning - Action"
+
+on:
+  push:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  CodeQL-Build:
+
+    strategy:
+      fail-fast: false
+
+
+    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      with:
+        languages: java
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+    - run: |
+        echo "Downloading submodules"
+        git submodule update --init --recursive
+        
+    - run: |
+        echo "Assemble modules"
+        ./gradlew :sdk:appcenter:assemble :sdk:appcenter-analytics:assemble :sdk:appcenter-crashes:assemble :sdk:appcenter-distribute:assemble :sdk:appcenter-push:assemble 
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CHANGELOG.md

@@ -1,5 +1,13 @@
 # App Center SDK for Android Change Log
 
+## Version 3.2.2
+
+### App Center
+
+* **[Fix]** Fix possible delays in UI thread when queueing a large number of events.
+
+___
+
 ## Version 3.2.1
 
 ### App Center Distribute

sdk/appcenter-analytics/src/main/java/com/microsoft/appcenter/analytics/Analytics.java

@@ -319,7 +319,7 @@ protected static void trackPage(String name, Map<String, String> properties) {
      * Additional validation rules apply depending on the configured secret.
      * <p>
      * For App Center, the name cannot be longer than 256 and is truncated otherwise.
-     * For One Collector, the name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.
+     * For One Collector, the name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.
      *
      * @param name An event name.
      */
@@ -346,8 +346,8 @@ public static void trackEvent(String name) {
      * <p>
      * For One Collector:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -377,8 +377,8 @@ public static void trackEvent(String name, Map<String, String> properties) {
      * <p>
      * For One Collector:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -415,8 +415,8 @@ public static void trackEvent(String name, Map<String, String> properties, int f
      * <p>
      * For One Collector:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -448,8 +448,8 @@ public static void trackEvent(String name, EventProperties properties) {
      * <p>
      * For One Collector:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -632,6 +632,7 @@ protected long getTriggerInterval() {
      *
      * @param activity current activity.
      */
+    @WorkerThread
     private void processOnResume(Activity activity) {
         if (mSessionTracker != null) {
             mSessionTracker.onActivityResumed();

sdk/appcenter-analytics/src/main/java/com/microsoft/appcenter/analytics/AnalyticsTransmissionTarget.java

@@ -154,7 +154,7 @@ private static void updateProvider(AuthenticationProvider authenticationProvider
      * Track a custom event with name.
      * <p>
      * The name cannot be null and needs to match the
-     * <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.
+     * <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.
      *
      * @param name An event name.
      */
@@ -167,9 +167,9 @@ public void trackEvent(String name) {
      * <p>
      * The following rules apply:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
      * <li>The property names or values cannot be null.</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -185,9 +185,9 @@ public void trackEvent(String name, Map<String, String> properties) {
      * <p>
      * The following rules apply:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
      * <li>The property names or values cannot be null.</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -215,10 +215,10 @@ public void trackEvent(String name, Map<String, String> properties, int flags) {
      * <p>
      * The following rules apply:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
      * <li>The property names or values cannot be null.</li>
      * <li>Double values must be finite (NaN or Infinite values are discarded).</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *
@@ -234,10 +234,10 @@ public void trackEvent(String name, EventProperties properties) {
      * <p>
      * The following rules apply:
      * <ul>
-     * <li>The event name needs to match the <tt>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</tt> regular expression.</li>
+     * <li>The event name needs to match the <code>[a-zA-Z0-9]((\.(?!(\.|$)))|[_a-zA-Z0-9]){3,99}</code> regular expression.</li>
      * <li>The property names or values cannot be null.</li>
      * <li>Double values must be finite (NaN or Infinite values are discarded).</li>
-     * <li>The <tt>baseData</tt> and <tt>baseDataType</tt> properties are reserved and thus discarded.</li>
+     * <li>The <code>baseData</code> and <code>baseDataType</code> properties are reserved and thus discarded.</li>
      * <li>The full event size when encoded as a JSON string cannot be larger than 1.9MB.</li>
      * </ul>
      *

sdk/appcenter-analytics/src/main/java/com/microsoft/appcenter/analytics/channel/SessionTracker.java

@@ -7,6 +7,7 @@
 
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
+import android.support.annotation.WorkerThread;
 
 import com.microsoft.appcenter.Flags;
 import com.microsoft.appcenter.analytics.Analytics;
@@ -118,6 +119,7 @@ public void onPreparingLog(@NonNull Log log, @NonNull String groupName) {
      * the session even when no pages are triggered but at the same time we want to keep using
      * the same session as long as the current activity is not paused (long video for example).
      */
+    @WorkerThread
     private void sendStartSessionIfNeeded() {
         if (mSid == null || hasSessionTimedOut()) {
 
@@ -143,6 +145,7 @@ private void sendStartSessionIfNeeded() {
     /**
      * Call this whenever an activity is resumed to update session tracker state.
      */
+    @WorkerThread
     public void onActivityResumed() {
 
         /* Record resume time for session timeout management. */
@@ -154,6 +157,7 @@ public void onActivityResumed() {
     /**
      * Call this whenever an activity is paused to update session tracker state.
      */
+    @WorkerThread
     public void onActivityPaused() {
 
         /* Record pause time for session timeout management. */

sdk/appcenter-distribute/src/main/java/com/microsoft/appcenter/distribute/Distribute.java

@@ -1128,20 +1128,12 @@ public void onBeforeCalling(URL url, Map<String, String> headers) {
 
             @Override
             public void onCallSucceeded(final HttpResponse httpResponse) {
-
-                /* onPostExecute is not always called on UI thread due to an old Android bug. */
-                HandlerUtils.runOnUiThread(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        try {
-                            String payload = httpResponse.getPayload();
-                            handleApiCallSuccess(releaseCallId, payload, ReleaseDetails.parse(payload), distributionGroupId);
-                        } catch (JSONException e) {
-                            onCallFailed(e);
-                        }
-                    }
-                });
+                try {
+                    String payload = httpResponse.getPayload();
+                    handleApiCallSuccess(releaseCallId, payload, ReleaseDetails.parse(payload), distributionGroupId);
+                } catch (JSONException e) {
+                    onCallFailed(e);
+                }
             }
 
             @Override

sdk/appcenter/src/main/java/com/microsoft/appcenter/AbstractAppCenterService.java

@@ -9,6 +9,7 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.annotation.WorkerThread;
 
 import com.microsoft.appcenter.channel.Channel;
 import com.microsoft.appcenter.ingestion.models.json.LogFactory;
@@ -136,6 +137,7 @@ public synchronized boolean isInstanceEnabled() {
         return SharedPreferencesManager.getBoolean(getEnabledPreferenceKey(), true);
     }
 
+    @WorkerThread
     @Override
     public synchronized void setInstanceEnabled(boolean enabled) {
 
@@ -173,6 +175,7 @@ public synchronized void setInstanceEnabled(boolean enabled) {
         }
     }
 
+    @WorkerThread
     protected synchronized void applyEnabledState(boolean enabled) {
 
         /* Optional callback to react to enabled state change. */
@@ -193,6 +196,7 @@ public final synchronized void onStarting(@NonNull AppCenterHandler handler) {
         mHandler = handler;
     }
 
+    @WorkerThread
     @Override
     public synchronized void onStarted(@NonNull Context context, @NonNull Channel channel, String appSecret, String transmissionTargetToken, boolean startedFromApp) {
         String groupName = getGroupName();

sdk/appcenter/src/main/java/com/microsoft/appcenter/AppCenter.java

@@ -840,6 +840,7 @@ private void finishConfiguration(boolean configureFromApp) {
         AppCenterLog.debug(LOG_TAG, "App Center initialized.");
     }
 
+    @WorkerThread
     private void applyStorageMaxSize() {
         boolean resizeResult = mChannel.setMaxStorageSize(mMaxStorageSizeInBytes);
         if (mSetMaxStorageSizeFuture != null) {