mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-20 12:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #180 from brarcher/import-from-filesystem

Browse Source 
Import from filesystem
This commit is contained in:
Branden Archer
2018-01-19 23:09:28 -05:00
committed by GitHub
parent 4034997d7f f1b0a26591
commit 23766fe9f0
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/protect/card_locker/ImportExportActivity.java
View File

@@ -248,6 +248,14 @@ public class ImportExportActivity extends AppCompatActivity
builder.setTitle(R.string.importFailedTitle);
}
int messageId = success ? R.string.importedFrom : R.string.importFailed;
final String template = getResources().getString(messageId);
// Get the filename of the file being imported
String filename = path.toString();
final String message = String.format(template, filename);
builder.setMessage(message);
builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
{
@Override
@@ -372,13 +380,24 @@ public class ImportExportActivity extends AppCompatActivity
try
{
InputStream reader = getContentResolver().openInputStream(uri);
InputStream reader;
if(uri.getScheme() != null)
{
reader = getContentResolver().openInputStream(uri);
}
else
{
reader = new FileInputStream(new File(uri.toString()));
}
Log.e(TAG, "Starting file import with: " + uri.toString());
startImport(reader, uri);
}
catch (FileNotFoundException e)
catch(FileNotFoundException e)
{
Log.e(TAG, "Failed to import file: " + uri.toString(), e);
onImportComplete(false, uri);
}
}
}