diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java index 210bc6880..819d2a342 100644 --- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java @@ -168,6 +168,10 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi progressView.setVisibility(View.GONE); } + private boolean requestInProgress() { + return progressView.getVisibility() == View.VISIBLE; + } + @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); @@ -198,6 +202,10 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi } private void save() { + if (requestInProgress()) { + return; + } + String newName = getNewName(); if (isEmpty(newName)) { @@ -241,10 +249,17 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi } private void deleteTag() { + if (requestInProgress()) { + return; + } + dialogBuilder .newMessageDialog(R.string.delete_tag_confirmation, gtasksList.getTitle()) .setPositiveButton( - R.string.delete, (dialog, which) -> deleteListViewModel.deleteList(context, gtasksList)) + R.string.delete, (dialog, which) -> { + showProgressIndicator(); + deleteListViewModel.deleteList(context, gtasksList); + }) .setNegativeButton(android.R.string.cancel, null) .show(); } @@ -260,6 +275,10 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi } private void discard() { + if (requestInProgress()) { + return; + } + if (hasChanges()) { dialogBuilder .newMessageDialog(R.string.discard_changes) diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 6c7cb370b..72dd78264 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -232,10 +232,4 @@ 3 - - @color/priority_1 - @color/priority_2 - @color/priority_3 - @color/priority_4 - \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 82e9aac91..5e4d20735 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -152,7 +152,7 @@