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

[Tomaž Vajngerl (via logerrit)]

 android/app/src/main/AndroidManifest.xml                             |    4 -
 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |   34 +++++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 65a19d4e216b279d27c7c6bd58c03ee3586fc93a
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Mar 2 09:32:15 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Mar 2 19:04:55 2020 +0100

    android: reuse an already open activity when starting a new one
    
    This sets the "launchMode" of the LOActivity to "singleTask" and
    implements "onNewIntent". This is necessary so that we don't
    duplicate LOActivity instances, as that isn't handled correctly
    and can cause a freeze or in some cases that text input from one
    instance is sent to the other. The back button stack isn't ideal
    as it still can return us to LibreOfficeUIActivity even when the
    activity is started from some other app, but this at least is
    consistent with how some other apps work.
    
    Change-Id: Idd11214578ec124661e2612bb49ba7e4bc4f3cea
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89811
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5d1f2b091..79cea3f49 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -35,7 +35,6 @@
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
@@ -50,7 +49,8 @@
         <!-- The main document editing Activity -->
         <activity
             android:name="org.libreoffice.androidlib.LOActivity"
-            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
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 ef8aa9bf3..c7796d05c 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -397,6 +397,36 @@ public class LOActivity extends AppCompatActivity {
         }
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+
+        Log.i(TAG, "onNewIntent");
+
+        if (documentLoaded) {
+            postMobileMessageNative("save dontTerminateEdit=true dontSaveIfUnmodified=true");
+        }
+
+        final Intent finalIntent = intent;
+        mProgressDialog.indeterminate(R.string.saving);
+        mainHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                documentLoaded = false;
+                postMobileMessageNative("BYE");
+                copyTempBackToIntent();
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        mProgressDialog.dismiss();
+                        setIntent(finalIntent);
+                        init();
+                    }
+                });
+            }
+        });
+        super.onNewIntent(intent);
+    }
+
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -417,7 +447,7 @@ public class LOActivity extends AppCompatActivity {
                     loadDocument();
                 } else {
                     Toast.makeText(this, getString(R.string.storage_permission_required), Toast.LENGTH_SHORT).show();
-                    finish();
+                    finishAndRemoveTask();
                     break;
                 }
                 break;
@@ -626,7 +656,7 @@ public class LOActivity extends AppCompatActivity {
                     }
                 });*/
 
-                finish();
+                finishAndRemoveTask();
             }
         });
     }