[Libreoffice-commits] online.git: android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b10113158efc2f646cc4ef14e6cb94521746e749
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Mar 16 11:20:51 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Mon Mar 16 19:38:16 2020 +0100

    android: Dismiss the progress dialog on error too.
    
    Change-Id: Ib88e98769bb59134ca90268a6a177459023aa842
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90583
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 470431e5b..e02ce5382 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -781,7 +781,7 @@ public class LOActivity extends AppCompatActivity {
         });
 
         // update progress bar when loading
-        if (message.startsWith("'statusindicator")) {
+        if (message.startsWith("'statusindicator") || message.startsWith("'error:")) {
             runOnUiThread(new Runnable() {
                 public void run() {
                     // update progress bar if it exists
@@ -798,7 +798,7 @@ public class LOActivity extends AppCompatActivity {
 
                         mProgressDialog.determinateProgress(progress);
                     }
-                    else if (message.startsWith("'statusindicatorfinish:")) {
+                    else if (message.startsWith("'statusindicatorfinish:") || message.startsWith("'error:")) {
                         mProgressDialog.dismiss();
                     }
                 }