TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debug merge issues

Browse Source
This commit is contained in:
Niels Andriesse 2019-08-08 11:29:40 +10:00
parent 1822e87f7c
commit 5936c16c47
4 changed files with 150 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
res/layout/conversation_input_panel.xml
View File

@ -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,19 +23,6 @@
android:background="?emoji_tab_strip_background"
android:visibility="gone" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:clickable="true"
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">
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -51,8 +44,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="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"
@ -64,8 +57,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:layout_marginTop="6dp"
android:visibility="gone"
app:linkpreview_type="compose" />
@ -78,35 +71,35 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:clipChildren="false"
android:clipToPadding="false"
android:visibility="gone">
android:clipToPadding="false">
<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"
android:paddingEnd="6dp" />
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
android:id="@+id/embedded_text_editor"
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:nextFocusRight="@+id/send_button"
android:nextFocusForward="@+id/send_button"
tools:hint="Send TextSecure message"
tools:visibility="invisible">
android:nextFocusRight="@+id/send_button"
tools:visibility="invisible"
tools:hint="Send TextSecure message" >
<requestFocus />
</org.thoughtcrime.securesms.components.ComposeText>
@ -114,7 +107,8 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false">
android:clipToPadding="false"
android:visibility="gone">
<org.thoughtcrime.securesms.components.HidingLinearLayout
android:id="@+id/quick_attachment_toggle"
@ -126,21 +120,19 @@
<ImageButton
android:id="@+id/quick_camera_toggle"
android:layout_width="24dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="12dp"
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"
android:scaleType="fitCenter"
android:tint="?compose_icon_tint"
app:srcCompat="@drawable/ic_camera_filled_24" />
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" />
<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_width="36dp"
android:layout_gravity="center_vertical"
android:clipChildren="false"
android:clipToPadding="false">
@ -160,14 +152,13 @@
<ImageButton
android:id="@+id/inline_attachment_button"
android:layout_width="24dp"
android:layout_width="wrap_content"
android:layout_height="@dimen/conversation_compose_height"
android:layout_marginEnd="8dp"
android:layout_gravity="bottom"
android:background="?selectableItemBackgroundBorderless"
android:scaleType="fitCenter"
android:padding="8dp"
android:src="@drawable/ic_add_white_24dp"
android:tint="?attr/conversation_input_inline_attach_icon_tint"
app:srcCompat="@drawable/ic_plus_24" />
android:background="?selectableItemBackgroundBorderless"/>
</org.thoughtcrime.securesms.components.HidingLinearLayout>
@ -187,9 +178,9 @@
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">
android:background="@drawable/circle_tintable"
android:layout_gravity="bottom">
<ImageButton
android:id="@+id/attach_button"
@ -197,26 +188,24 @@
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"
android:tint="@color/core_white"
app:srcCompat="@drawable/ic_plus_24" />
android:nextFocusLeft="@+id/embedded_text_editor" />
<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:paddingStart="11dp"
android:scaleType="fitCenter"
android:src="?conversation_transport_sms_indicator" />
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.AnimatingToggle>
</LinearLayout>
</org.thoughtcrime.securesms.components.InputPanel>

4
src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
View File

@ -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 {

2
src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
View File

@ -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);

3
src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
View File

@ -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();