diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2020-08-21 01:33:24 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2020-08-21 01:33:24 +0530 |
| commit | 92f80b2e3ddfb40ce339ed8614e5997d92357bca (patch) | |
| tree | 08e52ffa816541936d4acc60e79199600792db33 /app | |
| parent | 67ee24ef86f69550a1cbe9a7eecdbe6be4dfe74a (diff) | |
| parent | d9c3aff6d38a0a55a633940cfcdcb40a70788496 (diff) | |
Merge branch 'release' into develop
* release:
build: bump version
Update CHANGELOG
Revert "Reland symlink support (#1020)"
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle.kts | 4 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt | 10 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
3 files changed, 2 insertions, 13 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 626037f7..34a5470d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,7 +30,7 @@ android { defaultConfig { applicationId = "dev.msfjarvis.aps" - versionCode = 11101 + versionCode = 11111 versionName = "1.12.0-SNAPSHOT" } @@ -118,8 +118,6 @@ dependencies { implementation(Dependencies.ThirdParty.jgit) { exclude(group = "org.apache.httpcomponents", module = "httpclient") } - // Loaded dynamically by JGit to provide symlink support - implementation(Dependencies.ThirdParty.jgit_java7) implementation(Dependencies.ThirdParty.jsch) implementation(Dependencies.ThirdParty.sshj) implementation(Dependencies.ThirdParty.bouncycastle) 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 ff1d5238..1b32e29c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -226,7 +226,6 @@ <string name="no_repo_selected">No external repository selected</string> <string name="send_plaintext_password_to">Send password as plaintext using…</string> <string name="app_icon_hint">App icon</string> - <string name="error_broken_symlink">File not found, likely because of a broken symlink</string> <!-- Oreo Autofill --> <string name="oreo_autofill_strict_domain_search">Phishing-resistant search</string> |