[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - android/lib

mert (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 26 07:20:06 UTC 2020


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

New commits:
commit e527603c3b863294babec82a9098768d54375cac
Author:     mert <mert.tumer at collabora.com>
AuthorDate: Tue Aug 25 22:44:12 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Aug 26 09:19:45 2020 +0200

    Fix insert image dialog only opens once
    
    Change-Id: I5a184feadcf25e22829f80ad4da20d25e04d3f27
    Signed-off-by: mert <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101348
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 851bdeb949d28dd5ee5d451b85b121eecb160a6f)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101355
    Tested-by: Andras Timar <andras.timar 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 c131a983f..88b1fdafd 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -578,6 +578,10 @@ public class LOActivity extends AppCompatActivity {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         if (resultCode != RESULT_OK) {
+            if (requestCode == REQUEST_SELECT_IMAGE_FILE) {
+                valueCallback.onReceiveValue(null);
+                valueCallback = null;
+            }
             return;
         }
 


More information about the Libreoffice-commits mailing list