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

UI fixups (#892)

Browse source
This commit is contained in:
Harsh Shandilya 2020-06-28 01:45:39 +05:30 committed by GitHub
parent 0a0e517414
commit 9fc5d337b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
### Fixed ### Fixed
- Remember passphrase option did not work with keys that had empty passphrases and were generated before 2019 - Remember passphrase option did not work with keys that had empty passphrases and were generated before 2019
- Folder names that were very long did not look right
- Error message for wrong SSH/HTTPS password now looks cleaner
### Added ### Added

5
app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
View file

@ -9,6 +9,7 @@ import android.app.Activity
import android.content.Intent import android.content.Intent
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import androidx.core.content.edit import androidx.core.content.edit
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.google.android.material.checkbox.MaterialCheckBox import com.google.android.material.checkbox.MaterialCheckBox
@ -35,6 +36,7 @@ import org.eclipse.jgit.transport.URIish
import java.io.File import java.io.File
import kotlin.coroutines.Continuation import kotlin.coroutines.Continuation
import kotlin.coroutines.resume import kotlin.coroutines.resume
import com.google.android.material.R as materialR
private class GitOperationCredentialFinder(val callingActivity: Activity, val connectionMode: ConnectionMode) : InteractivePasswordFinder() { private class GitOperationCredentialFinder(val callingActivity: Activity, val connectionMode: ConnectionMode) : InteractivePasswordFinder() {
@ -77,7 +79,8 @@ private class GitOperationCredentialFinder(val callingActivity: Activity, val co
val rememberCredential = dialogView.findViewById<MaterialCheckBox>(R.id.git_auth_remember_credential) val rememberCredential = dialogView.findViewById<MaterialCheckBox>(R.id.git_auth_remember_credential)
rememberCredential.setText(rememberRes) rememberCredential.setText(rememberRes)
if (isRetry) if (isRetry)
editCredential.error = callingActivity.resources.getString(errorRes) editCredential.setError(callingActivity.resources.getString(errorRes),
ContextCompat.getDrawable(callingActivity, materialR.drawable.mtrl_ic_error))
MaterialAlertDialogBuilder(callingActivity).run { MaterialAlertDialogBuilder(callingActivity).run {
setTitle(R.string.passphrase_dialog_title) setTitle(R.string.passphrase_dialog_title)
setMessage(messageRes) setMessage(messageRes)

3
app/src/main/res/layout/password_row_layout.xml
View file

@ -26,12 +26,13 @@
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:textSize="18sp" android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/type_image" app:layout_constraintStart_toEndOf="@id/type_image"
app:layout_constraintEnd_toStartOf="@id/child_count"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="FILE_NAME" /> tools:text="FILE_NAME" />