mirror of
https://github.com/ArcaneChat/android.git
synced 2026-07-03 14:05:24 +02:00
Merge remote-tracking branch 'upstream/main'
This commit is contained in:
@@ -1 +1 @@
|
|||||||
blank_issues_enabled: true
|
blank_issues_enabled: false
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public class AudioRecorder {
|
|||||||
ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
|
ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
|
||||||
|
|
||||||
captureUri = blobProvider.create(context, new ParcelFileDescriptor.AutoCloseInputStream(fds[0]),
|
captureUri = blobProvider.create(context, new ParcelFileDescriptor.AutoCloseInputStream(fds[0]),
|
||||||
MediaUtil.AUDIO_AAC, null, null);
|
MediaUtil.AUDIO_AAC, "voice.aac", null);
|
||||||
audioCodec = new AudioCodec(context);
|
audioCodec = new AudioCodec(context);
|
||||||
|
|
||||||
audioCodec.start(new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]));
|
audioCodec.start(new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]));
|
||||||
|
|||||||
@@ -72,6 +72,9 @@ public class PersistentBlobProvider {
|
|||||||
@Nullable String fileName)
|
@Nullable String fileName)
|
||||||
{
|
{
|
||||||
final long id = System.currentTimeMillis();
|
final long id = System.currentTimeMillis();
|
||||||
|
if (fileName == null) {
|
||||||
|
fileName = "file." + MediaUtil.getExtensionFromMimeType(mimeType);
|
||||||
|
}
|
||||||
return create(context, new ByteArrayInputStream(blobBytes), id, mimeType, fileName, (long) blobBytes.length);
|
return create(context, new ByteArrayInputStream(blobBytes), id, mimeType, fileName, (long) blobBytes.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,6 +84,9 @@ public class PersistentBlobProvider {
|
|||||||
@Nullable String fileName,
|
@Nullable String fileName,
|
||||||
@Nullable Long fileSize)
|
@Nullable Long fileSize)
|
||||||
{
|
{
|
||||||
|
if (fileName == null) {
|
||||||
|
fileName = "file." + MediaUtil.getExtensionFromMimeType(mimeType);
|
||||||
|
}
|
||||||
return create(context, input, System.currentTimeMillis(), mimeType, fileName, fileSize);
|
return create(context, input, System.currentTimeMillis(), mimeType, fileName, fileSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,7 @@
|
|||||||
<string name="close_window">Close Window</string>
|
<string name="close_window">Close Window</string>
|
||||||
<string name="forward">Forward</string>
|
<string name="forward">Forward</string>
|
||||||
<string name="create">Create</string>
|
<string name="create">Create</string>
|
||||||
|
<string name="reset">Reset</string>
|
||||||
<string name="later">Later</string>
|
<string name="later">Later</string>
|
||||||
<!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
|
<!-- "Resend" means "Sending the selected message(s) again to the same chat". The string is used in a menu and should be as short as possible. Resending may be needed after failures or to repost old messages to new members. -->
|
||||||
<string name="resend">Resend</string>
|
<string name="resend">Resend</string>
|
||||||
@@ -50,6 +51,7 @@
|
|||||||
<!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
|
<!-- Verb "to unarchive", as in "remove a chat from the archive", opposite of the previous string -->
|
||||||
<string name="unarchive">Unarchive</string>
|
<string name="unarchive">Unarchive</string>
|
||||||
<string name="mute">Mute</string>
|
<string name="mute">Mute</string>
|
||||||
|
<string name="muted">Muted</string>
|
||||||
<string name="ephemeral_messages">Disappearing Messages</string>
|
<string name="ephemeral_messages">Disappearing Messages</string>
|
||||||
<string name="ephemeral_messages_hint">Applies to all members of this chat if they use Delta Chat; they can still copy, save, and forward messages or use other e-mail clients.</string>
|
<string name="ephemeral_messages_hint">Applies to all members of this chat if they use Delta Chat; they can still copy, save, and forward messages or use other e-mail clients.</string>
|
||||||
<string name="save">Save</string>
|
<string name="save">Save</string>
|
||||||
@@ -190,6 +192,12 @@
|
|||||||
<string name="webxdc_apps">Apps</string>
|
<string name="webxdc_apps">Apps</string>
|
||||||
<string name="webxdc_store_url">App Picker URL</string>
|
<string name="webxdc_store_url">App Picker URL</string>
|
||||||
<string name="webxdc_store_url_explain">If set, the URL will be used as the App Picker instead of the default one</string>
|
<string name="webxdc_store_url_explain">If set, the URL will be used as the App Picker instead of the default one</string>
|
||||||
|
<string name="home">Home</string>
|
||||||
|
<string name="games">Games</string>
|
||||||
|
<string name="tools">Tools</string>
|
||||||
|
<string name="app_size">Size</string>
|
||||||
|
<string name="app_date_published">Published</string>
|
||||||
|
<string name="add_to_chat">Add to Chat</string>
|
||||||
<string name="unknown">Unknown</string>
|
<string name="unknown">Unknown</string>
|
||||||
|
|
||||||
<string name="green">Green</string>
|
<string name="green">Green</string>
|
||||||
@@ -736,6 +744,7 @@
|
|||||||
<string name="pref_appearance">Appearance</string>
|
<string name="pref_appearance">Appearance</string>
|
||||||
<string name="pref_theme">Theme</string>
|
<string name="pref_theme">Theme</string>
|
||||||
<string name="pref_language">Language</string>
|
<string name="pref_language">Language</string>
|
||||||
|
<string name="pref_use_system_ui_font">Use System Font</string>
|
||||||
<string name="pref_incognito_keyboard">Incognito Keyboard</string>
|
<string name="pref_incognito_keyboard">Incognito Keyboard</string>
|
||||||
<!-- Translators: Must indicate that there is no guarantee as the system may not honor our request. -->
|
<!-- Translators: Must indicate that there is no guarantee as the system may not honor our request. -->
|
||||||
<string name="pref_incognito_keyboard_explain">Request keyboard to disable personalized learning</string>
|
<string name="pref_incognito_keyboard_explain">Request keyboard to disable personalized learning</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user