kopia lustrzana https://github.com/ryukoposting/Signal-Android
Revert "Do not remove onboarding story when disabling stories."
This reverts commit 8c76cead58
.
fork-5.53.8
rodzic
a04c2c30b9
commit
2bbce6ad47
|
@ -198,7 +198,6 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns,
|
|||
public abstract boolean isStory(long messageId);
|
||||
public abstract @NonNull Reader getOutgoingStoriesTo(@NonNull RecipientId recipientId);
|
||||
public abstract @NonNull Reader getAllOutgoingStories(boolean reverse, int limit);
|
||||
public abstract @NonNull Reader getAllIncomingStoriesExceptOnboarding();
|
||||
public abstract @NonNull Reader getAllOutgoingStoriesAt(long sentTimestamp);
|
||||
public abstract @NonNull List<StoryResult> getOrderedStoryRecipientsAndIds(boolean isOutgoingOnly);
|
||||
public abstract @NonNull Reader getAllStoriesFor(@NonNull RecipientId recipientId, int limit);
|
||||
|
|
|
@ -635,17 +635,6 @@ public class MmsDatabase extends MessageDatabase {
|
|||
return new Reader(rawQuery(where, null, reverse, limit));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull MessageDatabase.Reader getAllIncomingStoriesExceptOnboarding() {
|
||||
RecipientId onboardingRecipientId = SignalStore.releaseChannelValues().getReleaseChannelRecipientId();
|
||||
String where = IS_STORY_CLAUSE + " AND NOT (" + getOutgoingTypeClause() + ")";
|
||||
if (onboardingRecipientId != null) {
|
||||
where += " AND " + RECIPIENT_ID + " != " + onboardingRecipientId.serialize();
|
||||
}
|
||||
|
||||
return new Reader(rawQuery(where, null, false, -1L));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull MessageDatabase.Reader getAllOutgoingStoriesAt(long sentTimestamp) {
|
||||
String where = IS_STORY_CLAUSE + " AND " + DATE_SENT + " = ? AND (" + getOutgoingTypeClause() + ")";
|
||||
|
|
|
@ -1448,11 +1448,6 @@ public class SmsDatabase extends MessageDatabase {
|
|||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull MessageDatabase.Reader getAllIncomingStoriesExceptOnboarding() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NonNull MessageDatabase.Reader getAllOutgoingStoriesAt(long sentTimestamp) {
|
||||
throw new UnsupportedOperationException();
|
||||
|
|
|
@ -28,18 +28,10 @@ class StoriesPrivacySettingsRepository {
|
|||
Stories.onStorySettingsChanged(Recipient.self().id)
|
||||
ApplicationDependencies.resetAllNetworkConnections()
|
||||
|
||||
if (!isEnabled) {
|
||||
SignalDatabase.mms.getAllOutgoingStories(false, -1).use { reader ->
|
||||
reader.map { record -> record.id }
|
||||
}.forEach { messageId ->
|
||||
MessageSender.sendRemoteDelete(messageId, true)
|
||||
}
|
||||
|
||||
SignalDatabase.mms.allIncomingStoriesExceptOnboarding.use { reader ->
|
||||
reader.map { record -> record.id }
|
||||
}.forEach { messageId ->
|
||||
SignalDatabase.mms.deleteMessage(messageId)
|
||||
}
|
||||
SignalDatabase.mms.getAllOutgoingStories(false, -1).use { reader ->
|
||||
reader.map { record -> record.id }
|
||||
}.forEach { messageId ->
|
||||
MessageSender.sendRemoteDelete(messageId, true)
|
||||
}
|
||||
}.subscribeOn(Schedulers.io())
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue