Added AWS_DEFAULT_REGION option.

Fixes: #171.
lhns · Jul 9, 2023 · 65bb1cc · 65bb1cc
1 parent aea4f4d
commit 65bb1cc
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/app/src/main/java/de/lolhens/resticui/config/RepoConfig.kt b/app/src/main/java/de/lolhens/resticui/config/RepoConfig.kt
@@ -108,14 +108,16 @@ abstract class RepoParams {
 data class S3RepoParams(
  val s3Url: @Serializable(with = URISerializer::class) URI,
  val accessKeyId: String,
- val secretAccessKey: Secret
+ val secretAccessKey: Secret,
+ val s3DefaultRegion: String
 ) : RepoParams() {
  override fun repo(baseConfig: RepoBaseConfig, restic: Restic): ResticRepo = ResticRepoS3(
  restic,
  baseConfig.password.secret,
  s3Url,
  accessKeyId,
- secretAccessKey.secret
+ secretAccessKey.secret,
+ s3DefaultRegion
  )
 }
 
@@ -143,4 +145,4 @@ data class B2RepoParams(
  b2AccountId,
  b2AccountKey.secret
  )
-}
+}
diff --git a/app/src/main/java/de/lolhens/resticui/restic/ResticRepoS3.kt b/app/src/main/java/de/lolhens/resticui/restic/ResticRepoS3.kt
@@ -7,7 +7,8 @@ class ResticRepoS3(
  password: String,
  private val s3Url: URI,
  private val accessKeyId: String,
- private val secretAccessKey: String
+ private val secretAccessKey: String,
+ private val s3DefaultRegion: String
 ) : ResticRepo(
  restic,
  password
@@ -18,6 +19,7 @@ class ResticRepoS3(
 
  override fun vars(): List<Pair<String, String>> = listOf(
  Pair("AWS_ACCESS_KEY_ID", accessKeyId),
- Pair("AWS_SECRET_ACCESS_KEY", secretAccessKey)
+ Pair("AWS_SECRET_ACCESS_KEY", secretAccessKey),
+ Pair("AWS_DEFAULT_REGION", s3DefaultRegion)
  )
-}
+}
diff --git a/app/src/main/java/de/lolhens/resticui/ui/repo/RepoEditFragment.kt b/app/src/main/java/de/lolhens/resticui/ui/repo/RepoEditFragment.kt
@@ -84,6 +84,7 @@ class RepoEditFragment : Fragment() {
  binding.editRepoS3Parameters.editS3Uri.setText(s3RepoParams.s3Url.toString())
  binding.editRepoS3Parameters.editS3AccessKeyId.setText(s3RepoParams.accessKeyId)
  binding.editRepoS3Parameters.editS3SecretAccessKey.setText(s3RepoParams.secretAccessKey.secret)
+ binding.editRepoS3Parameters.editS3DefaultRegion.setText(s3RepoParams.s3DefaultRegion.toString())
  }
  RepoType.Rest -> {
  val restRepoParams = repo.params as RestRepoParams
@@ -221,7 +222,8 @@ class RepoEditFragment : Fragment() {
  S3RepoParams(
  s3Url = URI(binding.editRepoS3Parameters.editS3Uri.text.toString()),
  accessKeyId = binding.editRepoS3Parameters.editS3AccessKeyId.text.toString(),
- secretAccessKey = Secret(binding.editRepoS3Parameters.editS3SecretAccessKey.text.toString())
+ secretAccessKey = Secret(binding.editRepoS3Parameters.editS3SecretAccessKey.text.toString()),
+ s3DefaultRegion = binding.editRepoS3Parameters.editS3DefaultRegion.text.toString()
  )
  )
  }
@@ -320,4 +322,4 @@ class RepoEditFragment : Fragment() {
  _backupManager = null
  _binding = null
  }
-}
+}
diff --git a/app/src/main/res/layout/fragment_repo_edit_s3.xml b/app/src/main/res/layout/fragment_repo_edit_s3.xml
@@ -8,7 +8,7 @@
  <androidx.constraintlayout.widget.Group
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- app:constraint_referenced_ids="text_s3_uri, edit_s3_uri, text_access_key_id, edit_s3_access_key_id, text_secret_access_key, edit_s3_secret_access_key"
+ app:constraint_referenced_ids="text_s3_uri, edit_s3_uri, text_access_key_id, edit_s3_access_key_id, text_secret_access_key, edit_s3_secret_access_key, text_s3_default_region, edit_s3_default_region"
  android:id="@+id/repo_edit_s3_group" />
 
  <TextView
@@ -81,11 +81,35 @@
  android:layout_height="wrap_content"
  android:layout_marginStart="32dp"
  android:layout_marginEnd="32dp"
- android:layout_marginBottom="16dp"
  android:ems="10"
  android:inputType="textPassword"
- app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/text_secret_access_key" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+ <TextView
+ android:id="@+id/text_s3_default_region"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="16dp"
+ android:text="@string/repo_edit_s3_default_region_title"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/edit_s3_secret_access_key" />
+
+ <EditText
+ android:id="@+id/edit_s3_default_region"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="32dp"
+ android:layout_marginEnd="32dp"
+ android:layout_marginBottom="16dp"
+ android:ems="10"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/text_s3_default_region" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -64,4 +64,5 @@
  <string name="repo_edit_s3_access_key_id_error_mandatory">S3 Access Key ID needed</string>
  <string name="repo_edit_s3_secret_access_key_title">SECRET_ACCESS_KEY</string>
  <string name="repo_edit_s3_secret_access_key_error_mandatory">S3 Secret Access Key needed</string>
-</resources>
+ <string name="repo_edit_s3_default_region_title">AWS_DEFAULT_REGION</string>
+</resources>