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

UI fixups #892

Merged
merged 3 commits into from
Jun 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
### Fixed

- 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

Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import android.app.Activity
import android.content.Intent
import android.view.LayoutInflater
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.preference.PreferenceManager
import com.google.android.material.checkbox.MaterialCheckBox
Expand All @@ -35,6 +36,7 @@ import org.eclipse.jgit.transport.URIish
import java.io.File
import kotlin.coroutines.Continuation
import kotlin.coroutines.resume
import com.google.android.material.R as materialR


private class GitOperationCredentialFinder(val callingActivity: Activity, val connectionMode: ConnectionMode) : InteractivePasswordFinder() {
Expand Down Expand Up @@ -77,7 +79,8 @@ private class GitOperationCredentialFinder(val callingActivity: Activity, val co
val rememberCredential = dialogView.findViewById<MaterialCheckBox>(R.id.git_auth_remember_credential)
rememberCredential.setText(rememberRes)
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 {
setTitle(R.string.passphrase_dialog_title)
setMessage(messageRes)
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/password_row_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@

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

Expand Down