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

Commit 68909452 authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPE in readUriToLocalUri

Catch null local filenames.

Bug:26180970
Change-Id: If2848853e1e86a6b8a795fae554d97c0aa96ae0b
parent 4799a30d
Loading
Loading
Loading
Loading
+14 −4
Original line number Diff line number Diff line
@@ -523,6 +523,9 @@ public class ImportVCardActivity extends Activity {

    private Uri readUriToLocalUri(Uri sourceUri) {
        final String fileName = readUriToLocalFile(sourceUri);
        if (fileName == null) {
            return null;
        }
        return Uri.parse(getFileStreamPath(fileName).toURI().toString());
    }

@@ -635,11 +638,13 @@ public class ImportVCardActivity extends Activity {
                        final Uri uri = item.getUri();
                        if (uri != null) {
                            final Uri localUri = readUriToLocalUri(uri);
                            if (localUri != null) {
                                final String sourceDisplayName = getDisplayName(uri);
                                uris.add(localUri);
                                sourceDisplayNames.add(sourceDisplayName);
                            }
                        }
                    }
                    if (uris.isEmpty()) {
                        Log.w(LOG_TAG, "No vCard was selected for import");
                        finish();
@@ -654,7 +659,12 @@ public class ImportVCardActivity extends Activity {
                        Log.i(LOG_TAG, "vCard selected for import: " + uri);
                        final Uri localUri = readUriToLocalUri(uri);
                        final String sourceDisplayName = getDisplayName(uri);
                        if (localUri != null) {
                            importVCard(localUri, sourceDisplayName);
                        } else {
                            Log.w(LOG_TAG, "No local URI for vCard import");
                            finish();
                        }
                    } else {
                        Log.w(LOG_TAG, "No vCard was selected for import");
                        finish();