diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-07-26 20:11:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 20:11:53 +0530 |
| commit | 2b1f101685472452ecb30d8a84bcc6b88167bd1c (patch) | |
| tree | 1f722556a4498d16e1b0179974549241c79e329d /app/src/main | |
| parent | 9f8f9d588c00139e42470b491464457623c8b717 (diff) | |
Correctly set error on incorrect credentials (#972)
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt | 7 | ||||
| -rw-r--r-- | app/src/main/res/layout/git_credential_layout.xml | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt index 9d2c629f..90f72b7c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitOperation.kt @@ -9,12 +9,12 @@ import android.content.Intent import android.view.LayoutInflater import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.ContextCompat import androidx.core.content.edit import androidx.preference.PreferenceManager import com.google.android.material.checkbox.MaterialCheckBox import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText +import com.google.android.material.textfield.TextInputLayout import com.zeapo.pwdstore.R import com.zeapo.pwdstore.UserPreference import com.zeapo.pwdstore.git.config.ConnectionMode @@ -37,7 +37,6 @@ import org.eclipse.jgit.transport.CredentialItem import org.eclipse.jgit.transport.CredentialsProvider import org.eclipse.jgit.transport.SshSessionFactory import org.eclipse.jgit.transport.URIish -import com.google.android.material.R as materialR private class GitOperationCredentialFinder( @@ -78,13 +77,13 @@ private class GitOperationCredentialFinder( @SuppressLint("InflateParams") val dialogView = layoutInflater.inflate(R.layout.git_credential_layout, null) + val credentialLayout = dialogView.findViewById<TextInputLayout>(R.id.git_auth_passphrase_layout) val editCredential = dialogView.findViewById<TextInputEditText>(R.id.git_auth_credential) editCredential.setHint(hintRes) val rememberCredential = dialogView.findViewById<MaterialCheckBox>(R.id.git_auth_remember_credential) rememberCredential.setText(rememberRes) if (isRetry) - editCredential.setError(callingActivity.resources.getString(errorRes), - ContextCompat.getDrawable(callingActivity, materialR.drawable.mtrl_ic_error)) + credentialLayout.error = callingActivity.resources.getString(errorRes) MaterialAlertDialogBuilder(callingActivity).run { setTitle(R.string.passphrase_dialog_title) setMessage(messageRes) diff --git a/app/src/main/res/layout/git_credential_layout.xml b/app/src/main/res/layout/git_credential_layout.xml index 757658e6..180b904a 100644 --- a/app/src/main/res/layout/git_credential_layout.xml +++ b/app/src/main/res/layout/git_credential_layout.xml @@ -15,6 +15,7 @@ android:layout_height="wrap_content" app:endIconMode="password_toggle" app:hintEnabled="true" + app:errorEnabled="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> |