Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62532e55 authored by Matt Pietal's avatar Matt Pietal
Browse files

Sharesheet - Address misleading logs 

Log more informative warnings to assist developers in adding an
optional preview section.

Bug: 132152987
Test: Manual
Change-Id: I4a97675315871317591d627cccc79da3f7e89d46
parent d06c6d29

core/java/com/android/internal/app/ChooserActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ public class ChooserActivity extends ResolverActivity { 
                }

            }

        } catch (SecurityException | NullPointerException e) {

            Log.w(TAG, "Error loading file preview", e);

            logContentPreviewWarning(uri);

        }



        if (TextUtils.isEmpty(fileName)) {
@@ -793,6 +793,14 @@ public class ChooserActivity extends ResolverActivity { 
        return new FileInfo(fileName, hasThumbnail);

    }



    private void logContentPreviewWarning(Uri uri) {

        // The ContentResolver already logs the exception. Log something more informative.

        Log.w(TAG, "Could not load (" + uri.toString() + ") thumbnail/name for preview. If "

                + "desired, consider using Intent#createChooser to launch the ChooserActivity, "

                + "and set your Intent's clipData and flags in accordance with that method's "

                + "documentation");

    }



    private ViewGroup displayFileContentPreview(Intent targetIntent, LayoutInflater layoutInflater,

            ViewGroup convertView, ViewGroup parent) {
@@ -1664,7 +1672,7 @@ public class ChooserActivity extends ResolverActivity { 
        try {

            return ImageUtils.loadThumbnail(getContentResolver(), uri, size);

        } catch (IOException | NullPointerException | SecurityException ex) {

            Log.w(TAG, "Error loading preview thumbnail for uri: " + uri.toString(), ex);

            logContentPreviewWarning(uri);

        }

        return null;

    }