Merge remote-tracking branch 'origin/master'

4 files changed, 20 insertions, 5 deletions

diff --git a/README.md b/README.md
index bd847f5bf..4967d8f53 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,9 @@ An Android client for [Nextcloud Deck App](https://github.com/nextcloud/deck/).
 [<img src="https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/master/paypal-donate-button.png"
       alt="Donate with PayPal"
       height="80">](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=W523CNHTD7ARQ&source=url)
-[![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/stefan-niedermann/donate)
+[<img src="https://raw.githubusercontent.com/stefan-niedermann/DonateButtons/master/LiberaPay.png"
+      alt="Donate using Liberapay"
+      height="80">](https://liberapay.com/stefan-niedermann/donate)
 
 ## 👀 Screenshots
 
diff --git a/app/build.gradle b/app/build.gradle
index c93998f1a..b23b1dd8a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,11 +60,11 @@ dependencies {
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.work:work-runtime:2.2.0'
+    implementation 'androidx.work:work-runtime:2.3.0'
 
 
     // Flexbox
-    implementation 'com.google.android:flexbox:2.0.0'
+    implementation 'com.google.android:flexbox:2.0.1'
 
     // Tab-Layout-Helper
     implementation 'com.h6ah4i.android.tablayouthelper:tablayouthelper:1.0.0'
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index 68f595103..0a6002731 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -139,7 +139,14 @@ public class SyncManager {
                             responseCallback.onError(throwable);
                         }
                     });
-                    doAsync(() -> syncHelper.doUpSyncFor(new BoardDataProvider()));
+                    doAsync(() -> {
+                        try {
+                            syncHelper.doUpSyncFor(new BoardDataProvider());
+                        } catch (Throwable e) {
+                            DeckLog.logError(e);
+                            responseCallback.onError(e);
+                        }
+                    });
 
                 }
 
@@ -152,7 +159,12 @@ public class SyncManager {
 
             syncHelper.setResponseCallback(callback);
 
-            syncHelper.doSyncFor(new BoardDataProvider());
+            try {
+                syncHelper.doSyncFor(new BoardDataProvider());
+            } catch (Throwable e) {
+                DeckLog.logError(e);
+                responseCallback.onError(e);
+            }
         });
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
index ce15cab01..c144aaf7d 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java
@@ -248,6 +248,7 @@ public class EditActivity extends AppCompatActivity implements
         if (canEdit) {
             if (createMode) {
                 title.requestFocus();
+                // TODO: https://github.com/stefan-niedermann/nextcloud-deck/issues/249 -> if editMode -> https://stackoverflow.com/questions/4804493/how-to-automatically-pop-up-keyboard
                 ((InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE)).toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
                 if (fullCard.getCard().getTitle() != null) {
                     title.setSelection(fullCard.getCard().getTitle().length());