Merge branch 'release' into develop

* release:
  build: bump version
  Update CHANGELOG
  Revert "Reland symlink support (#1020)"

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

5 files changed, 12 insertions, 15 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9346f7b..dbfbf651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,16 @@ All notable changes to this project will be documented in this file.
 
 -   Allow sorting by recently used
 
+## [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)
@@ -301,7 +308,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
 
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>
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"