mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Only show stories and send stories with respect to capability.

fork-5.53.8
Alex Hart 2022-03-03 16:57:01 -04:00
rodzic 0ccaad1462
commit a1bc1aaa98
12 zmienionych plików z 66 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
Wyświetl plik

@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsState;
import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
@ -132,7 +133,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
}
private void updateTabVisibility() {
if (FeatureFlags.stories() && !SignalStore.storyValues().isFeatureDisabled()) {
if (Stories.isFeatureEnabled()) {
findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE);
WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_background_secondary));
} else {

9
app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt
Wyświetl plik

@ -7,10 +7,9 @@ import android.widget.FrameLayout
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.AvatarImageView
import org.thoughtcrime.securesms.database.model.StoryViewState
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.mms.GlideRequests
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.stories.Stories
import org.thoughtcrime.securesms.util.visible
/**
@ -28,8 +27,8 @@ class AvatarView @JvmOverloads constructor(
private val avatar: AvatarImageView = findViewById(R.id.avatar_image_view)
private val storyRing: View = findViewById(R.id.avatar_story_ring)
fun showStoryRing(hasUnreadStory: Boolean) {
if (!FeatureFlags.stories() || SignalStore.storyValues().isFeatureDisabled) {
private fun showStoryRing(hasUnreadStory: Boolean) {
if (!Stories.isFeatureEnabled()) {
return
}
@ -40,7 +39,7 @@ class AvatarView @JvmOverloads constructor(
avatar.scaleY = 0.82f
}
fun hideStoryRing() {
private fun hideStoryRing() {
storyRing.visible = false
avatar.scaleX = 1f

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
Wyświetl plik

@ -39,6 +39,7 @@ import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberL
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.service.KeyCachingService
import org.thoughtcrime.securesms.stories.Stories
import org.thoughtcrime.securesms.stories.settings.custom.PrivateStorySettingsFragmentArgs
import org.thoughtcrime.securesms.stories.settings.story.PrivateStoryItem
import org.thoughtcrime.securesms.util.CommunicationActions
@ -295,7 +296,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
summary = DSLSettingsText.from(incognitoSummary),
)
if (FeatureFlags.stories()) {
if (Stories.isFeatureAvailable()) {
dividerPref()

7
app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
Wyświetl plik

@ -29,16 +29,13 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.database.model.DistributionListPartialRecord;
import org.thoughtcrime.securesms.database.model.ThreadRecord;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.phonenumbers.NumberUtil;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.UsernameUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
/**
* CursorLoader that initializes a ContactsDatabase instance
@ -171,7 +168,7 @@ public class ContactsCursorLoader extends AbstractContactsCursorLoader {
}
private void addStoriesSection(@NonNull List<Cursor> cursorList) {
if (!FeatureFlags.stories() || !storiesEnabled(mode) || SignalStore.storyValues().isFeatureDisabled()) {
if (!Stories.isFeatureEnabled() ||!storiesEnabled(mode)) {
return;
}

3
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
Wyświetl plik

@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.sharing.MultiShareArgs
import org.thoughtcrime.securesms.sharing.ShareSelectionAdapter
import org.thoughtcrime.securesms.sharing.ShareSelectionMappingModel
import org.thoughtcrime.securesms.stories.Stories
import org.thoughtcrime.securesms.stories.settings.create.CreateStoryFlowDialogFragment
import org.thoughtcrime.securesms.stories.settings.create.CreateStoryWithViewersFragment
import org.thoughtcrime.securesms.util.BottomSheetUtil
@ -269,7 +270,7 @@ class MultiselectForwardFragment :
return ContactSearchConfiguration.build {
query = contactSearchState.query
if (FeatureFlags.stories() && isSelectedMediaValidForStories()) {
if (Stories.isFeatureEnabled() && isSelectedMediaValidForStories()) {
addSection(
ContactSearchConfiguration.Section.Stories(
groupStories = contactSearchState.groupStories,

4
app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
Wyświetl plik

@ -77,8 +77,8 @@ import org.thoughtcrime.securesms.revealable.ViewOnceExpirationInfo;
import org.thoughtcrime.securesms.revealable.ViewOnceUtil;
import org.thoughtcrime.securesms.sms.IncomingTextMessage;
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.util.CursorUtil;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.JsonUtils;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.SqlUtil;
@ -593,7 +593,7 @@ public class MmsDatabase extends MessageDatabase {
@Override
public @NonNull StoryViewState getStoryViewState(@NonNull RecipientId recipientId) {
if (!FeatureFlags.stories() || SignalStore.storyValues().isFeatureDisabled()) {
if (!Stories.isFeatureEnabled()) {
return StoryViewState.NONE;
}

1
app/src/main/java/org/thoughtcrime/securesms/jobs/PushDistributionListSendJob.java
Wyświetl plik

@ -168,7 +168,6 @@ public final class PushDistributionListSendJob extends PushSendJob {
private List<SendMessageResult> deliver(@NonNull OutgoingMediaMessage message, @NonNull List<Recipient> destinations)
throws IOException, UntrustedIdentityException, UndeliverableMessageException
{
// TODO [stories] Filter based off of stories capability
try {
rotateSenderCertificateIfNecessary();

5
app/src/main/java/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
Wyświetl plik

@ -241,7 +241,6 @@ public final class PushGroupSendJob extends PushSendJob {
.anyMatch(info -> info.getStatus() > GroupReceiptDatabase.STATUS_UNDELIVERED);
if (message.getStoryType().isStory()) {
// TODO [stories] Filter based off of stories capability
Optional<GroupDatabase.GroupRecord> groupRecord = SignalDatabase.groups().getGroup(groupId);
if (groupRecord.isPresent()) {
@ -308,6 +307,10 @@ public final class PushGroupSendJob extends PushSendJob {
MessageRecord storyRecord = SignalDatabase.mms().getMessageRecord(message.getParentStoryId().asMessageId().getId());
Recipient recipient = storyRecord.isOutgoing() ? Recipient.self() : storyRecord.getIndividualRecipient();
destinations = destinations.stream()
.filter(r -> r.getStoriesCapability() == Recipient.Capability.SUPPORTED)
.collect(java.util.stream.Collectors.toList());
groupMessageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(recipient.requireServiceId(), storyRecord.getDateSent()));
} catch (NoSuchMessageException e) {
// The story has probably expired

5
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionActivity.kt
Wyświetl plik

@ -20,12 +20,12 @@ import org.thoughtcrime.securesms.TransportOptions
import org.thoughtcrime.securesms.components.emoji.EmojiEventListener
import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.mediasend.Media
import org.thoughtcrime.securesms.mediasend.MediaSendActivityResult
import org.thoughtcrime.securesms.mediasend.v2.review.MediaReviewFragment
import org.thoughtcrime.securesms.mediasend.v2.text.TextStoryPostCreationViewModel
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.stories.Stories
import org.thoughtcrime.securesms.util.FeatureFlags
import org.thoughtcrime.securesms.util.navigation.safeNavigate
import org.thoughtcrime.securesms.util.visible
@ -104,9 +104,8 @@ class MediaSelectionActivity :
}
private fun canDisplayStorySwitch(): Boolean {
return FeatureFlags.stories() &&
return Stories.isFeatureEnabled() &&
FeatureFlags.storiesTextPosts() &&
!SignalStore.storyValues().isFeatureDisabled &&
isCameraFirst() &&
!viewModel.hasSelectedMedia() &&
destination == MediaSelectionDestination.ChooseAfterMediaSelection

20
app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java
Wyświetl plik

@ -160,7 +160,15 @@ public final class GroupSendUtil {
@NonNull SignalServiceStoryMessage message)
throws IOException, UntrustedIdentityException
{
return sendMessage(context, null, getDistributionId(distributionListId), messageId, allTargets, isRecipientUpdate, new StorySendOperation(messageId, null, sentTimestamp, message), null);
return sendMessage(
context,
null,
getDistributionId(distributionListId),
messageId,
allTargets,
isRecipientUpdate,
new StorySendOperation(messageId, null, sentTimestamp, message),
null);
}
/**
@ -178,7 +186,15 @@ public final class GroupSendUtil {
@NonNull SignalServiceStoryMessage message)
throws IOException, UntrustedIdentityException
{
return sendMessage(context, groupId, getDistributionId(groupId), messageId, allTargets, isRecipientUpdate, new StorySendOperation(messageId, groupId, sentTimestamp, message), null);
return sendMessage(
context,
groupId,
getDistributionId(groupId),
messageId,
allTargets,
isRecipientUpdate,
new StorySendOperation(messageId, groupId, sentTimestamp, message),
null);
}
/**

11
app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
Wyświetl plik

@ -115,6 +115,7 @@ import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.stickers.StickerLocator;
import org.thoughtcrime.securesms.storage.StorageSyncHelper;
import org.thoughtcrime.securesms.stories.Stories;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.thoughtcrime.securesms.util.Hex;
@ -1319,6 +1320,11 @@ public final class MessageContentProcessor {
private void handleStoryMessage(@NonNull SignalServiceContent content, @NonNull SignalServiceStoryMessage message, @NonNull Recipient senderRecipient) throws StorageFailedException {
log(content.getTimestamp(), "Story message.");
if (Stories.isFeatureAvailable()) {
warn(content.getTimestamp(), "Dropping unsupported story.");
return;
}
Optional<InsertResult> insertResult;
MessageDatabase database = SignalDatabase.mms();
@ -1379,6 +1385,11 @@ public final class MessageContentProcessor {
private void handleStoryReply(@NonNull SignalServiceContent content, @NonNull SignalServiceDataMessage message, @NonNull Recipient senderRecipient) throws StorageFailedException {
log(content.getTimestamp(), "Story reply.");
if (!Stories.isFeatureAvailable()) {
warn(content.getTimestamp(), "Dropping unsupported story reply.");
return;
}
SignalServiceDataMessage.StoryContext storyContext = message.getStoryContext().get();
MessageDatabase database = SignalDatabase.mms();

17
app/src/main/java/org/thoughtcrime/securesms/stories/Stories.kt 100644
Wyświetl plik

@ -0,0 +1,17 @@
package org.thoughtcrime.securesms.stories
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.FeatureFlags
object Stories {
@JvmStatic
fun isFeatureAvailable(): Boolean {
return FeatureFlags.stories() && Recipient.self().storiesCapability == Recipient.Capability.SUPPORTED
}
@JvmStatic
fun isFeatureEnabled(): Boolean {
return isFeatureAvailable() && !SignalStore.storyValues().isFeatureDisabled
}
}