srctree

Robin Linden parent 9dfd2f86 025fb20b
Fix chat history export merge oops

Co-authored-by: Akito <the@akito.ooo>

inlinesplit
atox/src/main/kotlin/ui/chat/ChatFragment.kt added: 13, removed: 15, total 0
@@ -10,7 +10,6 @@ import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.content.res.Resources
import android.net.Uri
import android.os.Build
import android.os.Bundle
@@ -24,7 +23,6 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.core.content.getSystemService
import androidx.core.os.ConfigurationCompat
import androidx.core.os.bundleOf
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsAnimationCompat
@@ -53,7 +51,8 @@ import java.io.File
import java.net.URLConnection
import java.text.DateFormat
import java.text.SimpleDateFormat
import java.util.*
import java.util.Date
import java.util.Locale
 
const val CONTACT_PUBLIC_KEY = "publicKey"
const val FOCUS_ON_MESSAGE_BOX = "focusOnMessageBox"
@@ -159,8 +158,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>(FragmentChatBinding::infl
"backup-atox-${"messages" /* TODO @Akito: Put in Helper object. */}_${contactPubKey}_${
SimpleDateFormat(
"""yyyy-MM-dd'T'HH-mm-ss""",
ConfigurationCompat
.getLocales(Resources.getSystem().configuration).get(0),
Locale.getDefault(),
).format(Date())
}.json",
)
 
atox/src/main/kotlin/ui/chat/ChatViewModel.kt added: 13, removed: 15, total 0
@@ -167,7 +167,7 @@ class ChatViewModel @Inject constructor(
withContext(Dispatchers.Main) {
Toast.makeText(
context,
R.string.backup_history_success,
R.string.export_history_success,
Toast.LENGTH_LONG,
).show()
}
@@ -176,7 +176,7 @@ class ChatViewModel @Inject constructor(
withContext(Dispatchers.Main) {
Toast.makeText(
context,
"${R.string.backup_history_failure} : " + e.message,
context.getString(R.string.export_history_failure, e.message),
Toast.LENGTH_LONG,
).show()
}
 
atox/src/main/res/menu/chat_options_menu.xml added: 13, removed: 15, total 0
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/call" android:title="@string/call"/>
<item android:id="@+id/backup_history" android:title="@string/backup_history"/>
<item android:id="@+id/backup_history" android:title="@string/export_history"/>
<item android:id="@+id/clear_history" android:title="@string/clear_history"/>
</menu>
 
atox/src/main/res/values/strings.xml added: 13, removed: 15, total 0
@@ -187,7 +187,7 @@
<string name="share">Share</string>
<string name="mark_as_read">Mark as read</string>
<string name="file_not_found">File not found</string>
<string name="backup_history">Backup history</string>
<string name="backup_history_success">Message history exported</string>
<string name="backup_history_failure">Message history export failed</string>
<string name="export_history">Export history</string>
<string name="export_history_success">Message history exported</string>
<string name="export_history_failure">Message history export failed: %1$s</string>
</resources>
No newline at end of file