From c0b3a3ff0c32c8025174ebb92fbcf4a7fc67f497 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 15 Feb 2016 23:15:04 +0100
Subject: basic support for XEP-0308: Last Message Correction. fixes #864

---
 src/main/res/drawable-hdpi/ic_lock_black_18dp.png         | Bin 0 -> 368 bytes
 src/main/res/drawable-hdpi/ic_lock_white_18dp.png         | Bin 0 -> 371 bytes
 src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png    | Bin 0 -> 264 bytes
 src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png    | Bin 0 -> 299 bytes
 src/main/res/drawable-hdpi/ic_secure_indicator.png        | Bin 294 -> 0 bytes
 src/main/res/drawable-hdpi/ic_secure_indicator_white.png  | Bin 322 -> 0 bytes
 src/main/res/drawable-mdpi/ic_lock_black_18dp.png         | Bin 0 -> 293 bytes
 src/main/res/drawable-mdpi/ic_lock_white_18dp.png         | Bin 0 -> 298 bytes
 src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png    | Bin 0 -> 229 bytes
 src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png    | Bin 0 -> 249 bytes
 src/main/res/drawable-mdpi/ic_secure_indicator.png        | Bin 295 -> 0 bytes
 src/main/res/drawable-mdpi/ic_secure_indicator_white.png  | Bin 306 -> 0 bytes
 src/main/res/drawable-xhdpi/ic_lock_black_18dp.png        | Bin 0 -> 397 bytes
 src/main/res/drawable-xhdpi/ic_lock_white_18dp.png        | Bin 0 -> 399 bytes
 src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png   | Bin 0 -> 291 bytes
 src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png   | Bin 0 -> 351 bytes
 src/main/res/drawable-xhdpi/ic_secure_indicator.png       | Bin 410 -> 0 bytes
 src/main/res/drawable-xhdpi/ic_secure_indicator_white.png | Bin 434 -> 0 bytes
 src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png       | Bin 0 -> 559 bytes
 src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png       | Bin 0 -> 558 bytes
 src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png  | Bin 0 -> 336 bytes
 src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png  | Bin 0 -> 436 bytes
 src/main/res/drawable-xxhdpi/ic_secure_indicator.png      | Bin 380 -> 0 bytes
 .../res/drawable-xxhdpi/ic_secure_indicator_white.png     | Bin 441 -> 0 bytes
 src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png      | Bin 0 -> 636 bytes
 src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png      | Bin 0 -> 760 bytes
 src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png | Bin 0 -> 366 bytes
 src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png | Bin 0 -> 490 bytes
 src/main/res/layout/message_received.xml                  |  12 +++++++++++-
 src/main/res/layout/message_sent.xml                      |  12 +++++++++++-
 src/main/res/menu/message_context.xml                     |   4 ++++
 src/main/res/values/strings.xml                           |   2 ++
 32 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/drawable-hdpi/ic_lock_black_18dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_lock_white_18dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png
 create mode 100644 src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png
 delete mode 100644 src/main/res/drawable-hdpi/ic_secure_indicator.png
 delete mode 100644 src/main/res/drawable-hdpi/ic_secure_indicator_white.png
 create mode 100644 src/main/res/drawable-mdpi/ic_lock_black_18dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_lock_white_18dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png
 create mode 100644 src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png
 delete mode 100644 src/main/res/drawable-mdpi/ic_secure_indicator.png
 delete mode 100644 src/main/res/drawable-mdpi/ic_secure_indicator_white.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_lock_black_18dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png
 delete mode 100644 src/main/res/drawable-xhdpi/ic_secure_indicator.png
 delete mode 100644 src/main/res/drawable-xhdpi/ic_secure_indicator_white.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png
 delete mode 100644 src/main/res/drawable-xxhdpi/ic_secure_indicator.png
 delete mode 100644 src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png

(limited to 'src/main/res')

diff --git a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png
new file mode 100644
index 00000000..4c7a7c59
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png
new file mode 100644
index 00000000..29e8bfd3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 00000000..00e7d074
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 00000000..558f0ea3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png
deleted file mode 100644
index 220463fc..00000000
Binary files a/src/main/res/drawable-hdpi/ic_secure_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_secure_indicator_white.png b/src/main/res/drawable-hdpi/ic_secure_indicator_white.png
deleted file mode 100644
index 46eb1195..00000000
Binary files a/src/main/res/drawable-hdpi/ic_secure_indicator_white.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png
new file mode 100644
index 00000000..c8b6fe71
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png
new file mode 100644
index 00000000..1265e98e
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 00000000..ebd96073
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 00000000..e23c42db
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png
deleted file mode 100644
index 690d4d03..00000000
Binary files a/src/main/res/drawable-mdpi/ic_secure_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_secure_indicator_white.png b/src/main/res/drawable-mdpi/ic_secure_indicator_white.png
deleted file mode 100644
index e2f894ef..00000000
Binary files a/src/main/res/drawable-mdpi/ic_secure_indicator_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png
new file mode 100644
index 00000000..0888c617
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png
new file mode 100644
index 00000000..b94735ec
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 00000000..b33c964d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 00000000..3ee3e172
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png
deleted file mode 100644
index cd0d1391..00000000
Binary files a/src/main/res/drawable-xhdpi/ic_secure_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png
deleted file mode 100644
index b624a8ce..00000000
Binary files a/src/main/res/drawable-xhdpi/ic_secure_indicator_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 00000000..dbcf3f33
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png
new file mode 100644
index 00000000..895aabbf
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 00000000..66d25296
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 00000000..9d7f2ff9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
deleted file mode 100644
index 6a74ccbe..00000000
Binary files a/src/main/res/drawable-xxhdpi/ic_secure_indicator.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png
deleted file mode 100644
index 4945c959..00000000
Binary files a/src/main/res/drawable-xxhdpi/ic_secure_indicator_white.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png
new file mode 100644
index 00000000..c49d420e
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png
new file mode 100644
index 00000000..0dcada81
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png
new file mode 100644
index 00000000..827b6848
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png
new file mode 100644
index 00000000..34ec7092
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png differ
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index a998bf37..466dd045 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -91,7 +91,17 @@
                     android:layout_marginRight="4sp"
                     android:alpha="0.70"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator_white" />
+                    android:src="@drawable/ic_lock_white_18dp" />
+
+                <ImageView
+                    android:id="@+id/edit_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="4sp"
+                    android:alpha="0.70"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_mode_edit_white_18dp" />
 
                 <TextView
                     android:id="@+id/message_time"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 55f874e6..fc68c389 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -91,7 +91,17 @@
                     android:layout_marginLeft="4sp"
                     android:alpha="0.54"
                     android:gravity="center_vertical"
-                    android:src="@drawable/ic_secure_indicator" />
+                    android:src="@drawable/ic_lock_black_18dp" />
+
+                <ImageView
+                    android:id="@+id/edit_indicator"
+                    android:layout_width="?attr/TextSizeInfo"
+                    android:layout_height="?attr/TextSizeInfo"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="4sp"
+                    android:alpha="0.54"
+                    android:gravity="center_vertical"
+                    android:src="@drawable/ic_mode_edit_black_18dp" />
 
                 <ImageView
                     android:id="@+id/indicator_received"
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 4e1316d3..0d4e66ef 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -5,6 +5,10 @@
         android:id="@+id/copy_text"
         android:title="@string/copy_text"
         android:visible="false"/>
+    <item
+        android:id="@+id/correct_message"
+        android:title="@string/correct_message"
+        android:visible="false"/>
     <item
         android:id="@+id/share_with"
         android:title="@string/share_with"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0b726ae7..15322e04 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -593,4 +593,6 @@
 	<string name="selection_too_large">The selected area is too large</string>
 	<string name="no_accounts">(No activated accounts)</string>
 	<string name="this_field_is_required">This field is required</string>
+	<string name="correct_message">Correct message</string>
+	<string name="send_corrected_message">Send corrected message</string>
 </resources>
-- 
cgit v1.2.3