[Libreoffice-commits] core.git: android/Bootstrap android/source desktop/source

2018-03-27 Thread Mert Tümer 
 android/Bootstrap/src/org/libreoffice/kit/Document.java  |2 
 android/source/src/java/org/libreoffice/InvalidationHandler.java |   17 +++
 android/source/src/java/org/libreoffice/LOEvent.java |   11 ++
 android/source/src/java/org/libreoffice/LOKitThread.java |6 +
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   12 ++
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |   45 
+++---
 android/source/src/java/org/libreoffice/TileProvider.java|8 +
 desktop/source/lib/lokandroid.cxx|5 -
 8 files changed, 72 insertions(+), 34 deletions(-)

New commits:
commit fc88892e9964554d4440637e11a7325c4200fedf
Author: Mert Tümer 
Date:   Sun Mar 18 17:49:19 2018 +0300

.uno:Save callback for the Android Viewer

Change-Id: Ic2e16985e52869092faa2a31a59a85cb77b8e28c
Signed-off-by: Mert Tümer 
Reviewed-on: https://gerrit.libreoffice.org/51506
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index f0c5e7a6f99a..855bdd2c5a2e 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -213,7 +213,7 @@ public class Document {
  * @param command - the command, like ".uno:Bold"
  * @param arguments
  */
-public native void postUnoCommand(String command, String arguments);
+public native void postUnoCommand(String command, String arguments, 
boolean notifyWhenFinished);
 
 /**
  * Change text selection.
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index eb22f6c8f3d3..b33f678de90f 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -62,6 +62,9 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 case Document.CALLBACK_INVALIDATE_TILES:
 invalidateTiles(payload);
 break;
+case Document.CALLBACK_UNO_COMMAND_RESULT:
+unoCommandResult(payload);
+break;
 case Document.CALLBACK_INVALIDATE_VISIBLE_CURSOR:
 invalidateCursor(payload);
 break;
@@ -116,10 +119,24 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 case Document.CALLBACK_DOCUMENT_SIZE_CHANGED:
 pageSizeChanged(payload);
 default:
+
 Log.d(LOGTAG, "LOK_CALLBACK uncaught: " + messageID + " : " + 
payload);
 }
 }
 
+private void unoCommandResult(String payload) {
+try {
+JSONObject payloadObject = new JSONObject(payload);
+if (payloadObject.getString("commandName").equals(".uno:Save")) {
+if (payloadObject.getString("success").equals("true")) {
+mContext.saveFilesToCloud();
+}
+}
+}catch(JSONException e){
+e.printStackTrace();
+}
+}
+
 private void cellFormula(final String payload) {
 LOKitShell.getMainHandler().post(new Runnable() {
 @Override
diff --git a/android/source/src/java/org/libreoffice/LOEvent.java 
b/android/source/src/java/org/libreoffice/LOEvent.java
index 979d8ba29ed7..7e15dea2b988 100644
--- a/android/source/src/java/org/libreoffice/LOEvent.java
+++ b/android/source/src/java/org/libreoffice/LOEvent.java
@@ -41,6 +41,8 @@ public class LOEvent implements Comparable {
 public static final int UPDATE_CALC_HEADERS = 20;
 public static final int REFRESH = 21;
 public static final int PAGE_SIZE_CHANGED = 22;
+public static final int UNO_COMMAND_NOTIFY = 23;
+
 
 public final int mType;
 public int mPriority = 0;
@@ -60,6 +62,7 @@ public class LOEvent implements Comparable {
 public String mValue;
 public int mPageWidth;
 public int mPageHeight;
+public boolean mNotify;
 
 public LOEvent(int type) {
 mType = type;
@@ -78,6 +81,14 @@ public class LOEvent implements Comparable {
 mValue = null;
 }
 
+public LOEvent(int type, String someString, boolean notify) {
+mType = type;
+mTypeString = "String";
+mString = someString;
+mValue = null;
+mNotify = notify;
+}
+
 public LOEvent(int type, String key, String value) {
 mType = type;
 mTypeString = "key / value";
diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java 
b/android/source/src/java/org/libreoffice/LOKitThread.java
index 63f49dc6253f..92303f588c2f 100644
---

[Libreoffice-commits] core.git: android/Bootstrap android/source desktop/source

2018-03-14 Thread Mert Tümer 
 android/Bootstrap/src/org/libreoffice/kit/Document.java  |   15 ++
 android/source/res/drawable/ic_content_copy_black_24dp.xml   |9 +
 android/source/res/drawable/ic_content_cut_black_24dp.xml|9 +
 android/source/res/drawable/ic_content_paste_black_24dp.xml  |9 +
 android/source/res/menu/main.xml |   29 
 android/source/res/values/strings.xml|7 +
 android/source/src/java/org/libreoffice/InvalidationHandler.java |3 
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   21 +++
 android/source/src/java/org/libreoffice/TileProvider.java|   13 +
 android/source/src/java/org/libreoffice/ToolbarController.java   |   70 
++
 desktop/source/lib/lokandroid.cxx|   17 ++
 11 files changed, 202 insertions(+)

New commits:
commit e5bc7fa4e83b33fc3eee343e560a4f8cb91eacd6
Author: Mert Tümer 
Date:   Wed Mar 14 19:19:56 2018 +0300

tdf#96796 - Added clipboard actions for the Android Viewer

Change-Id: I52e134532ab70e765b6ccd929f189be84f9c9a90
Signed-off-by: Mert Tümer 
Reviewed-on: https://gerrit.libreoffice.org/51286
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 6a1f402970ea..f0c5e7a6f99a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -232,6 +232,21 @@ public class Document {
 public native void setGraphicSelection(int type, int x, int y);
 
 /**
+ * Get selected text
+ * @param mimeType
+ * @return
+ */
+public native String getTextSelection(String mimeType);
+
+/**
+ * paste
+ * @param mimeType
+ * @param data
+ * @return
+ */
+public native boolean paste(String mimeType, String data);
+
+/**
  * Reset current (any kind of) selection.
  */
 public native void resetSelection();
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml 
b/android/source/res/drawable/ic_content_copy_black_24dp.xml
new file mode 100644
index ..8a894a3bcd73
--- /dev/null
+++ b/android/source/res/drawable/ic_content_copy_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml 
b/android/source/res/drawable/ic_content_cut_black_24dp.xml
new file mode 100644
index ..1c0f96a37b42
--- /dev/null
+++ b/android/source/res/drawable/ic_content_cut_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml 
b/android/source/res/drawable/ic_content_paste_black_24dp.xml
new file mode 100644
index ..a902d9a856a0
--- /dev/null
+++ b/android/source/res/drawable/ic_content_paste_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index 229c20aed68c..7fba5f46e380 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -47,6 +47,35 @@
 android:enabled="false" />
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 Don\'t Compress
 Do you want to compress the 
photo?
 
+
+Copy
+Paste
+Cut
+Back
+Text copied to the clipboard
+
 
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index e411770976c9..eb22f6c8f3d3 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -452,6 +452,7 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(null);
 }
+mContext.getToolbarController().showHideClipboardCutAndCopy(false);
 } else {
 List rectangles = convertPayloadToRectangles(payload);
 if (mState != OverlayState.SELECTION) {
@@ -462,6 +463,8 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if

[Libreoffice-commits] core.git: android/Bootstrap android/source desktop/source

2018-03-14 Thread Thorsten Behrens 
 android/Bootstrap/src/org/libreoffice/kit/Document.java  |   15 --
 android/source/res/drawable/ic_content_copy_black_24dp.xml   |9 -
 android/source/res/drawable/ic_content_cut_black_24dp.xml|9 -
 android/source/res/drawable/ic_content_paste_black_24dp.xml  |9 -
 android/source/res/menu/main.xml |   29 
 android/source/res/values/strings.xml|7 -
 android/source/src/java/org/libreoffice/InvalidationHandler.java |3 
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   21 ---
 android/source/src/java/org/libreoffice/TileProvider.java|   13 -
 android/source/src/java/org/libreoffice/ToolbarController.java   |   70 
--
 desktop/source/lib/lokandroid.cxx|   17 --
 11 files changed, 202 deletions(-)

New commits:
commit b203e78a69acf5d84cc245ce7232ffee4a6edcd4
Author: Thorsten Behrens 
Date:   Wed Mar 14 15:24:14 2018 +0100

Revert "tdf#96796 - Added clipboard actions for the Android Viewer"

Breaks Android tinderbox

This reverts commit 31e939c9f4b29fb2b2e63eb096450cf3da35d67f.

Change-Id: Id565c9ef8330c0b3bce2c678facb7605dcf3e356

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index f0c5e7a6f99a..6a1f402970ea 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -232,21 +232,6 @@ public class Document {
 public native void setGraphicSelection(int type, int x, int y);
 
 /**
- * Get selected text
- * @param mimeType
- * @return
- */
-public native String getTextSelection(String mimeType);
-
-/**
- * paste
- * @param mimeType
- * @param data
- * @return
- */
-public native boolean paste(String mimeType, String data);
-
-/**
  * Reset current (any kind of) selection.
  */
 public native void resetSelection();
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml 
b/android/source/res/drawable/ic_content_copy_black_24dp.xml
deleted file mode 100644
index 8a894a3bcd73..
--- a/android/source/res/drawable/ic_content_copy_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-http://schemas.android.com/apk/res/android;
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-
-
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml 
b/android/source/res/drawable/ic_content_cut_black_24dp.xml
deleted file mode 100644
index 1c0f96a37b42..
--- a/android/source/res/drawable/ic_content_cut_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-http://schemas.android.com/apk/res/android;
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-
-
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml 
b/android/source/res/drawable/ic_content_paste_black_24dp.xml
deleted file mode 100644
index a902d9a856a0..
--- a/android/source/res/drawable/ic_content_paste_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-http://schemas.android.com/apk/res/android;
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-
-
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index 7fba5f46e380..229c20aed68c 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -47,35 +47,6 @@
 android:enabled="false" />
 
 
-
-
-
-
-
-
-
-
-
-
-
 
 Don\'t Compress
 Do you want to compress the 
photo?
 
-
-Copy
-Paste
-Cut
-Back
-Text copied to the clipboard
-
 
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index eb22f6c8f3d3..e411770976c9 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -452,7 +452,6 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(null);
 }
-mContext.getToolbarController().showHideClipboardCutAndCopy(false);
 } else {
 List rectangles = convertPayloadToRectangles(payload);
 if (mState != OverlayState.SELECTION) {
@@ -463,8 +462,6 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(rectangles.get(0));

[Libreoffice-commits] core.git: android/Bootstrap android/source desktop/source

2018-03-13 Thread Mert Tümer 
 android/Bootstrap/src/org/libreoffice/kit/Document.java  |   15 ++
 android/source/res/drawable/ic_content_copy_black_24dp.xml   |9 +
 android/source/res/drawable/ic_content_cut_black_24dp.xml|9 +
 android/source/res/drawable/ic_content_paste_black_24dp.xml  |9 +
 android/source/res/menu/main.xml |   29 
 android/source/res/values/strings.xml|7 +
 android/source/src/java/org/libreoffice/InvalidationHandler.java |3 
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   21 +++
 android/source/src/java/org/libreoffice/TileProvider.java|   13 +
 android/source/src/java/org/libreoffice/ToolbarController.java   |   70 
++
 desktop/source/lib/lokandroid.cxx|   17 ++
 11 files changed, 202 insertions(+)

New commits:
commit 31e939c9f4b29fb2b2e63eb096450cf3da35d67f
Author: Mert Tümer 
Date:   Mon Mar 5 02:39:36 2018 +0300

tdf#96796 - Added clipboard actions for the Android Viewer

Change-Id: I2779ef9a9f68dcf08c3072ffe83b9f2450b7257e
Signed-off-by: Mert Tümer 
Reviewed-on: https://gerrit.libreoffice.org/50757
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 6a1f402970ea..f0c5e7a6f99a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -232,6 +232,21 @@ public class Document {
 public native void setGraphicSelection(int type, int x, int y);
 
 /**
+ * Get selected text
+ * @param mimeType
+ * @return
+ */
+public native String getTextSelection(String mimeType);
+
+/**
+ * paste
+ * @param mimeType
+ * @param data
+ * @return
+ */
+public native boolean paste(String mimeType, String data);
+
+/**
  * Reset current (any kind of) selection.
  */
 public native void resetSelection();
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml 
b/android/source/res/drawable/ic_content_copy_black_24dp.xml
new file mode 100644
index ..8a894a3bcd73
--- /dev/null
+++ b/android/source/res/drawable/ic_content_copy_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml 
b/android/source/res/drawable/ic_content_cut_black_24dp.xml
new file mode 100644
index ..1c0f96a37b42
--- /dev/null
+++ b/android/source/res/drawable/ic_content_cut_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml 
b/android/source/res/drawable/ic_content_paste_black_24dp.xml
new file mode 100644
index ..a902d9a856a0
--- /dev/null
+++ b/android/source/res/drawable/ic_content_paste_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index 229c20aed68c..7fba5f46e380 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -47,6 +47,35 @@
 android:enabled="false" />
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 Don\'t Compress
 Do you want to compress the 
photo?
 
+
+Copy
+Paste
+Cut
+Back
+Text copied to the clipboard
+
 
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index 5dcb572af6c4..6c582550ff81 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -443,6 +443,7 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(null);
 }
+mContext.getToolbarController().showHideClipboardCutAndCopy(false);
 } else {
 List rectangles = convertPayloadToRectangles(payload);
 if (mState != OverlayState.SELECTION) {
@@ -453,6 +454,8 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet())

[Libreoffice-commits] core.git: android/Bootstrap android/source desktop/source

2017-08-27 Thread Ximeng Zu 
 android/Bootstrap/src/org/libreoffice/kit/Document.java  |9 +
 android/Bootstrap/src/org/libreoffice/kit/Office.java|   36 
++
 android/source/res/layout/password_dialog.xml|   17 +++
 android/source/res/values/strings.xml|5 
 android/source/src/java/org/libreoffice/InvalidationHandler.java |   19 +++
 android/source/src/java/org/libreoffice/LOKitThread.java |1 
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   22 +++
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |   34 
++
 android/source/src/java/org/libreoffice/PasswordDialogFragment.java  |   56 
++
 desktop/source/lib/lokandroid.cxx|   40 
+++
 10 files changed, 235 insertions(+), 4 deletions(-)

New commits:
commit 43f5161991cffedabb280a6e4e388c5bcbac4f96
Author: Ximeng Zu 
Date:   Wed Jul 26 11:15:26 2017 -0500

[Android Viewer] Password support

Added password support for documents.

Change-Id: Ifd9cf86894ddaf2fd5ad97510d2ac1b5850611ad
Reviewed-on: https://gerrit.libreoffice.org/40458
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 8278532c6381..6a1f402970ea 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -119,6 +119,15 @@ public class Document {
 public static final int KEYBOARD_MODIFIER_MOD2 = 0x4000;
 public static final int KEYBOARD_MODIFIER_MOD3 = 0x8000;
 
+/** Optional features of LibreOfficeKit, in particular callbacks that block
+ *  LibreOfficeKit until the corresponding reply is received, which would
+ *  deadlock if the client does not support the feature.
+ */
+public static final long LOK_FEATURE_DOCUMENT_PASSWORD = 1;
+public static final long LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY = (1 << 
1);
+public static final long LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK = (1 << 
2);
+public static final long LOK_FEATURE_NO_TILED_ANNOTATIONS = (1 << 3);
+
 private final ByteBuffer handle;
 private MessageCallback messageCallback = null;
 
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Office.java 
b/android/Bootstrap/src/org/libreoffice/kit/Office.java
index 8c616d0e9ce2..25c838ffb2e4 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Office.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Office.java
@@ -13,11 +13,18 @@ import java.nio.ByteBuffer;
 
 public class Office {
 private ByteBuffer handle;
+private MessageCallback messageCallback = null;
 
 public Office(ByteBuffer handle) {
 this.handle = handle;
+bindMessageCallback();
 }
 
+/**
+ * Bind the signal callback in LOK.
+ */
+private native void bindMessageCallback();
+
 public native String getError();
 
 private native ByteBuffer documentLoadNative(String url);
@@ -33,4 +40,33 @@ public class Office {
 
 public native void destroy();
 public native void destroyAndExit();
+public native void setDocumentPassword(String url, String pwd);
+public native void setOptionalFeatures(long options);
+
+public void setMessageCallback(MessageCallback messageCallback) {
+this.messageCallback = messageCallback;
+}
+
+/**
+ * Callback triggered through JNI to indicate that a new signal
+ * from LibreOfficeKit was retrieved.
+ */
+private void messageRetrievedLOKit(int signalNumber, String payload) {
+if (messageCallback != null) {
+messageCallback.messageRetrieved(signalNumber, payload);
+}
+
+}
+
+/**
+ * Callback to retrieve messages from LOK
+ */
+public interface MessageCallback {
+/**
+ * Invoked when a message is retrieved from LOK
+ * @param signalNumber - signal type / number
+ * @param payload - retrieved for the signal
+ */
+void messageRetrieved(int signalNumber, String payload);
+}
 }
diff --git a/android/source/res/layout/password_dialog.xml 
b/android/source/res/layout/password_dialog.xml
new file mode 100644
index ..adc4f4249daf
--- /dev/null
+++ b/android/source/res/layout/password_dialog.xml
@@ -0,0 +1,17 @@
+
+http://schemas.android.com/apk/res/android;
+android:orientation="vertical" android:layout_width="wrap_content"
+android:layout_height="wrap_content">
+
+
+
+
\ No newline at end of file
diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index 04f1be3cc029..c8c84f9702ba 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -152,4

[Libreoffice-commits] core.git: android/Bootstrap android/source desktop/source

2017-03-30 Thread brainbreaker 
 android/Bootstrap/src/org/libreoffice/kit/Document.java   |2 
 android/source/build.gradle   |2 
 android/source/res/anim/fab_close.xml |   18 
 android/source/res/anim/fab_open.xml  |   19 
 android/source/res/drawable/ic_add_black_24dp.xml |9 
 android/source/res/layout/activity_document_browser.xml   |  213 
+-
 android/source/res/values/strings.xml |9 
 android/source/src/java/org/libreoffice/LOEvent.java  |   17 
 android/source/src/java/org/libreoffice/LOKitShell.java   |   12 
 android/source/src/java/org/libreoffice/LOKitThread.java  |   58 ++
 android/source/src/java/org/libreoffice/LOKitTileProvider.java|   24 +
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java  |  132 
--
 android/source/src/java/org/libreoffice/TileProvider.java |6 
 android/source/src/java/org/libreoffice/ToolbarController.java|6 
 android/source/src/java/org/libreoffice/ui/FileUtilities.java |2 
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |  123 
+
 desktop/source/lib/lokandroid.cxx |2 
 17 files changed, 586 insertions(+), 68 deletions(-)

New commits:
commit 1503769fe15c122ff2bb8f6f7e7b4ab72656ddc2
Author: brainbreaker 
Date:   Tue Mar 14 19:12:20 2017 +0530

tdf#106325 - No way to create a new Document

This commit will add the ability to create a new document.
A FAB is used in home screen which on expansion gives
four options namely new writer document, new impress,
new Sheet or new Draw. Two new events loadNewDocument
and saveDocumentAs have been added.
Another major change includes the use of constraint layout
in LOUIActivity layout as it decreases nesting of views and
improves the app performance. This was needed because
of the new FAB layouts being added.
Support for vector drawables has been enabled.

Change-Id: Ia3ea17f73c0d8514f8ddb7b9a1cbd2ce7de6ac08
Reviewed-on: https://gerrit.libreoffice.org/35183
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index a7d3f04938bb..7cf99413644c 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -147,7 +147,7 @@ public class Document {
 
 public native void setClientZoom(int nTilePixelWidth, int 
nTilePixelHeight, int nTileTwipWidth, int nTileTwipHeight);
 
-private native void saveAs(String url, String format, String options);
+public native void saveAs(String url, String format, String options);
 
 private native void paintTileNative(ByteBuffer buffer, int canvasWidth, 
int canvasHeight, int tilePositionX, int tilePositionY, int tileWidth, int 
tileHeight);
 
diff --git a/android/source/build.gradle b/android/source/build.gradle
index d5fc5c932be0..302d34a54754 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -26,6 +26,7 @@ dependencies {
 compile 
files("${liboWorkdir}/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar")
 compile 'com.android.support:appcompat-v7:25.1.0'
 compile 'com.android.support:design:25.1.0'
+compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
 
 android {
@@ -64,6 +65,7 @@ android {
 // ToDo: fix openssl stuff to not block targeting 23 or later
 targetSdkVersion 22
 manifestPlaceholders = [installLocation: "preferExternal"]
+vectorDrawables.useSupportLibrary = true
 }
 buildTypes {
 debug {
diff --git a/android/source/res/anim/fab_close.xml 
b/android/source/res/anim/fab_close.xml
new file mode 100644
index ..ba13b0f038be
--- /dev/null
+++ b/android/source/res/anim/fab_close.xml
@@ -0,0 +1,18 @@
+
+http://schemas.android.com/apk/res/android;
+android:fillAfter="true">
+
+
+
+
diff --git a/android/source/res/anim/fab_open.xml 
b/android/source/res/anim/fab_open.xml
new file mode 100644
index ..9099d8b53c80
--- /dev/null
+++ b/android/source/res/anim/fab_open.xml
@@ -0,0 +1,19 @@
+
+http://schemas.android.com/apk/res/android;
+android:fillAfter="true">
+
+
+
+
diff --git a/android/source/res/drawable/ic_add_black_24dp.xml 
b/android/source/res/drawable/ic_add_black_24dp.xml
new file mode 100644
index ..0258249cc482
--- /dev/null
+++ b/android/source/res/drawable/ic_add_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android;
+android:width="24dp"
+android:height="24dp"
+