Merge pull request #381 from Microsoft/develop

Release version 0.6.1

Author: guperrot

README.md

@@ -10,7 +10,7 @@
 
 The Microsoft Mobile Center Android SDK lets you add Mobile Center services to your Android application.
 
-The SDK is currently in private beta release and we support the following services:
+The SDK currently supports the following services:
 
 1. **Analytics**: Mobile Center Analytics helps you understand user behavior and customer engagement to improve your Android app. The SDK automatically captures session count and device properties like model, OS Version etc. You can define your own custom events to measure things that matter to your business. All the information captured is available in the Mobile Center portal for you to analyze the data.
 

sdk/mobile-center-distribute/src/main/java/com/microsoft/azure/mobile/distribute/CheckDownloadTask.java

@@ -8,8 +8,8 @@
 import android.os.AsyncTask;
 import android.os.Build;
 
+import com.microsoft.azure.mobile.utils.HandlerUtils;
 import com.microsoft.azure.mobile.utils.MobileCenterLog;
-import com.microsoft.azure.mobile.utils.storage.StorageHelper;
 
 import java.util.NoSuchElementException;
 
@@ -53,7 +53,7 @@ class CheckDownloadTask extends AsyncTask<Void, Void, DownloadProgress> {
      * @param releaseDetails release details.
      */
     CheckDownloadTask(Context context, long downloadId, boolean checkProgress, ReleaseDetails releaseDetails) {
-        mContext = context;
+        mContext = context.getApplicationContext();
         mDownloadId = downloadId;
         mCheckProgress = checkProgress;
         mReleaseDetails = releaseDetails;
@@ -76,10 +76,8 @@ protected DownloadProgress doInBackground(Void... params) {
          */
         MobileCenterLog.debug(LOG_TAG, "Check download id=" + mDownloadId);
         Distribute distribute = Distribute.getInstance();
-        if (!distribute.isStarted()) {
-            MobileCenterLog.debug(LOG_TAG, "Called before onStart, init storage");
-            StorageHelper.initialize(mContext);
-            mReleaseDetails = DistributeUtils.loadCachedReleaseDetails();
+        if (mReleaseDetails == null) {
+            mReleaseDetails = distribute.startFromBackground(mContext);
         }
 
         /* Check intent data is what we expected. */
@@ -105,11 +103,15 @@ protected DownloadProgress doInBackground(Void... params) {
                     throw new IllegalStateException();
                 }
                 if (status != DownloadManager.STATUS_SUCCESSFUL || mCheckProgress) {
-                    distribute.markDownloadStillInProgress(this);
-                    long totalSize = cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_TOTAL_SIZE_BYTES));
-                    long currentSize = cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR));
-                    MobileCenterLog.verbose(LOG_TAG, "currentSize=" + currentSize + " totalSize=" + totalSize);
-                    return new DownloadProgress(currentSize, totalSize);
+                    if (mCheckProgress) {
+                        long totalSize = cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_TOTAL_SIZE_BYTES));
+                        long currentSize = cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR));
+                        MobileCenterLog.verbose(LOG_TAG, "currentSize=" + currentSize + " totalSize=" + totalSize);
+                        return new DownloadProgress(currentSize, totalSize);
+                    } else {
+                        distribute.markDownloadStillInProgress(mReleaseDetails);
+                        return null;
+                    }
                 }
 
                 /* Build install intent. */
@@ -127,12 +129,12 @@ protected DownloadProgress doInBackground(Void... params) {
                 }
                 if (!installerFound) {
                     MobileCenterLog.error(LOG_TAG, "Installer not found");
-                    distribute.completeWorkflow(this);
+                    distribute.completeWorkflow(mReleaseDetails);
                     return null;
                 }
 
                 /* Check if a should install now. */
-                if (!distribute.notifyDownload(mContext, this, intent)) {
+                if (!distribute.notifyDownload(mReleaseDetails, intent)) {
 
                     /*
                      * This start call triggers strict mode in U.I. thread so it
@@ -146,34 +148,33 @@ protected DownloadProgress doInBackground(Void... params) {
                     MobileCenterLog.info(LOG_TAG, "Show install UI now.");
                     mContext.startActivity(intent);
                     if (mReleaseDetails != null && mReleaseDetails.isMandatoryUpdate()) {
-                        distribute.setInstalling(this);
+                        distribute.setInstalling(mReleaseDetails);
                     } else {
-                        distribute.completeWorkflow(this);
+                        distribute.completeWorkflow(mReleaseDetails);
                     }
                 }
             } finally {
                 cursor.close();
             }
         } catch (RuntimeException e) {
             MobileCenterLog.error(LOG_TAG, "Failed to download update id=" + mDownloadId);
-            distribute.completeWorkflow(this);
+            distribute.completeWorkflow(mReleaseDetails);
         }
         return null;
     }
 
     @Override
-    protected void onPostExecute(DownloadProgress result) {
+    protected void onPostExecute(final DownloadProgress result) {
         if (result != null) {
-            Distribute.getInstance().updateProgressDialog(this, result);
-        }
-    }
 
-    /**
-     * Get context.
-     *
-     * @return context.
-     */
-    Context getContext() {
-        return mContext;
+            /* onPostExecute is not always called on UI thread due to an old Android bug. */
+            HandlerUtils.runOnUiThread(new Runnable() {
+
+                @Override
+                public void run() {
+                    Distribute.getInstance().updateProgressDialog(mReleaseDetails, result);
+                }
+            });
+        }
     }
 }