rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up URI handling.

Browse Source
This commit is contained in:
Brian Pellin
2016-03-10 21:25:57 -06:00
parent bb8afabb0d
commit 48b0aaa565
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/keepassdroid/PasswordActivity.java
View File

@@ -265,9 +265,6 @@ public class PasswordActivity extends LockingActivity {
return;
}
String fileName = getEditText(R.id.filename);
// Clear before we load
Database db = App.getDB();
db.clear();
@@ -275,10 +272,8 @@ public class PasswordActivity extends LockingActivity {
// Clear the shutdown flag
App.clearShutdown();
Uri uri = UriUtil.parseDefaultFile(fileName);
Handler handler = new Handler();
LoadDB task = new LoadDB(db, PasswordActivity.this, uri, pass, keyfile, new AfterLoad(handler, db));
LoadDB task = new LoadDB(db, PasswordActivity.this, mDbUri, pass, keyfile, new AfterLoad(handler, db));
ProgressTask pt = new ProgressTask(PasswordActivity.this, task, R.string.loading_database);
pt.run();
}

2
app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java
View File

@@ -327,7 +327,7 @@ public class FileSelectActivity extends ListActivity {
if (data != null) {
Uri uri = data.getData();
if (uri != null) {
filename = uri.getPath();
filename = uri.toString();
}
}
}