Skip to content

Commit 8c9df8d

Browse files
cody-signalgreyson-signal
authored andcommittedMay 10, 2021
Add support for Group V2 description field.
1 parent b3aec58 commit 8c9df8d

File tree

56 files changed

+893
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+893
-118
lines changed
 

‎app/build.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ dependencies {
330330
force = true
331331
}
332332
implementation 'androidx.recyclerview:recyclerview:1.1.0'
333-
implementation 'com.google.android.material:material:1.2.1'
333+
implementation 'com.google.android.material:material:1.3.0'
334334
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
335335
implementation 'androidx.cardview:cardview:1.0.0'
336336
implementation 'androidx.preference:preference:1.0.0'
@@ -527,6 +527,10 @@ task signProductionWebsiteRelease {
527527
}
528528

529529
def getLastCommitTimestamp() {
530+
if (!(new File('.git').exists())) {
531+
return System.currentTimeMillis().toString()
532+
}
533+
530534
new ByteArrayOutputStream().withStream { os ->
531535
def result = exec {
532536
executable = 'git'
@@ -539,6 +543,10 @@ def getLastCommitTimestamp() {
539543
}
540544

541545
def getGitHash() {
546+
if (!(new File('.git').exists())) {
547+
return "abcd1234"
548+
}
549+
542550
def stdout = new ByteArrayOutputStream()
543551
exec {
544552
commandLine 'git', 'rev-parse', '--short', 'HEAD'

‎app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
import androidx.lifecycle.LifecycleOwner;
99
import androidx.lifecycle.Observer;
1010

11-
import org.thoughtcrime.securesms.components.MaskView;
1211
import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
1312
import org.thoughtcrime.securesms.contactshare.Contact;
14-
import org.thoughtcrime.securesms.conversation.ConversationItem;
1513
import org.thoughtcrime.securesms.conversation.ConversationMessage;
1614
import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord;
1715
import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -78,6 +76,7 @@ interface EventListener {
7876
void onEnableCallNotificationsClicked();
7977
void onPlayInlineContent(ConversationMessage conversationMessage);
8078
void onInMemoryMessageClicked(@NonNull InMemoryMessageRecord messageRecord);
79+
void onViewGroupDescriptionChange(@Nullable GroupId groupId, @NonNull String description, boolean isMessageRequestAccepted);
8180

8281
/** @return true if handled, false if you want to let the normal url handling continue */
8382
boolean onUrlClicked(@NonNull String url);

0 commit comments

Comments
 (0)