From 26211403b9209c29cbcf639301b99864f3b65603 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Thu, 24 Aug 2023 12:09:52 +1000
Subject: [PATCH] fix: some compile issues for themes from merge
---
app/src/main/res/values/strings.xml | 4 +-
app/src/main/res/values/themes.xml | 75 -
libsignal/protobuf/SignalService.proto | 13 -
.../libsignal/protos/SignalServiceProtos.java | 5922 ++++++++++++-----
4 files changed, 4089 insertions(+), 1925 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 99cc802a5c..d092031b78 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
Please wait…
Save
Image
+ Video
Note to Self
Version %s
Expand
@@ -909,6 +910,7 @@
Mute
This message has been deleted
Delete just for me
+ Delete from all my devices
Delete for everyone
Delete for me and %s
Feedback/Survey
@@ -1054,8 +1056,6 @@
Leave Group
Group Members
Delete Group
- image
- video
Clear All Messages
Clear All Media
Are you sure you want to clear all group messages?
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 24f8a96d88..428d37c5ef 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,81 +1,6 @@