diff --git a/app/build.gradle b/app/build.gradle index 51422a2870..3a708a512f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 96005 - versionName "96.5 - Stable" + versionCode 96006 + versionName "96.6 - Stable" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61e2f724db..7dfbac4dd6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java index 7b6c3620f7..66299c274d 100644 --- a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java +++ b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java @@ -2681,7 +2681,7 @@ public class AnimatableValueParser { public static final boolean i1(Channel channel, Presence presence) { m.checkNotNullParameter(channel, "$this$isDMStatusVisible"); com.discord.models.user.User v0 = v0(channel); - return h1(channel) && !A1(channel) && (v0 != null ? UserUtils.INSTANCE.isStatusVisible(v0, presence) : false); + return h1(channel) && !A1(channel) && (v0 != null ? UserUtils.INSTANCE.isStatusVisible(v0, presence, true) : false); } @RecentlyNonNull diff --git a/app/src/main/java/com/discord/utilities/user/UserUtils.java b/app/src/main/java/com/discord/utilities/user/UserUtils.java index e82f6ad4db..a9238fe0e7 100644 --- a/app/src/main/java/com/discord/utilities/user/UserUtils.java +++ b/app/src/main/java/com/discord/utilities/user/UserUtils.java @@ -272,13 +272,13 @@ public final class UserUtils { return hasFlag(user, 1); } - public final boolean isStatusVisible(int i, Presence presence) { - return presence != null && (!hasFlag(i, 524288) || presence.getStatus() != ClientStatus.OFFLINE); + public final boolean isStatusVisible(int i, Presence presence, boolean z2) { + return hasFlag(i, 524288) ? (presence == null || presence.getStatus() == ClientStatus.OFFLINE) ? false : true : presence != null || z2; } - public final boolean isStatusVisible(User user, Presence presence) { + public final boolean isStatusVisible(User user, Presence presence, boolean z2) { m.checkNotNullParameter(user, "$this$isStatusVisible"); - return isStatusVisible(user.getPublicFlags() | user.getFlags(), presence); + return isStatusVisible(user.getPublicFlags() | user.getFlags(), presence, z2); } public final boolean isVerifiedBot(User user) { diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java index 3d5c05c86c..926c7b0b33 100644 --- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java +++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java @@ -270,7 +270,7 @@ public final class UserAvatarPresenceView extends RelativeLayout { } StatusView statusView = this.i.e; m.checkNotNullExpressionValue(statusView, "binding.userAvatarPresenceStatus"); - if (!aVar.d || !UserUtils.INSTANCE.isStatusVisible(aVar.a, aVar.b)) { + if (!aVar.d || !UserUtils.INSTANCE.isStatusVisible(aVar.a, aVar.b, true)) { z3 = false; } if (!z3) { diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java index 7e51a5fef3..11f39a0b16 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.java @@ -61,7 +61,7 @@ public final class ChannelMembersListViewHolderMember extends RecyclerView.ViewH this.binding.g.setPresence(member.getPresence()); StatusView statusView = this.binding.g; m.checkNotNullExpressionValue(statusView, "binding.channelMembersListItemPresence"); - statusView.setVisibility(UserUtils.INSTANCE.isStatusVisible(member.getUserFlags(), member.getPresence()) ? 0 : 8); + statusView.setVisibility(UserUtils.INSTANCE.isStatusVisible(member.getUserFlags(), member.getPresence(), true) ? 0 : 8); ImageView imageView3 = this.binding.h; m.checkNotNullExpressionValue(imageView3, "binding.channelMembersListItemRichPresenceIv"); if (!PresenceUtils.INSTANCE.shouldShowRichPresenceIcon(member.getPresence())) { diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java index e8bcffe0ce..8bbdd285e6 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/adapter/AutocompleteItemViewHolder.java @@ -357,7 +357,7 @@ public final class AutocompleteItemViewHolder extends RecyclerView.ViewHolder { if (presence != null) { StatusView statusView = this.binding.g; m.checkNotNullExpressionValue(statusView, "binding.chatInputItemStatus"); - if (!userUtils.isStatusVisible(user, presence)) { + if (!userUtils.isStatusVisible(user, presence, true)) { i = 8; } statusView.setVisibility(i); diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java index 91525f338d..f43fc6e26e 100644 --- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java +++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java @@ -600,7 +600,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl userListItemView.j.e.setPresence(null); StatusView statusView = userListItemView.j.e; m.checkNotNullExpressionValue(statusView, "binding.userListItemStatus"); - if (!userUtils.isStatusVisible(user, (Presence) null)) { + if (!userUtils.isStatusVisible(user, (Presence) null, false)) { i3 = 8; } statusView.setVisibility(i3); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index e56e367209..4ece79b9cf 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -314,7 +314,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 96.5 - Stable (96005)"); + textView.setText(string + " - 96.6 - Stable (96006)"); binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4adf9e1a9a..02b53686d2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1432,7 +1432,7 @@ Select a color Transparency Use Default - 78bf26a0f09948c2b9eeba477a48be8d + eb2e4e84e0af4718bf64b623cf226a71 Coming Soon Slash command application {applicationName} {applicationName} application