oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity

fix: merge compile errors and increment build number

Browse source
This commit is contained in:
Harris 2022-03-17 17:19:07 +11:00
parent 4355322ee5
commit 5c88d5e1b8
4 changed files with 987 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -158,7 +158,7 @@ dependencies {
testImplementation 'org.robolectric:shadows-multidex:4.4' testImplementation 'org.robolectric:shadows-multidex:4.4'
} }
def canonicalVersionCode = 254 def canonicalVersionCode = 259
def canonicalVersionName = "1.12.4" def canonicalVersionName = "1.12.4"
def postFixSize = 10 def postFixSize = 10

2
app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
View file

@ -122,6 +122,6 @@ public abstract class DisplayRecord {
public boolean isControlMessage() { public boolean isControlMessage() {
return isGroupUpdateMessage() || isExpirationTimerUpdate() || isDataExtractionNotification() return isGroupUpdateMessage() || isExpirationTimerUpdate() || isDataExtractionNotification()
|| isMessageRequestResponse() || || isCallLog(); || isMessageRequestResponse() || isCallLog();
} }
} }

1
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View file

@ -6,6 +6,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
import org.session.libsession.messaging.jobs.AttachmentDownloadJob import org.session.libsession.messaging.jobs.AttachmentDownloadJob
import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.jobs.JobQueue
import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.Message
import org.session.libsession.messaging.messages.control.CallMessage
import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
import org.session.libsession.messaging.messages.control.ConfigurationMessage import org.session.libsession.messaging.messages.control.ConfigurationMessage
import org.session.libsession.messaging.messages.control.DataExtractionNotification import org.session.libsession.messaging.messages.control.DataExtractionNotification

1070
libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java
View file

File diff suppressed because it is too large Load diff