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

Fix edit operation with latest changes in FILE_PATH

Browse source
This commit is contained in:
Mohamed Zenadi 2017-08-02 12:23:30 +01:00 committed by Mohamed Zenadi
parent de5edf6e93
commit 145c96f5da
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
View file

@ -37,7 +37,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
} }
var passwordEntry: PasswordEntry? = null var passwordEntry: PasswordEntry? = null
var api : OpenPgpApi? = null var api: OpenPgpApi? = null
val operation: String by lazy { intent.getStringExtra("OPERATION") } val operation: String by lazy { intent.getStringExtra("OPERATION") }
val repoPath: String by lazy { intent.getStringExtra("REPO_PATH") } val repoPath: String by lazy { intent.getStringExtra("REPO_PATH") }
@ -77,7 +77,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
"ENCRYPT" -> { "ENCRYPT" -> {
setContentView(R.layout.encrypt_layout) setContentView(R.layout.encrypt_layout)
title = getString(R.string.new_password_title) title = getString(R.string.new_password_title)
crypto_password_category.text = relativeParentPath crypto_password_category.text = getRelativePath(fullPath, repoPath)
} }
} }
} }
@ -91,7 +91,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
// Inflate the menu; this adds items to the action bar if it is present. // Inflate the menu; this adds items to the action bar if it is present.
// Do not use the value `operation` in this case as it is not valid when editing // Do not use the value `operation` in this case as it is not valid when editing
val menuId = when (intent.getStringExtra("OPERATION")) { val menuId = when (intent.getStringExtra("OPERATION")) {
"ENCRYPT" -> R.menu.pgp_handler_new_password "ENCRYPT", "EDIT" -> R.menu.pgp_handler_new_password
"DECRYPT" -> R.menu.pgp_handler "DECRYPT" -> R.menu.pgp_handler
else -> R.menu.pgp_handler else -> R.menu.pgp_handler
} }
@ -196,7 +196,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
passwordEntry = entry passwordEntry = entry
if (operation == "EDIT") { if (intent.getStringExtra("OPERATION") == "EDIT") {
editPassword() editPassword()
return@executeApiAsync return@executeApiAsync
} }
@ -279,7 +279,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
val iStream = ByteArrayInputStream("$pass\n$extra".toByteArray(Charset.forName("UTF-8"))) val iStream = ByteArrayInputStream("$pass\n$extra".toByteArray(Charset.forName("UTF-8")))
val oStream = ByteArrayOutputStream() val oStream = ByteArrayOutputStream()
val path = "$repoPath/$relativeParentPath/$name.gpg" val path = if (intent.getStringExtra("OPERATION") == "EDIT") fullPath else "$fullPath/$name.gpg"
api?.executeApiAsync(data, iStream, oStream, { result: Intent? -> api?.executeApiAsync(data, iStream, oStream, { result: Intent? ->
when (result?.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) { when (result?.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) {
@ -333,7 +333,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
delayTask?.skip = true delayTask?.skip = true
val data = Intent(this, PgpActivity::class.java) val data = Intent(this, PgpActivity::class.java)
data.putExtra("OPERATION", "ENCRYPT") data.putExtra("OPERATION", "EDIT")
data.putExtra("fromDecrypt", true) data.putExtra("fromDecrypt", true)
intent = data intent = data
invalidateOptionsMenu() invalidateOptionsMenu()
@ -575,7 +575,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
/** /**
* Gets the Parent path, relative to the repository * Gets the Parent path, relative to the repository
*/ */
fun getParentPath(fullPath: String, repositoryPath: String) : String { fun getParentPath(fullPath: String, repositoryPath: String): String {
val relativePath = getRelativePath(fullPath, repositoryPath) val relativePath = getRelativePath(fullPath, repositoryPath)
val index = relativePath.lastIndexOf("/") val index = relativePath.lastIndexOf("/")
return "/${relativePath.substring(startIndex = 0, endIndex = index + 1)}/".replace("/+".toRegex(), "/") return "/${relativePath.substring(startIndex = 0, endIndex = index + 1)}/".replace("/+".toRegex(), "/")
@ -584,7 +584,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
/** /**
* Gets the name of the password (excluding .gpg) * Gets the name of the password (excluding .gpg)
*/ */
fun getName(fullPath: String, repositoryPath: String) : String { fun getName(fullPath: String, repositoryPath: String): String {
val relativePath = getRelativePath(fullPath, repositoryPath) val relativePath = getRelativePath(fullPath, repositoryPath)
val index = relativePath.lastIndexOf("/") val index = relativePath.lastIndexOf("/")
return relativePath.substring(index + 1).replace("\\.gpg$".toRegex(), "") return relativePath.substring(index + 1).replace("\\.gpg$".toRegex(), "")