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

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |    5 +++++
 loleaflet/src/control/Control.Menubar.js                             |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 876854d3ebb859d9bce870c9a80dd2c83b20e57d
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Tue Mar 17 12:41:41 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Mar 18 00:35:00 2020 +0100

    android: Add support for EPUB, but disable it for the moment.
    
    It needs support in the core that is currently missing...
    
    Change-Id: I417172bca0c7d32dfda0a11bd8a9894ec33d72fa
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90653
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.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 299dd57eb..0459b8db2 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -132,6 +132,7 @@ public class LOActivity extends AppCompatActivity {
     public static final int REQUEST_SAVEAS_DOC = 509;
     public static final int REQUEST_SAVEAS_PPT = 510;
     public static final int REQUEST_SAVEAS_XLS = 511;
+    public static final int REQUEST_SAVEAS_EPUB = 512;
 
     /** Broadcasting event for passing info back to the shell. */
     public static final String LO_ACTIVITY_BROADCAST = "LOActivityBroadcast";
@@ -608,6 +609,7 @@ public class LOActivity extends AppCompatActivity {
             case REQUEST_SAVEAS_DOC:
             case REQUEST_SAVEAS_PPT:
             case REQUEST_SAVEAS_XLS:
+            case REQUEST_SAVEAS_EPUB:
                 if (intent == null) {
                     return;
                 }
@@ -659,6 +661,7 @@ public class LOActivity extends AppCompatActivity {
             case REQUEST_SAVEAS_DOC: return "doc";
             case REQUEST_SAVEAS_PPT: return "ppt";
             case REQUEST_SAVEAS_XLS: return "xls";
+            case REQUEST_SAVEAS_EPUB: return "epub";
         }
         return null;
     }
@@ -941,6 +944,7 @@ public class LOActivity extends AppCompatActivity {
             case "doc": return REQUEST_SAVEAS_DOC;
             case "ppt": return REQUEST_SAVEAS_PPT;
             case "xls": return REQUEST_SAVEAS_XLS;
+            case "epub": return REQUEST_SAVEAS_EPUB;
         }
         return 0;
     }
@@ -958,6 +962,7 @@ public class LOActivity extends AppCompatActivity {
             case "doc": return "application/msword";
             case "ppt": return "application/vnd.ms-powerpoint";
             case "xls": return "application/vnd.ms-excel";
+            case "epub": return "application/epub+zip";
         }
         return null;
     }
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 7bd57d538..5759d2e99 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -477,7 +477,7 @@ L.Control.Menubar = L.Control.extend({
 				{name: _('Word 2003 Document (.doc)'), id: 'downloadas-doc', type: 'action'},
 				{name: _('Word Document (.docx)'), id: 'downloadas-docx', type: 'action'},
 				{name: _('Rich Text (.rtf)'), id: 'downloadas-rtf', type: 'action'},
-				{name: _('EPUB (.epub)'), id: 'downloadas-epub', type: 'action'}
+				{name: _('EPUB (.epub)'), id: 'downloadas-epub', type: 'action', mobileapp: false}
 			]},
 			{name: _UNO('.uno:EditMenu', 'text'), id: 'editmenu', type: 'menu', menu: [
 				{uno: '.uno:Undo'},