diff --git a/app/build.gradle b/app/build.gradle index e65271335e..ed81ef1ea9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102114 - versionName "102.14 - Beta" + versionCode 102115 + versionName "102.15 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e68158afbd..13b044536d 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/models/domain/ModelUserNote.java b/app/src/main/java/com/discord/models/domain/ModelUserNote.java index 9000a1b5c8..83224f8444 100644 --- a/app/src/main/java/com/discord/models/domain/ModelUserNote.java +++ b/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); } diff --git a/app/src/main/java/com/discord/stores/StoreUserNotes.java b/app/src/main/java/com/discord/stores/StoreUserNotes.java index 45040eac28..ff5b5751ac 100644 --- a/app/src/main/java/com/discord/stores/StoreUserNotes.java +++ b/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 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 3a60af384c..669947b96d 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.14 - Beta (102114)"); + textView.setText(string + " - 102.15 - Beta (102115)"); 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 43e4d3069d..c18c50061c 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 - 2f69913a53e44d45807a2c75220b4c43 + 3aca1d331a4748e5b4372a93f0f5fbb6 Coming Soon Slash command application {applicationName} {applicationName} application