Merge pull request #465 from Microsoft/develop

v0.10.0

Author: guperrot

apps/sasquatch/src/main/AndroidManifest.xml

@@ -11,7 +11,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-        <activity android:name=".activities.MainActivity">
+        <activity
+            android:name=".activities.MainActivity"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -41,7 +43,9 @@
         <activity
             android:name=".activities.ManagedErrorActivity"
             android:label="@string/title_error"/>
-        <activity android:name=".activities.CustomPropertiesActivity"></activity>
+        <activity
+            android:name=".activities.CustomPropertiesActivity"
+            android:label="@string/title_custom_properties"/>
     </application>
 
 </manifest>

apps/sasquatch/src/main/java/com/microsoft/azure/mobile/sasquatch/activities/MainActivity.java

@@ -2,14 +2,18 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.test.espresso.idling.CountingIdlingResource;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
@@ -26,7 +30,9 @@
 import com.microsoft.azure.mobile.analytics.channel.AnalyticsListener;
 import com.microsoft.azure.mobile.analytics.ingestion.models.EventLog;
 import com.microsoft.azure.mobile.analytics.ingestion.models.PageLog;
+import com.microsoft.azure.mobile.crashes.AbstractCrashesListener;
 import com.microsoft.azure.mobile.crashes.Crashes;
+import com.microsoft.azure.mobile.crashes.ingestion.models.ErrorAttachmentLog;
 import com.microsoft.azure.mobile.crashes.model.ErrorReport;
 import com.microsoft.azure.mobile.distribute.Distribute;
 import com.microsoft.azure.mobile.ingestion.models.LogWithProperties;
@@ -37,11 +43,12 @@
 import com.microsoft.azure.mobile.sasquatch.SasquatchDistributeListener;
 import com.microsoft.azure.mobile.sasquatch.features.TestFeatures;
 import com.microsoft.azure.mobile.sasquatch.features.TestFeaturesListAdapter;
-import com.microsoft.azure.mobile.sasquatch.utils.SasquatchCrashesListener;
 import com.microsoft.azure.mobile.utils.MobileCenterLog;
 
 import org.json.JSONObject;
 
+import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
 import java.util.Map;
 
 
@@ -74,7 +81,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         /* Set listeners. */
         AnalyticsPrivateHelper.setListener(getAnalyticsListener());
-        Crashes.setListener(new SasquatchCrashesListener(this));
+        Crashes.setListener(getCrashesListener());
         Distribute.setListener(new SasquatchDistributeListener());
         Push.setListener(getPushListener());
 
@@ -132,6 +139,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return true;
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        try {
+            Push.class.getMethod("checkLaunchedFromNotification", Activity.class, Intent.class).invoke(null, this, intent);
+        } catch (Exception ignored) {
+        }
+    }
+
     private AnalyticsListener getAnalyticsListener() {
         return new AnalyticsListener() {
 
@@ -179,6 +195,79 @@ public void onSendingSucceeded(com.microsoft.azure.mobile.ingestion.models.Log l
         };
     }
 
+    @NonNull
+    private AbstractCrashesListener getCrashesListener() {
+        return new AbstractCrashesListener() {
+
+            @Override
+            public boolean shouldAwaitUserConfirmation() {
+                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+                builder
+                        .setTitle(R.string.crash_confirmation_dialog_title)
+                        .setMessage(R.string.crash_confirmation_dialog_message)
+                        .setPositiveButton(R.string.crash_confirmation_dialog_send_button, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Crashes.notifyUserConfirmation(Crashes.SEND);
+                            }
+                        })
+                        .setNegativeButton(R.string.crash_confirmation_dialog_not_send_button, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Crashes.notifyUserConfirmation(Crashes.DONT_SEND);
+                            }
+                        })
+                        .setNeutralButton(R.string.crash_confirmation_dialog_always_send_button, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                Crashes.notifyUserConfirmation(Crashes.ALWAYS_SEND);
+                            }
+                        });
+                builder.create().show();
+                return true;
+            }
+
+            @Override
+            public Iterable<ErrorAttachmentLog> getErrorAttachments(ErrorReport report) {
+
+                /* Attach some text. */
+                ErrorAttachmentLog textLog = ErrorAttachmentLog.attachmentWithText("This is a text attachment.", "text.txt");
+
+                /* Attach app icon to test binary. */
+                Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
+                ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                bitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);
+                byte[] bitMapData = stream.toByteArray();
+                ErrorAttachmentLog binaryLog = ErrorAttachmentLog.attachmentWithBinary(bitMapData, "icon.jpeg", "image/jpeg");
+
+                /* Return attachments as list. */
+                return Arrays.asList(textLog, binaryLog);
+            }
+
+            @Override
+            public void onBeforeSending(ErrorReport report) {
+                Toast.makeText(MainActivity.this, R.string.crash_before_sending, Toast.LENGTH_SHORT).show();
+                crashesIdlingResource.increment();
+            }
+
+            @Override
+            public void onSendingFailed(ErrorReport report, Exception e) {
+                Toast.makeText(MainActivity.this, R.string.crash_sent_failed, Toast.LENGTH_SHORT).show();
+                crashesIdlingResource.decrement();
+            }
+
+            @Override
+            public void onSendingSucceeded(ErrorReport report) {
+                String message = String.format("%s\nCrash ID: %s", getString(R.string.crash_sent_succeeded), report.getId());
+                if (report.getThrowable() != null) {
+                    message += String.format("\nThrowable: %s", report.getThrowable().toString());
+                }
+                Toast.makeText(MainActivity.this, message, Toast.LENGTH_SHORT).show();
+                crashesIdlingResource.decrement();
+            }
+        };
+    }
+
     @NonNull
     private PushListener getPushListener() {
         return new PushListener() {

apps/sasquatch/src/main/java/com/microsoft/azure/mobile/sasquatch/utils/SasquatchCrashesListener.java

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.google.gms:google-services:3.0.0'

build.gradle

@@ -1,4 +1,4 @@
-#Wed May 17 17:09:08 PDT 2017
+#Fri Jun 09 15:55:05 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.jar

@@ -1,10 +1,11 @@
 package com.microsoft.azure.mobile.analytics;
 
 import android.annotation.SuppressLint;
+import android.app.Application;
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 
-import com.microsoft.azure.mobile.Constants;
+import com.microsoft.azure.mobile.MobileCenter;
 import com.microsoft.azure.mobile.analytics.channel.AnalyticsListener;
 import com.microsoft.azure.mobile.analytics.ingestion.models.EventLog;
 import com.microsoft.azure.mobile.channel.Channel;
@@ -41,8 +42,7 @@ public class AnalyticsAndroidTest {
     public static void setUpClass() {
         MobileCenterLog.setLogLevel(android.util.Log.VERBOSE);
         sContext = InstrumentationRegistry.getContext();
-        Constants.loadFromContext(sContext);
-        StorageHelper.initialize(sContext);
+        MobileCenter.configure((Application) sContext.getApplicationContext(), "dummy");
     }
 
     @Before
@@ -54,7 +54,6 @@ public void cleanup() {
 
     @Test
     public void testAnalyticsListener() {
-
         AnalyticsListener analyticsListener = mock(AnalyticsListener.class);
         Analytics.setListener(analyticsListener);
         Channel channel = mock(Channel.class);

gradle/wrapper/gradle-wrapper.properties

@@ -7,6 +7,7 @@
 import com.microsoft.azure.mobile.analytics.ingestion.models.StartSessionLog;
 import com.microsoft.azure.mobile.channel.Channel;
 import com.microsoft.azure.mobile.ingestion.models.Log;
+import com.microsoft.azure.mobile.ingestion.models.StartServiceLog;
 import com.microsoft.azure.mobile.utils.MobileCenterLog;
 import com.microsoft.azure.mobile.utils.UUIDUtils;
 import com.microsoft.azure.mobile.utils.storage.StorageHelper;
@@ -110,9 +111,13 @@ public SessionTracker(Channel channel, String groupName) {
     @Override
     public synchronized void onEnqueuingLog(@NonNull Log log, @NonNull String groupName) {
 
-        /* Since we enqueue start session logs, skip them to avoid infinite loop. */
-        if (log instanceof StartSessionLog)
+        /*
+         * Since we enqueue start session logs, skip them to avoid infinite loop.
+         * Also skip start service log as it's always sent and should not trigger a session.
+         */
+        if (log instanceof StartSessionLog || log instanceof StartServiceLog) {
             return;
+        }
 
         /*
          * If the log has already specified a timestamp, try correlating with a past session.
@@ -143,7 +148,7 @@ public synchronized void onEnqueuingLog(@NonNull Log log, @NonNull String groupN
      * Generate a new session identifier if the first time or
      * we went in background for more X seconds or
      * if enough time has elapsed since the last background usage of the API.
-     *
+     * <p>
      * Indeed the API can be used for events or crashes only for example, we need to renew
      * 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).
@@ -167,6 +172,12 @@ private void sendStartSessionIfNeeded() {
                 sessionStorage.add(session.getKey() + STORAGE_KEY_VALUE_SEPARATOR + session.getValue());
             StorageHelper.PreferencesStorage.putStringSet(STORAGE_KEY, sessionStorage);
 
+            /*
+             * Record queued time for the session log itself to avoid double log if resuming
+             * from background after timeout and sending a log at same time we resume like a page.
+             */
+            mLastQueuedLogTime = SystemClock.elapsedRealtime();
+
             /* Enqueue a start session log. */
             StartSessionLog startSessionLog = new StartSessionLog();
             startSessionLog.setSid(mSid);