Try getting decrypt going

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
android-password-store · May 25, 2020 · 1bdf9bc · 1bdf9bc
1 parent 8e4e950
commit 1bdf9bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/BasePgpActivity.kt
@@ -74,8 +74,13 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        serviceConnection?.unbindFromService()
+    }
+
     override fun onBound(service: IOpenPgpService2) {
-        initOpenPgpApi()
+        api = OpenPgpApi(this, service)
     }
 
     override fun onError(e: Exception) {
@@ -103,10 +108,6 @@ open class BasePgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBou
         }
     }
 
-    private fun initOpenPgpApi() {
-        api = api ?: OpenPgpApi(this, serviceConnection!!.service!!)
-    }
-
     /**
      * Gets a relative string describing when this shape was last changed
      * (e.g. "one hour ago")

diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt
@@ -21,7 +21,7 @@ import com.zeapo.pwdstore.databinding.DecryptLayoutBinding
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import me.msfjarvis.openpgpktx.util.OpenPgpApi
-import org.apache.commons.io.FileUtils
+import org.openintents.openpgp.IOpenPgpService2
 import java.io.ByteArrayOutputStream
 import java.io.File
 
@@ -91,6 +91,11 @@ class DecryptActivity : BasePgpActivity() {
         }
     }
 
+    override fun onBound(service: IOpenPgpService2) {
+        super.onBound(service)
+        decryptAndVerify()
+    }
+
     private fun copyUsernameToClipboard(username: String?) {
         val clipboard = clipboard ?: return
         val clip = ClipData.newPlainText("pgp_handler_result_pm", username)
@@ -133,7 +138,7 @@ class DecryptActivity : BasePgpActivity() {
         val data = receivedIntent ?: Intent()
         data.action = OpenPgpApi.ACTION_DECRYPT_VERIFY
 
-        val inputStream = FileUtils.openInputStream(File(fullPath))
+        val inputStream = File(fullPath).inputStream()
         val outputStream = ByteArrayOutputStream()
 
         lifecycleScope.launch(Dispatchers.IO) {