From 5936c16c47cd24fd4557d5f4c5229251950091c8 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 8 Aug 2019 11:29:40 +1000
Subject: [PATCH] Debug merge issues

---
 res/layout/conversation_input_panel.xml       | 305 +++++++++---------
 .../database/DatabaseContentProviders.java    |   4 +-
 .../database/helpers/SQLCipherOpenHelper.java |   2 -
 .../registration/WelcomeActivity.java         |   3 +-
 4 files changed, 150 insertions(+), 164 deletions(-)

diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index c7cbdb2ff0..3a97180cb2 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -4,9 +4,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/bottom_panel"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:clickable="true"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="6dp"
+    android:paddingBottom="6dp"
     android:clipChildren="false"
     android:clipToPadding="false">
 
@@ -17,206 +23,189 @@
         android:background="?emoji_tab_strip_background"
         android:visibility="gone" />
 
-    <LinearLayout
-        android:layout_width="fill_parent"
+    <FrameLayout
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:clickable="true"
+        android:layout_weight="1"
         android:clipChildren="false"
-        android:clipToPadding="false"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingStart="16dp"
-        android:paddingTop="6dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="6dp">
+        android:clipToPadding="false">
 
-        <FrameLayout
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/compose_bubble"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:background="?attr/conversation_input_background"
             android:clipChildren="false"
-            android:clipToPadding="false">
+            android:clipToPadding="false"
+            android:orientation="vertical">
 
-            <LinearLayout
-                android:id="@+id/compose_bubble"
+            <org.thoughtcrime.securesms.components.QuoteView
+                android:id="@+id/quote_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_marginEnd="6dp"
+                android:layout_marginTop="6dp"
+                android:visibility="gone"
+                app:message_type="preview"
+                app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color"
+                app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color"
+                tools:visibility="visible"/>
+
+            <org.thoughtcrime.securesms.components.LinkPreviewView
+                android:id="@+id/link_preview"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:layout_marginEnd="6dp"
+                android:layout_marginTop="6dp"
+                android:visibility="gone"
+                app:linkpreview_type="compose" />
+
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/conversation_input_background"
                 android:clipChildren="false"
-                android:clipToPadding="false"
-                android:orientation="vertical">
+                android:clipToPadding="false">
 
-                <org.thoughtcrime.securesms.components.QuoteView
-                    android:id="@+id/quote_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginEnd="6dp"
-                    android:visibility="gone"
-                    app:message_type="preview"
-                    app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color"
-                    app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color"
-                    tools:visibility="visible" />
-
-                <org.thoughtcrime.securesms.components.LinkPreviewView
-                    android:id="@+id/link_preview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="6dp"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginEnd="6dp"
-                    android:visibility="gone"
-                    app:linkpreview_type="compose" />
-
-                <FrameLayout
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:paddingStart="10dp"
                     android:clipChildren="false"
                     android:clipToPadding="false">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <org.thoughtcrime.securesms.components.emoji.EmojiToggle
+                        android:id="@+id/emoji_toggle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/conversation_compose_height"
+                        android:layout_gravity="bottom"
+                        android:paddingStart="4dp"
+                        android:paddingEnd="6dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
+
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/conversation_compose_height" />
+
+                    <org.thoughtcrime.securesms.components.ComposeText
+                        style="@style/ComposeEditText"
+                        android:id="@+id/embedded_text_editor"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:nextFocusForward="@+id/send_button"
+                        android:nextFocusRight="@+id/send_button"
+                        tools:visibility="invisible"
+                        tools:hint="Send TextSecure message" >
+                        <requestFocus />
+                    </org.thoughtcrime.securesms.components.ComposeText>
+
+                    <FrameLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
                         android:clipChildren="false"
                         android:clipToPadding="false"
                         android:visibility="gone">
 
-                        <org.thoughtcrime.securesms.components.emoji.EmojiToggle
-                            android:id="@+id/emoji_toggle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="@dimen/conversation_compose_height"
-                            android:layout_gravity="bottom"
-                            android:background="?selectableItemBackgroundBorderless"
-                            android:contentDescription="@string/conversation_activity__emoji_toggle_description"
-                            android:paddingEnd="6dp" />
-
-                        <Space
-                            android:layout_width="0dp"
-                            android:layout_height="@dimen/conversation_compose_height" />
-
-                        <org.thoughtcrime.securesms.components.ComposeText
-                            android:id="@+id/embedded_text_editor"
-                            style="@style/ComposeEditText"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:layout_weight="1"
-                            android:nextFocusRight="@+id/send_button"
-                            android:nextFocusForward="@+id/send_button"
-                            tools:hint="Send TextSecure message"
-                            tools:visibility="invisible">
-
-                            <requestFocus />
-                        </org.thoughtcrime.securesms.components.ComposeText>
-
-                        <FrameLayout
+                        <org.thoughtcrime.securesms.components.HidingLinearLayout
+                            android:id="@+id/quick_attachment_toggle"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
+                            android:layout_gravity="right|end"
                             android:clipChildren="false"
                             android:clipToPadding="false">
 
-                            <org.thoughtcrime.securesms.components.HidingLinearLayout
-                                android:id="@+id/quick_attachment_toggle"
+                            <ImageButton
+                                android:id="@+id/quick_camera_toggle"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:layout_gravity="right|end"
+                                android:layout_gravity="center_vertical"
+                                android:src="?quick_camera_icon"
+                                android:paddingStart="6dp"
+                                android:paddingEnd="6dp"
+                                android:background="?selectableItemBackgroundBorderless"
+                                android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" />
+
+                            <org.thoughtcrime.securesms.components.MicrophoneRecorderView
+                                android:id="@+id/recorder_view"
+                                android:layout_height="match_parent"
+                                android:layout_width="36dp"
+                                android:layout_gravity="center_vertical"
                                 android:clipChildren="false"
                                 android:clipToPadding="false">
 
-                                <ImageButton
-                                    android:id="@+id/quick_camera_toggle"
-                                    android:layout_width="24dp"
-                                    android:layout_height="match_parent"
-                                    android:layout_marginEnd="12dp"
-                                    android:layout_gravity="center_vertical"
-                                    android:background="?selectableItemBackgroundBorderless"
-                                    android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
-                                    android:scaleType="fitCenter"
-                                    android:tint="?compose_icon_tint"
-                                    app:srcCompat="@drawable/ic_camera_filled_24" />
+                                <include layout="@layout/microphone_recorder_view" />
 
-                                <org.thoughtcrime.securesms.components.MicrophoneRecorderView
-                                    android:id="@+id/recorder_view"
-                                    android:layout_width="24dp"
-                                    android:layout_height="match_parent"
-                                    android:layout_marginEnd="8dp"
-                                    android:layout_gravity="center_vertical"
-                                    android:clipChildren="false"
-                                    android:clipToPadding="false">
+                            </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
 
-                                    <include layout="@layout/microphone_recorder_view" />
+                        </org.thoughtcrime.securesms.components.HidingLinearLayout>
 
-                                </org.thoughtcrime.securesms.components.MicrophoneRecorderView>
+                        <org.thoughtcrime.securesms.components.HidingLinearLayout
+                            android:id="@+id/inline_attachment_container"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="right|end"
+                            android:visibility="gone">
 
-                            </org.thoughtcrime.securesms.components.HidingLinearLayout>
-
-                            <org.thoughtcrime.securesms.components.HidingLinearLayout
-                                android:id="@+id/inline_attachment_container"
+                            <ImageButton
+                                android:id="@+id/inline_attachment_button"
                                 android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_gravity="right|end"
-                                android:visibility="gone">
+                                android:layout_height="@dimen/conversation_compose_height"
+                                android:layout_gravity="bottom"
+                                android:padding="8dp"
+                                android:src="@drawable/ic_add_white_24dp"
+                                android:tint="?attr/conversation_input_inline_attach_icon_tint"
+                                android:background="?selectableItemBackgroundBorderless"/>
 
-                                <ImageButton
-                                    android:id="@+id/inline_attachment_button"
-                                    android:layout_width="24dp"
-                                    android:layout_height="@dimen/conversation_compose_height"
-                                    android:layout_marginEnd="8dp"
-                                    android:layout_gravity="bottom"
-                                    android:background="?selectableItemBackgroundBorderless"
-                                    android:scaleType="fitCenter"
-                                    android:tint="?attr/conversation_input_inline_attach_icon_tint"
-                                    app:srcCompat="@drawable/ic_plus_24" />
+                        </org.thoughtcrime.securesms.components.HidingLinearLayout>
 
-                            </org.thoughtcrime.securesms.components.HidingLinearLayout>
+                    </FrameLayout>
 
-                        </FrameLayout>
+                </LinearLayout>
 
-                    </LinearLayout>
+                <include layout="@layout/recording_layout" />
 
-                    <include layout="@layout/recording_layout" />
+            </FrameLayout>
 
-                </FrameLayout>
+        </LinearLayout>
 
-            </LinearLayout>
+    </FrameLayout>
 
-        </FrameLayout>
+    <org.thoughtcrime.securesms.components.AnimatingToggle
+        android:id="@+id/button_toggle"
+        android:layout_width="@dimen/conversation_compose_height"
+        android:layout_height="@dimen/conversation_compose_height"
+        android:layout_marginStart="12dp"
+        android:background="@drawable/circle_tintable"
+        android:layout_gravity="bottom">
 
-        <org.thoughtcrime.securesms.components.AnimatingToggle
-            android:id="@+id/button_toggle"
-            android:layout_width="@dimen/conversation_compose_height"
-            android:layout_height="@dimen/conversation_compose_height"
-            android:layout_gravity="bottom"
-            android:layout_marginStart="12dp"
-            android:background="@drawable/circle_tintable">
+        <ImageButton
+            android:id="@+id/attach_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:background="@drawable/circle_touch_highlight_background"
+            android:src="@drawable/ic_add_white_24dp"
+            android:contentDescription="@string/ConversationActivity_add_attachment"
+            android:nextFocusLeft="@+id/embedded_text_editor" />
 
-            <ImageButton
-                android:id="@+id/attach_button"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:background="@drawable/circle_touch_highlight_background"
-                android:contentDescription="@string/ConversationActivity_add_attachment"
-                android:nextFocusLeft="@+id/embedded_text_editor"
-                android:tint="@color/core_white"
-                app:srcCompat="@drawable/ic_plus_24" />
+        <org.thoughtcrime.securesms.components.SendButton
+            android:id="@+id/send_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingTop="6dp"
+            android:paddingEnd="6dp"
+            android:paddingBottom="6dp"
+            android:paddingStart="11dp"
+            android:scaleType="fitCenter"
+            android:contentDescription="@string/conversation_activity__send"
+            android:nextFocusLeft="@+id/embedded_text_editor"
+            android:src="?conversation_transport_sms_indicator"
+            android:background="@drawable/circle_touch_highlight_background" />
 
-            <org.thoughtcrime.securesms.components.SendButton
-                android:id="@+id/send_button"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/circle_touch_highlight_background"
-                android:contentDescription="@string/conversation_activity__send"
-                android:nextFocusLeft="@+id/embedded_text_editor"
-                android:paddingStart="11dp"
-                android:paddingTop="6dp"
-                android:paddingEnd="6dp"
-                android:paddingBottom="6dp"
-                android:scaleType="fitCenter"
-                android:src="?conversation_transport_sms_indicator" />
+    </org.thoughtcrime.securesms.components.AnimatingToggle>
 
-        </org.thoughtcrime.securesms.components.AnimatingToggle>
-
-    </LinearLayout>
-</org.thoughtcrime.securesms.components.InputPanel>
+</org.thoughtcrime.securesms.components.InputPanel>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
index da14cd3dce..44d4607cdf 100644
--- a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
+++ b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
@@ -30,11 +30,11 @@ public class DatabaseContentProviders {
   }
 
   public static class Sticker extends NoopContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.sticker");
+    public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.sticker");
   }
 
   public static class StickerPack extends NoopContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.stickerpack");
+    public static final Uri CONTENT_URI = Uri.parse("content://network.loki.securesms.database.stickerpack");
   }
 
   private static abstract class NoopContentProvider extends ContentProvider {
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 6f0740a83f..ccf838db4e 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -131,8 +131,6 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
     db.execSQL(LokiThreadDatabase.getCreateSessionResetTableCommand());
     db.execSQL(LokiUserDisplayNameDatabase.getCreateTableCommand());
 
-    executeStatements(db, SearchDatabase.CREATE_TABLE);
-    executeStatements(db, JobDatabase.CREATE_TABLE);
     executeStatements(db, SmsDatabase.CREATE_INDEXS);
     executeStatements(db, MmsDatabase.CREATE_INDEXS);
     executeStatements(db, AttachmentDatabase.CREATE_INDEXS);
diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
index 88ee770172..1592873038 100644
--- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
@@ -34,7 +34,7 @@ public class WelcomeActivity extends BaseActionBarActivity {
   private void onContinueClicked() {
     Permissions.with(this)
         .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
-        .ifNecessary(false)
+        .ifNecessary()
         .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_folder_white_48dp)
         .onAnyResult(() -> {
           TextSecurePreferences.setHasSeenWelcomeScreen(WelcomeActivity.this, true);
@@ -46,7 +46,6 @@ public class WelcomeActivity extends BaseActionBarActivity {
           }
 
           startActivity(nextIntent);
-          overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
           finish();
         })
         .execute();