From 7a7e58f6dd0881d032742b1f7997e86e1ef56d49 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 21 Aug 2020 01:07:35 +0530 Subject: Revert "Reland symlink support (#1020)" This does not work below API 27. Fixes #1032 This reverts commit 087ab547c123e90eb4207bfe9080486d54fbf3ef. --- app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt | 10 +--------- app/src/main/res/values/strings.xml | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt index a697f2ba..79f9e6da 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt @@ -12,7 +12,6 @@ import android.text.method.PasswordTransformationMethod import android.view.Menu import android.view.MenuItem import android.view.View -import android.widget.Toast import androidx.activity.result.IntentSenderRequest import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult import androidx.lifecycle.lifecycleScope @@ -24,7 +23,6 @@ import com.zeapo.pwdstore.utils.PreferenceKeys import com.zeapo.pwdstore.utils.viewBinding import java.io.ByteArrayOutputStream import java.io.File -import java.io.FileNotFoundException import kotlin.time.ExperimentalTime import kotlin.time.seconds import kotlinx.coroutines.Dispatchers @@ -137,13 +135,7 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound { val data = receivedIntent ?: Intent() data.action = OpenPgpApi.ACTION_DECRYPT_VERIFY - val inputStream = try { - File(fullPath).inputStream() - } catch (e: FileNotFoundException) { - Toast.makeText(this, getString(R.string.error_broken_symlink), Toast.LENGTH_SHORT).show() - finish() - return - } + val inputStream = File(fullPath).inputStream() val outputStream = ByteArrayOutputStream() lifecycleScope.launch(Dispatchers.IO) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fe2a3488..a7a9c141 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -225,7 +225,6 @@ No external repository selected Send password as plaintext using… App icon - File not found, likely because of a broken symlink Phishing-resistant search -- cgit v1.2.3