kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

backport the fix of ssh key import

Browse source
This commit is contained in:
zeapo 2017-08-09 14:27:07 +02:00 committed by Mohamed Zenadi
parent 6b967923fd
commit 7bdeb80011
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/com/zeapo/pwdstore/UserPreference.kt
View file

@ -241,23 +241,21 @@ class UserPreference : AppCompatActivity() {
* Opens a file explorer to import the private key * Opens a file explorer to import the private key
*/ */
fun getSshKey(useDefaultPicker: Boolean) { fun getSshKey(useDefaultPicker: Boolean) {
if (useDefaultPicker) { val intent = if (useDefaultPicker) {
val intent = Intent(Intent.ACTION_GET_CONTENT) val intent = Intent(Intent.ACTION_GET_CONTENT)
intent.type = "*/*" intent.setType("*/*")
startActivityForResult(intent, IMPORT_SSH_KEY)
} else { } else {
// This always works // This always works
val i = Intent(applicationContext, FilePickerActivity::class.java) val intent = Intent(applicationContext, FilePickerActivity::class.java)
// This works if you defined the intent filter
// Intent i = new Intent(Intent.ACTION_GET_CONTENT);
// Set these depending on your use case. These are the defaults. // Set these depending on your use case. These are the defaults.
i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false) intent.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false)
i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, false) intent.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, false)
i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_FILE) intent.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_FILE)
i.putExtra(FilePickerActivity.EXTRA_START_PATH, Environment.getExternalStorageDirectory().path) intent.putExtra(FilePickerActivity.EXTRA_START_PATH, Environment.getExternalStorageDirectory().path)
} }
startActivityForResult(intent, IMPORT_SSH_KEY)
} }
/** /**