Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change-git-provider-after-auth #115

Merged
merged 1 commit into from
Jan 9, 2025
Merged

fix: change-git-provider-after-auth #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 43 additions & 32 deletions app/src/main/java/com/viscouspot/gitsync/ui/dialog/AuthDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,39 @@ class AuthDialog(private val context: Context, private val settingsManager: Sett

private val keyInput = LayoutInflater.from(context).inflate(R.layout.edittext_key, null) as ConstraintLayout

private val confirmPrivKeyCopyDialog = BaseDialog(context)
.setTitle(context.getString(R.string.confirm_priv_key_copy))
.setMessage(context.getString(R.string.confirm_priv_key_copy_msg))
.setCancelable(1)
.setPositiveButton(R.string.understood) { _, _ ->
privKeyButton.icon = AppCompatResources.getDrawable(context, R.drawable.confirm_clipboard)
privKeyButton.setIconTintResource(R.color.auth_green)

val clipboard: ClipboardManager? = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
val clip = ClipData.newPlainText(context.getString(R.string.copied_text), privKeyButton.text)
clipboard?.setPrimaryClip(clip)
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }

private val restoreKeyDialog = BaseDialog(context)
.setTitle(context.getString(R.string.import_private_key))
.setMessage(context.getString(R.string.import_private_key_msg))
.setCancelable(1)
.setView(keyInput)
.setPositiveButton(R.string.import_key) { _, _ ->
val key = keyInput.findViewById<EditText>(R.id.input).text
if (key == null || key.isEmpty()) return@setPositiveButton
setGitCredentials(null, key.toString())
dismiss()
this.dismiss()
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
private fun showConfirmPrivKeyCopyDialog() {
BaseDialog(context)
.setTitle(context.getString(R.string.confirm_priv_key_copy))
.setMessage(context.getString(R.string.confirm_priv_key_copy_msg))
.setCancelable(1)
.setPositiveButton(R.string.understood) { _, _ ->
privKeyButton.icon = AppCompatResources.getDrawable(context, R.drawable.confirm_clipboard)
privKeyButton.setIconTintResource(R.color.auth_green)

val clipboard: ClipboardManager? = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager?
val clip = ClipData.newPlainText(context.getString(R.string.copied_text), privKeyButton.text)
clipboard?.setPrimaryClip(clip)
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
.show()
}

private fun showRestoreKeyDialog(provider: GitProviderManager.Companion.Provider){
BaseDialog(context)
.setTitle(context.getString(R.string.import_private_key))
.setMessage(context.getString(R.string.import_private_key_msg))
.setCancelable(1)
.setView(keyInput)
.setPositiveButton(R.string.import_key) { _, _ ->
val key = keyInput.findViewById<EditText>(R.id.input).text
if (key == null || key.isEmpty()) return@setPositiveButton
setAuth(provider,null, key.toString())
dismiss()
this.dismiss()
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
.show()
}

override fun onStart() {
super.onStart()
Expand Down Expand Up @@ -97,14 +103,18 @@ class AuthDialog(private val context: Context, private val settingsManager: Sett
spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
val provider = providers.keys.toList()[position]
settingsManager.setGitProvider(provider)
updateInputs(provider)
}

override fun onNothingSelected(parent: AdapterView<*>) {}
}
}

private fun setAuth(provider: GitProviderManager.Companion.Provider, username: String?, token: String) {
settingsManager.setGitProvider(provider)
setGitCredentials(username, token)
}

private fun updateInputs(provider: GitProviderManager.Companion.Provider) {
when (provider) {
GitProviderManager.Companion.Provider.GITHUB,
Expand All @@ -115,6 +125,7 @@ class AuthDialog(private val context: Context, private val settingsManager: Sett

oAuthButton.setOnClickListener {
val gitManager = GitProviderManager.getManager(context, settingsManager)
settingsManager.setGitProvider(provider)
gitManager.launchOAuthFlow()
dismiss()
}
Expand Down Expand Up @@ -149,7 +160,7 @@ class AuthDialog(private val context: Context, private val settingsManager: Sett
}

loginButton.setOnClickListener {
setGitCredentials(usernameInput.text.toString(), tokenInput.text.toString())
setAuth(provider, usernameInput.text.toString(), tokenInput.text.toString())
dismiss()
}
}
Expand Down Expand Up @@ -186,13 +197,13 @@ class AuthDialog(private val context: Context, private val settingsManager: Sett
generateKeyButton.isEnabled = false
generateKeyButton.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.auth_green_secondary))
} else {
setGitCredentials(null, key!!)
setAuth(provider, null, key!!)
dismiss()
}
}

restoreKeyButton.setOnClickListener {
restoreKeyDialog.show()
showRestoreKeyDialog(provider)
}

pubKeyButton.setOnClickListener {
Expand All @@ -207,7 +218,7 @@ class AuthDialog(private val context: Context, private val settingsManager: Sett
generateKeyButton.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.auth_green))
}

privKeyButton.setOnClickListener { confirmPrivKeyCopyDialog.show() }
privKeyButton.setOnClickListener { showConfirmPrivKeyCopyDialog() }
}
}
}
Expand Down