102.13 - Beta (102113)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 102112
+        versionCode 102113
-        versionName "102.12 - Beta"
+        versionName "102.13 - Beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102112" android:versionName="102.12 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102113" android:versionName="102.13 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>

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<Map.Entry<Long, Map<Long, GuildRole>>> it = this.guildRolesCache.get().entrySet().iterator();
         while (true) {

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<ModelUserSettings, Unit> {
+    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");
+    }
+}

app/src/main/java/com/discord/stores/StoreUserSettings.java

@@ -563,8 +563,8 @@ public final class StoreUserSettings extends Store {
         }
     }
 
-    public final Observable<ModelUserSettings> updateContactSyncShown() {
+    public final void updateContactSyncShown() {
-        return RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithContactSyncUpsellShown());
+        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<ModelUserSettings> updateCustomStatus(ModelCustomStatusSetting modelCustomStatusSetting) {

app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java

@@ -1159,7 +1159,9 @@ public final class WidgetContactSyncViewModel extends AppViewModel<ViewState> {
 
     @MainThread
     public final void dismissUpsell() {
-        StoreStream.Companion.getContactSync().dismissUpsell();
+        StoreStream.Companion companion = StoreStream.Companion;
+        companion.getContactSync().dismissUpsell();
+        companion.getUserSettings().updateContactSyncShown();
     }
 
     public final ContactSyncFlowAnalytics getTracker() {

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);

app/src/main/res/values/strings.xml

@@ -1505,7 +1505,7 @@
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887585_com_crashlytics_android_build_id">8d6123f10d1745fd8d88c92a8c23b4d6</string>
+    <string name="res_2131887585_com_crashlytics_android_build_id">85f0b33d079947538a46c0502efdaf5a</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>