Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 7a7e58f

Browse files
committed
Revert "Reland symlink support (#1020)"
This does not work below API 27. Fixes #1032 This reverts commit 087ab54.
1 parent 80b3a15 commit 7a7e58f

File tree

4 files changed

+1
-13
lines changed

4 files changed

+1
-13
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ dependencies {
118118
implementation(Dependencies.ThirdParty.jgit) {
119119
exclude(group = "org.apache.httpcomponents", module = "httpclient")
120120
}
121-
// Loaded dynamically by JGit to provide symlink support
122-
implementation(Dependencies.ThirdParty.jgit_java7)
123121
implementation(Dependencies.ThirdParty.jsch)
124122
implementation(Dependencies.ThirdParty.sshj)
125123
implementation(Dependencies.ThirdParty.bouncycastle)

app/src/main/java/com/zeapo/pwdstore/crypto/DecryptActivity.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import android.text.method.PasswordTransformationMethod
1212
import android.view.Menu
1313
import android.view.MenuItem
1414
import android.view.View
15-
import android.widget.Toast
1615
import androidx.activity.result.IntentSenderRequest
1716
import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult
1817
import androidx.lifecycle.lifecycleScope
@@ -24,7 +23,6 @@ import com.zeapo.pwdstore.utils.PreferenceKeys
2423
import com.zeapo.pwdstore.utils.viewBinding
2524
import java.io.ByteArrayOutputStream
2625
import java.io.File
27-
import java.io.FileNotFoundException
2826
import kotlin.time.ExperimentalTime
2927
import kotlin.time.seconds
3028
import kotlinx.coroutines.Dispatchers
@@ -137,13 +135,7 @@ class DecryptActivity : BasePgpActivity(), OpenPgpServiceConnection.OnBound {
137135
val data = receivedIntent ?: Intent()
138136
data.action = OpenPgpApi.ACTION_DECRYPT_VERIFY
139137

140-
val inputStream = try {
141-
File(fullPath).inputStream()
142-
} catch (e: FileNotFoundException) {
143-
Toast.makeText(this, getString(R.string.error_broken_symlink), Toast.LENGTH_SHORT).show()
144-
finish()
145-
return
146-
}
138+
val inputStream = File(fullPath).inputStream()
147139
val outputStream = ByteArrayOutputStream()
148140

149141
lifecycleScope.launch(Dispatchers.IO) {

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225
<string name="no_repo_selected">No external repository selected</string>
226226
<string name="send_plaintext_password_to">Send password as plaintext using…</string>
227227
<string name="app_icon_hint">App icon</string>
228-
<string name="error_broken_symlink">File not found, likely because of a broken symlink</string>
229228

230229
<!-- Oreo Autofill -->
231230
<string name="oreo_autofill_strict_domain_search">Phishing-resistant search</string>

buildSrc/src/main/java/Dependencies.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ object Dependencies {
5656
const val fastscroll = "me.zhanghai.android.fastscroll:library:1.1.4"
5757
const val jsch = "com.jcraft:jsch:0.1.55"
5858
const val jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
59-
const val jgit_java7 = "org.eclipse.jgit:org.eclipse.jgit.java7:3.7.1.201504261725-r"
6059
const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.4"
6160
const val plumber = "com.squareup.leakcanary:plumber-android:2.4"
6261
const val sshj = "com.hierynomus:sshj:0.30.0"

0 commit comments

Comments
 (0)