fix email setting, allow empty value

app/src/main/AndroidManifest.xml

@@ -76,7 +76,7 @@
     <activity
       android:name=".ui.git.config.GitServerConfigActivity"
       android:exported="false"
-      android:label="@string/title_activity_git_clone"
+      android:label="@string/title_activity_git_remote"
       android:windowSoftInputMode="adjustResize" />
 
     <activity

app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt

@@ -52,7 +52,7 @@ class GitConfigActivity : BaseGitActivity() {
     binding.saveButton.setOnClickListener {
       val email = binding.gitUserEmail.text.toString().trim()
       val name = binding.gitUserName.text.toString().trim()
-      if (!email.matches(Patterns.EMAIL_ADDRESS.toRegex())) {
+      if (!email.isEmpty() && !email.matches(Patterns.EMAIL_ADDRESS.toRegex())) {
         MaterialAlertDialogBuilder(this)
           .setMessage(getString(R.string.invalid_email_dialog_text))
           .setPositiveButton(getString(R.string.dialog_ok), null)

app/src/main/java/app/passwordstore/ui/settings/RepositorySettings.kt

@@ -232,7 +232,7 @@ class RepositorySettings(private val activity: FragmentActivity) : SettingsProvi
   override fun provideSettings(builder: PreferenceScreen.Builder) {
     builder.apply {
       pref(PreferenceKeys.GIT_SERVER_INFO) {
-        titleRes = R.string.pref_edit_git_server_settings
+        titleRes = R.string.title_activity_git_remote
         onClick {
           configureGitServer.launch(Intent(activity, GitServerConfigActivity::class.java))
           true

app/src/main/java/app/passwordstore/util/git/GitCommandExecutor.kt

@@ -63,8 +63,11 @@ class GitCommandExecutor(
             // the previous status will eventually be used to avoid a commit
             if (nbChanges > 0) {
               withContext(dispatcherProvider.io()) {
-                val name = gitSettings.authorName.ifEmpty { "root" }
-                val email = gitSettings.authorEmail.ifEmpty { "localhost" }
+                val name = gitSettings.authorName.ifEmpty { "aps" }
+                val email =
+                  gitSettings.authorEmail.ifEmpty {
+                    "aps@" + android.os.Build.MODEL.replace(' ', '_')
+                  }
                 val identity = PersonIdent(name, email)
                 command.setAuthor(identity).setCommitter(identity).call()
               }

app/src/main/java/app/passwordstore/util/git/sshj/SshKey.kt

@@ -236,7 +236,9 @@ object SshKey {
         context.getString(R.string.ssh_key_import_error_not_an_ssh_key_message)
       )
 
-    val userId = context.sharedPrefs.getString(PreferenceKeys.GIT_CONFIG_AUTHOR_EMAIL) ?: "nn@aps"
+    val userId =
+      context.sharedPrefs.getString(PreferenceKeys.GIT_CONFIG_AUTHOR_EMAIL)
+        ?: "aps@" + android.os.Build.MODEL.replace(' ', '_')
 
     // At this point, we are reasonably confident that we have actually been provided a private
     // key and delete the old key.
@@ -273,7 +275,9 @@ object SshKey {
         generateKeyPair()
       }
 
-    val userId = context.sharedPrefs.getString(PreferenceKeys.GIT_CONFIG_AUTHOR_EMAIL) ?: "nn@aps"
+    val userId =
+      context.sharedPrefs.getString(PreferenceKeys.GIT_CONFIG_AUTHOR_EMAIL)
+        ?: "aps@" + android.os.Build.MODEL.replace(' ', '_')
 
     // Write public key in SSH format to .ssh_key.pub.
     publicKeyFile.writeText(toSshPublicKey(keyPair.public) + " " + userId)
@@ -306,7 +310,9 @@ object SshKey {
       )
     }
 
-    val userId = context.sharedPrefs.getString(PreferenceKeys.GIT_CONFIG_AUTHOR_EMAIL) ?: "nn@aps"
+    val userId =
+      context.sharedPrefs.getString(PreferenceKeys.GIT_CONFIG_AUTHOR_EMAIL)
+        ?: "aps@" + android.os.Build.MODEL.replace(' ', '_')
     publicKeyFile.writeText(toSshPublicKey(keyPair.public) + " " + userId)
 
     type = Type.KeystoreWrappedEd25519

app/src/main/res/values-ca/strings.xml

@@ -14,7 +14,6 @@
     <string name="dialog_delete_msg">Voleu suprimir el directori actual del magatzem de contrasenyes?\n(%1$s)</string>
     <string name="dialog_delete">Suprimeix el directori</string>
     <string name="dialog_do_not_delete">Cancel·lar</string>
-    <string name="title_activity_git_clone">Informació del repositori</string>
     <string name="title_activity_git_config">Configuració de Git</string>
     <string name="title_activity_git_log">Registre de commits</string>
     <string name="creation_dialog_text">Cloneu o creeu un nou repositori absn d\'intentar afegir una contrasenya o sincronitzar.</string>
@@ -69,7 +68,6 @@
     <string name="copy_password">Copia la contrasenya</string>
     <string name="share_as_plaintext">Comparteix com a text</string>
     <string name="pref_category_repository_title">Repositori</string>
-    <string name="pref_edit_git_server_settings">Edita la configuració del servidor Git</string>
     <string name="pref_edit_git_config">Configuració local de Git i utilitats</string>
     <string name="pref_import_ssh_key_title">Importa clau SSH</string>
     <string name="pref_ssh_keygen_title">Genera un parell de claus SSH</string>

app/src/main/res/values-de/strings.xml

@@ -17,7 +17,7 @@
   <string name="dialog_delete_msg">Möchten Sie das lokale Password-Repository wirklich löschen?\n\n%1$s</string>
   <string name="dialog_delete">Ordner löschen</string>
   <string name="dialog_do_not_delete">Abbrechen</string>
-  <string name="title_activity_git_clone">Repository-Informationen</string>
+  <string name="title_activity_git_remote">Remote-Repository</string>
   <string name="title_activity_git_config">Git-Konfiguration</string>
   <string name="title_activity_git_log">Commit-Log</string>
 
@@ -104,7 +104,6 @@
 
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repository</string>
-  <string name="pref_edit_git_server_settings">Git-Server-Einstellungen</string>
   <string name="pref_git_server_auth_key">Authentifizierungsschlüssel</string>
   <string name="pref_edit_git_config">Lokale Git-Konfiguration &amp; Dienstprogramme</string>
   <string name="pref_ssh_use_pgp_key_title">PGP-Schlüssel verwenden</string>

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

@@ -18,7 +18,6 @@
   <string name="dialog_delete_msg">¿Desea eliminar el directorio actual del almacén de contraseñas?\n(%1$s)</string>
   <string name="dialog_delete">Eliminar directorio</string>
   <string name="dialog_do_not_delete">Cancelar</string>
-  <string name="title_activity_git_clone">Información del repositorio</string>
     <string name="title_activity_git_config">Configuración de Git</string>
     <string name="title_activity_git_log">Registro de commits</string>
 
@@ -95,7 +94,6 @@
 
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repositorio</string>
-  <string name="pref_edit_git_server_settings">Editar la configuración del servidor Git</string>
   <string name="pref_edit_git_config">Configuración y utilidades locales de Git</string>
   <string name="pref_import_ssh_key_title">Importar clave SSH</string>
   <string name="pref_ssh_keygen_title">Generar claves SSH</string>

app/src/main/res/values-fr/strings.xml

@@ -14,7 +14,6 @@
   <string name="dialog_delete_msg">Voulez vous supprimer le répertoire actual du gestionnaire de mots de passe?\n(%1$s)</string>
   <string name="dialog_delete">Supprimer le répertoire</string>
   <string name="dialog_do_not_delete">Annuler</string>
-  <string name="title_activity_git_clone">Information sur le dépôt Git</string>
   <string name="title_activity_git_log">Historique des commits</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">Clonez ou créez un dépôt suivant avant d\'essayer d\'ajouter un mot de passe ou d\'effectuer une opération de synchronisation.</string>
@@ -74,7 +73,6 @@
   <string name="share_as_plaintext">Partager en clair</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">Dépôt</string>
-  <string name="pref_edit_git_server_settings">Modifier les paramètres du serveur Git</string>
   <string name="pref_edit_git_config">Configuration locale de Git &amp; utilitaires</string>
   <string name="pref_import_ssh_key_title">Importer une clef SSH</string>
   <string name="pref_ssh_keygen_title">Générer une paire de clefs SSH</string>

app/src/main/res/values-gl/strings.xml

@@ -14,7 +14,6 @@
   <string name="dialog_delete_msg">Desexas eliminar o directorio actual de password store?\n(%1$s)</string>
   <string name="dialog_delete">Eliminar directorio</string>
   <string name="dialog_do_not_delete">Cancelar</string>
-  <string name="title_activity_git_clone">Información do repositorio</string>
   <string name="title_activity_git_log">Rexistro de cambios</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">Clona ou crea un novo repositorio aquí antes de intentar engadir un contrasinal ou realizar unha sincronización.</string>
@@ -75,7 +74,6 @@
   <string name="share_as_plaintext">Compartir como texto plano</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repositorio</string>
-  <string name="pref_edit_git_server_settings">Editar axustes do servidor git</string>
   <string name="pref_edit_git_config">Configuración e Utilidades locais Git</string>
   <string name="pref_import_ssh_key_title">Importar chave SSH</string>
   <string name="pref_ssh_keygen_title">Crear par de chaves SSH</string>

app/src/main/res/values-it/strings.xml

@@ -14,7 +14,6 @@
   <string name="dialog_delete_msg">Vuoi eliminare la directory dell\'archivio delle password corrente?\n(%1$s)</string>
   <string name="dialog_delete">Elimina directory</string>
   <string name="dialog_do_not_delete">Annulla</string>
-  <string name="title_activity_git_clone">Informazioni della repository</string>
   <string name="title_activity_git_log">Conferma registro</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">Sei pregato di clonare o creare una nuova repository sotto prima di provare ad aggiungere una password o eseguire qualsiasi operazione di sincronizzazione.</string>
@@ -74,7 +73,6 @@
   <string name="share_as_plaintext">Condividi come testo semplice</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repository</string>
-  <string name="pref_edit_git_server_settings">Modifica impostazioni del server di Git</string>
   <string name="pref_edit_git_config">Configurazione &amp; utilità della configurazione di Git</string>
   <string name="pref_import_ssh_key_title">Importa chiave SSH</string>
   <string name="pref_ssh_keygen_title">Genera coppia di chiavi SSH</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -12,7 +12,6 @@
   <string name="dialog_delete_title">이미 생성된 디렉토리입니다</string>
   <string name="dialog_delete">디렉토리 삭제</string>
   <string name="dialog_do_not_delete">삭제 취소</string>
-  <string name="title_activity_git_clone">레포지토리 정보</string>
   <string name="title_activity_git_log">커밋 로그</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">비밀번호를 추가하거나 동기화 하기 전에 레포지토리를 클론 하거나 새로 생성해 주세요.</string>
@@ -72,7 +71,6 @@
   <string name="share_as_plaintext">텍스트로 공유</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">저장소</string>
-  <string name="pref_edit_git_server_settings">Git 서버 설정 수정</string>
   <string name="pref_edit_git_config">로컬 Git 설정 &amp; 툴</string>
   <string name="pref_import_ssh_key_title">SSH 키 가져오기</string>
   <string name="pref_ssh_keygen_title">SSH 키쌍 생성</string>

app/src/main/res/values-pl-rPL/strings.xml

@@ -17,7 +17,6 @@
   <string name="dialog_delete_msg">Czy chcesz usunąć aktualny katalog z repozytorium haseł?\n(%1$s)</string>
   <string name="dialog_delete">Usuń katalog</string>
   <string name="dialog_do_not_delete">Anuluj</string>
-  <string name="title_activity_git_clone">Konfiguracja repozytorium</string>
   <string name="title_activity_git_log">Dziennik commitów</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">Zanim dodasz hasło lub rozpoczniesz synchronizację, stwórz albo sklonuj poniżej nowe repozytorium.</string>
@@ -73,7 +72,6 @@
   <string name="share_as_plaintext">Udostępnij bez szyfrowania</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repozytorium</string>
-  <string name="pref_edit_git_server_settings">Edytuj ustawienia serwera Git</string>
   <string name="pref_edit_git_config">Konfiguracja lokalnego repo Git &amp; narzędzia</string>
   <string name="pref_import_ssh_key_title">Importuj klucz SSH</string>
   <string name="pref_ssh_keygen_title">Wygeneruj klucz SSH</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -14,7 +14,6 @@
   <string name="dialog_delete_msg">Você quer excluir o diretório atual de armazenamento de senhas?\n(%1$s)</string>
   <string name="dialog_delete">Excluir diretório</string>
   <string name="dialog_do_not_delete">Cancelar</string>
-  <string name="title_activity_git_clone">Informações do repositório</string>
   <string name="title_activity_git_log">Log de Commits</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">Por favor, clone ou crie um novo repositório abaixo antes de tentar adicionar uma senha ou executar qualquer operação de sincronização.</string>
@@ -75,7 +74,6 @@
   <string name="share_as_plaintext">Compartilhar como texto</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repositório</string>
-  <string name="pref_edit_git_server_settings">Editar configurações do servidor Git</string>
   <string name="pref_edit_git_config">Configuração local do Git &amp; utilitários</string>
   <string name="pref_import_ssh_key_title">Importar chave SSH</string>
   <string name="pref_ssh_keygen_title">Gerar um par de chave SSH</string>

app/src/main/res/values-ru/strings.xml

@@ -16,7 +16,6 @@
   <string name="dialog_delete_msg">Хотите удалить существующую директорию\n(%1$s)</string>
   <string name="dialog_delete">Удалить директорию</string>
   <string name="dialog_do_not_delete">Отменить</string>
-  <string name="title_activity_git_clone">Информация о репозитории</string>
   <string name="title_activity_git_log">Журнал изменений</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">Пожалуйста, клонируйте или создайте новый репозиторий перед тем, как добавлять пароль или выполнять синхронизацию.</string>
@@ -79,7 +78,6 @@
   <string name="share_as_plaintext">Поделиться в открытом виде</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">Репозиторий</string>
-  <string name="pref_edit_git_server_settings">Изменить настройки сервера Git</string>
   <string name="pref_edit_git_config">Конфигурация локального Git</string>
   <string name="pref_import_ssh_key_title">Импортировать SSH ключ</string>
   <string name="pref_ssh_keygen_title">Сгенерировать пару SSH ключей</string>

app/src/main/res/values-tr/strings.xml

@@ -18,7 +18,6 @@
   <string name="dialog_delete_msg">Mevcut şifre deposu dizinini silmek istiyor musunuz?\n(%1$s)</string>
   <string name="dialog_delete">Dizini sil</string>
   <string name="dialog_do_not_delete">İptal</string>
-  <string name="title_activity_git_clone">Depo bilgileri</string>
   <string name="title_activity_git_config">Git yapılandırması</string>
   <string name="title_activity_git_log">Commit günlüğü</string>
 
@@ -94,7 +93,6 @@
 
   <!-- Preferences -->
   <string name="pref_category_repository_title">Depo</string>
-  <string name="pref_edit_git_server_settings">Git sunucu ayarlarını düzenle</string>
   <string name="pref_edit_git_config">Yerel Git yapılandırması ve araçlar</string>
   <string name="pref_import_ssh_key_title">SSH anahtarını içe aktar</string>
   <string name="pref_ssh_keygen_title">SSH anahtar çifti oluştur</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -12,7 +12,6 @@
   <string name="dialog_delete_title">目录已存在</string>
   <string name="dialog_delete">删除目录</string>
   <string name="dialog_do_not_delete">取消</string>
-  <string name="title_activity_git_clone">存储库信息</string>
   <string name="title_activity_git_log">提交日志</string>
   <!-- Password Store -->
   <string name="creation_dialog_text">在尝试添加密码或运行任何同步操作之前,请在下面同步或创建新存储库</string>
@@ -72,7 +71,6 @@
   <string name="share_as_plaintext">用明文分享</string>
   <!-- Preferences -->
   <string name="pref_category_repository_title">仓库</string>
-  <string name="pref_edit_git_server_settings">编辑 Git 服务器设置</string>
   <string name="pref_edit_git_config">本地Git配置 &amp; utilities</string>
   <string name="pref_import_ssh_key_title">导入 SSH 密钥</string>
   <string name="pref_ssh_keygen_title">生成SSH密钥</string>

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

@@ -18,7 +18,7 @@
   <string name="dialog_delete_msg">Do you really want to delete the local password repository?\n\n%1$s</string>
   <string name="dialog_delete">Delete directory</string>
   <string name="dialog_do_not_delete">Abort</string>
-  <string name="title_activity_git_clone">Repository information</string>
+  <string name="title_activity_git_remote">Remote repository</string>
   <string name="title_activity_git_config">Git configuration</string>
   <string name="title_activity_git_log">Commit log</string>
 
@@ -106,7 +106,6 @@
 
   <!-- Preferences -->
   <string name="pref_category_repository_title">Repository</string>
-  <string name="pref_edit_git_server_settings">Git server settings</string>
   <string name="pref_git_server_auth_key">Authentication key</string>
   <string name="pref_edit_git_config">Local Git config &amp; utilities</string>
   <string name="pref_ssh_use_pgp_key_title">Use PGP key</string>