kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "Reland symlink support (#1020)"

Browse source 
This does not work below API 27.

Fixes #1032

This reverts commit 087ab547c1.
This commit is contained in:
Harsh Shandilya 2020-08-21 01:07:35 +05:30
parent 80b3a15592
commit 7a7e58f6dd
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
4 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -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)

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

@ -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) {

1
app/src/main/res/values/strings.xml
View file

@ -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>

1
buildSrc/src/main/java/Dependencies.kt
View file

@ -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"