From 7a7e58f6dd0881d032742b1f7997e86e1ef56d49 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
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 -
 3 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'app')

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 @@
     <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>
-- 
cgit v1.2.3