für playstore änderungen

android/app/build.gradle.kts

@@ -34,8 +34,8 @@ android {
         applicationId = "de.ypchat.android"
         minSdk = 26
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = 2
+        versionName = "1.1.0"
     }
 
     lint {

android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application
         android:name=".YpChatApp"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@drawable/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="${usesCleartextTraffic}"
         android:supportsRtl="true"
         android:theme="@style/Theme.YpChat">
@@ -20,4 +21,3 @@
         </activity>
     </application>
 </manifest>
-

android/app/src/main/java/de/ypchat/android/ui/ChatViewModel.kt

@@ -36,6 +36,7 @@ class ChatViewModel(private val repository: ChatRepository) : ViewModel() {
     fun openConversation(userName: String) = repository.openConversation(userName)
     fun closeConversation() = repository.closeConversation()
     fun sendMessage(text: String) = repository.sendMessage(text)
+    fun setImageUploadMessage(message: String) = repository.setImageUploadState(false, message)
     fun sendImage(context: Context, uri: Uri) {
         val target = state.value.currentConversation ?: return
         viewModelScope.launch {

android/app/src/main/java/de/ypchat/android/ui/YpChatRoot.kt

@@ -1,5 +1,10 @@
 package de.ypchat.android.ui
 
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
@@ -76,6 +81,8 @@ import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
+import java.io.File
+import java.io.FileOutputStream
 
 enum class AppTab(val labelRes: Int) {
     Online(R.string.tab_online),
@@ -87,7 +94,7 @@ enum class AppTab(val labelRes: Int) {
 }
 
 private enum class MoreSection {
-    Overview, Feedback, Partners, Faq, Rules, Safety, Imprint
+    Overview, Feedback, Partners, Faq, Rules, Safety, Privacy, Imprint
 }
 
 private val BgApp = Color(0xFFF4F6F5)
@@ -105,6 +112,7 @@ private val Primary600 = Color(0xFF2F6F46)
 private val Primary500 = Color(0xFF3D8654)
 private val Primary100 = Color(0xFFE7F1EA)
 private val Danger = Color(0xFFA24040)
+private const val PrivacyPolicyUrl = "https://www.single-chat.net/datenschutz"
 
 private data class GenderOption(val value: String, val label: String)
 private data class SmileyItem(val token: String, val hexCode: String, val tooltip: String)
@@ -574,6 +582,7 @@ private fun MoreScreen(state: ChatState, viewModel: ChatViewModel, section: More
         MoreSection.Faq -> StaticContentScreen(stringResource(R.string.faq_title), stringResource(R.string.faq_body)) { onSectionChange(MoreSection.Overview) }
         MoreSection.Rules -> StaticContentScreen(stringResource(R.string.rules_title), stringResource(R.string.rules_body)) { onSectionChange(MoreSection.Overview) }
         MoreSection.Safety -> StaticContentScreen(stringResource(R.string.safety_title), stringResource(R.string.safety_body)) { onSectionChange(MoreSection.Overview) }
+        MoreSection.Privacy -> PrivacyScreen { onSectionChange(MoreSection.Overview) }
         MoreSection.Imprint -> StaticContentScreen(stringResource(R.string.imprint_title), stringResource(R.string.imprint_body)) { onSectionChange(MoreSection.Overview) }
     }
 }
@@ -587,6 +596,7 @@ private fun MoreOverviewScreen(onSectionChange: (MoreSection) -> Unit) {
         item { MoreLinkCard(stringResource(R.string.more_faq), stringResource(R.string.faq_intro)) { onSectionChange(MoreSection.Faq) } }
         item { MoreLinkCard(stringResource(R.string.more_rules), stringResource(R.string.rules_intro)) { onSectionChange(MoreSection.Rules) } }
         item { MoreLinkCard(stringResource(R.string.more_safety), stringResource(R.string.safety_intro)) { onSectionChange(MoreSection.Safety) } }
+        item { MoreLinkCard(stringResource(R.string.more_privacy), stringResource(R.string.privacy_intro)) { onSectionChange(MoreSection.Privacy) } }
         item { MoreLinkCard(stringResource(R.string.more_imprint), stringResource(R.string.imprint_intro)) { onSectionChange(MoreSection.Imprint) } }
     }
 }
@@ -712,6 +722,29 @@ private fun PartnersScreen(links: List<PartnerLinkDto>, error: String?, onBack:
     }
 }
 
+@Composable
+private fun PrivacyScreen(onBack: () -> Unit) {
+    val uriHandler = LocalUriHandler.current
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp)
+    ) {
+        BackHeader(stringResource(R.string.privacy_title), onBack)
+        Text(stringResource(R.string.privacy_body), color = TextStrong)
+        Button(
+            onClick = { uriHandler.openUri(PrivacyPolicyUrl) },
+            colors = ButtonDefaults.buttonColors(containerColor = Primary600),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text(stringResource(R.string.privacy_open_policy))
+        }
+    }
+}
+
 @Composable
 private fun StaticContentScreen(title: String, body: String, onBack: () -> Unit) {
     Column(
@@ -743,6 +776,25 @@ private fun ChatScreen(state: ChatState, viewModel: ChatViewModel) {
     val imagePicker = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
         if (uri != null) viewModel.sendImage(context, uri)
     }
+    val cameraLauncher = rememberLauncherForActivityResult(ActivityResultContracts.TakePicturePreview()) { bitmap ->
+        if (bitmap != null) {
+            val uri = saveCameraBitmap(context, bitmap)
+            if (uri != null) {
+                viewModel.sendImage(context, uri)
+            } else {
+                viewModel.setImageUploadMessage("Camera capture failed")
+            }
+        } else {
+            viewModel.setImageUploadMessage("Camera capture failed")
+        }
+    }
+    val cameraPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
+        if (granted) {
+            cameraLauncher.launch(null)
+        } else {
+            viewModel.setImageUploadMessage("Camera permission denied")
+        }
+    }
 
     Column(modifier = Modifier.fillMaxSize()) {
         Row(modifier = Modifier.fillMaxWidth().padding(12.dp), verticalAlignment = Alignment.CenterVertically) {
@@ -782,6 +834,25 @@ private fun ChatScreen(state: ChatState, viewModel: ChatViewModel) {
                 enabled = !state.isUploadingImage
             )
             Spacer(Modifier.width(8.dp))
+            TextButton(
+                onClick = {
+                    if (context.checkSelfPermission(Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
+                        cameraLauncher.launch(null)
+                    } else {
+                        cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+                    }
+                },
+                enabled = !state.isUploadingImage,
+                colors = ButtonDefaults.textButtonColors(
+                    containerColor = Primary100,
+                    contentColor = Primary700,
+                    disabledContainerColor = SurfaceSubtle,
+                    disabledContentColor = TextMuted
+                )
+            ) {
+                Text(stringResource(R.string.button_camera), fontWeight = FontWeight.Bold)
+            }
+            Spacer(Modifier.width(8.dp))
             Button(
                 onClick = { viewModel.sendMessage(draft); draft = "" },
                 colors = ButtonDefaults.buttonColors(containerColor = Primary600),
@@ -813,6 +884,16 @@ private fun ChatScreen(state: ChatState, viewModel: ChatViewModel) {
     }
 }
 
+private fun saveCameraBitmap(context: Context, bitmap: Bitmap): Uri? {
+    return runCatching {
+        val file = File(context.cacheDir, "singlechat-photo-${System.currentTimeMillis()}.jpg")
+        FileOutputStream(file).use { output ->
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 88, output)
+        }
+        Uri.fromFile(file)
+    }.getOrNull()
+}
+
 @Composable
 private fun UploadStatusBanner(state: ChatState) {
     val message = when {
@@ -1007,6 +1088,10 @@ private fun localizeRuntimeMessage(message: String): String {
             stringResource(R.string.image_upload_too_large)
         message == "Image could not be opened" ->
             stringResource(R.string.image_upload_open_failed)
+        message == "Camera permission denied" ->
+            stringResource(R.string.camera_permission_denied)
+        message == "Camera capture failed" ->
+            stringResource(R.string.camera_capture_failed)
         message.endsWith(" blocked") ->
             stringResource(R.string.user_blocked, message.removeSuffix(" blocked"))
         message.endsWith(" unblocked") ->

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

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">Bitte gib deinen Nicknamen für den Chat ein:</string>
-    <string name="label_gender">Geschlecht:</string>
-    <string name="label_age">Alter:</string>
-    <string name="label_country">Land:</string>
-    <string name="button_start_chat">Chat starten</string>
-    <string name="gender_female">Weiblich</string>
-    <string name="gender_male">Männlich</string>
-    <string name="gender_pair">Paar</string>
-    <string name="gender_trans_mf">Transgender (M-&gt;F)</string>
-    <string name="gender_trans_fm">Transgender (F-&gt;M)</string>
-    <string name="tab_search">Suchen</string>
-    <string name="tab_inbox">Posteingang</string>
-    <string name="tab_history">Verlauf</string>
-    <string name="button_send">Senden</string>
-    <string name="search_username_includes">Benutzername enthält</string>
-    <string name="search_from_age">Von Alter</string>
-    <string name="search_to_age">Bis Alter</string>
-    <string name="search_country">Land</string>
-    <string name="search_genders">Geschlechter</string>
-    <string name="search_all">Alle</string>
-    <string name="search_button">Suchen</string>
-    <string name="search_no_results">Keine Ergebnisse.</string>
-    <string name="search_min_age_error">Das Mindestalter muss mindestens so groß sein wie das Höchstalter.</string>
-    <string name="history_empty">Keine vorherigen Unterhaltungen verfügbar.</string>
-    <string name="block">Benutzer blockieren</string>
-    <string name="unblock">Benutzer entsperren</string>
-    <string name="button_image">Ein Bild senden</string>
-</resources>

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

@@ -49,6 +49,7 @@
     <string name="unblock">Entsperren</string>
     <string name="message_placeholder">Nachricht</string>
     <string name="button_image">Bild</string>
+    <string name="button_camera">Foto</string>
     <string name="button_send">Senden</string>
     <string name="button_smileys">Smileys</string>
     <string name="image_message">Bildnachricht</string>
@@ -57,6 +58,8 @@
     <string name="image_upload_failed">Bild-Upload fehlgeschlagen.</string>
     <string name="image_upload_too_large">Das Bild ist größer als 5 MB.</string>
     <string name="image_upload_open_failed">Das Bild konnte nicht geöffnet werden.</string>
+    <string name="camera_permission_denied">Die Kameraberechtigung wurde abgelehnt.</string>
+    <string name="camera_capture_failed">Das Foto konnte nicht aufgenommen werden.</string>
     <string name="feedback_created_at">Eingegangen %1$s</string>
     <string name="feedback_meta_separator"> • </string>
     <string name="countries_load_error">Länderliste konnte nicht geladen werden: %1$s</string>
@@ -83,21 +86,26 @@
     <string name="more_faq">FAQ</string>
     <string name="more_rules">Regeln</string>
     <string name="more_safety">Sicherheit</string>
+    <string name="more_privacy">Datenschutz</string>
     <string name="more_imprint">Impressum</string>
     <string name="more_back">Zur Übersicht</string>
     <string name="partners_intro">Empfehlungen und befreundete Projekte für unsere Community.</string>
     <string name="faq_intro">Antworten auf häufige Fragen zum Chat.</string>
     <string name="rules_intro">Grundregeln für respektvollen Chat.</string>
     <string name="safety_intro">Tipps für Privatsphäre und sichere Nutzung.</string>
+    <string name="privacy_intro">Datenschutzerklärung, verarbeitete Daten und Kontakt für Datenschutzanfragen.</string>
     <string name="imprint_intro">Rechtliche Hinweise und Kontaktdaten.</string>
     <string name="external_link">Externer Link</string>
     <string name="faq_title">Häufige Fragen</string>
     <string name="rules_title">Chat-Regeln</string>
     <string name="safety_title">Sicherheit und Privatsphäre</string>
+    <string name="privacy_title">Datenschutzerklärung</string>
     <string name="imprint_title">Impressum</string>
     <string name="partners_title">Partner</string>
     <string name="faq_body">Wähle einen Nicknamen, gib deine Profildaten an und starte den Chat. Teile keine sensiblen Daten wie Telefonnummern, Adressen, Passwörter oder Zahlungsinformationen. Du kannst Bilder senden, Benutzer blockieren und Feedback für ernste Vorfälle nutzen.</string>
     <string name="rules_body">Keine Beleidigungen, Hassrede, illegalen Inhalte, Spam oder unerwünschte Belästigung. Sende nur Bilder, die du teilen darfst, und respektiere die Privatsphäre anderer.</string>
     <string name="safety_body">Nutze einen Nicknamen, der dich nicht identifiziert. Teile keine privaten Kontakt- oder Zahlungsdaten. Sei vorsichtig mit Links von Unbekannten und beende Gespräche, die sich falsch anfühlen. Nutze Blockieren und Feedback bei schweren Vorfällen.</string>
+    <string name="privacy_body">SingleChat verarbeitet den von dir gewählten Nickname, Profildaten wie Alter, Geschlecht und Land, Chat-Nachrichten, von dir aktiv gesendete Bilder, Feedback-Nachrichten sowie technisch notwendige Sitzungsdaten. Die Android-App fragt den Kamerazugriff nur an, wenn du in der App aktiv ein Foto aufnehmen möchtest. Die vollständige Datenschutzerklärung für Website und App ist auf single-chat.net veröffentlicht.</string>
+    <string name="privacy_open_policy">Datenschutzerklärung öffnen</string>
     <string name="imprint_body">Torsten Schulz, Friedrich-Stampfer-Str. 21, 60437 Frankfurt. Kontakt: tsschulz@tsschulz.de. Für externe Links sind deren Betreiber verantwortlich.</string>
 </resources>

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

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">Por favor, escribe tu apodo para el chat:</string>
-    <string name="label_gender">Género:</string>
-    <string name="label_age">Edad:</string>
-    <string name="label_country">País:</string>
-    <string name="button_start_chat">Iniciar chat</string>
-    <string name="gender_female">Femenino</string>
-    <string name="gender_male">Masculino</string>
-    <string name="gender_pair">Pareja</string>
-    <string name="gender_trans_mf">Transgénero (M-&gt;F)</string>
-    <string name="gender_trans_fm">Transgénero (F-&gt;M)</string>
-    <string name="tab_search">Buscar</string>
-    <string name="tab_inbox">Bandeja de entrada</string>
-    <string name="tab_history">Historial</string>
-    <string name="button_send">Enviar</string>
-    <string name="search_username_includes">El nombre de usuario incluye</string>
-    <string name="search_from_age">Desde la edad</string>
-    <string name="search_to_age">Hasta la edad</string>
-    <string name="search_country">País</string>
-    <string name="search_genders">Géneros</string>
-    <string name="search_all">Todos</string>
-    <string name="search_button">Buscar</string>
-    <string name="search_no_results">Sin resultados.</string>
-    <string name="search_min_age_error">La edad mínima debe ser al menos tan grande como la edad máxima.</string>
-    <string name="history_empty">No hay conversaciones anteriores disponibles.</string>
-    <string name="block">Bloquear usuario</string>
-    <string name="unblock">Desbloquear usuario</string>
-    <string name="button_image">Enviar una imagen</string>
-</resources>

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

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">Veuillez saisir votre pseudo pour le chat:</string>
-    <string name="label_gender">Genre:</string>
-    <string name="label_age">Âge:</string>
-    <string name="label_country">Pays:</string>
-    <string name="button_start_chat">Démarrer le chat</string>
-    <string name="gender_female">Féminin</string>
-    <string name="gender_male">Masculin</string>
-    <string name="gender_pair">Couple</string>
-    <string name="gender_trans_mf">Transgenre (M-&gt;F)</string>
-    <string name="gender_trans_fm">Transgenre (F-&gt;M)</string>
-    <string name="tab_search">Rechercher</string>
-    <string name="tab_inbox">Boîte de réception</string>
-    <string name="tab_history">Historique</string>
-    <string name="button_send">Envoyer</string>
-    <string name="search_username_includes">Le nom d\'utilisateur contient</string>
-    <string name="search_from_age">À partir de l\'âge</string>
-    <string name="search_to_age">Jusqu\'à l\'âge</string>
-    <string name="search_country">Pays</string>
-    <string name="search_genders">Genres</string>
-    <string name="search_all">Tous</string>
-    <string name="search_button">Rechercher</string>
-    <string name="search_no_results">Aucun résultat.</string>
-    <string name="search_min_age_error">L\'âge minimum doit être au moins aussi grand que l\'âge maximum.</string>
-    <string name="history_empty">Aucune conversation précédente disponible.</string>
-    <string name="block">Bloquer l\'utilisateur</string>
-    <string name="unblock">Débloquer l\'utilisateur</string>
-    <string name="button_image">Envoyer une image</string>
-</resources>

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

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">Inserisci il tuo nickname per la chat:</string>
-    <string name="label_gender">Genere:</string>
-    <string name="label_age">Età:</string>
-    <string name="label_country">Paese:</string>
-    <string name="button_start_chat">Inizia chat</string>
-    <string name="gender_female">Femmina</string>
-    <string name="gender_male">Maschio</string>
-    <string name="gender_pair">Coppia</string>
-    <string name="gender_trans_mf">Transgender (M-&gt;F)</string>
-    <string name="gender_trans_fm">Transgender (F-&gt;M)</string>
-    <string name="tab_search">Cerca</string>
-    <string name="tab_inbox">Posta in arrivo</string>
-    <string name="tab_history">Cronologia</string>
-    <string name="button_send">Invia</string>
-    <string name="search_username_includes">Il nome utente include</string>
-    <string name="search_from_age">Dall\'età</string>
-    <string name="search_to_age">Fino all\'età</string>
-    <string name="search_country">Paese</string>
-    <string name="search_genders">Generi</string>
-    <string name="search_all">Tutti</string>
-    <string name="search_button">Cerca</string>
-    <string name="search_no_results">Nessun risultato.</string>
-    <string name="search_min_age_error">L\'età minima deve essere almeno grande quanto l\'età massima.</string>
-    <string name="history_empty">Nessuna conversazione precedente disponibile.</string>
-    <string name="block">Blocca utente</string>
-    <string name="unblock">Sblocca utente</string>
-    <string name="button_image">Invia un\'immagine</string>
-</resources>

android/app/src/main/res/values-ja/strings.generated.xml

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">チャット用のニックネームを入力してください:</string>
-    <string name="label_gender">性別:</string>
-    <string name="label_age">年齢:</string>
-    <string name="label_country">国:</string>
-    <string name="button_start_chat">チャットを開始</string>
-    <string name="gender_female">女性</string>
-    <string name="gender_male">男性</string>
-    <string name="gender_pair">カップル</string>
-    <string name="gender_trans_mf">トランスジェンダー (M-&gt;F)</string>
-    <string name="gender_trans_fm">トランスジェンダー (F-&gt;M)</string>
-    <string name="tab_search">検索</string>
-    <string name="tab_inbox">受信トレイ</string>
-    <string name="tab_history">履歴</string>
-    <string name="button_send">送信</string>
-    <string name="search_username_includes">ユーザー名に含まれる</string>
-    <string name="search_from_age">年齢から</string>
-    <string name="search_to_age">年齢まで</string>
-    <string name="search_country">国</string>
-    <string name="search_genders">性別</string>
-    <string name="search_all">すべて</string>
-    <string name="search_button">検索</string>
-    <string name="search_no_results">結果がありません。</string>
-    <string name="search_min_age_error">最小年齢は最大年齢以上でなければなりません。</string>
-    <string name="history_empty">以前の会話はありません。</string>
-    <string name="block">ユーザーをブロック</string>
-    <string name="unblock">ユーザーのブロックを解除</string>
-    <string name="button_image">画像を送信</string>
-</resources>

android/app/src/main/res/values-th/strings.generated.xml

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">กรุณาพิมพ์ชื่อเล่นของคุณสำหรับแชท:</string>
-    <string name="label_gender">เพศ:</string>
-    <string name="label_age">อายุ:</string>
-    <string name="label_country">ประเทศ:</string>
-    <string name="button_start_chat">เริ่มแชท</string>
-    <string name="gender_female">หญิง</string>
-    <string name="gender_male">ชาย</string>
-    <string name="gender_pair">คู่</string>
-    <string name="gender_trans_mf">ทรานส์เจนเดอร์ (M-&gt;F)</string>
-    <string name="gender_trans_fm">ทรานส์เจนเดอร์ (F-&gt;M)</string>
-    <string name="tab_search">ค้นหา</string>
-    <string name="tab_inbox">กล่องจดหมาย</string>
-    <string name="tab_history">ประวัติ</string>
-    <string name="button_send">ส่ง</string>
-    <string name="search_username_includes">ชื่อผู้ใช้รวมถึง</string>
-    <string name="search_from_age">จากอายุ</string>
-    <string name="search_to_age">ถึงอายุ</string>
-    <string name="search_country">ประเทศ</string>
-    <string name="search_genders">เพศ</string>
-    <string name="search_all">ทั้งหมด</string>
-    <string name="search_button">ค้นหา</string>
-    <string name="search_no_results">ไม่มีผลลัพธ์</string>
-    <string name="search_min_age_error">อายุขั้นต่ำต้องมากกว่าหรือเท่ากับอายุสูงสุด</string>
-    <string name="history_empty">ไม่มีการสนทนาก่อนหน้านี้</string>
-    <string name="block">บล็อกผู้ใช้</string>
-    <string name="unblock">ยกเลิกการบล็อกผู้ใช้</string>
-    <string name="button_image">ส่งรูปภาพ</string>
-</resources>

android/app/src/main/res/values-tl/strings.generated.xml

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">Mangyaring i-type ang iyong nickname para sa chat:</string>
-    <string name="label_gender">Kasarian:</string>
-    <string name="label_age">Edad:</string>
-    <string name="label_country">Bansa:</string>
-    <string name="button_start_chat">Simulan ang chat</string>
-    <string name="gender_female">Babae</string>
-    <string name="gender_male">Lalaki</string>
-    <string name="gender_pair">Mag-asawa</string>
-    <string name="gender_trans_mf">Transgender (M-&gt;F)</string>
-    <string name="gender_trans_fm">Transgender (F-&gt;M)</string>
-    <string name="tab_search">Maghanap</string>
-    <string name="tab_inbox">Inbox</string>
-    <string name="tab_history">Kasaysayan</string>
-    <string name="button_send">Ipadala</string>
-    <string name="search_username_includes">Kasama sa username</string>
-    <string name="search_from_age">Mula sa edad</string>
-    <string name="search_to_age">Hanggang edad</string>
-    <string name="search_country">Bansa</string>
-    <string name="search_genders">Kasarian</string>
-    <string name="search_all">Lahat</string>
-    <string name="search_button">Maghanap</string>
-    <string name="search_no_results">Walang resulta.</string>
-    <string name="search_min_age_error">Ang minimum na edad ay dapat na hindi bababa sa maximum na edad.</string>
-    <string name="history_empty">Walang nakaraang pag-uusap na available.</string>
-    <string name="block">I-block ang user</string>
-    <string name="unblock">I-unblock ang user</string>
-    <string name="button_image">Magpadala ng larawan</string>
-</resources>

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

@@ -1,29 +0,0 @@
-<resources>
-    <string name="label_nick">请输入您的聊天昵称:</string>
-    <string name="label_gender">性别:</string>
-    <string name="label_age">年龄:</string>
-    <string name="label_country">国家:</string>
-    <string name="button_start_chat">开始聊天</string>
-    <string name="gender_female">女性</string>
-    <string name="gender_male">男性</string>
-    <string name="gender_pair">情侣</string>
-    <string name="gender_trans_mf">跨性别 (M-&gt;F)</string>
-    <string name="gender_trans_fm">跨性别 (F-&gt;M)</string>
-    <string name="tab_search">搜索</string>
-    <string name="tab_inbox">收件箱</string>
-    <string name="tab_history">历史记录</string>
-    <string name="button_send">发送</string>
-    <string name="search_username_includes">用户名包含</string>
-    <string name="search_from_age">从年龄</string>
-    <string name="search_to_age">到年龄</string>
-    <string name="search_country">国家</string>
-    <string name="search_genders">性别</string>
-    <string name="search_all">全部</string>
-    <string name="search_button">搜索</string>
-    <string name="search_no_results">没有结果。</string>
-    <string name="search_min_age_error">最小年龄必须至少等于或大于最大年龄。</string>
-    <string name="history_empty">没有可用的历史对话。</string>
-    <string name="block">屏蔽用户</string>
-    <string name="unblock">取消屏蔽用户</string>
-    <string name="button_image">发送图片</string>
-</resources>

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

@@ -49,6 +49,7 @@
     <string name="unblock">Unblock</string>
     <string name="message_placeholder">Message</string>
     <string name="button_image">Image</string>
+    <string name="button_camera">Photo</string>
     <string name="button_send">Send</string>
     <string name="button_smileys">Smileys</string>
     <string name="image_message">Image message</string>
@@ -57,6 +58,8 @@
     <string name="image_upload_failed">Image upload failed.</string>
     <string name="image_upload_too_large">Image is larger than 5 MB.</string>
     <string name="image_upload_open_failed">Image could not be opened.</string>
+    <string name="camera_permission_denied">Camera permission was denied.</string>
+    <string name="camera_capture_failed">Photo could not be captured.</string>
     <string name="feedback_created_at">Received %1$s</string>
     <string name="feedback_meta_separator"> • </string>
     <string name="countries_load_error">Country list could not be loaded: %1$s</string>
@@ -83,21 +86,26 @@
     <string name="more_faq">FAQ</string>
     <string name="more_rules">Rules</string>
     <string name="more_safety">Safety</string>
+    <string name="more_privacy">Privacy</string>
     <string name="more_imprint">Imprint</string>
     <string name="more_back">Back to overview</string>
     <string name="partners_intro">Recommended and friendly projects for our community.</string>
     <string name="faq_intro">Answers to common questions about the chat.</string>
     <string name="rules_intro">Basic rules for respectful chatting.</string>
     <string name="safety_intro">Tips for privacy and safer usage.</string>
+    <string name="privacy_intro">Privacy policy, processed data and contact for privacy requests.</string>
     <string name="imprint_intro">Legal notice and contact details.</string>
     <string name="external_link">External link</string>
     <string name="faq_title">Frequently Asked Questions</string>
     <string name="rules_title">Chat Rules</string>
     <string name="safety_title">Safety and Privacy</string>
+    <string name="privacy_title">Privacy Policy</string>
     <string name="imprint_title">Imprint</string>
     <string name="partners_title">Partners</string>
     <string name="faq_body">Choose a nickname, enter your profile details and start chatting. Do not share sensitive data like phone numbers, addresses, passwords or payment information. You can send images, block users and use feedback for serious issues.</string>
     <string name="rules_body">No insults, hate speech, illegal content, spam or unwanted harassment. Only send images you are allowed to share and respect the privacy of others.</string>
     <string name="safety_body">Use a nickname that does not identify you. Do not share private contact or payment data. Be careful with links from strangers and end conversations that feel wrong. Use block and feedback for serious incidents.</string>
+    <string name="privacy_body">SingleChat processes the nickname you choose, profile details such as age, gender and country, chat messages, images you actively send, feedback messages and technically necessary session data. The Android app requests camera access only if you actively want to take a photo in the app. The full privacy policy for website and app is published on single-chat.net.</string>
+    <string name="privacy_open_policy">Open privacy policy</string>
     <string name="imprint_body">Torsten Schulz, Friedrich-Stampfer-Str. 21, 60437 Frankfurt. Contact: tsschulz@tsschulz.de. External links are the responsibility of their operators.</string>
 </resources>