aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt1
-rw-r--r--app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt2
-rw-r--r--app/src/main/res/layout/activity_git_clone.xml24
3 files changed, 3 insertions, 24 deletions
diff --git a/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt
index 85eae71d..5792645a 100644
--- a/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt
@@ -83,7 +83,6 @@ class GitServerConfigActivity : BaseGitActivity() {
setAuthModes(it.startsWith("http://") || it.startsWith("https://"))
}
)
- binding.serverBranch.setText(gitSettings.branch)
binding.serverUrl.doOnTextChanged { text, _, _, _ ->
if (text.isNullOrEmpty()) return@doOnTextChanged
diff --git a/app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt
index f0348771..67a64cd5 100644
--- a/app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt
+++ b/app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt
@@ -19,6 +19,6 @@ class CloneOperation(callingActivity: AppCompatActivity, uri: String) :
override val commands: Array<GitCommand<out Any>> =
arrayOf(
- Git.cloneRepository().setBranch(remoteBranch).setDirectory(repository.workTree).setURI(uri),
+ Git.cloneRepository().setDirectory(repository.workTree).setURI(uri),
)
}
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml
index 16998921..4f16fc1d 100644
--- a/app/src/main/res/layout/activity_git_clone.xml
+++ b/app/src/main/res/layout/activity_git_clone.xml
@@ -10,7 +10,6 @@
android:layout_height="match_parent"
android:background="?android:attr/windowBackground"
android:padding="@dimen/activity_horizontal_margin"
- tools:background="@color/white"
tools:context="app.passwordstore.ui.git.config.GitServerConfigActivity">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -33,26 +32,7 @@
android:layout_height="wrap_content"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
- android:nextFocusForward="@id/server_branch" />
-
- </com.google.android.material.textfield.TextInputLayout>
-
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/label_server_branch"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:hint="@string/server_branch"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/label_server_url">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/server_branch"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:imeOptions="actionDone"
- android:inputType="textNoSuggestions" />
+ android:nextFocusForward="@id/auth_mode_group" />
</com.google.android.material.textfield.TextInputLayout>
@@ -65,7 +45,7 @@
android:layout_marginBottom="16dp"
android:text="@string/connection_mode"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/label_server_branch" />
+ app:layout_constraintTop_toBottomOf="@id/label_server_url" />
<com.google.android.material.button.MaterialButtonToggleGroup
android:id="@+id/auth_mode_group"