diff --git a/app/build.gradle b/app/build.gradle index 997d897110..dbaaa03b8c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102112 - versionName "102.12 - Beta" + versionCode 102113 + versionName "102.13 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8724d440e9..7d81bea04d 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/discord/stores/StoreGuilds.java b/app/src/main/java/com/discord/stores/StoreGuilds.java index 0d2d1aaf77..a698bd2ed4 100644 --- a/app/src/main/java/com/discord/stores/StoreGuilds.java +++ b/app/src/main/java/com/discord/stores/StoreGuilds.java @@ -18,6 +18,7 @@ import com.discord.models.member.GuildMember; import com.discord.models.user.MeUser; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.utilities.collections.CollectionExtensionsKt; import com.discord.utilities.collections.SnowflakePartitionMap; import com.discord.utilities.guilds.GuildUtilsKt; import com.discord.utilities.persister.Persister; @@ -477,7 +478,7 @@ public final class StoreGuilds extends StoreV2 { @Override // com.discord.stores.Store public void init(Context context) { m.checkNotNullParameter(context, "context"); - this.guilds.putAll(this.guildsCache.get()); + this.guilds.putAll(CollectionExtensionsKt.filterNonNullValues(this.guildsCache.get())); LinkedHashMap linkedHashMap = new LinkedHashMap(); Iterator>> it = this.guildRolesCache.get().entrySet().iterator(); while (true) { diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings$updateContactSyncShown$1.java b/app/src/main/java/com/discord/stores/StoreUserSettings$updateContactSyncShown$1.java new file mode 100644 index 0000000000..c37816acb6 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreUserSettings$updateContactSyncShown$1.java @@ -0,0 +1,27 @@ +package com.discord.stores; + +import com.discord.models.domain.ModelUserSettings; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreUserSettings.kt */ +public final class StoreUserSettings$updateContactSyncShown$1 extends o implements Function1 { + public static final StoreUserSettings$updateContactSyncShown$1 INSTANCE = new StoreUserSettings$updateContactSyncShown$1(); + + public StoreUserSettings$updateContactSyncShown$1() { + super(1); + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(ModelUserSettings modelUserSettings) { + invoke(modelUserSettings); + return Unit.a; + } + + public final void invoke(ModelUserSettings modelUserSettings) { + m.checkNotNullParameter(modelUserSettings, "it"); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings.java b/app/src/main/java/com/discord/stores/StoreUserSettings.java index 842f9b73ce..9e0a559450 100644 --- a/app/src/main/java/com/discord/stores/StoreUserSettings.java +++ b/app/src/main/java/com/discord/stores/StoreUserSettings.java @@ -563,8 +563,8 @@ public final class StoreUserSettings extends Store { } } - public final Observable updateContactSyncShown() { - return RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithContactSyncUpsellShown()); + public final void updateContactSyncShown() { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithContactSyncUpsellShown()), false, 1, null), StoreUserSettings.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, StoreUserSettings$updateContactSyncShown$1.INSTANCE, 62, (Object) null); } public final Observable updateCustomStatus(ModelCustomStatusSetting modelCustomStatusSetting) { diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java index fe05b13085..0ce0406271 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java @@ -1159,7 +1159,9 @@ public final class WidgetContactSyncViewModel extends AppViewModel { @MainThread public final void dismissUpsell() { - StoreStream.Companion.getContactSync().dismissUpsell(); + StoreStream.Companion companion = StoreStream.Companion; + companion.getContactSync().dismissUpsell(); + companion.getUserSettings().updateContactSyncShown(); } public final ContactSyncFlowAnalytics getTracker() { 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 cfd621884c..5990e9f016 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,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 + " - 102.12 - Beta (102112)"); + textView.setText(string + " - 102.13 - Beta (102113)"); binding.B.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 056787fcfd..9d545da87f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1505,7 +1505,7 @@ Select a color Transparency Use Default - 8d6123f10d1745fd8d88c92a8c23b4d6 + 85f0b33d079947538a46c0502efdaf5a Coming Soon Slash command application {applicationName} {applicationName} application