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

Fix indentation

Browse Source
This commit is contained in:
Niels Andriesse 2019-10-21 15:26:57 +11:00
parent e438d09a62
commit a978253e00
2 changed files with 118 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
res/layout/attachment_type_selector.xml
View File

@ -1,54 +1,59 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <View
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="4dp"
android:layout_width="match_parent" android:background="@drawable/attachment_selector_shadow"/>
android:layout_height="wrap_content">
<View android:layout_width="match_parent" <LinearLayout
android:layout_height="4dp" android:orientation="vertical"
android:background="@drawable/attachment_selector_shadow"/> android:layout_width="match_parent"
android:layout_height="wrap_content"
<LinearLayout android:orientation="vertical" android:background="?attachment_type_selector_background">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attachment_type_selector_background">
<org.thoughtcrime.securesms.components.RecentPhotoViewRail <org.thoughtcrime.securesms.components.RecentPhotoViewRail
android:id="@+id/recent_photos" android:id="@+id/recent_photos"
android:layout_width="match_parent"
android:layout_height="90dp"
android:padding="4dp"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:weightSum="2">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="90dp" android:layout_height="wrap_content"
android:padding="4dp"/> android:layout_weight="1"
android:gravity="center"
<LinearLayout android:orientation="horizontal" android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:weightSum="2">
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.CircleColorImageView <org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/gallery_button" android:id="@+id/gallery_button"
android:layout_width="53dp" android:layout_width="53dp"
android:layout_height="53dp" android:layout_height="53dp"
android:src="@drawable/ic_image_white_24dp" android:src="@drawable/ic_image_white_24dp"
android:scaleType="center" android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__gallery_description" android:contentDescription="@string/attachment_type_selector__gallery_description"
app:circleColor="@color/purple_400"/> app:circleColor="@color/purple_400"/>
<TextView android:layout_marginTop="10dp" <TextView
style="@style/AttachmentTypeLabel" android:layout_marginTop="10dp"
android:layout_width="wrap_content" style="@style/AttachmentTypeLabel"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:text="@string/attachment_type_selector__gallery"/> android:layout_height="wrap_content"
android:text="@string/attachment_type_selector__gallery"/>
</LinearLayout> </LinearLayout>
@ -128,40 +133,43 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="match_parent" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:gravity="center" android:layout_height="wrap_content"
android:orientation="vertical" android:gravity="center"
android:layout_weight="1" android:orientation="vertical"
android:visibility="gone"> android:layout_weight="1"
android:visibility="gone">
<org.thoughtcrime.securesms.components.CircleColorImageView <org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/contact_button" android:id="@+id/contact_button"
android:layout_width="53dp" android:layout_width="53dp"
android:layout_height="53dp" android:layout_height="53dp"
android:src="@drawable/ic_person_white_24dp" android:src="@drawable/ic_person_white_24dp"
android:scaleType="center" android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__contact_description" android:contentDescription="@string/attachment_type_selector__contact_description"
app:circleColor="@color/blue_400"/> app:circleColor="@color/blue_400"/>
<TextView android:layout_marginTop="10dp" <TextView
android:layout_width="wrap_content" android:layout_marginTop="10dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"
style="@style/AttachmentTypeLabel" android:layout_height="wrap_content"
android:text="@string/attachment_type_selector__contact"/> style="@style/AttachmentTypeLabel"
android:text="@string/attachment_type_selector__contact"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:orientation="horizontal" <LinearLayout
android:layout_width="match_parent" android:orientation="horizontal"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginTop="16dp" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="16dp" android:layout_marginStart="16dp"
android:layout_marginBottom="16dp" android:layout_marginEnd="16dp"
android:weightSum="2"> android:layout_marginBottom="16dp"
android:weightSum="2">
<LinearLayout <LinearLayout
android:id="@+id/location_linear_layout" android:id="@+id/location_linear_layout"
@ -191,53 +199,56 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="match_parent" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:orientation="vertical"> android:gravity="center"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.CircleColorImageView <org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/giphy_button" android:id="@+id/giphy_button"
android:layout_width="53dp" android:layout_width="53dp"
android:layout_height="53dp" android:layout_height="53dp"
android:src="@drawable/ic_gif_white_24dp" android:src="@drawable/ic_gif_white_24dp"
android:scaleType="center" android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__gif_description" android:contentDescription="@string/attachment_type_selector__gif_description"
app:circleColor="@color/cyan_400"/> app:circleColor="@color/cyan_400"/>
<TextView android:layout_marginTop="10dp" <TextView
android:layout_width="wrap_content" android:layout_marginTop="10dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"
style="@style/AttachmentTypeLabel" android:layout_height="wrap_content"
android:text="@string/attachment_type_selector__gif"/> style="@style/AttachmentTypeLabel"
android:text="@string/attachment_type_selector__gif"/>
</LinearLayout> </LinearLayout>
<LinearLayout android:layout_width="match_parent" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_weight="1" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:orientation="vertical"> android:gravity="center"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.CircleColorImageView <org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/close_button" android:id="@+id/close_button"
android:layout_width="53dp" android:layout_width="53dp"
android:layout_height="53dp" android:layout_height="53dp"
android:src="@drawable/ic_keyboard_arrow_down_white_24dp" android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
android:scaleType="center" android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__drawer_description" android:contentDescription="@string/attachment_type_selector__drawer_description"
app:circleColor="@color/gray50"/> app:circleColor="@color/gray50"/>
<TextView android:layout_marginTop="10dp" <TextView
android:layout_width="wrap_content" android:layout_marginTop="10dp"
android:layout_height="wrap_content" android:layout_width="wrap_content"
style="@style/AttachmentTypeLabel" android:layout_height="wrap_content"
android:text=""/> style="@style/AttachmentTypeLabel"
android:text=""/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

9
src/org/thoughtcrime/securesms/loki/LokiPublicChatPoller.kt
View File

@ -17,9 +17,11 @@ import org.thoughtcrime.securesms.util.GroupUtil
import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.TextSecurePreferences
import org.thoughtcrime.securesms.util.Util import org.thoughtcrime.securesms.util.Util
import org.whispersystems.libsignal.util.guava.Optional import org.whispersystems.libsignal.util.guava.Optional
import org.whispersystems.signalservice.api.messages.* import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
import org.whispersystems.signalservice.api.messages.SignalServiceContent
import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
import org.whispersystems.signalservice.api.messages.SignalServiceGroup
import org.whispersystems.signalservice.api.push.SignalServiceAddress import org.whispersystems.signalservice.api.push.SignalServiceAddress
import org.whispersystems.signalservice.internal.push.SignalServiceProtos
import org.whispersystems.signalservice.loki.api.LokiPublicChat import org.whispersystems.signalservice.loki.api.LokiPublicChat
import org.whispersystems.signalservice.loki.api.LokiPublicChatAPI import org.whispersystems.signalservice.loki.api.LokiPublicChatAPI
import org.whispersystems.signalservice.loki.api.LokiPublicChatMessage import org.whispersystems.signalservice.loki.api.LokiPublicChatMessage
@ -131,10 +133,7 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
val lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(context) val lokiMessageDatabase = DatabaseFactory.getLokiMessageDatabase(context)
val isDuplicate = lokiMessageDatabase.getMessageID(messageServerID) != null val isDuplicate = lokiMessageDatabase.getMessageID(messageServerID) != null
if (isDuplicate) { return } if (isDuplicate) { return }
// Ignore empty messages with no attachments or quotes
if (message.body.isEmpty() && message.attachments.isEmpty() && message.quote == null) { return } if (message.body.isEmpty() && message.attachments.isEmpty() && message.quote == null) { return }
val id = group.id.toByteArray() val id = group.id.toByteArray()
val mmsDatabase = DatabaseFactory.getMmsDatabase(context) val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
val recipient = Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedId(id, false)), false) val recipient = Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedId(id, false)), false)