keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix indentation

Browse Source
pull/36/head
Niels Andriesse 6 years ago
parent e438d09a62
commit a978253e00
2 changed files with 120 additions and 110 deletions
Show Stats Download Patch File Download Diff File

41
res/layout/attachment_type_selector.xml
Unescape Escape View File

@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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">
<View android:layout_width="match_parent"
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="@drawable/attachment_selector_shadow"/>
<LinearLayout android:orientation="vertical"
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attachment_type_selector_background">
@ -21,7 +23,8 @@
android:layout_height="90dp"
android:padding="4dp"/>
<LinearLayout android:orientation="horizontal"
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -29,7 +32,8 @@
android:layout_marginTop="16dp"
android:weightSum="2">
<LinearLayout android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
@ -44,7 +48,8 @@
android:contentDescription="@string/attachment_type_selector__gallery_description"
app:circleColor="@color/purple_400"/>
<TextView android:layout_marginTop="10dp"
<TextView
android:layout_marginTop="10dp"
style="@style/AttachmentTypeLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -128,7 +133,8 @@
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
@ -144,7 +150,8 @@
android:contentDescription="@string/attachment_type_selector__contact_description"
app:circleColor="@color/blue_400"/>
<TextView android:layout_marginTop="10dp"
<TextView
android:layout_marginTop="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AttachmentTypeLabel"
@ -154,7 +161,8 @@
</LinearLayout>
<LinearLayout android:orientation="horizontal"
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -191,7 +199,8 @@
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
@ -206,7 +215,8 @@
android:contentDescription="@string/attachment_type_selector__gif_description"
app:circleColor="@color/cyan_400"/>
<TextView android:layout_marginTop="10dp"
<TextView
android:layout_marginTop="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AttachmentTypeLabel"
@ -214,7 +224,8 @@
</LinearLayout>
<LinearLayout android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
@ -229,7 +240,8 @@
android:contentDescription="@string/attachment_type_selector__drawer_description"
app:circleColor="@color/gray50"/>
<TextView android:layout_marginTop="10dp"
<TextView
android:layout_marginTop="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AttachmentTypeLabel"
@ -237,7 +249,6 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@ -17,9 +17,11 @@ import org.thoughtcrime.securesms.util.GroupUtil
import org.thoughtcrime.securesms.util.TextSecurePreferences
import org.thoughtcrime.securesms.util.Util
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.internal.push.SignalServiceProtos
import org.whispersystems.signalservice.loki.api.LokiPublicChat
import org.whispersystems.signalservice.loki.api.LokiPublicChatAPI
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 isDuplicate = lokiMessageDatabase.getMessageID(messageServerID) != null
if (isDuplicate) { return }
// Ignore empty messages with no attachments or quotes
if (message.body.isEmpty() && message.attachments.isEmpty() && message.quote == null) { return }
val id = group.id.toByteArray()
val mmsDatabase = DatabaseFactory.getMmsDatabase(context)
val recipient = Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedId(id, false)), false)

Write Preview
Loading…
Cancel
Save