Merge pull request #200 from Microsoft/develop

0.1.2 release merge

Author: jaeklim

.idea/shelf/sasquatch_release_patch.xml

@@ -73,16 +73,12 @@ Now that you've integrated the SDK in your application, it's time to start the S
 
 To start the Sonoma SDK in your app, follow these steps:
 
-1. **Get the App Secret of your application:** Before you call the API to start the SDK, you need to get your app specific Application Secret from the Sonoma portal that needs to be a part of the method call. This will make sure all the data collected by the SDK corresponds to your application.
-
-    Go over to the Sonoma portal, click on "Microsoft Azure Sonoma". Under "My apps", click on the app that you want the SDK to set up for. Then click on "Manage app" and make note of the "App Secret" value.
-
-2. **Start the SDK:**  Sonoma provides developers with two modules to get started – Analytics and Crashes. In order to use these modules, you need to opt in for the module(s) that you'd like, meaning by default no modules are started and you will have to explicitly call each of them when starting the SDK. Insert the following line inside your app's main activity class' `onCreate` callback.
+1. **Start the SDK:**  Sonoma provides developers with two modules to get started – Analytics and Crashes. In order to use these modules, you need to opt in for the module(s) that you'd like, meaning by default no modules are started and you will have to explicitly call each of them when starting the SDK. Insert the following line inside your app's main activity class' `onCreate` callback.
 
     ```Java
     Sonoma.start(getApplication(), "{Your App Secret}", Analytics.class, Crashes.class);
     ```
-    Make sure to replace {Your App Secret} text with the actual value for your application.
+    You can also copy paste the `start` method call from the Overview page on Sonoma portal once your app is selected. It already includes the App Secret so that all the data collected by the SDK corresponds to your application. Make sure to replace {Your App Secret} text with the actual value for your application.
     
     The example above shows how to use the `start()` method and include both the Analytics and Crashes module. If you wish not to use Analytics, remove the parameter from the method call above. Note that, unless you explicitly specify each module as parameters in the start method, you can't use that Sonoma service. Also, the `start()` API can be used only once in the lifecycle of your app – all other calls will log a warning to the console and only the modules included in the first call will be available.
 

.idea/shelf/sasquatch_release_patch/shelved.patch

@@ -19,8 +19,7 @@ repositories {
 }
 
 dependencies {
-    //noinspection GradleDynamicVersion
-    compile "com.microsoft.sonoma:analytics:+"
-    //noinspection GradleDynamicVersion
-    compile "com.microsoft.sonoma:crashes:+"
+    def version = "0.1.1"
+    compile "com.microsoft.sonoma:analytics:${version}"
+    compile "com.microsoft.sonoma:crashes:${version}"
 }

README.md

@@ -6,7 +6,6 @@
 
 import com.microsoft.sonoma.analytics.Analytics;
 import com.microsoft.sonoma.core.Sonoma;
-import com.microsoft.sonoma.core.utils.UUIDUtils;
 import com.microsoft.sonoma.crashes.Crashes;
 
 public class HelloWorldActivity extends Activity {
@@ -17,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         Sonoma.setLogLevel(Log.VERBOSE);
-        Sonoma.start(getApplication(), UUIDUtils.randomUUID().toString(), Analytics.class, Crashes.class);
+        Sonoma.start(getApplication(), "45d1d9f6-2492-4e68-bd44-7190351eb5f3", Analytics.class, Crashes.class);
     }
 
     @SuppressWarnings({"ConstantConditions", "ConstantIfStatement"})

apps/helloworld/build.gradle

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.microsoft.sonoma.sasquatch">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.microsoft.sonoma.sasquatch">
 
     <application
         android:allowBackup="true"
@@ -10,19 +10,31 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-        <activity android:name="com.microsoft.sonoma.sasquatch.activities.MainActivity">
+        <activity android:name=".activities.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name="com.microsoft.sonoma.sasquatch.activities.DeviceInfoActivity"/>
-        <activity android:name="com.microsoft.sonoma.sasquatch.activities.EventActivity"/>
-        <activity android:name="com.microsoft.sonoma.sasquatch.activities.PageActivity"/>
-        <activity android:name="com.microsoft.sonoma.sasquatch.activities.DummyActivity"/>
-        <activity android:name="com.microsoft.sonoma.sasquatch.activities.SettingsActivity"/>
+        <activity
+            android:name=".activities.DeviceInfoActivity"
+            android:label="@string/title_device_info" />
+        <activity
+            android:name=".activities.EventActivity"
+            android:label="@string/title_event" />
+        <activity
+            android:name=".activities.PageActivity"
+            android:label="@string/title_page" />
+        <activity
+            android:name=".activities.DummyActivity"
+            android:label="@string/title_generate_page_log" />
+        <activity
+            android:name=".activities.SettingsActivity"
+            android:label="@string/settings" />
+        <activity
+            android:name=".activities.ManagedErrorActivity"
+            android:label="@string/title_error" />
     </application>
 
 </manifest>

apps/helloworld/src/main/java/com/microsoft/sonoma/helloworld/HelloWorldActivity.java

@@ -0,0 +1,80 @@
+package com.microsoft.sonoma.sasquatch.activities;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.microsoft.sonoma.crashes.Crashes;
+import com.microsoft.sonoma.sasquatch.R;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ManagedErrorActivity extends AppCompatActivity {
+
+    private static final List<Class<? extends Throwable>> sSupportedThrowables = Arrays.asList(
+            ArithmeticException.class,
+            ArrayIndexOutOfBoundsException.class,
+            ArrayStoreException.class,
+            ClassCastException.class,
+            ClassNotFoundException.class,
+            CloneNotSupportedException.class,
+            IllegalAccessException.class,
+            IllegalArgumentException.class,
+            IllegalMonitorStateException.class,
+            IllegalStateException.class,
+            IllegalThreadStateException.class,
+            IndexOutOfBoundsException.class,
+            InstantiationException.class,
+            InterruptedException.class,
+            NegativeArraySizeException.class,
+            NoSuchFieldException.class,
+            NoSuchMethodException.class,
+            NullPointerException.class,
+            NumberFormatException.class,
+            SecurityException.class,
+            UnsupportedOperationException.class,
+            AssertionError.class,
+            LinkageError.class,
+            ThreadDeath.class,
+            VirtualMachineError.class);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_managed_error);
+
+        ListView listView = (ListView) findViewById(R.id.throwables_list_view);
+        listView.setAdapter(new ArrayAdapter<Class<? extends Throwable>>(this, android.R.layout.simple_list_item_1, sSupportedThrowables) {
+            @SuppressWarnings("ConstantConditions")
+            @NonNull
+            @Override
+            public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+                View view = super.getView(position, convertView, parent);
+                ((TextView) view.findViewById(android.R.id.text1)).setText(getItem(position).getSimpleName());
+                return view;
+            }
+        });
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                try {
+                    @SuppressWarnings("unchecked")
+                    Class<? extends Throwable> clazz = (Class<? extends Throwable>) parent.getItemAtPosition(position);
+                    Crashes.trackException(clazz.getConstructor(String.class).newInstance("Test Exception"));
+                } catch (Exception e) {
+
+                    /* This is not expected behavior so let the application crashes. */
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+    }
+}

apps/sasquatch/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
 import com.microsoft.sonoma.sasquatch.activities.DeviceInfoActivity;
 import com.microsoft.sonoma.sasquatch.activities.DummyActivity;
 import com.microsoft.sonoma.sasquatch.activities.EventActivity;
+import com.microsoft.sonoma.sasquatch.activities.ManagedErrorActivity;
 import com.microsoft.sonoma.sasquatch.activities.PageActivity;
 
 import java.lang.ref.WeakReference;
@@ -34,6 +35,7 @@ public void onClick(View v) {
             }
         }));
         sTestFeatureModel.add(new TestFeatureModel(R.string.title_device_info, R.string.description_device_info, DeviceInfoActivity.class));
+        sTestFeatureModel.add(new TestFeatureModel(R.string.title_error, R.string.description_error, ManagedErrorActivity.class));
         sTestFeatureModel.add(new TestFeatureModel(R.string.title_event, R.string.description_event, EventActivity.class));
         sTestFeatureModel.add(new TestFeatureModel(R.string.title_page, R.string.description_page, PageActivity.class));
         sTestFeatureModel.add(new TestFeatureModel(R.string.title_generate_page_log, R.string.description_generate_page_log, DummyActivity.class));

apps/sasquatch/src/main/java/com/microsoft/sonoma/sasquatch/activities/ManagedErrorActivity.java

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context=".activities.ManagedErrorActivity">
+
+    <ListView
+        android:id="@+id/throwables_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

apps/sasquatch/src/main/java/com/microsoft/sonoma/sasquatch/features/TestFeatures.java

@@ -9,6 +9,8 @@
     <string name="title_generate_page_log">Generate page logs</string>
     <string name="description_generate_page_log">Simulate page open and close 5 times</string>
     <string name="error_device_info">Couldn\'t retrieve device information</string>
+    <string name="title_error">Errors</string>
+    <string name="description_error">Send an exception</string>
     <string name="title_event">Events</string>
     <string name="description_event">Send a custom event</string>
     <string name="title_page">Pages</string>