81.10 - Beta (81110)
This commit is contained in:
parent
9e62d7cc81
commit
231993b3d5
|
@ -10,8 +10,8 @@ android {
|
||||||
applicationId 'com.discord'
|
applicationId 'com.discord'
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 81107
|
versionCode 81110
|
||||||
versionName "81.7 - Beta"
|
versionName "81.10 - Beta"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="81107" android:versionName="81.7 - 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="81110" android:versionName="81.10 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
|
||||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
|
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
|
||||||
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
<uses-feature android:name="android.hardware.camera" android:required="false"/>
|
||||||
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
|
||||||
|
|
|
@ -172,7 +172,7 @@ public class App extends Application {
|
||||||
loggingProvider.init(appLog);
|
loggingProvider.init(appLog);
|
||||||
c.i.c.c.e(this);
|
c.i.c.c.e(this);
|
||||||
String str = null;
|
String str = null;
|
||||||
if (BuildUtils.INSTANCE.isValidBuildVersionName("81.7 - Beta")) {
|
if (BuildUtils.INSTANCE.isValidBuildVersionName("81.10 - Beta")) {
|
||||||
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
|
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
|
||||||
} else {
|
} else {
|
||||||
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);
|
FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);
|
||||||
|
|
|
@ -5,6 +5,7 @@ import com.discord.restapi.RestAPIParams;
|
||||||
import com.discord.stores.StoreAuthentication;
|
import com.discord.stores.StoreAuthentication;
|
||||||
import com.discord.stores.StoreInviteSettings;
|
import com.discord.stores.StoreInviteSettings;
|
||||||
import com.discord.stores.StoreStream;
|
import com.discord.stores.StoreStream;
|
||||||
|
import com.discord.utilities.analytics.AnalyticsTracker;
|
||||||
import com.discord.utilities.rest.RestAPI;
|
import com.discord.utilities.rest.RestAPI;
|
||||||
import com.discord.utilities.rx.ObservableExtensionsKt;
|
import com.discord.utilities.rx.ObservableExtensionsKt;
|
||||||
import d0.z.d.k;
|
import d0.z.d.k;
|
||||||
|
@ -86,6 +87,7 @@ public final class StoreAuthentication$register$1<T, R> implements b<String, Obs
|
||||||
companion.getUserSettingsSystem().setIsSyncThemeEnabled(false);
|
companion.getUserSettingsSystem().setIsSyncThemeEnabled(false);
|
||||||
this.this$0.this$0.setFingerprint(null, true);
|
this.this$0.this$0.setFingerprint(null, true);
|
||||||
this.this$0.this$0.setAuthed(registerResponse.a());
|
this.this$0.this$0.setAuthed(registerResponse.a());
|
||||||
|
AnalyticsTracker.INSTANCE.appFirstLogin();
|
||||||
companion.getNotifications().setEnabledInApp(true, false);
|
companion.getNotifications().setEnabledInApp(true, false);
|
||||||
companion.getNux().setFirstOpen(true);
|
companion.getNux().setFirstOpen(true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -331,6 +331,7 @@ public final class StoreAuthentication extends Store {
|
||||||
setAuthed(modelLoginResult.getToken());
|
setAuthed(modelLoginResult.getToken());
|
||||||
if (modelLoginResult.getToken() != null) {
|
if (modelLoginResult.getToken() != null) {
|
||||||
setAgeGateError(null);
|
setAgeGateError(null);
|
||||||
|
AnalyticsTracker.INSTANCE.appFirstLogin();
|
||||||
}
|
}
|
||||||
PublishSubject<Boolean> publishSubject = this.userInitiatedAuthEventSubject;
|
PublishSubject<Boolean> publishSubject = this.userInitiatedAuthEventSubject;
|
||||||
publishSubject.j.onNext(Boolean.TRUE);
|
publishSubject.j.onNext(Boolean.TRUE);
|
||||||
|
|
|
@ -15,7 +15,7 @@ public final class StoreClientVersion extends Store {
|
||||||
private int clientMinVersion;
|
private int clientMinVersion;
|
||||||
private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY";
|
private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY";
|
||||||
private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE));
|
private final SerializedSubject<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE));
|
||||||
private final int clientVersion = 81107;
|
private final int clientVersion = 81110;
|
||||||
|
|
||||||
public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
|
public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
|
||||||
storeClientVersion.setClientMinVersion(i);
|
storeClientVersion.setClientMinVersion(i);
|
||||||
|
|
|
@ -77,7 +77,7 @@ public final class AnalyticSuperProperties {
|
||||||
private final void setBaselineProperties() {
|
private final void setBaselineProperties() {
|
||||||
String locale = Locale.getDefault().toString();
|
String locale = Locale.getDefault().toString();
|
||||||
m.checkNotNullExpressionValue(locale, "Locale.getDefault().toString()");
|
m.checkNotNullExpressionValue(locale, "Locale.getDefault().toString()");
|
||||||
updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/81107"), o.to("client_build_number", 81107), o.to("client_version", "81.7 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
|
updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/81110"), o.to("client_build_number", 81110), o.to("client_version", "81.10 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void setSuperProperties(Map<String, ? extends Object> map) {
|
private final void setSuperProperties(Map<String, ? extends Object> map) {
|
||||||
|
|
|
@ -50,6 +50,7 @@ import com.discord.utilities.fcm.NotificationClient;
|
||||||
import com.discord.utilities.intent.RouteHandlers;
|
import com.discord.utilities.intent.RouteHandlers;
|
||||||
import com.discord.utilities.logging.Logger;
|
import com.discord.utilities.logging.Logger;
|
||||||
import com.discord.utilities.permissions.PermissionUtils;
|
import com.discord.utilities.permissions.PermissionUtils;
|
||||||
|
import com.discord.utilities.persister.Persister;
|
||||||
import com.discord.utilities.platform.Platform;
|
import com.discord.utilities.platform.Platform;
|
||||||
import com.discord.utilities.rest.FileUploadAlertType;
|
import com.discord.utilities.rest.FileUploadAlertType;
|
||||||
import com.discord.utilities.rx.ObservableExtensionsKt;
|
import com.discord.utilities.rx.ObservableExtensionsKt;
|
||||||
|
@ -907,6 +908,14 @@ public final class AnalyticsTracker {
|
||||||
tracker.track("app_exception_thrown", g0.mapOf(o.to("stacktrace", str)));
|
tracker.track("app_exception_thrown", g0.mapOf(o.to("stacktrace", str)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public final void appFirstLogin() {
|
||||||
|
Persister persister = new Persister("app_first_login", Boolean.TRUE);
|
||||||
|
if (((Boolean) persister.get()).booleanValue()) {
|
||||||
|
tracker.track("app_first_login", g0.mapOf(o.to("platform", "Android")));
|
||||||
|
persister.set(Boolean.FALSE, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public final void applicationCommandBrowserJump(long j) {
|
public final void applicationCommandBrowserJump(long j) {
|
||||||
tracker.track("application_command_browser_jumped", g0.mapOf(o.to("target_application_id", Long.valueOf(j))));
|
tracker.track("application_command_browser_jumped", g0.mapOf(o.to("target_application_id", Long.valueOf(j))));
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,9 +3,11 @@ package com.discord.utilities.analytics;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import com.discord.stores.StoreUserSettingsSystem;
|
import com.discord.stores.StoreUserSettingsSystem;
|
||||||
import com.discord.utilities.analytics.AnalyticsUtils;
|
import com.discord.utilities.analytics.AnalyticsUtils;
|
||||||
|
import com.discord.utilities.persister.Persister;
|
||||||
import com.discord.utilities.time.Clock;
|
import com.discord.utilities.time.Clock;
|
||||||
import d0.g;
|
import d0.g;
|
||||||
import d0.o;
|
import d0.o;
|
||||||
|
import d0.t.g0;
|
||||||
import d0.t.h0;
|
import d0.t.h0;
|
||||||
import d0.z.d.m;
|
import d0.z.d.m;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -14,6 +16,7 @@ import kotlin.Lazy;
|
||||||
import kotlin.jvm.internal.DefaultConstructorMarker;
|
import kotlin.jvm.internal.DefaultConstructorMarker;
|
||||||
/* compiled from: AppStartAnalyticsTracker.kt */
|
/* compiled from: AppStartAnalyticsTracker.kt */
|
||||||
public final class AppStartAnalyticsTracker {
|
public final class AppStartAnalyticsTracker {
|
||||||
|
private static final String APP_FIRST_LAUNCHED = "app_first_launched";
|
||||||
public static final Companion Companion = new Companion(null);
|
public static final Companion Companion = new Companion(null);
|
||||||
private static final Lazy instance$delegate = g.lazy(AppStartAnalyticsTracker$Companion$instance$2.INSTANCE);
|
private static final Lazy instance$delegate = g.lazy(AppStartAnalyticsTracker$Companion$instance$2.INSTANCE);
|
||||||
private Long appOpenTimestamp;
|
private Long appOpenTimestamp;
|
||||||
|
@ -103,6 +106,11 @@ public final class AppStartAnalyticsTracker {
|
||||||
public final void appOpen(Uri uri, boolean z2, boolean z3) {
|
public final void appOpen(Uri uri, boolean z2, boolean z3) {
|
||||||
m.checkNotNullParameter(uri, "uri");
|
m.checkNotNullParameter(uri, "uri");
|
||||||
this.tracker.track(o.to("app_opened", null), 300000, new AppStartAnalyticsTracker$appOpen$1(this, z3, z2, uri));
|
this.tracker.track(o.to("app_opened", null), 300000, new AppStartAnalyticsTracker$appOpen$1(this, z3, z2, uri));
|
||||||
|
Persister persister = new Persister("app_first_launched", Boolean.TRUE);
|
||||||
|
if (((Boolean) persister.get()).booleanValue()) {
|
||||||
|
this.tracker.track("app_first_launched", g0.mapOf(o.to("platform", "Android")));
|
||||||
|
persister.set(Boolean.FALSE, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void appUiViewed(String str, long j) {
|
public final void appUiViewed(String str, long j) {
|
||||||
|
|
|
@ -176,7 +176,7 @@ public final class RestAPI implements RestAPIInterface {
|
||||||
|
|
||||||
@Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider
|
@Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider
|
||||||
public String getUserAgent() {
|
public String getUserAgent() {
|
||||||
return "Discord-Android/81107";
|
return "Discord-Android/81110";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ public final class WidgetFatalCrash extends AppFragment {
|
||||||
textView2.setText(b.j(this, 2131887893, objArr2, null, 4));
|
textView2.setText(b.j(this, 2131887893, objArr2, null, 4));
|
||||||
TextView textView3 = getBinding().b;
|
TextView textView3 = getBinding().b;
|
||||||
m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion");
|
m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion");
|
||||||
textView3.setText(b.j(this, 2131887886, new Object[]{"81.7 - Beta"}, null, 4));
|
textView3.setText(b.j(this, 2131887886, new Object[]{"81.10 - Beta"}, null, 4));
|
||||||
TextView textView4 = getBinding().d;
|
TextView textView4 = getBinding().d;
|
||||||
m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
|
m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
|
||||||
textView4.setText(b.j(this, 2131887889, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
|
textView4.setText(b.j(this, 2131887889, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));
|
||||||
|
|
|
@ -271,7 +271,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
|
||||||
TextView textView = binding.f;
|
TextView textView = binding.f;
|
||||||
m.checkNotNullExpressionValue(textView, "appInfoHeader");
|
m.checkNotNullExpressionValue(textView, "appInfoHeader");
|
||||||
String string = getString(2131886360);
|
String string = getString(2131886360);
|
||||||
textView.setText(string + " - 81.7 - Beta (81107)");
|
textView.setText(string + " - 81.10 - Beta (81110)");
|
||||||
binding.w.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this));
|
binding.w.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this));
|
||||||
binding.t.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE);
|
binding.t.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE);
|
||||||
binding.q.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
|
binding.q.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
package com.discord.widgets.settings.connections;
|
package com.discord.widgets.settings.connections;
|
||||||
|
|
||||||
|
import c.d.b.a.a;
|
||||||
import com.discord.models.domain.ModelConnectedAccount;
|
import com.discord.models.domain.ModelConnectedAccount;
|
||||||
import com.discord.models.guild.Guild;
|
import com.discord.models.guild.Guild;
|
||||||
import com.discord.widgets.settings.connections.WidgetSettingsUserConnectionsViewModel;
|
import com.discord.widgets.settings.connections.WidgetSettingsUserConnectionsViewModel;
|
||||||
import d0.z.d.m;
|
import d0.z.d.m;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import rx.functions.Func2;
|
import rx.functions.Func2;
|
||||||
|
@ -12,9 +14,14 @@ public final class WidgetSettingsUserConnectionsViewModel$Companion$observeStore
|
||||||
public static final WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1 INSTANCE = new WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1();
|
public static final WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1 INSTANCE = new WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1();
|
||||||
|
|
||||||
public final WidgetSettingsUserConnectionsViewModel.StoreState call(List<ModelConnectedAccount> list, Map<Long, Guild> map) {
|
public final WidgetSettingsUserConnectionsViewModel.StoreState call(List<ModelConnectedAccount> list, Map<Long, Guild> map) {
|
||||||
m.checkNotNullExpressionValue(list, "accounts");
|
ArrayList S = a.S(list, "accounts");
|
||||||
|
for (Object obj : list) {
|
||||||
|
if (!m.areEqual(((ModelConnectedAccount) obj).getType(), "contacts")) {
|
||||||
|
S.add(obj);
|
||||||
|
}
|
||||||
|
}
|
||||||
m.checkNotNullExpressionValue(map, "guilds");
|
m.checkNotNullExpressionValue(map, "guilds");
|
||||||
return new WidgetSettingsUserConnectionsViewModel.StoreState(list, map);
|
return new WidgetSettingsUserConnectionsViewModel.StoreState(S, map);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return type fixed from 'java.lang.Object' to match base method */
|
/* Return type fixed from 'java.lang.Object' to match base method */
|
||||||
|
|
|
@ -91,7 +91,7 @@ public final class WidgetSettingsUserConnectionsViewModel extends AppViewModel<V
|
||||||
private final Observable<StoreState> observeStores() {
|
private final Observable<StoreState> observeStores() {
|
||||||
StoreStream.Companion companion = StoreStream.Companion;
|
StoreStream.Companion companion = StoreStream.Companion;
|
||||||
Observable<StoreState> j = Observable.j(companion.getUserConnections().observeConnectedAccounts(), companion.getGuilds().observeGuilds(), WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1.INSTANCE);
|
Observable<StoreState> j = Observable.j(companion.getUserConnections().observeConnectedAccounts(), companion.getGuilds().observeGuilds(), WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1.INSTANCE);
|
||||||
m.checkNotNullExpressionValue(j, "Observable.combineLatest…State(accounts, guilds) }");
|
m.checkNotNullExpressionValue(j, "Observable.combineLatest…= \"contacts\" }, guilds) }");
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
package com.discord.widgets.settings.premiumguild;
|
package com.discord.widgets.settings.premiumguild;
|
||||||
|
|
||||||
import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
|
import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot;
|
||||||
|
import com.discord.stores.StoreStream;
|
||||||
import com.discord.widgets.guilds.WidgetGuildSelector;
|
import com.discord.widgets.guilds.WidgetGuildSelector;
|
||||||
import d0.t.m0;
|
import d0.t.o0;
|
||||||
import d0.z.d.m;
|
import d0.z.d.m;
|
||||||
import d0.z.d.o;
|
import d0.z.d.o;
|
||||||
import kotlin.Unit;
|
import kotlin.Unit;
|
||||||
|
@ -28,6 +29,6 @@ public final class WidgetSettingsPremiumGuildSubscription$showContent$1 extends
|
||||||
public final void invoke(ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot, long j) {
|
public final void invoke(ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot, long j) {
|
||||||
m.checkNotNullParameter(modelPremiumGuildSubscriptionSlot, "slot");
|
m.checkNotNullParameter(modelPremiumGuildSubscriptionSlot, "slot");
|
||||||
WidgetSettingsPremiumGuildSubscription.access$getViewModel$p(this.this$0).transferClicked(modelPremiumGuildSubscriptionSlot, j);
|
WidgetSettingsPremiumGuildSubscription.access$getViewModel$p(this.this$0).transferClicked(modelPremiumGuildSubscriptionSlot, j);
|
||||||
WidgetGuildSelector.Companion.launch$default(WidgetGuildSelector.Companion, this.this$0, null, false, 0, new WidgetGuildSelector.GuildFilterFunction(m0.setOf(Long.valueOf(j))), 14, null);
|
WidgetGuildSelector.Companion.launch$default(WidgetGuildSelector.Companion, this.this$0, null, false, 0, new WidgetGuildSelector.GuildFilterFunction(o0.minus(StoreStream.Companion.getGuilds().getGuilds().keySet(), Long.valueOf(j))), 14, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,7 @@ import com.discord.widgets.user.profile.UserProfileAdminView;
|
||||||
import com.discord.widgets.user.profile.UserProfileConnectionsView;
|
import com.discord.widgets.user.profile.UserProfileConnectionsView;
|
||||||
import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView;
|
import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView;
|
||||||
import com.discord.widgets.user.usersheet.WidgetUserSheet;
|
import com.discord.widgets.user.usersheet.WidgetUserSheet;
|
||||||
|
import d0.g0.t;
|
||||||
import d0.t.n;
|
import d0.t.n;
|
||||||
import d0.t.u;
|
import d0.t.u;
|
||||||
import d0.z.d.m;
|
import d0.z.d.m;
|
||||||
|
@ -1593,6 +1594,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
return new UserProfileAdminView.ViewState(z4, z6, p1, z7, z8, z9, z10, z11, z12, z5, z3);
|
return new UserProfileAdminView.ViewState(z4, z6, p1, z7, z8, z9, z10, z11, z12, z5, z3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private final List<Node<MessageRenderContext>> createAndProcessBioAstFromText(String str) {
|
||||||
|
if (str == null || t.isBlank(str)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
List<Node<MessageRenderContext>> generateAst = generateAst(str);
|
||||||
|
createMessagePreprocessor().process(generateAst);
|
||||||
|
return generateAst;
|
||||||
|
}
|
||||||
|
|
||||||
private final UserProfileConnectionsView.ViewState createConnectionsViewState(ModelUserProfile modelUserProfile, boolean z2, boolean z3) {
|
private final UserProfileConnectionsView.ViewState createConnectionsViewState(ModelUserProfile modelUserProfile, boolean z2, boolean z3) {
|
||||||
List<ModelConnectedAccount> connectedAccounts = modelUserProfile.getConnectedAccounts();
|
List<ModelConnectedAccount> connectedAccounts = modelUserProfile.getConnectedAccounts();
|
||||||
m.checkNotNullExpressionValue(connectedAccounts, "userProfile.connectedAccounts");
|
m.checkNotNullExpressionValue(connectedAccounts, "userProfile.connectedAccounts");
|
||||||
|
@ -1665,7 +1675,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
|
|
||||||
/* JADX DEBUG: Multi-variable search result rejected for r14v1, resolved type: java.lang.Boolean */
|
/* JADX DEBUG: Multi-variable search result rejected for r14v1, resolved type: java.lang.Boolean */
|
||||||
/* JADX DEBUG: Multi-variable search result rejected for r1v7, resolved type: java.lang.Float */
|
/* JADX DEBUG: Multi-variable search result rejected for r1v7, resolved type: java.lang.Float */
|
||||||
/* JADX DEBUG: Multi-variable search result rejected for r1v15, resolved type: java.lang.Float */
|
/* JADX DEBUG: Multi-variable search result rejected for r1v31, resolved type: java.lang.Float */
|
||||||
/* JADX DEBUG: Multi-variable search result rejected for r14v4, resolved type: java.lang.Boolean */
|
/* JADX DEBUG: Multi-variable search result rejected for r14v4, resolved type: java.lang.Boolean */
|
||||||
/* JADX WARN: Multi-variable type inference failed */
|
/* JADX WARN: Multi-variable type inference failed */
|
||||||
/* JADX WARNING: Code restructure failed: missing block: B:19:0x008a, code lost:
|
/* JADX WARNING: Code restructure failed: missing block: B:19:0x008a, code lost:
|
||||||
|
@ -1673,12 +1683,11 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
*/
|
*/
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:68:0x01c4 */
|
/* JADX WARNING: Removed duplicated region for block: B:68:0x01c4 */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:69:0x01c9 */
|
/* JADX WARNING: Removed duplicated region for block: B:69:0x01c9 */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:71:0x01cc */
|
/* JADX WARNING: Removed duplicated region for block: B:72:0x01d4 */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:74:0x01db */
|
/* JADX WARNING: Removed duplicated region for block: B:79:0x01e8 */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:81:0x01ef */
|
/* JADX WARNING: Removed duplicated region for block: B:87:0x01fc */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:89:0x0203 */
|
/* JADX WARNING: Removed duplicated region for block: B:90:0x0208 */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:92:0x020f */
|
/* JADX WARNING: Removed duplicated region for block: B:91:0x020d */
|
||||||
/* JADX WARNING: Removed duplicated region for block: B:93:0x0214 */
|
|
||||||
private final void handleStoreState(StoreState storeState) {
|
private final void handleStoreState(StoreState storeState) {
|
||||||
List list;
|
List list;
|
||||||
ManageUserContext manageUserContext;
|
ManageUserContext manageUserContext;
|
||||||
|
@ -1688,7 +1697,6 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
String str2;
|
String str2;
|
||||||
StreamContext streamContext;
|
StreamContext streamContext;
|
||||||
String encodedStreamKey;
|
String encodedStreamKey;
|
||||||
List<Node<MessageRenderContext>> generateAst;
|
|
||||||
ViewState viewState;
|
ViewState viewState;
|
||||||
String str3;
|
String str3;
|
||||||
StoreUserNotes.UserNoteState userNoteFetchState;
|
StoreUserNotes.UserNoteState userNoteFetchState;
|
||||||
|
@ -1763,10 +1771,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
}
|
}
|
||||||
UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z3, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null);
|
UserProfileStageActionsView.ViewState viewState3 = new UserProfileStageActionsView.ViewState(z3, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null);
|
||||||
String d = userProfile.getUser().d();
|
String d = userProfile.getUser().d();
|
||||||
generateAst = d == null ? generateAst(d) : null;
|
List<Node<MessageRenderContext>> createAndProcessBioAstFromText = d == null ? createAndProcessBioAstFromText(d) : null;
|
||||||
if (generateAst != null) {
|
|
||||||
createMessagePreprocessor().process(generateAst);
|
|
||||||
}
|
|
||||||
viewState = getViewState();
|
viewState = getViewState();
|
||||||
if (!(viewState instanceof ViewState.Loaded)) {
|
if (!(viewState instanceof ViewState.Loaded)) {
|
||||||
viewState = null;
|
viewState = null;
|
||||||
|
@ -1783,7 +1788,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
if (str3 == null) {
|
if (str3 == null) {
|
||||||
str3 = "";
|
str3 = "";
|
||||||
}
|
}
|
||||||
updateViewState(new ViewState.Loaded(user, z3, z5, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, generateAst));
|
updateViewState(new ViewState.Loaded(user, z3, z5, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText));
|
||||||
this.mostRecentStoreState = storeState;
|
this.mostRecentStoreState = storeState;
|
||||||
}
|
}
|
||||||
str2 = str;
|
str2 = str;
|
||||||
|
@ -1799,8 +1804,6 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
String d = userProfile.getUser().d();
|
String d = userProfile.getUser().d();
|
||||||
if (d == null) {
|
if (d == null) {
|
||||||
}
|
}
|
||||||
if (generateAst != null) {
|
|
||||||
}
|
|
||||||
viewState = getViewState();
|
viewState = getViewState();
|
||||||
if (!(viewState instanceof ViewState.Loaded)) {
|
if (!(viewState instanceof ViewState.Loaded)) {
|
||||||
}
|
}
|
||||||
|
@ -1813,7 +1816,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
}
|
}
|
||||||
if (str3 == null) {
|
if (str3 == null) {
|
||||||
}
|
}
|
||||||
updateViewState(new ViewState.Loaded(user, z3, z5, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, generateAst));
|
updateViewState(new ViewState.Loaded(user, z3, z5, viewState2, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState3, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText));
|
||||||
this.mostRecentStoreState = storeState;
|
this.mostRecentStoreState = storeState;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1932,10 +1935,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel<ViewState> {
|
||||||
}
|
}
|
||||||
ViewState.Loaded loaded = (ViewState.Loaded) viewState;
|
ViewState.Loaded loaded = (ViewState.Loaded) viewState;
|
||||||
if (loaded != null && (storeState = this.mostRecentStoreState) != null && (userProfile = storeState.getUserProfile()) != null && (user = userProfile.getUser()) != null && (d = user.d()) != null) {
|
if (loaded != null && (storeState = this.mostRecentStoreState) != null && (userProfile = storeState.getUserProfile()) != null && (user = userProfile.getUser()) != null && (d = user.d()) != null) {
|
||||||
List<Node<MessageRenderContext>> generateAst = generateAst(d);
|
|
||||||
this.revealedBioIndices.add(Integer.valueOf(spoilerNode.getId()));
|
this.revealedBioIndices.add(Integer.valueOf(spoilerNode.getId()));
|
||||||
createMessagePreprocessor().process(generateAst);
|
updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, createAndProcessBioAstFromText(d), 262143, null));
|
||||||
updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, null, false, generateAst, 262143, null));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,5 +3,5 @@
|
||||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_h1_bold"/>
|
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_h1_bold"/>
|
||||||
<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/res_2131952572_uikit_textview_medium"/>
|
<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" android:paddingHorizontal="16dp" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/res_2131952572_uikit_textview_medium"/>
|
||||||
<androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/res_2131952603_uikit_viewgroup_recyclerview"/>
|
<androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/res_2131952603_uikit_viewgroup_recyclerview"/>
|
||||||
<com.discord.views.LoadingButton android:id="@+id/contact_sync_suggestions_submit_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" app:layout_constraintBottom_toBottomOf="0" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
|
<com.discord.views.LoadingButton android:id="@+id/contact_sync_suggestions_submit_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" app:layout_constraintBottom_toBottomOf="0" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next" app:lb_text_color="?attr/primary_100"/>
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
|
@ -3,5 +3,5 @@
|
||||||
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_h1_bold"/>
|
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@+id/contact_sync_suggestions_title" android:text="@string/contact_sync_suggestions_title" android:textAlignment="center" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_subtitle" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toTopOf="0" app:layout_constraintVertical_chainStyle="2" style="@style/res_2131952564_uikit_textview_h1_bold"/>
|
||||||
<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/res_2131952572_uikit_textview_medium"/>
|
<com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@+id/contact_sync_suggestions_subtitle" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="16dp" android:layout_marginTop="8dp" android:text="@string/contact_sync_suggestions_subtitle" android:lineSpacingMultiplier="1" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_title" style="@style/res_2131952572_uikit_textview_medium"/>
|
||||||
<androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/res_2131952603_uikit_viewgroup_recyclerview"/>
|
<androidx.recyclerview.widget.RecyclerView android:id="@+id/contact_sync_suggestions_list_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/contact_sync_suggestions_submit_button" app:layout_constraintEnd_toEndOf="0" app:layout_constraintStart_toStartOf="0" app:layout_constraintTop_toBottomOf="@+id/contact_sync_suggestions_subtitle" style="@style/res_2131952603_uikit_viewgroup_recyclerview"/>
|
||||||
<com.discord.views.LoadingButton android:id="@+id/contact_sync_suggestions_submit_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" app:layout_constraintBottom_toBottomOf="0" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next"/>
|
<com.discord.views.LoadingButton android:id="@+id/contact_sync_suggestions_submit_button" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="8dp" app:layout_constraintBottom_toBottomOf="0" app:lb_disabled_alpha="0.6" app:lb_progress_color="@color/white" app:lb_text="@string/next" app:lb_text_color="?attr/primary_100"/>
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
|
@ -1341,7 +1341,7 @@
|
||||||
<string name="color_picker_presets">Presets</string>
|
<string name="color_picker_presets">Presets</string>
|
||||||
<string name="color_picker_title">Select a color</string>
|
<string name="color_picker_title">Select a color</string>
|
||||||
<string name="color_picker_transparency">Transparency</string>
|
<string name="color_picker_transparency">Transparency</string>
|
||||||
<string name="res_2131887421_com_crashlytics_android_build_id">db5bfdf98d1946d28c237d0a5609d9c3</string>
|
<string name="res_2131887421_com_crashlytics_android_build_id">c8db8258b308408b8258511bab75ee5a</string>
|
||||||
<string name="coming_soon">Coming Soon</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_header_item">Slash command application {applicationName}</string>
|
||||||
<string name="command_accessibility_desc_app_item">{applicationName} application</string>
|
<string name="command_accessibility_desc_app_item">{applicationName} application</string>
|
||||||
|
|
Loading…
Reference in New Issue