Skip to content

Commit 852d5ba

Browse files
ViscousPotViscousPot
authored
Merge pull request #146 from ViscousPot/fix/improve-multi-repo-messaging
Fix/improve multi repo messaging
2 parents bdebf84 + ced60bd commit 852d5ba

File tree

5 files changed

+41
-25
lines changed

5 files changed

+41
-25
lines changed

‎app/src/main/java/com/viscouspot/gitsync/MainActivity.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,10 @@ class MainActivity : AppCompatActivity() {
433433

434434
removeRepoButton.setOnClickListener {
435435
BaseDialog(this)
436-
.setTitle(getString(R.string.confirm_repo_delete))
436+
.setTitle(getString(R.string.confirm_container_delete))
437437
.setMessage(
438438
getString(
439-
R.string.confirm_repo_delete_msg,
439+
R.string.confirm_container_delete_msg,
440440
repoManager.getRepoNames().elementAt(repoManager.getRepoIndex())
441441
)
442442
)
@@ -461,10 +461,10 @@ class MainActivity : AppCompatActivity() {
461461
renameRepoButton.setOnClickListener {
462462
val keyInput = LayoutInflater.from(this).inflate(R.layout.edittext_key, null) as ConstraintLayout
463463
val input = keyInput.findViewById<EditText>(R.id.input)
464-
input.hint = getString(R.string.default_repo_name)
464+
input.hint = getString(R.string.default_container_name)
465465
input.setText(repoManager.getRepoNames().elementAt(repoManager.getRepoIndex()))
466466
BaseDialog(this)
467-
.setTitle(getString(R.string.rename_repository))
467+
.setTitle(getString(R.string.rename_container))
468468
.setCancelable(1)
469469
.setView(keyInput)
470470
.setNegativeButton(android.R.string.cancel) { _, _ -> }
@@ -497,9 +497,10 @@ class MainActivity : AppCompatActivity() {
497497
showContributeDialog(this, repoManager) {
498498
val keyInput = LayoutInflater.from(this).inflate(R.layout.edittext_key, null) as ConstraintLayout
499499
val input = keyInput.findViewById<EditText>(R.id.input)
500-
input.hint = getString(R.string.default_repo_name)
500+
input.hint = getString(R.string.default_container_name)
501501
BaseDialog(this)
502-
.setTitle(getString(R.string.add_repository))
502+
.setTitle(getString(R.string.add_container))
503+
.setMessage(getString(R.string.add_container_msg))
503504
.setCancelable(1)
504505
.setView(keyInput)
505506
.setPositiveButton(R.string.add) { _, _ -> }

‎app/src/main/java/com/viscouspot/gitsync/util/GitManager.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ class GitManager(private val context: Context, private val settingsManager: Sett
7777
if (transport is SshTransport) {
7878
transport.sshSessionFactory = sshSessionFactory
7979
}
80+
transport.timeout = 3000
8081
}
8182
} else {
8283
val authCredentials = settingsManager.getGitAuthCredentials()
8384
command.setCredentialsProvider(UsernamePasswordCredentialsProvider(authCredentials.first, authCredentials.second))
84-
}
85-
command.setTransportConfigCallback { transport ->
86-
transport.timeout = 3000
85+
command.setTransportConfigCallback { transport ->
86+
transport.timeout = 3000
87+
}
8788
}
8889
}
8990

‎app/src/main/java/com/viscouspot/gitsync/util/Logger.kt‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ object Logger {
7575

7676
private fun addToLastLogs(type: LogType, message: String) {
7777
lastLogs.add(Pair(type, message))
78-
while (lastLogs.size > 10) {
78+
while (lastLogs.size > 20) {
7979
lastLogs.removeAt(0)
8080
}
8181
}
@@ -123,13 +123,25 @@ object Logger {
123123
}
124124

125125
private fun createGitHubIssueIntent(): Intent {
126-
val lastLogsString = lastLogs.joinToString(separator = "\n") { (first, second) -> "$first: $second" }
126+
val lastLogsString = lastLogs.reversed().joinToString(separator = "\n") { (first, second) -> "$first: $second" }
127127
var url = "https://github.com/ViscousPot/GitSync/issues/new?"
128128
url += "body="
129129
url += urlEncode("""
130+
<!-- Fill out the error details below -->
130131
132+
#### Have you looked at the wiki?
133+
<!-- e.g. N -->
131134
132-
<!-- PROVIDE ERROR REPRO STEPS -->
135+
#### Can you reproduce this issue reliably?
136+
<!-- e.g. N -->
137+
138+
#### Which feature is affected?
139+
<!-- e.g. auth -->
140+
141+
#### What auth method are you using?
142+
<!-- e.g. oauth -->
143+
144+
<!-- -------- STOP HERE -------- -->
133145
134146
---
135147

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,18 @@
6868
<string name="sync_on_app_opened">Sincronizar al abrir la(s) aplicación(es)</string>
6969

7070
<!-- Multi Repo -->
71-
<string name="default_repo_name">origin</string>
71+
<string name="default_container_name">alias</string>
7272

7373
<string name="rename">Renombrar</string>
74-
<string name="rename_repository">Renombrar Repositorio</string>
75-
<string name="rename_repository_msg">Introduce un nuevo nombre para el repositorio</string>
74+
<string name="rename_container">Renombrar Repositorio</string>
75+
<string name="rename_container_msg">Introduce un nuevo nombre para el repositorio</string>
7676

7777
<string name="add">Añadir</string>
78-
<string name="add_repository">Añadir Repositorio</string>
78+
<string name="add_container">Añadir Repositorio</string>
79+
<string name="add_container_msg">¡Dale a tu nuevo contenedor un nombre único! Este alias te ayudará a identificarlo fácilmente más tarde.</string>
7980

80-
<string name="confirm_repo_delete_msg">¿Estás seguro de que quieres eliminar el repositorio \"%1$s\"? \n\nEsta acción no se puede deshacer.</string>
81-
<string name="confirm_repo_delete">Confirmar Eliminación del Repositorio</string>
81+
<string name="confirm_container_delete_msg">¿Estás seguro de que quieres eliminar el repositorio \"%1$s\"? \n\nEsta acción no se puede deshacer.</string>
82+
<string name="confirm_container_delete">Confirmar Eliminación del Repositorio</string>
8283

8384
<!-- Clone Screen-->
8485
<string name="clone_repo">Clonar repositorio remoto</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,18 @@
6868
<string name="sync_on_app_opened">Sync on app(s) opened</string>
6969

7070
<!-- Multi Repo -->
71-
<string name="default_repo_name">main</string>
71+
<string name="default_container_name">alias</string>
7272

7373
<string name="rename">Rename</string>
74-
<string name="rename_repository">Rename Repository</string>
75-
<string name="rename_repository_msg">Enter a new name for the repository</string>
74+
<string name="rename_container">Rename Container</string>
75+
<string name="rename_container_msg">Enter a new name for the container</string>
7676

7777
<string name="add">Add</string>
78-
<string name="add_repository">Add Repository</string>
79-
80-
<string name="confirm_repo_delete_msg">Are you sure you want to delete the repository \"%1$s\"? \n\nThis action cannot be undone.</string>
81-
<string name="confirm_repo_delete">Confirm Repository Deletion</string>
78+
<string name="add_container">Add Container</string>
79+
<string name="add_container_msg">Give your new container a unique name! This alias will help you easily identify it later.</string>
80+
81+
<string name="confirm_container_delete">Confirm Container Deletion</string>
82+
<string name="confirm_container_delete_msg">Are you sure you want to delete the container \"%1$s\"? \n\nThis action cannot be undone.</string>
8283

8384
<!-- Clone Screen-->
8485
<string name="clone_repo">Clone remote repository</string>

0 commit comments

Comments
 (0)