103.8 - Alpha (103208)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 103207
+        versionCode 103208
-        versionName "103.7 - Alpha"
+        versionName "103.8 - Alpha"
 
         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="103207" android:versionName="103.7 - Alpha" 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="103208" android:versionName="103.8 - Alpha" 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/models/domain/ModelUserNote.java

@@ -100,7 +100,6 @@ public final class ModelUserNote {
     }
 
     public ModelUserNote(long j, String str) {
-        m.checkNotNullParameter(str, "note");
         this.noteUserId = j;
         this.note = str;
     }
@@ -124,7 +123,6 @@ public final class ModelUserNote {
     }
 
     public final ModelUserNote copy(long j, String str) {
-        m.checkNotNullParameter(str, "note");
         return new ModelUserNote(j, str);
     }
 

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

@@ -156,7 +156,12 @@ public final class StoreUserNotes extends StoreV2 {
 
     @StoreThread
     private final void handleRequestUserNoteSuccess(ModelUserNote modelUserNote) {
-        updateNoteInternal(modelUserNote.getNoteUserId(), modelUserNote.getNote());
+        long noteUserId = modelUserNote.getNoteUserId();
+        String note = modelUserNote.getNote();
+        if (note == null) {
+            note = "";
+        }
+        updateNoteInternal(noteUserId, note);
     }
 
     @StoreThread

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 + " - 103.7 - Alpha (103207)");
+        textView.setText(string + " - 103.8 - Alpha (103208)");
         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-ar-rXB/strings.xml

@@ -3860,6 +3860,8 @@
     <string name="guild_role_subscription_purchase_page_unavailable_cta_hook">‏‮Sorry,‬‏ ‏‮$[‬‏‏‮{serverName}‬‏ ‏‮Premium](serverNameHook)‬‏ ‏‮isn\'t‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮purchase‬‏ ‏‮on‬‏ ‏‮mobile‬‏</string>
     <string name="guild_role_subscription_purchase_page_unavailable_description">‏‮We’re‬‏ ‏‮working‬‏ ‏‮on‬‏ ‏‮a‬‏ ‏‮solution.‬‏ ‏‮In‬‏ ‏‮the‬‏ ‏‮meantime,‬‏ ‏‮visit‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮on‬‏ ‏‮desktop‬‏ ‏‮or‬‏ ‏‮web‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮info.‬‏</string>
     <string name="guild_role_subscription_purchase_upsell_page_cta">‏‮Subscribe‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{serverName}‬‏ ‏‮Premium**‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮#‬‏‏‮{channelName}‬‏</string>
+    <string name="guild_role_subscription_restarted_description">‏‮Your‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮charged‬‏ ‏‮at‬‏ ‏‮the‬‏ ‏‮beginning‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮billing‬‏ ‏‮period.‬‏</string>
+    <string name="guild_role_subscription_restarted_title">‏‮Your‬‏ ‏‮membership‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮restarted!‬‏</string>
     <string name="guild_role_subscription_search_channels_placeholder">‏‮Search‬‏ ‏‮channels‬‏</string>
     <string name="guild_role_subscription_settings_description">‏‮Monetize‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮by‬‏ ‏‮offering‬‏ ‏‮exclusive‬‏ ‏‮channels‬‏ ‏‮and‬‏ ‏‮benefits.‬‏</string>
     <string name="guild_role_subscription_settings_no_published_tiers">‏‮Get‬‏ ‏‮Started‬‏</string>
@@ -6168,8 +6170,8 @@
     <string name="move_members_description">‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏</string>
     <string name="move_to">‏‮Move‬‏ ‏‮To‬‏</string>
     <string name="move_to_success">‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏</string>
-    <string name="res_2131892267_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
+    <string name="res_2131892269_msg_alert_cleared">‏‮Alert‬‏ ‏‮Cleared‬‏</string>
-    <string name="res_2131892268_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
+    <string name="res_2131892270_msg_no_alert_showing">‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏</string>
     <string name="mtrl_badge_numberless_content_description">‏‮New‬‏ ‏‮notification‬‏</string>
     <string name="mtrl_chip_close_icon_content_description">‏‮Remove‬‏ ‏‮%1$s‬‏</string>
     <string name="mtrl_exceed_max_badge_number_content_description">‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏</string>

app/src/main/res/values-en-rXA/strings.xml

@@ -3860,6 +3860,8 @@
     <string name="guild_role_subscription_purchase_page_unavailable_cta_hook">[Šöŕŕý, €[»{serverName}« Þŕéḿîûḿ](šéŕVéŕÑåḿéĤööķ) îšñ\'ţ åVåîļåɓļé ţö þûŕçĥåšé öñ ḿöɓîļé one two three four five six seven eight nine ten eleven twelve thirteen fourteen]</string>
     <string name="guild_role_subscription_purchase_page_unavailable_description">[Ŵé’ŕé ŵöŕķîñĝ öñ å šöļûţîöñ. Îñ ţĥé ḿéåñţîḿé, Vîšîţ ţĥîš šéŕVéŕ öñ ðéšķţöþ öŕ ŵéɓ ƒöŕ ḿöŕé îñƒö. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen]</string>
     <string name="guild_role_subscription_purchase_upsell_page_cta">[Šûɓšçŕîɓé ţö **»{serverName}« Þŕéḿîûḿ** ţö ûñļöçķ #»{channelName}« one two three four five]</string>
+    <string name="guild_role_subscription_restarted_description">[Ýöûŕ þåýḿéñţ ḿéţĥöð ŵîļļ ɓé çĥåŕĝéð åţ ţĥé ɓéĝîññîñĝ öƒ ţĥé ñéхţ ɓîļļîñĝ þéŕîöð. one two three four five six seven eight nine]</string>
+    <string name="guild_role_subscription_restarted_title">[Ýöûŕ ḿéḿɓéŕšĥîþ ĥåš ɓééñ ŕéšţåŕţéð¡ one two three four]</string>
     <string name="guild_role_subscription_search_channels_placeholder">[Šéåŕçĥ çĥåññéļš one two three]</string>
     <string name="guild_role_subscription_settings_description">[Ḿöñéţîžé ýöûŕ šéŕVéŕ ɓý öƒƒéŕîñĝ éхçļûšîVé çĥåññéļš åñð ɓéñéƒîţš. one two three four five six seven]</string>
     <string name="guild_role_subscription_settings_no_published_tiers">[Ĝéţ Šţåŕţéð one two]</string>
@@ -6168,8 +6170,8 @@
     <string name="move_members_description">[Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen]</string>
     <string name="move_to">[ḾöVé Ţö one two]</string>
     <string name="move_to_success">[Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five]</string>
-    <string name="res_2131892267_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
+    <string name="res_2131892269_msg_alert_cleared">[Åļéŕţ Çļéåŕéð one two]</string>
-    <string name="res_2131892268_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
+    <string name="res_2131892270_msg_no_alert_showing">[Ñö Åļéŕţ Šĥöŵîñĝ one two three]</string>
     <string name="mtrl_badge_numberless_content_description">[Ñéŵ ñöţîƒîçåţîöñ one two three]</string>
     <string name="mtrl_chip_close_icon_content_description">[ŔéḿöVé »%1$s« one two]</string>
     <string name="mtrl_exceed_max_badge_number_content_description">[Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four]</string>

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

@@ -1514,7 +1514,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_2131887594_com_crashlytics_android_build_id">602a3cf5530748d7834a467383f85772</string>
+    <string name="res_2131887594_com_crashlytics_android_build_id">fc4ffa0896154ceeaafed4a4b6f33cc9</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>
@@ -3876,6 +3876,8 @@
     <string name="guild_role_subscription_purchase_page_unavailable_cta_hook">Sorry, $[{serverName} Premium](serverNameHook) isn\'t available to purchase on mobile</string>
     <string name="guild_role_subscription_purchase_page_unavailable_description">We’re working on a solution. In the meantime, visit this server on desktop or web for more info.</string>
     <string name="guild_role_subscription_purchase_upsell_page_cta">Subscribe to **{serverName} Premium** to unlock #{channelName}</string>
+    <string name="guild_role_subscription_restarted_description">Your payment method will be charged at the beginning of the next billing period.</string>
+    <string name="guild_role_subscription_restarted_title">Your membership has been restarted!</string>
     <string name="guild_role_subscription_search_channels_placeholder">Search channels</string>
     <string name="guild_role_subscription_settings_description">Monetize your server by offering exclusive channels and benefits.</string>
     <string name="guild_role_subscription_settings_no_published_tiers">Get Started</string>
@@ -6187,8 +6189,8 @@
     <string name="move_members_description">Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access.</string>
     <string name="move_to">Move To</string>
     <string name="move_to_success">User has been moved to the selected channel.</string>
-    <string name="res_2131892267_msg_alert_cleared">Alert Cleared</string>
+    <string name="res_2131892269_msg_alert_cleared">Alert Cleared</string>
-    <string name="res_2131892268_msg_no_alert_showing">No Alert Showing</string>
+    <string name="res_2131892270_msg_no_alert_showing">No Alert Showing</string>
     <string name="mtrl_badge_numberless_content_description">New notification</string>
     <string name="mtrl_chip_close_icon_content_description">Remove %1$s</string>
     <string name="mtrl_exceed_max_badge_number_content_description">More than %1$d new notifications</string>