Merge branch 'release/5.9' into develop

2 files changed, 12 insertions, 23 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
index 288ad522f..06ee0e38f 100644
--- a/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
+++ b/WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
@@ -76,7 +76,7 @@ public class GCMMessageService extends GcmListenerService {
 
     private void synchronizedHandleDefaultPush(String from, @NonNull Bundle data) {
         // sActiveNotificationsMap being static, we can't just synchronize the method
-        synchronized (sActiveNotificationsMap) {
+        synchronized (GCMMessageService.class) {
             handleDefaultPush(from, data);
         }
     }
@@ -407,7 +407,9 @@ public class GCMMessageService extends GcmListenerService {
 
                 String noteType = StringUtils.notNullStr(remainingNote.getString(PUSH_ARG_TYPE));
                 String noteId = remainingNote.getString(PUSH_ARG_NOTE_ID, "");
-                showIndividualNotificationForBuilder(builder, noteType, noteId, sActiveNotificationsMap.keyAt(0));
+                if (!sActiveNotificationsMap.isEmpty()) {
+                    showIndividualNotificationForBuilder(builder, noteType, noteId, sActiveNotificationsMap.keyAt(0));
+                }
             }
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index 276383909..e670d7cd7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -1439,34 +1439,21 @@ public class EditPostActivity extends AppCompatActivity implements EditorFragmen
      * Media
      */
 
-    private void fetchMedia(final List<Uri> mediaUris) {
-        new AsyncTask<List<Uri>, Boolean, Void>() {
-            @Override
-            protected Void doInBackground(List<Uri>... lists) {
-                for (Uri mediaUri : mediaUris) {
-                    if (mediaUri == null) {
-                        publishProgress(false);
-                        continue;
-                    }
-
-                    if (!addMedia(mediaUri)) {
-                        publishProgress(false);
-                    }
-                }
-
-                return null;
+    private void fetchMedia(List<Uri> mediaUris) {
+        for (Uri mediaUri : mediaUris) {
+            if (mediaUri == null) {
+                Toast.makeText(EditPostActivity.this,
+                        getResources().getText(R.string.gallery_error), Toast.LENGTH_SHORT).show();
+                continue;
             }
 
-            @Override
-            protected void onProgressUpdate(Boolean... values) {
-                // use onProgressUpdate to Toast on error
+            if (!addMedia(mediaUri)) {
                 Toast.makeText(EditPostActivity.this, getResources().getText(R.string.gallery_error),
                         Toast.LENGTH_SHORT).show();
             }
-        }.execute(mediaUris);
+        }
     }
 
-
     private void updateMediaFileOnServer(WPImageSpan wpIS) {
         Blog currentBlog = WordPress.getCurrentBlog();
         if (currentBlog == null || wpIS == null)