[Libreoffice-commits] online.git: 3 commits - android/app android/build.gradle

[Libreoffice Gerrit user]

 android/app/src/main/cpp/androidapp.cpp                                |    3 ++-
 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |    7 +++++++
 android/build.gradle                                                   |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0297c42549ede7884c7f7a887a39c91598a3bef1
Author:     Florin Ciornei <florin.ciornei at collabora.com>
AuthorDate: Tue Apr 23 15:22:12 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue May 21 11:55:48 2019 +0200

    android: Send a BYE signal when stopping.
    
    This triggers the save-on-exit operation.
    
    Change-Id: Ibf76ca5a5e87906e6abbc9d8ae17871ec4d5d11a

diff --git a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
index bc0236cf1..43315e7c9 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
@@ -312,6 +312,13 @@ public class MainActivity extends AppCompatActivity {
         updatePreferences();
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        Log.d(TAG, "Stop LOOLWSD instance");
+        postMobileMessage("BYE");
+    }
+
     private void loadDocument() {
         String finalUrlToLoad = "file:///android_asset/dist/loleaflet.html?file_path=" +
                 urlToLoad + "&closebutton=1";
commit 11000f11f0b2bac33cbee76ebfd1539316d217fe
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue May 21 11:31:28 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue May 21 11:31:28 2019 +0200

    android: Logging must be initialized only once, otherwise it crashes.
    
    Change-Id: I78d5f03951bef5603f0e84d992e656c222a1416e

diff --git a/android/app/src/main/cpp/androidapp.cpp b/android/app/src/main/cpp/androidapp.cpp
index a54ff86fc..b41571e51 100644
--- a/android/app/src/main/cpp/androidapp.cpp
+++ b/android/app/src/main/cpp/androidapp.cpp
@@ -44,6 +44,8 @@ JNI_OnLoad(JavaVM* vm, void*) {
         return JNI_ERR; // JNI version not supported.
     }
 
+    Log::initialize("Mobile", "trace", false, false, {});
+
     return JNI_VERSION_1_6;
 }
 
@@ -245,7 +247,6 @@ Java_org_libreoffice_androidapp_MainActivity_createLOOLWSD(JNIEnv *env, jobject,
 
     fileURL = std::string(env->GetStringUTFChars(loadFileURL, nullptr));
 
-    Log::initialize("Mobile", "trace", false, false, {});
     Util::setThreadName("main");
 
     fakeSocketSetLoggingCallback([](const std::string& line)
commit aa3330199794e3b928af00e8d7210ad1a051a451
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue May 21 11:30:56 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue May 21 11:30:56 2019 +0200

    android: Update to a newer gradle.
    
    Change-Id: I5eec51a8531ab763634aa78ef80b2fc1964444ac

diff --git a/android/build.gradle b/android/build.gradle
index 2fc827a68..56532aa69 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files