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

[Michael Weghorn (via logerrit)]

 android/source/src/java/org/libreoffice/ui/FileUtilities.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f869807175f1fc49328465473aa8e90b6f1876ff
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 14 17:17:04 2022 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Apr 14 20:40:09 2022 +0200

    android: Use "ContentResolver#query" available from API level 1
    
    Use the `ContentResolver#query` overload that is available from
    Android API level 1 on, not the one that's only available from
    API level 26 on [2], which would otherwise trigger an exception
    if run on devices running Android version < 8.0, as seen
    on an AVD with API level 21:
    
    > E/AndroidRuntime( 2914): FATAL EXCEPTION: main
    > E/AndroidRuntime( 2914): Process: org.libreoffice, PID: 2914
    > E/AndroidRuntime( 2914): java.lang.NoSuchMethodError: No virtual method 
query(Landroid/net/Uri;[Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/database/Cursor;
 in class Landroid/content/ContentResolver; or its super classes (declaration 
of 'android.content.ContentResolver' appears in /system/framework/framework.jar)
    > E/AndroidRuntime( 2914):        at 
org.libreoffice.ui.FileUtilities.retrieveDisplayNameForDocumentUri(FileUtilities.java:137)
    > E/AndroidRuntime( 2914):        at 
org.libreoffice.ui.LibreOfficeUIActivity.createUI(LibreOfficeUIActivity.java:206)
    > E/AndroidRuntime( 2914):        at 
org.libreoffice.ui.LibreOfficeUIActivity.onCreate(LibreOfficeUIActivity.java:147)
    > E/AndroidRuntime( 2914):        at 
android.app.Activity.performCreate(Activity.java:5937)
    > E/AndroidRuntime( 2914):        at 
android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1105)
    > E/AndroidRuntime( 2914):        at 
android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2251)
    > E/AndroidRuntime( 2914):        at 
android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2360)
    > E/AndroidRuntime( 2914):        at 
android.app.ActivityThread.access$800(ActivityThread.java:144)
    > E/AndroidRuntime( 2914):        at 
android.app.ActivityThread$H.handleMessage(ActivityThread.java:1278)
    > E/AndroidRuntime( 2914):        at 
android.os.Handler.dispatchMessage(Handler.java:102)
    > E/AndroidRuntime( 2914):        at android.os.Looper.loop(Looper.java:135)
    > E/AndroidRuntime( 2914):        at 
android.app.ActivityThread.main(ActivityThread.java:5221)
    > E/AndroidRuntime( 2914):        at java.lang.reflect.Method.invoke(Native 
Method)
    > E/AndroidRuntime( 2914):        at 
java.lang.reflect.Method.invoke(Method.java:372)
    > E/AndroidRuntime( 2914):        at 
com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:899)
    > E/AndroidRuntime( 2914):        at 
com.android.internal.os.ZygoteInit.main(ZygoteInit.java:694)
    >
    
    [1] 
https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20java.lang.String,%20java.lang.String[],%20java.lang.String)
    [2] 
https://developer.android.com/reference/android/content/ContentResolver#query(android.net.Uri,%20java.lang.String[],%20android.os.Bundle,%20android.os.CancellationSignal)
    
    Change-Id: I13ecc57d3d6b25a7eb2e5ff85a3420ef8064cb20
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133024
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java 
b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
index 5bfb93b4c1f5..72da47b8cc3a 100644
--- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java
+++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
@@ -134,7 +134,7 @@ public class FileUtilities {
         Cursor cursor = null;
         try {
             String[] columns = {OpenableColumns.DISPLAY_NAME};
-            cursor = resolver.query(docUri, columns, null, null);
+            cursor = resolver.query(docUri, columns, null, null, null);
             if (cursor != null && cursor.moveToFirst()) {
                 displayName = 
cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
             }