Merge pull request #3172 from nextcloud/backport-3114

Backport #3114: create a task for each button
nextcloud · Oct 24, 2018 · c7e072c · c7e072c
2 parents bd5942a + 8b172b8
commit c7e072c
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java
@@ -136,18 +136,23 @@ public void onBindViewHolder(@NonNull NotificationViewHolder holder, int positio
         // add action buttons
         holder.buttons.removeAllViews();
         Button button;
-        ExecuteActionTask executeActionTask = new ExecuteActionTask(holder);
+
 
         for (Action action : notification.getActions()) {
             button = new Button(notificationsActivity);
             button.setText(action.label);
+
             if (action.primary) {
                 button.getBackground().setColorFilter(ThemeUtils.primaryColor(notificationsActivity, true),
                         PorterDuff.Mode.SRC_ATOP);
                 button.setTextColor(ThemeUtils.fontColor(notificationsActivity));
             }
 
-            button.setOnClickListener(v -> executeActionTask.execute(action));
+            button.setOnClickListener(v -> {
+                setButtonEnabled(holder, false);
+
+                new ExecuteActionTask(holder).execute(action);
+            });
 
             holder.buttons.addView(button);
         }
@@ -222,7 +227,7 @@ protected Boolean doInBackground(Action... actions) {
                 return false;
             }
 
-            return status == HttpStatus.SC_OK;
+            return status == HttpStatus.SC_OK || status == HttpStatus.SC_ACCEPTED;
         }
 
         @Override
@@ -232,11 +237,18 @@ protected void onPostExecute(Boolean success) {
                 notificationsList.remove(position);
                 notifyItemRemoved(position);
             } else {
+                setButtonEnabled(holder, true);
                 DisplayUtils.showSnackMessage(notificationsActivity, "Failed to execute action!");
             }
         }
     }
 
+    private void setButtonEnabled(NotificationViewHolder holder, boolean enabled) {
+        for (int i = 0; i < holder.buttons.getChildCount(); i++) {
+            holder.buttons.getChildAt(i).setEnabled(enabled);
+        }
+    }
+
     private void downloadIcon(String icon, ImageView itemViewType) {
         GenericRequestBuilder<Uri, InputStream, SVG, PictureDrawable> requestBuilder = Glide.with(notificationsActivity)
                 .using(Glide.buildStreamModelLoader(Uri.class, notificationsActivity), InputStream.class)