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

[Jan Holesovsky (via logerrit)]

 android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java |    6 +++++-
 android/app/src/main/res/menu/navigation_menu.xml                                  |    4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 6f49366f3cc071995140bf66ee4d53df0b2595e2
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Dec 6 15:41:07 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Dec 6 15:49:38 2019 +0100

    android: Disable OTG and Remote server for the moment, it's totally untested.
    
    Change-Id: I64b7a5ded00fc9dd481972a13a4c3b169802498a
    Reviewed-on: https://gerrit.libreoffice.org/84640
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 0e2696190..7d1983207 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -260,7 +260,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
         );
 
         // Loop through the document providers menu items and check if they are available or not
-        for (int index = 0; index < providerNames.size(); index++) {
+        for (int index = 0; index < navigationDrawer.getMenu().size(); ++index) {
             MenuItem item = navigationDrawer.getMenu().getItem(index);
             item.setEnabled(documentProviderFactory.getProvider(index).checkProviderAvailability(this));
         }
@@ -270,10 +270,12 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 
                 switch (item.getItemId()) {
+                    /* FIXME disabled for the moment, enable when menu_provider_owncloud is enabled
                     case R.id.menu_storage_preferences: {
                         startActivity(new Intent(LibreOfficeUIActivity.this, DocumentProviderSettingsActivity.class));
                         return true;
                     }
+                    */
 
                     case R.id.menu_provider_documents: {
                         switchToDocumentProvider(documentProviderFactory.getProvider(0));
@@ -290,6 +292,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
                         return true;
                     }
 
+                    /* FIXME disabled for the moment, it's totally untested
                     case R.id.menu_provider_otg: {
                         switchToDocumentProvider(documentProviderFactory.getProvider(3));
                         return true;
@@ -299,6 +302,7 @@ public class LibreOfficeUIActivity extends AppCompatActivity implements Settings
                         switchToDocumentProvider(documentProviderFactory.getProvider(4));
                         return true;
                     }
+                    */
 
                     default:
                         return false;
diff --git a/android/app/src/main/res/menu/navigation_menu.xml b/android/app/src/main/res/menu/navigation_menu.xml
index db680a9a1..e96c3374d 100644
--- a/android/app/src/main/res/menu/navigation_menu.xml
+++ b/android/app/src/main/res/menu/navigation_menu.xml
@@ -16,6 +16,7 @@
             android:title="@string/external_sd_file_system"
             android:icon="@drawable/ic_sd_card_black_24dp"/>
 
+        <!-- FIXME these two are totally untested, let's disable for the moment
         <item android:id="@+id/menu_provider_otg"
             android:title="@string/otg_file_system"
             android:icon="@drawable/ic_usb_black_24dp"/>
@@ -23,13 +24,16 @@
         <item android:id="@+id/menu_provider_owncloud"
             android:title="@string/owncloud"
             android:icon="@drawable/ic_cloud_black_24dp"/>
+        -->
 
 
     </group>
 
+    <!-- FIXME enable once the menu_provider_owncloud is enabled again
     <group android:orderInCategory="100">
         <item android:id="@+id/menu_storage_preferences"
             android:title="@string/storage_provider_settings"
             android:icon="@drawable/ic_settings_black_24dp"/>
     </group>
+    -->
 </menu>