fix: merge compile errors and increment build number
This commit is contained in:
parent
4355322ee5
commit
5c88d5e1b8
|
@ -158,7 +158,7 @@ dependencies {
|
|||
testImplementation 'org.robolectric:shadows-multidex:4.4'
|
||||
}
|
||||
|
||||
def canonicalVersionCode = 254
|
||||
def canonicalVersionCode = 259
|
||||
def canonicalVersionName = "1.12.4"
|
||||
|
||||
def postFixSize = 10
|
||||
|
|
|
@ -122,6 +122,6 @@ public abstract class DisplayRecord {
|
|||
|
||||
public boolean isControlMessage() {
|
||||
return isGroupUpdateMessage() || isExpirationTimerUpdate() || isDataExtractionNotification()
|
||||
|| isMessageRequestResponse() || || isCallLog();
|
||||
|| isMessageRequestResponse() || isCallLog();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
|
|||
import org.session.libsession.messaging.jobs.AttachmentDownloadJob
|
||||
import org.session.libsession.messaging.jobs.JobQueue
|
||||
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.ConfigurationMessage
|
||||
import org.session.libsession.messaging.messages.control.DataExtractionNotification
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue