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/build.gradle.kts | 2 -- app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt | 10 +--------- app/src/main/res/values/strings.xml | 1 - buildSrc/src/main/java/Dependencies.kt | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dc672aec..19c6a49d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 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 diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index c4714a0e..23c4c264 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -56,7 +56,6 @@ object Dependencies { const val fastscroll = "me.zhanghai.android.fastscroll:library:1.1.4" const val jsch = "com.jcraft:jsch:0.1.55" const val jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r" - const val jgit_java7 = "org.eclipse.jgit:org.eclipse.jgit.java7:3.7.1.201504261725-r" const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.4" const val plumber = "com.squareup.leakcanary:plumber-android:2.4" const val sshj = "com.hierynomus:sshj:0.30.0" -- cgit v1.2.3 From 84afcb183ff4a9fff394ae4ab584cec10a35fbfe Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 21 Aug 2020 01:09:47 +0530 Subject: Update CHANGELOG Signed-off-by: Harsh Shandilya --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74e5b01b..241a1b4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,16 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [1.11.1] - 2020-08-21 + +### Fixed + +- App failed to start on Android 7 and below + ## [1.11.0] - 2020-08-18 ### Added + - Allow changing the branch used for Git operations - Allow setting a subdirectory key when creating folders - Allow adding digits/symbols in XkPasswd generated passwords using a mask-like value (`dds` gives you two digits and a symbol, and so on) @@ -297,7 +304,9 @@ All notable changes to this project will be documented in this file. - Fix elements overlapping. -[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.0...HEAD +[Unreleased]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.1...HEAD + +[1.11.1]: https://github.com/android-password-store/Android-Password-Store/compare/1.11.0...1.11.1 [1.11.0]: https://github.com/android-password-store/Android-Password-Store/compare/1.10.3...1.11.0 -- cgit v1.2.3 From d9c3aff6d38a0a55a633940cfcdcb40a70788496 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 21 Aug 2020 01:10:03 +0530 Subject: build: bump version Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 19c6a49d..d83d6f88 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,8 +30,8 @@ android { defaultConfig { applicationId = "dev.msfjarvis.aps" - versionCode = 11100 - versionName = "1.11.0" + versionCode = 11110 + versionName = "1.11.1" } lintOptions { -- cgit v1.2.3