AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: simplifications to exception messages for content file handling

Browse Source 
The method getUriWithValidPermission() now returns null only if the
Uri couldn't be parsed, otherwise, returns the parsed Uri and fail later
when used if it doesn't have permissions for example.

Also, Don't use use hardcoded strings for method names, and print the
exception message instead of the whole stack.

Pick-to: 6.2
Task-number: QTBUG-96081
Task-number: QTBUG-96957
Change-Id: If7ba88265c9683e6660cb483cfee6c22016f2976
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
This commit is contained in:
Assam Boudjelthia 2021-11-02 17:50:58 +02:00
parent c034ad03ac
commit be55118bd3
1 changed files with 63 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/android/jar/src/org/qtproject/qt/android/QtNative.java
View File

@ -45,31 +45,26 @@ import java.io.FileNotFoundException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.Semaphore; import java.util.concurrent.Semaphore;
import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import android.app.Activity; import android.app.Activity;
import android.app.Service; import android.app.Service;
import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.UriPermission; import android.content.UriPermission;
import android.graphics.Rect;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.ClipboardManager.OnPrimaryClipChangedListener;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipDescription; import android.content.ClipDescription;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.util.Log; import android.util.Log;
import android.util.DisplayMetrics;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.Menu; import android.view.Menu;
@ -121,7 +116,8 @@ public class QtNative
private static HashMap<String, Uri> m_cachedUris = new HashMap<String, Uri>(); private static HashMap<String, Uri> m_cachedUris = new HashMap<String, Uri>();
private static ArrayList<String> m_knownDirs = new ArrayList<String>(); private static ArrayList<String> m_knownDirs = new ArrayList<String>();
private static final int KEYBOARD_HEIGHT_THRESHOLD = 100; private static final int KEYBOARD_HEIGHT_THRESHOLD = 100;
private static final String NoPermissionErrorMessage = "No permissions to open Uri";
private static final String INVALID_OR_NULL_URI_ERROR_MESSAGE = "Received invalid/null Uri";
private static final Runnable runPendingCppRunnablesRunnable = new Runnable() { private static final Runnable runPendingCppRunnablesRunnable = new Runnable() {
@Override @Override
@ -175,10 +171,22 @@ public class QtNative
return joinedString.split(","); return joinedString.split(",");
} }
private static String getCurrentMethodNameLog()
{
return new Exception().getStackTrace()[1].getMethodName() + ": ";
}
private static Uri getUriWithValidPermission(Context context, String uri, String openMode) private static Uri getUriWithValidPermission(Context context, String uri, String openMode)
{ {
Uri parsedUri;
try {
parsedUri = Uri.parse(uri);
} catch (NullPointerException e) {
e.printStackTrace();
return null;
}
try { try {
Uri parsedUri = Uri.parse(uri);
String scheme = parsedUri.getScheme(); String scheme = parsedUri.getScheme();
// We only want to check permissions for content Uris // We only want to check permissions for content Uris
@ -190,12 +198,12 @@ public class QtNative
for (int i = 0; i < permissions.size(); ++i) { for (int i = 0; i < permissions.size(); ++i) {
Uri iterUri = permissions.get(i).getUri(); Uri iterUri = permissions.get(i).getUri();
boolean isRightPermission = permissions.get(i).isReadPermission(); boolean isRequestPermission = permissions.get(i).isReadPermission();
if (!openMode.equals("r")) if (!openMode.equals("r"))
isRightPermission = permissions.get(i).isWritePermission(); isRequestPermission = permissions.get(i).isWritePermission();
if (iterUri.getPath().equals(uriStr) && isRightPermission) if (iterUri.getPath().equals(uriStr) && isRequestPermission)
return iterUri; return iterUri;
} }
@ -204,17 +212,16 @@ public class QtNative
// and check for SecurityExceptions later // and check for SecurityExceptions later
return parsedUri; return parsedUri;
} catch (SecurityException e) { } catch (SecurityException e) {
e.printStackTrace(); Log.e(QtTAG, getCurrentMethodNameLog() + e.toString());
return null; return parsedUri;
} }
} }
public static boolean openURL(Context context, String url, String mime) public static boolean openURL(Context context, String url, String mime)
{ {
Uri uri = getUriWithValidPermission(context, url, "r"); final Uri uri = getUriWithValidPermission(context, url, "r");
if (uri == null) { if (uri == null) {
Log.e(QtTAG, "openURL(): No permissions to open Uri"); Log.e(QtTAG, getCurrentMethodNameLog() + INVALID_OR_NULL_URI_ERROR_MESSAGE);
return false; return false;
} }
@ -227,16 +234,8 @@ public class QtNative
activity().startActivity(intent); activity().startActivity(intent);
return true; return true;
} catch (IllegalArgumentException e) {
Log.e(QtTAG, "openURL(): Invalid Uri");
e.printStackTrace();
return false;
} catch (UnsupportedOperationException e) {
Log.e(QtTAG, "openURL(): Unsupported operation for given Uri");
e.printStackTrace();
return false;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); Log.e(QtTAG, getCurrentMethodNameLog() + e.toString());
return false; return false;
} }
} }
@ -246,26 +245,21 @@ public class QtNative
Uri uri = m_cachedUris.get(contentUrl); Uri uri = m_cachedUris.get(contentUrl);
if (uri == null) if (uri == null)
uri = getUriWithValidPermission(context, contentUrl, openMode); uri = getUriWithValidPermission(context, contentUrl, openMode);
int error = -1;
int fileDescriptor = -1;
if (uri == null) { if (uri == null) {
Log.e(QtTAG, "openFdForContentUrl(): " + NoPermissionErrorMessage); Log.e(QtTAG, getCurrentMethodNameLog() + INVALID_OR_NULL_URI_ERROR_MESSAGE);
return error; return fileDescriptor;
} }
try { try {
ContentResolver resolver = context.getContentResolver(); final ContentResolver resolver = context.getContentResolver();
ParcelFileDescriptor fdDesc = resolver.openFileDescriptor(uri, openMode); fileDescriptor = resolver.openFileDescriptor(uri, openMode).detachFd();
return fdDesc.detachFd(); } catch (IllegalArgumentException | SecurityException | FileNotFoundException e) {
} catch (FileNotFoundException e) { Log.e(QtTAG, getCurrentMethodNameLog() + e.toString());
e.printStackTrace();
} catch (IllegalArgumentException e) {
Log.e(QtTAG, "openFdForContentUrl(): Invalid Uri");
e.printStackTrace();
} catch (SecurityException e) {
Log.e(QtTAG, NoPermissionErrorMessage);
} }
return error;
return fileDescriptor;
} }
public static long getSize(Context context, String contentUrl) public static long getSize(Context context, String contentUrl)
@ -276,7 +270,7 @@ public class QtNative
uri = getUriWithValidPermission(context, contentUrl, "r"); uri = getUriWithValidPermission(context, contentUrl, "r");
if (uri == null) { if (uri == null) {
Log.e(QtTAG, NoPermissionErrorMessage); Log.e(QtTAG, getCurrentMethodNameLog() + INVALID_OR_NULL_URI_ERROR_MESSAGE);
return size; return size;
} else if (!m_cachedUris.containsKey(contentUrl)) { } else if (!m_cachedUris.containsKey(contentUrl)) {
m_cachedUris.put(contentUrl, uri); m_cachedUris.put(contentUrl, uri);
@ -284,21 +278,17 @@ public class QtNative
try { try {
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
Cursor cur = resolver.query(uri, new String[] { DocumentsContract.Document.COLUMN_SIZE }, null, null, null); Cursor cur = resolver.query(uri, new String[] {
DocumentsContract.Document.COLUMN_SIZE },
null, null, null);
if (cur != null) { if (cur != null) {
if (cur.moveToFirst()) if (cur.moveToFirst())
size = cur.getLong(0); size = cur.getLong(0);
cur.close(); cur.close();
} }
return size; return size;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException | SecurityException | UnsupportedOperationException e) {
Log.e(QtTAG, "getSize(): Invalid Uri"); Log.e(QtTAG, getCurrentMethodNameLog() + e.toString());
e.printStackTrace();
} catch (UnsupportedOperationException e) {
Log.e(QtTAG, "getSize(): Unsupported operation for given Uri");
e.printStackTrace();
} catch (SecurityException e) {
Log.e(QtTAG, NoPermissionErrorMessage);
} }
return size; return size;
} }
@ -310,7 +300,7 @@ public class QtNative
if (uri == null) if (uri == null)
uri = getUriWithValidPermission(context, contentUrl, "r"); uri = getUriWithValidPermission(context, contentUrl, "r");
if (uri == null) { if (uri == null) {
Log.e(QtTAG, NoPermissionErrorMessage); Log.e(QtTAG, getCurrentMethodNameLog() + INVALID_OR_NULL_URI_ERROR_MESSAGE);
return exists; return exists;
} else { } else {
if (!m_cachedUris.containsKey(contentUrl)) if (!m_cachedUris.containsKey(contentUrl))
@ -325,14 +315,8 @@ public class QtNative
cur.close(); cur.close();
} }
return exists; return exists;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException | SecurityException | UnsupportedOperationException e) {
Log.e(QtTAG, "checkFileExists(): Invalid Uri"); Log.e(QtTAG, getCurrentMethodNameLog() + e.toString());
e.printStackTrace();
} catch (UnsupportedOperationException e) {
Log.e(QtTAG, "checkFileExists(): Unsupported operation for given Uri");
e.printStackTrace();
} catch (SecurityException e) {
Log.e(QtTAG, NoPermissionErrorMessage);
} }
return exists; return exists;
} }
@ -348,11 +332,11 @@ public class QtNative
Uri uri = m_cachedUris.get(contentUrl); Uri uri = m_cachedUris.get(contentUrl);
if (m_knownDirs.contains(contentUrl)) if (m_knownDirs.contains(contentUrl))
return true; return true;
if (uri == null) { if (uri == null)
uri = getUriWithValidPermission(context, contentUrl, "r"); uri = getUriWithValidPermission(context, contentUrl, "r");
}
if (uri == null) { if (uri == null) {
Log.e(QtTAG, NoPermissionErrorMessage); Log.e(QtTAG, getCurrentMethodNameLog() + INVALID_OR_NULL_URI_ERROR_MESSAGE);
return isDir; return isDir;
} else { } else {
if (!m_cachedUris.containsKey(contentUrl)) if (!m_cachedUris.containsKey(contentUrl))
@ -365,10 +349,13 @@ public class QtNative
if (!paths.get(0).equals("tree")) if (!paths.get(0).equals("tree"))
return false; return false;
ContentResolver resolver = context.getContentResolver(); ContentResolver resolver = context.getContentResolver();
Uri docUri = DocumentsContract.buildDocumentUriUsingTree(uri, DocumentsContract.getTreeDocumentId(uri)); Uri docUri = DocumentsContract.buildDocumentUriUsingTree(uri,
DocumentsContract.getTreeDocumentId(uri));
if (!docUri.toString().startsWith(uri.toString())) if (!docUri.toString().startsWith(uri.toString()))
return false; return false;
Cursor cur = resolver.query(docUri, new String[] { DocumentsContract.Document.COLUMN_MIME_TYPE }, null, null, null); Cursor cur = resolver.query(docUri, new String[] {
DocumentsContract.Document.COLUMN_MIME_TYPE },
null, null, null);
if (cur != null) { if (cur != null) {
if (cur.moveToFirst()) { if (cur.moveToFirst()) {
final String dirStr = new String(DocumentsContract.Document.MIME_TYPE_DIR); final String dirStr = new String(DocumentsContract.Document.MIME_TYPE_DIR);
@ -379,23 +366,18 @@ public class QtNative
cur.close(); cur.close();
} }
return isDir; return isDir;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException | SecurityException | UnsupportedOperationException e) {
Log.e(QtTAG, "checkIfDir(): Invalid Uri"); Log.e(QtTAG, getCurrentMethodNameLog() + e.toString());
e.printStackTrace();
} catch (UnsupportedOperationException e) {
Log.e(QtTAG, "checkIfDir(): Unsupported operation for given Uri");
e.printStackTrace();
} catch (SecurityException e) {
Log.e(QtTAG, NoPermissionErrorMessage);
} }
return false; return false;
} }
public static String[] listContentsFromTreeUri(Context context, String contentUrl) public static String[] listContentsFromTreeUri(Context context, String contentUrl)
{ {
Uri treeUri = Uri.parse(contentUrl); Uri treeUri = Uri.parse(contentUrl);
final ArrayList<String> results = new ArrayList<String>(); final ArrayList<String> results = new ArrayList<>();
if (treeUri == null) { if (treeUri == null) {
Log.e(QtTAG, "listContentsFromTreeUri(): Invalid uri"); Log.e(QtTAG, getCurrentMethodNameLog() + INVALID_OR_NULL_URI_ERROR_MESSAGE);
return results.toArray(new String[results.size()]); return results.toArray(new String[results.size()]);
} }
final ContentResolver resolver = context.getContentResolver(); final ContentResolver resolver = context.getContentResolver();
@ -403,16 +385,20 @@ public class QtNative
DocumentsContract.getTreeDocumentId(treeUri)); DocumentsContract.getTreeDocumentId(treeUri));
final Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(docUri, final Uri childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(docUri,
DocumentsContract.getDocumentId(docUri)); DocumentsContract.getDocumentId(docUri));
Cursor c = null; Cursor c;
final String dirStr = new String(DocumentsContract.Document.MIME_TYPE_DIR); final String dirStr = DocumentsContract.Document.MIME_TYPE_DIR;
try { try {
c = resolver.query(childrenUri, new String[] { c = resolver.query(childrenUri, new String[] {
DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_MIME_TYPE }, null, null, null); DocumentsContract.Document.COLUMN_DOCUMENT_ID,
DocumentsContract.Document.COLUMN_DISPLAY_NAME,
DocumentsContract.Document.COLUMN_MIME_TYPE },
null, null, null);
while (c.moveToNext()) { while (c.moveToNext()) {
final String fileString = c.getString(1); final String fileString = c.getString(1);
if (!m_cachedUris.containsKey(contentUrl + "/" + fileString)) { if (!m_cachedUris.containsKey(contentUrl + "/" + fileString)) {
m_cachedUris.put(contentUrl + "/" + fileString, m_cachedUris.put(contentUrl + "/" + fileString,
DocumentsContract.buildDocumentUriUsingTree(treeUri, c.getString(0))); DocumentsContract.buildDocumentUriUsingTree(treeUri,
c.getString(0)));
} }
results.add(fileString); results.add(fileString);
if (c.getString(2).equals(dirStr)) if (c.getString(2).equals(dirStr))
@ -425,6 +411,7 @@ public class QtNative
} }
return results.toArray(new String[results.size()]); return results.toArray(new String[results.size()]);
} }
// this method loads full path libs // this method loads full path libs
public static void loadQtLibraries(final ArrayList<String> libraries) public static void loadQtLibraries(final ArrayList<String> libraries)
{ {