diff --git a/app/build.gradle b/app/build.gradle index bab88317b1..62d5a70f5e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 80011 - versionName "80.11 - Stable" + versionCode 81014 + versionName "81.14 - Stable" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a67119e370..43dd11f208 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/androidx/activity/contextaware/ContextAwareKt.java b/app/src/main/java/androidx/activity/contextaware/ContextAwareKt.java index fdba997fce..e623779f46 100644 --- a/app/src/main/java/androidx/activity/contextaware/ContextAwareKt.java +++ b/app/src/main/java/androidx/activity/contextaware/ContextAwareKt.java @@ -7,7 +7,7 @@ import d0.w.h.a.g; import d0.z.d.l; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function1; -import s.a.j; +import s.a.k; /* compiled from: ContextAware.kt */ public final class ContextAwareKt { public static final Object withContextAvailable(ContextAware contextAware, Function1 function1, Continuation continuation) { @@ -15,12 +15,12 @@ public final class ContextAwareKt { if (peekAvailableContext != null) { return function1.invoke(peekAvailableContext); } - j jVar = new j(b.intercepted(continuation), 1); - jVar.A(); - ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 = new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1(jVar, contextAware, function1); + k kVar = new k(b.intercepted(continuation), 1); + kVar.A(); + ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 = new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1(kVar, contextAware, function1); contextAware.addOnContextAvailableListener(contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1); - jVar.e(new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$2(contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1, contextAware, function1)); - Object u = jVar.u(); + kVar.e(new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$2(contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1, contextAware, function1)); + Object u = kVar.u(); if (u != c.getCOROUTINE_SUSPENDED()) { return u; } @@ -34,12 +34,12 @@ public final class ContextAwareKt { return function1.invoke(peekAvailableContext); } l.mark(0); - j jVar = new j(b.intercepted(continuation), 1); - jVar.A(); - ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 = new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1(jVar, contextAware, function1); + k kVar = new k(b.intercepted(continuation), 1); + kVar.A(); + ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1 = new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1(kVar, contextAware, function1); contextAware.addOnContextAvailableListener(contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1); - jVar.e(new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$2(contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1, contextAware, function1)); - Object u = jVar.u(); + kVar.e(new ContextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$2(contextAwareKt$withContextAvailable$$inlined$suspendCancellableCoroutine$lambda$1, contextAware, function1)); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } diff --git a/app/src/main/java/androidx/lifecycle/BlockRunner$cancel$1.java b/app/src/main/java/androidx/lifecycle/BlockRunner$cancel$1.java index e5e05e8a88..88d49b9132 100644 --- a/app/src/main/java/androidx/lifecycle/BlockRunner$cancel$1.java +++ b/app/src/main/java/androidx/lifecycle/BlockRunner$cancel$1.java @@ -43,7 +43,7 @@ public final class BlockRunner$cancel$1 extends k implements Function2 { private final Function2, Continuation, Object> block; @@ -63,8 +64,8 @@ public final class BlockRunner { public final void cancel() { if (this.cancellationJob == null) { CoroutineScope coroutineScope = this.scope; - z zVar = j0.a; - this.cancellationJob = a.F(coroutineScope, s.a.a.m.b.H(), null, new BlockRunner$cancel$1(this, null), 2, null); + CoroutineDispatcher coroutineDispatcher = j0.a; + this.cancellationJob = a.G(coroutineScope, n.b.H(), null, new BlockRunner$cancel$1(this, null), 2, null); return; } throw new IllegalStateException("Cancel call cannot happen without a maybeRun".toString()); @@ -74,11 +75,11 @@ public final class BlockRunner { public final void maybeRun() { Job job = this.cancellationJob; if (job != null) { - a.j(job, null, 1, null); + a.k(job, null, 1, null); } this.cancellationJob = null; if (this.runningJob == null) { - this.runningJob = a.F(this.scope, null, null, new BlockRunner$maybeRun$1(this, null), 3, null); + this.runningJob = a.G(this.scope, null, null, new BlockRunner$maybeRun$1(this, null), 3, null); } } } diff --git a/app/src/main/java/androidx/lifecycle/CloseableCoroutineScope.java b/app/src/main/java/androidx/lifecycle/CloseableCoroutineScope.java index 62283cbe33..0e31ed2fbe 100644 --- a/app/src/main/java/androidx/lifecycle/CloseableCoroutineScope.java +++ b/app/src/main/java/androidx/lifecycle/CloseableCoroutineScope.java @@ -16,7 +16,7 @@ public final class CloseableCoroutineScope implements Closeable, CoroutineScope @Override // java.io.Closeable, java.lang.AutoCloseable public void close() { - a.i(getCoroutineContext(), null, 1, null); + a.j(getCoroutineContext(), null, 1, null); } @Override // kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/java/androidx/lifecycle/CoroutineLiveData.java b/app/src/main/java/androidx/lifecycle/CoroutineLiveData.java index fe90272981..2d3a5a3b9e 100644 --- a/app/src/main/java/androidx/lifecycle/CoroutineLiveData.java +++ b/app/src/main/java/androidx/lifecycle/CoroutineLiveData.java @@ -12,11 +12,12 @@ import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.Job; +import s.a.a.n; import s.a.j0; -import s.a.k0; -import s.a.o1; -import s.a.z; +import s.a.l0; +import s.a.r1; /* compiled from: CoroutineLiveData.kt */ public final class CoroutineLiveData extends MediatorLiveData { private BlockRunner blockRunner; @@ -43,9 +44,9 @@ public final class CoroutineLiveData extends MediatorLiveData { public CoroutineLiveData(CoroutineContext coroutineContext, long j, Function2, ? super Continuation, ? extends Object> function2) { m.checkNotNullParameter(coroutineContext, "context"); m.checkNotNullParameter(function2, "block"); - o1 o1Var = new o1((Job) coroutineContext.get(Job.h)); - z zVar = j0.a; - this.blockRunner = new BlockRunner<>(this, function2, j, a.a(s.a.a.m.b.H().plus(coroutineContext).plus(o1Var)), new AnonymousClass1(this)); + r1 r1Var = new r1((Job) coroutineContext.get(Job.h)); + CoroutineDispatcher coroutineDispatcher = j0.a; + this.blockRunner = new BlockRunner<>(this, function2, j, a.a(n.b.H().plus(coroutineContext).plus(r1Var)), new AnonymousClass1(this)); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ @@ -109,7 +110,7 @@ public final class CoroutineLiveData extends MediatorLiveData { /* JADX WARNING: Removed duplicated region for block: B:14:0x0046 */ /* JADX WARNING: Removed duplicated region for block: B:20:0x0065 A[RETURN] */ /* JADX WARNING: Removed duplicated region for block: B:8:0x0024 */ - public final Object emitSource$lifecycle_livedata_ktx_release(LiveData liveData, Continuation continuation) { + public final Object emitSource$lifecycle_livedata_ktx_release(LiveData liveData, Continuation continuation) { CoroutineLiveData$emitSource$1 coroutineLiveData$emitSource$1; Object obj; Object coroutine_suspended; diff --git a/app/src/main/java/androidx/lifecycle/CoroutineLiveDataKt.java b/app/src/main/java/androidx/lifecycle/CoroutineLiveDataKt.java index 4f8a21f0e3..940e5fe98f 100644 --- a/app/src/main/java/androidx/lifecycle/CoroutineLiveDataKt.java +++ b/app/src/main/java/androidx/lifecycle/CoroutineLiveDataKt.java @@ -3,34 +3,35 @@ package androidx.lifecycle; import androidx.annotation.RequiresApi; import c.q.a.k.a; import d0.w.f; +import d0.z.d.m; import java.time.Duration; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function2; -import s.a.a.m; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: CoroutineLiveData.kt */ public final class CoroutineLiveDataKt { public static final long DEFAULT_TIMEOUT = 5000; public static final Object addDisposableSource(MediatorLiveData mediatorLiveData, LiveData liveData, Continuation continuation) { - z zVar = j0.a; - return a.h0(m.b.H(), new CoroutineLiveDataKt$addDisposableSource$2(mediatorLiveData, liveData, null), continuation); + CoroutineDispatcher coroutineDispatcher = j0.a; + return a.i0(n.b.H(), new CoroutineLiveDataKt$addDisposableSource$2(mediatorLiveData, liveData, null), continuation); } public static final LiveData liveData(CoroutineContext coroutineContext, long j, Function2, ? super Continuation, ? extends Object> function2) { - d0.z.d.m.checkNotNullParameter(coroutineContext, "context"); - d0.z.d.m.checkNotNullParameter(function2, "block"); + m.checkNotNullParameter(coroutineContext, "context"); + m.checkNotNullParameter(function2, "block"); return new CoroutineLiveData(coroutineContext, j, function2); } @RequiresApi(26) public static final LiveData liveData(CoroutineContext coroutineContext, Duration duration, Function2, ? super Continuation, ? extends Object> function2) { - d0.z.d.m.checkNotNullParameter(coroutineContext, "context"); - d0.z.d.m.checkNotNullParameter(duration, "timeout"); - d0.z.d.m.checkNotNullParameter(function2, "block"); + m.checkNotNullParameter(coroutineContext, "context"); + m.checkNotNullParameter(duration, "timeout"); + m.checkNotNullParameter(function2, "block"); return new CoroutineLiveData(coroutineContext, duration.toMillis(), function2); } diff --git a/app/src/main/java/androidx/lifecycle/DispatchQueue.java b/app/src/main/java/androidx/lifecycle/DispatchQueue.java index 1712a2deb0..a82aeb2705 100644 --- a/app/src/main/java/androidx/lifecycle/DispatchQueue.java +++ b/app/src/main/java/androidx/lifecycle/DispatchQueue.java @@ -7,9 +7,10 @@ import d0.z.d.m; import java.util.ArrayDeque; import java.util.Queue; import kotlin.coroutines.CoroutineContext; -import s.a.i1; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.z; +import s.a.k1; /* compiled from: DispatchQueue.kt */ public final class DispatchQueue { private boolean finished; @@ -40,8 +41,8 @@ public final class DispatchQueue { public final void dispatchAndEnqueue(CoroutineContext coroutineContext, Runnable runnable) { m.checkNotNullParameter(coroutineContext, "context"); m.checkNotNullParameter(runnable, "runnable"); - z zVar = j0.a; - i1 H = s.a.a.m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); if (H.isDispatchNeeded(coroutineContext) || canRun()) { H.dispatch(coroutineContext, new DispatchQueue$dispatchAndEnqueue$$inlined$with$lambda$1(this, coroutineContext, runnable)); } else { diff --git a/app/src/main/java/androidx/lifecycle/EmittedSource.java b/app/src/main/java/androidx/lifecycle/EmittedSource.java index 1e882c6710..f41df4944e 100644 --- a/app/src/main/java/androidx/lifecycle/EmittedSource.java +++ b/app/src/main/java/androidx/lifecycle/EmittedSource.java @@ -6,11 +6,12 @@ import d0.w.g.c; import d0.z.d.m; import kotlin.Unit; import kotlin.coroutines.Continuation; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.k0; -import s.a.z; +import s.a.l0; /* compiled from: CoroutineLiveData.kt */ -public final class EmittedSource implements k0 { +public final class EmittedSource implements l0 { private boolean disposed; private final MediatorLiveData mediator; private final LiveData source; @@ -35,15 +36,15 @@ public final class EmittedSource implements k0 { } } - @Override // s.a.k0 + @Override // s.a.l0 public void dispose() { - z zVar = j0.a; - a.F(a.a(s.a.a.m.b.H()), null, null, new EmittedSource$dispose$1(this, null), 3, null); + CoroutineDispatcher coroutineDispatcher = j0.a; + a.G(a.a(n.b.H()), null, null, new EmittedSource$dispose$1(this, null), 3, null); } public final Object disposeNow(Continuation continuation) { - z zVar = j0.a; - Object h02 = a.h0(s.a.a.m.b.H(), new EmittedSource$disposeNow$2(this, null), continuation); - return h02 == c.getCOROUTINE_SUSPENDED() ? h02 : Unit.a; + CoroutineDispatcher coroutineDispatcher = j0.a; + Object i02 = a.i0(n.b.H(), new EmittedSource$disposeNow$2(this, null), continuation); + return i02 == c.getCOROUTINE_SUSPENDED() ? i02 : Unit.a; } } diff --git a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1$observer$1.java b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1$observer$1.java index 70c49d1903..49f8aa320e 100644 --- a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1$observer$1.java +++ b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1$observer$1.java @@ -1,6 +1,6 @@ package androidx.lifecycle; -import s.a.w1.d; +import s.a.z1.d; /* compiled from: FlowLiveData.kt */ public final class FlowLiveDataConversions$asFlow$1$observer$1 implements Observer { public final /* synthetic */ d $channel; diff --git a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1.java b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1.java index 738afa6a61..c7ebdf5ee2 100644 --- a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1.java +++ b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asFlow$1.java @@ -8,14 +8,15 @@ import d0.z.d.m; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; -import s.a.i1; +import s.a.a.n; +import s.a.a2.c; import s.a.j0; -import s.a.u0; -import s.a.w1.d; -import s.a.w1.g; -import s.a.x1.c; -import s.a.z; +import s.a.k1; +import s.a.w0; +import s.a.z1.d; +import s.a.z1.g; /* compiled from: FlowLiveData.kt */ @e(c = "androidx.lifecycle.FlowLiveDataConversions$asFlow$1", f = "FlowLiveData.kt", l = {96, 100, 101}, m = "invokeSuspend") public final class FlowLiveDataConversions$asFlow$1 extends k implements Function2, Continuation, Object> { @@ -133,10 +134,10 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio Throwable th2; c cVar; Observer observer2; - s.a.w1.e eVar; + s.a.z1.e eVar; Object obj2; FlowLiveDataConversions$asFlow$1 flowLiveDataConversions$asFlow$12; - s.a.w1.e eVar2; + s.a.z1.e eVar2; c cVar2; Object a; d dVar; @@ -148,14 +149,14 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio c cVar3 = (c) this.L$0; g gVar = new g(null); FlowLiveDataConversions$asFlow$1$observer$1 flowLiveDataConversions$asFlow$1$observer$1 = new FlowLiveDataConversions$asFlow$1$observer$1(gVar); - z zVar = j0.a; - i1 H = s.a.a.m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); AnonymousClass1 r8 = new AnonymousClass1(this, flowLiveDataConversions$asFlow$1$observer$1, null); this.L$0 = cVar3; this.L$1 = gVar; this.L$2 = flowLiveDataConversions$asFlow$1$observer$1; this.label = 1; - if (a.h0(H, r8, this) == coroutine_suspended) { + if (a.i0(H, r8, this) == coroutine_suspended) { return coroutine_suspended; } dVar = gVar; @@ -170,17 +171,17 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio l.throwOnFailure(obj); cVar = (c) this.L$0; observer2 = (Observer) this.L$1; - eVar = (s.a.w1.e) this.L$2; + eVar = (s.a.z1.e) this.L$2; obj2 = coroutine_suspended; flowLiveDataConversions$asFlow$12 = this; if (!((Boolean) obj).booleanValue()) { } - u0 u0Var = u0.i; - z zVar2 = j0.a; - a.F(u0Var, s.a.a.m.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$12, observer2, null), 2, null); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher2 = j0.a; + a.G(w0Var, n.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$12, observer2, null), 2, null); return Unit.a; } else if (i == 3) { - eVar2 = (s.a.w1.e) this.L$2; + eVar2 = (s.a.z1.e) this.L$2; observer = (Observer) this.L$1; cVar2 = (c) this.L$0; try { @@ -221,17 +222,17 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio } return obj2; } - u0 u0Var = u0.i; - z zVar2 = j0.a; - a.F(u0Var, s.a.a.m.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$12, observer2, null), 2, null); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher2 = j0.a; + a.G(w0Var, n.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$12, observer2, null), 2, null); return Unit.a; } catch (Throwable th3) { observer = observer2; th = th3; flowLiveDataConversions$asFlow$1 = flowLiveDataConversions$asFlow$12; - u0 u0Var2 = u0.i; - z zVar3 = j0.a; - a.F(u0Var2, s.a.a.m.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$1, observer, null), 2, null); + w0 w0Var2 = w0.i; + CoroutineDispatcher coroutineDispatcher3 = j0.a; + a.G(w0Var2, n.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$1, observer, null), 2, null); throw th; } } @@ -243,7 +244,7 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } try { - s.a.w1.e it = dVar.iterator(); + s.a.z1.e it = dVar.iterator(); observer = observer3; eVar2 = it; flowLiveDataConversions$asFlow$1 = this; @@ -252,9 +253,9 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio observer = observer3; th = th2; flowLiveDataConversions$asFlow$1 = this; - u0 u0Var2 = u0.i; - z zVar3 = j0.a; - a.F(u0Var2, s.a.a.m.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$1, observer, null), 2, null); + w0 w0Var2 = w0.i; + CoroutineDispatcher coroutineDispatcher3 = j0.a; + a.G(w0Var2, n.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$1, observer, null), 2, null); throw th; } try { @@ -268,9 +269,9 @@ public final class FlowLiveDataConversions$asFlow$1 extends k implements Functio return coroutine_suspended; } catch (Throwable th6) { th = th6; - u0 u0Var2 = u0.i; - z zVar3 = j0.a; - a.F(u0Var2, s.a.a.m.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$1, observer, null), 2, null); + w0 w0Var2 = w0.i; + CoroutineDispatcher coroutineDispatcher3 = j0.a; + a.G(w0Var2, n.b.H(), null, new AnonymousClass2(flowLiveDataConversions$asFlow$1, observer, null), 2, null); throw th; } } diff --git a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1$invokeSuspend$$inlined$collect$1.java b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1$invokeSuspend$$inlined$collect$1.java index 15617fc9c9..ab6b41ba7a 100644 --- a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1$invokeSuspend$$inlined$collect$1.java +++ b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1$invokeSuspend$$inlined$collect$1.java @@ -2,7 +2,7 @@ package androidx.lifecycle; import kotlin.Unit; import kotlin.coroutines.Continuation; -import s.a.x1.c; +import s.a.a2.c; /* compiled from: Collect.kt */ public final class FlowLiveDataConversions$asLiveData$1$invokeSuspend$$inlined$collect$1 implements c { public final /* synthetic */ LiveDataScope $this_liveData$inlined; @@ -11,7 +11,7 @@ public final class FlowLiveDataConversions$asLiveData$1$invokeSuspend$$inlined$c this.$this_liveData$inlined = liveDataScope; } - @Override // s.a.x1.c + @Override // s.a.a2.c public Object emit(Object obj, Continuation continuation) { Object emit = this.$this_liveData$inlined.emit(obj, continuation); return emit == d0.w.g.c.getCOROUTINE_SUSPENDED() ? emit : Unit.a; diff --git a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1.java b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1.java index 22dddd332e..4556126f8b 100644 --- a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1.java +++ b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions$asLiveData$1.java @@ -8,7 +8,7 @@ import d0.z.d.m; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; -import s.a.x1.b; +import s.a.a2.b; /* compiled from: FlowLiveData.kt */ @e(c = "androidx.lifecycle.FlowLiveDataConversions$asLiveData$1", f = "FlowLiveData.kt", l = {149}, m = "invokeSuspend") public final class FlowLiveDataConversions$asLiveData$1 extends k implements Function2, Continuation, Object> { diff --git a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions.java b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions.java index ab5cbe6341..16491bc6bc 100644 --- a/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions.java +++ b/app/src/main/java/androidx/lifecycle/FlowLiveDataConversions.java @@ -5,8 +5,8 @@ import d0.w.f; import d0.z.d.m; import java.time.Duration; import kotlin.coroutines.CoroutineContext; -import s.a.x1.b; -import s.a.x1.d; +import s.a.a2.b; +import s.a.a2.d; /* compiled from: FlowLiveData.kt */ public final class FlowLiveDataConversions { public static final b asFlow(LiveData liveData) { diff --git a/app/src/main/java/androidx/lifecycle/LifecycleController$observer$1.java b/app/src/main/java/androidx/lifecycle/LifecycleController$observer$1.java index 0610dd840d..d7d36080f9 100644 --- a/app/src/main/java/androidx/lifecycle/LifecycleController$observer$1.java +++ b/app/src/main/java/androidx/lifecycle/LifecycleController$observer$1.java @@ -22,7 +22,7 @@ public final class LifecycleController$observer$1 implements LifecycleEventObser m.checkNotNullExpressionValue(lifecycle, "source.lifecycle"); if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { LifecycleController lifecycleController = this.this$0; - a.j(this.$parentJob, null, 1, null); + a.k(this.$parentJob, null, 1, null); lifecycleController.finish(); return; } diff --git a/app/src/main/java/androidx/lifecycle/LifecycleController.java b/app/src/main/java/androidx/lifecycle/LifecycleController.java index 216261b52e..f8a9bb38ae 100644 --- a/app/src/main/java/androidx/lifecycle/LifecycleController.java +++ b/app/src/main/java/androidx/lifecycle/LifecycleController.java @@ -24,7 +24,7 @@ public final class LifecycleController { LifecycleController$observer$1 lifecycleController$observer$1 = new LifecycleController$observer$1(this, job); this.observer = lifecycleController$observer$1; if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { - a.j(job, null, 1, null); + a.k(job, null, 1, null); finish(); return; } @@ -44,7 +44,7 @@ public final class LifecycleController { } private final void handleDestroy(Job job) { - a.j(job, null, 1, null); + a.k(job, null, 1, null); finish(); } diff --git a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScope.java b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScope.java index 1f9c821f4c..706d053917 100644 --- a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScope.java +++ b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScope.java @@ -17,16 +17,16 @@ public abstract class LifecycleCoroutineScope implements CoroutineScope { public final Job launchWhenCreated(Function2, ? extends Object> function2) { m.checkNotNullParameter(function2, "block"); - return a.F(this, null, null, new LifecycleCoroutineScope$launchWhenCreated$1(this, function2, null), 3, null); + return a.G(this, null, null, new LifecycleCoroutineScope$launchWhenCreated$1(this, function2, null), 3, null); } public final Job launchWhenResumed(Function2, ? extends Object> function2) { m.checkNotNullParameter(function2, "block"); - return a.F(this, null, null, new LifecycleCoroutineScope$launchWhenResumed$1(this, function2, null), 3, null); + return a.G(this, null, null, new LifecycleCoroutineScope$launchWhenResumed$1(this, function2, null), 3, null); } public final Job launchWhenStarted(Function2, ? extends Object> function2) { m.checkNotNullParameter(function2, "block"); - return a.F(this, null, null, new LifecycleCoroutineScope$launchWhenStarted$1(this, function2, null), 3, null); + return a.G(this, null, null, new LifecycleCoroutineScope$launchWhenStarted$1(this, function2, null), 3, null); } } diff --git a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.java b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.java index 4cd2c7c444..094137e9d9 100644 --- a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.java +++ b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.java @@ -47,7 +47,7 @@ public final class LifecycleCoroutineScopeImpl$register$1 extends k implements F if (this.this$0.getLifecycle$lifecycle_runtime_ktx_release().getCurrentState().compareTo(Lifecycle.State.INITIALIZED) >= 0) { this.this$0.getLifecycle$lifecycle_runtime_ktx_release().addObserver(this.this$0); } else { - a.i(coroutineScope.getCoroutineContext(), null, 1, null); + a.j(coroutineScope.getCoroutineContext(), null, 1, null); } return Unit.a; } diff --git a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java index 7c7194eb33..574ac23ca9 100644 --- a/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java +++ b/app/src/main/java/androidx/lifecycle/LifecycleCoroutineScopeImpl.java @@ -4,8 +4,9 @@ import androidx.lifecycle.Lifecycle; import c.q.a.k.a; import d0.z.d.m; import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: Lifecycle.kt */ public final class LifecycleCoroutineScopeImpl extends LifecycleCoroutineScope implements LifecycleEventObserver { private final CoroutineContext coroutineContext; @@ -17,7 +18,7 @@ public final class LifecycleCoroutineScopeImpl extends LifecycleCoroutineScope i this.lifecycle = lifecycle; this.coroutineContext = coroutineContext; if (getLifecycle$lifecycle_runtime_ktx_release().getCurrentState() == Lifecycle.State.DESTROYED) { - a.i(getCoroutineContext(), null, 1, null); + a.j(getCoroutineContext(), null, 1, null); } } @@ -37,12 +38,12 @@ public final class LifecycleCoroutineScopeImpl extends LifecycleCoroutineScope i m.checkNotNullParameter(event, "event"); if (getLifecycle$lifecycle_runtime_ktx_release().getCurrentState().compareTo(Lifecycle.State.DESTROYED) <= 0) { getLifecycle$lifecycle_runtime_ktx_release().removeObserver(this); - a.i(getCoroutineContext(), null, 1, null); + a.j(getCoroutineContext(), null, 1, null); } } public final void register() { - z zVar = j0.a; - a.F(this, s.a.a.m.b.H(), null, new LifecycleCoroutineScopeImpl$register$1(this, null), 2, null); + CoroutineDispatcher coroutineDispatcher = j0.a; + a.G(this, n.b.H(), null, new LifecycleCoroutineScopeImpl$register$1(this, null), 2, null); } } diff --git a/app/src/main/java/androidx/lifecycle/LifecycleKt.java b/app/src/main/java/androidx/lifecycle/LifecycleKt.java index c00bacab76..7495634646 100644 --- a/app/src/main/java/androidx/lifecycle/LifecycleKt.java +++ b/app/src/main/java/androidx/lifecycle/LifecycleKt.java @@ -3,10 +3,11 @@ package androidx.lifecycle; import c.q.a.k.a; import d0.z.d.m; import kotlin.coroutines.CoroutineContext; -import s.a.e1; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; +import s.a.g1; import s.a.j0; -import s.a.s; -import s.a.z; +import s.a.t; /* compiled from: Lifecycle.kt */ public final class LifecycleKt { public static final LifecycleCoroutineScope getCoroutineScope(Lifecycle lifecycle) { @@ -17,9 +18,9 @@ public final class LifecycleKt { if (lifecycleCoroutineScopeImpl2 != null) { return lifecycleCoroutineScopeImpl2; } - s b = a.b(null, 1); - z zVar = j0.a; - lifecycleCoroutineScopeImpl = new LifecycleCoroutineScopeImpl(lifecycle, CoroutineContext.Element.a.plus((e1) b, s.a.a.m.b.H())); + t b = a.b(null, 1); + CoroutineDispatcher coroutineDispatcher = j0.a; + lifecycleCoroutineScopeImpl = new LifecycleCoroutineScopeImpl(lifecycle, CoroutineContext.Element.a.plus((g1) b, n.b.H())); } while (!lifecycle.mInternalScopeRef.compareAndSet(null, lifecycleCoroutineScopeImpl)); lifecycleCoroutineScopeImpl.register(); return lifecycleCoroutineScopeImpl; diff --git a/app/src/main/java/androidx/lifecycle/LiveDataScope.java b/app/src/main/java/androidx/lifecycle/LiveDataScope.java index b57adf493f..718ad6b42d 100644 --- a/app/src/main/java/androidx/lifecycle/LiveDataScope.java +++ b/app/src/main/java/androidx/lifecycle/LiveDataScope.java @@ -2,12 +2,12 @@ package androidx.lifecycle; import kotlin.Unit; import kotlin.coroutines.Continuation; -import s.a.k0; +import s.a.l0; /* compiled from: CoroutineLiveData.kt */ public interface LiveDataScope { Object emit(T t, Continuation continuation); - Object emitSource(LiveData liveData, Continuation continuation); + Object emitSource(LiveData liveData, Continuation continuation); T getLatestValue(); } diff --git a/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl$emitSource$2.java b/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl$emitSource$2.java index 0d69aaa15f..1c8303cab5 100644 --- a/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl$emitSource$2.java +++ b/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl$emitSource$2.java @@ -9,10 +9,10 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; -import s.a.k0; +import s.a.l0; /* compiled from: CoroutineLiveData.kt */ @e(c = "androidx.lifecycle.LiveDataScopeImpl$emitSource$2", f = "CoroutineLiveData.kt", l = {94}, m = "invokeSuspend") -public final class LiveDataScopeImpl$emitSource$2 extends k implements Function2, Object> { +public final class LiveDataScopeImpl$emitSource$2 extends k implements Function2, Object> { public final /* synthetic */ LiveData $source; public int label; public final /* synthetic */ LiveDataScopeImpl this$0; @@ -32,7 +32,7 @@ public final class LiveDataScopeImpl$emitSource$2 extends k implements Function2 /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ @Override // kotlin.jvm.functions.Function2 - public final Object invoke(CoroutineScope coroutineScope, Continuation continuation) { + public final Object invoke(CoroutineScope coroutineScope, Continuation continuation) { return ((LiveDataScopeImpl$emitSource$2) create(coroutineScope, continuation)).invokeSuspend(Unit.a); } diff --git a/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl.java b/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl.java index 02c470b96d..05f127f065 100644 --- a/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl.java +++ b/app/src/main/java/androidx/lifecycle/LiveDataScopeImpl.java @@ -6,9 +6,10 @@ import d0.z.d.m; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.k0; -import s.a.z; +import s.a.l0; /* compiled from: CoroutineLiveData.kt */ public final class LiveDataScopeImpl implements LiveDataScope { private final CoroutineContext coroutineContext; @@ -18,19 +19,19 @@ public final class LiveDataScopeImpl implements LiveDataScope { m.checkNotNullParameter(coroutineLiveData, "target"); m.checkNotNullParameter(coroutineContext, "context"); this.target = coroutineLiveData; - z zVar = j0.a; - this.coroutineContext = coroutineContext.plus(s.a.a.m.b.H()); + CoroutineDispatcher coroutineDispatcher = j0.a; + this.coroutineContext = coroutineContext.plus(n.b.H()); } @Override // androidx.lifecycle.LiveDataScope public Object emit(T t, Continuation continuation) { - Object h02 = a.h0(this.coroutineContext, new LiveDataScopeImpl$emit$2(this, t, null), continuation); - return h02 == c.getCOROUTINE_SUSPENDED() ? h02 : Unit.a; + Object i02 = a.i0(this.coroutineContext, new LiveDataScopeImpl$emit$2(this, t, null), continuation); + return i02 == c.getCOROUTINE_SUSPENDED() ? i02 : Unit.a; } @Override // androidx.lifecycle.LiveDataScope - public Object emitSource(LiveData liveData, Continuation continuation) { - return a.h0(this.coroutineContext, new LiveDataScopeImpl$emitSource$2(this, liveData, null), continuation); + public Object emitSource(LiveData liveData, Continuation continuation) { + return a.i0(this.coroutineContext, new LiveDataScopeImpl$emitSource$2(this, liveData, null), continuation); } @Override // androidx.lifecycle.LiveDataScope diff --git a/app/src/main/java/androidx/lifecycle/PausingDispatcher.java b/app/src/main/java/androidx/lifecycle/PausingDispatcher.java index a42701c58f..0858eeea1b 100644 --- a/app/src/main/java/androidx/lifecycle/PausingDispatcher.java +++ b/app/src/main/java/androidx/lifecycle/PausingDispatcher.java @@ -2,24 +2,25 @@ package androidx.lifecycle; import d0.z.d.m; import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: PausingDispatcher.kt */ -public final class PausingDispatcher extends z { +public final class PausingDispatcher extends CoroutineDispatcher { public final DispatchQueue dispatchQueue = new DispatchQueue(); - @Override // s.a.z + @Override // kotlinx.coroutines.CoroutineDispatcher public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { m.checkNotNullParameter(coroutineContext, "context"); m.checkNotNullParameter(runnable, "block"); this.dispatchQueue.dispatchAndEnqueue(coroutineContext, runnable); } - @Override // s.a.z + @Override // kotlinx.coroutines.CoroutineDispatcher public boolean isDispatchNeeded(CoroutineContext coroutineContext) { m.checkNotNullParameter(coroutineContext, "context"); - z zVar = j0.a; - if (s.a.a.m.b.H().isDispatchNeeded(coroutineContext)) { + CoroutineDispatcher coroutineDispatcher = j0.a; + if (n.b.H().isDispatchNeeded(coroutineContext)) { return true; } return !this.dispatchQueue.canRun(); diff --git a/app/src/main/java/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.java b/app/src/main/java/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.java index 8e00bed8a8..ca2a5db17e 100644 --- a/app/src/main/java/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.java +++ b/app/src/main/java/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.java @@ -59,7 +59,7 @@ public final class PausingDispatcherKt$whenStateAtLeast$2 extends k implements F Function2 function2 = this.$block; this.L$0 = lifecycleController2; this.label = 1; - obj = a.h0(pausingDispatcher, function2, this); + obj = a.i0(pausingDispatcher, function2, this); if (obj == coroutine_suspended) { return coroutine_suspended; } diff --git a/app/src/main/java/androidx/lifecycle/PausingDispatcherKt.java b/app/src/main/java/androidx/lifecycle/PausingDispatcherKt.java index 42571c3911..8cccb639a2 100644 --- a/app/src/main/java/androidx/lifecycle/PausingDispatcherKt.java +++ b/app/src/main/java/androidx/lifecycle/PausingDispatcherKt.java @@ -5,9 +5,10 @@ import c.q.a.k.a; import d0.z.d.m; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: PausingDispatcher.kt */ public final class PausingDispatcherKt { public static final Object whenCreated(Lifecycle lifecycle, Function2, ? extends Object> function2, Continuation continuation) { @@ -41,7 +42,7 @@ public final class PausingDispatcherKt { } public static final Object whenStateAtLeast(Lifecycle lifecycle, Lifecycle.State state, Function2, ? extends Object> function2, Continuation continuation) { - z zVar = j0.a; - return a.h0(s.a.a.m.b.H(), new PausingDispatcherKt$whenStateAtLeast$2(lifecycle, state, function2, null), continuation); + CoroutineDispatcher coroutineDispatcher = j0.a; + return a.i0(n.b.H(), new PausingDispatcherKt$whenStateAtLeast$2(lifecycle, state, function2, null), continuation); } } diff --git a/app/src/main/java/androidx/lifecycle/ViewModelKt.java b/app/src/main/java/androidx/lifecycle/ViewModelKt.java index e12d422092..f955779d4c 100644 --- a/app/src/main/java/androidx/lifecycle/ViewModelKt.java +++ b/app/src/main/java/androidx/lifecycle/ViewModelKt.java @@ -3,11 +3,12 @@ package androidx.lifecycle; import c.q.a.k.a; import d0.z.d.m; import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; -import s.a.e1; +import s.a.a.n; +import s.a.g1; import s.a.j0; -import s.a.s; -import s.a.z; +import s.a.t; /* compiled from: ViewModel.kt */ public final class ViewModelKt { private static final String JOB_KEY = "androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY"; @@ -18,9 +19,9 @@ public final class ViewModelKt { if (coroutineScope != null) { return coroutineScope; } - s b = a.b(null, 1); - z zVar = j0.a; - Object tagIfAbsent = viewModel.setTagIfAbsent("androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY", new CloseableCoroutineScope(CoroutineContext.Element.a.plus((e1) b, s.a.a.m.b.H()))); + t b = a.b(null, 1); + CoroutineDispatcher coroutineDispatcher = j0.a; + Object tagIfAbsent = viewModel.setTagIfAbsent("androidx.lifecycle.ViewModelCoroutineScope.JOB_KEY", new CloseableCoroutineScope(CoroutineContext.Element.a.plus((g1) b, n.b.H()))); m.checkNotNullExpressionValue(tagIfAbsent, "setTagIfAbsent(\n …Main.immediate)\n )"); return (CoroutineScope) tagIfAbsent; } diff --git a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java index 64428fc406..9032084f7d 100644 --- a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java +++ b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1.java @@ -6,23 +6,23 @@ import d0.l; import d0.z.d.m; import kotlin.jvm.functions.Function0; import kotlinx.coroutines.CancellableContinuation; -import s.a.z; +import kotlinx.coroutines.CoroutineDispatcher; /* compiled from: WithLifecycleState.kt */ public final class WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 implements LifecycleEventObserver { public final /* synthetic */ Function0 $block$inlined; public final /* synthetic */ CancellableContinuation $co; public final /* synthetic */ boolean $dispatchNeeded$inlined; - public final /* synthetic */ z $lifecycleDispatcher$inlined; + public final /* synthetic */ CoroutineDispatcher $lifecycleDispatcher$inlined; public final /* synthetic */ Lifecycle.State $state$inlined; public final /* synthetic */ Lifecycle $this_suspendWithStateAtLeastUnchecked$inlined; - public WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1(CancellableContinuation cancellableContinuation, Lifecycle lifecycle, Lifecycle.State state, Function0 function0, boolean z2, z zVar) { + public WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1(CancellableContinuation cancellableContinuation, Lifecycle lifecycle, Lifecycle.State state, Function0 function0, boolean z2, CoroutineDispatcher coroutineDispatcher) { this.$co = cancellableContinuation; this.$this_suspendWithStateAtLeastUnchecked$inlined = lifecycle; this.$state$inlined = state; this.$block$inlined = function0; this.$dispatchNeeded$inlined = z2; - this.$lifecycleDispatcher$inlined = zVar; + this.$lifecycleDispatcher$inlined = coroutineDispatcher; } @Override // androidx.lifecycle.LifecycleEventObserver diff --git a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2.java b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2.java index 8f34c60429..70415006a4 100644 --- a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2.java +++ b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2.java @@ -2,23 +2,23 @@ package androidx.lifecycle; import androidx.lifecycle.Lifecycle; import kotlin.jvm.functions.Function0; -import s.a.z; +import kotlinx.coroutines.CoroutineDispatcher; /* compiled from: WithLifecycleState.kt */ public final class WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2 implements Runnable { public final /* synthetic */ Function0 $block$inlined; public final /* synthetic */ boolean $dispatchNeeded$inlined; - public final /* synthetic */ z $lifecycleDispatcher$inlined; + public final /* synthetic */ CoroutineDispatcher $lifecycleDispatcher$inlined; public final /* synthetic */ WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 $observer; public final /* synthetic */ Lifecycle.State $state$inlined; public final /* synthetic */ Lifecycle $this_suspendWithStateAtLeastUnchecked$inlined; - public WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2(WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, Lifecycle lifecycle, Lifecycle.State state, Function0 function0, boolean z2, z zVar) { + public WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2(WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, Lifecycle lifecycle, Lifecycle.State state, Function0 function0, boolean z2, CoroutineDispatcher coroutineDispatcher) { this.$observer = withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1; this.$this_suspendWithStateAtLeastUnchecked$inlined = lifecycle; this.$state$inlined = state; this.$block$inlined = function0; this.$dispatchNeeded$inlined = z2; - this.$lifecycleDispatcher$inlined = zVar; + this.$lifecycleDispatcher$inlined = coroutineDispatcher; } @Override // java.lang.Runnable diff --git a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3.java b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3.java index 4b058fcccb..6cd6abf387 100644 --- a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3.java +++ b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3.java @@ -6,12 +6,12 @@ import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; -import s.a.z; +import kotlinx.coroutines.CoroutineDispatcher; /* compiled from: WithLifecycleState.kt */ public final class WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3 extends o implements Function1 { public final /* synthetic */ Function0 $block$inlined; public final /* synthetic */ boolean $dispatchNeeded$inlined; - public final /* synthetic */ z $lifecycleDispatcher$inlined; + public final /* synthetic */ CoroutineDispatcher $lifecycleDispatcher$inlined; public final /* synthetic */ WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 $observer; public final /* synthetic */ Lifecycle.State $state$inlined; public final /* synthetic */ Lifecycle $this_suspendWithStateAtLeastUnchecked$inlined; @@ -33,14 +33,14 @@ public final class WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inline } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3(WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, Lifecycle lifecycle, Lifecycle.State state, Function0 function0, boolean z2, z zVar) { + public WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3(WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, Lifecycle lifecycle, Lifecycle.State state, Function0 function0, boolean z2, CoroutineDispatcher coroutineDispatcher) { super(1); this.$observer = withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1; this.$this_suspendWithStateAtLeastUnchecked$inlined = lifecycle; this.$state$inlined = state; this.$block$inlined = function0; this.$dispatchNeeded$inlined = z2; - this.$lifecycleDispatcher$inlined = zVar; + this.$lifecycleDispatcher$inlined = coroutineDispatcher; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -52,9 +52,9 @@ public final class WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inline } public final void invoke(Throwable th) { - z zVar = this.$lifecycleDispatcher$inlined; + CoroutineDispatcher coroutineDispatcher = this.$lifecycleDispatcher$inlined; f fVar = f.i; - if (zVar.isDispatchNeeded(fVar)) { + if (coroutineDispatcher.isDispatchNeeded(fVar)) { this.$lifecycleDispatcher$inlined.dispatch(fVar, new AnonymousClass1(this)); } else { this.$this_suspendWithStateAtLeastUnchecked$inlined.removeObserver(this.$observer); diff --git a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt.java b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt.java index 51fcea0748..ea953970cf 100644 --- a/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt.java +++ b/app/src/main/java/androidx/lifecycle/WithLifecycleStateKt.java @@ -6,26 +6,27 @@ import d0.w.g.b; import d0.w.g.c; import d0.w.h.a.g; import d0.z.d.l; +import d0.z.d.m; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function0; -import s.a.a.m; -import s.a.i1; -import s.a.j; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; import s.a.j0; -import s.a.z; +import s.a.k; +import s.a.k1; /* compiled from: WithLifecycleState.kt */ public final class WithLifecycleStateKt { - public static final Object suspendWithStateAtLeastUnchecked(Lifecycle lifecycle, Lifecycle.State state, boolean z2, z zVar, Function0 function0, Continuation continuation) { - j jVar = new j(b.intercepted(continuation), 1); - jVar.A(); - WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 = new WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1(jVar, lifecycle, state, function0, z2, zVar); + public static final Object suspendWithStateAtLeastUnchecked(Lifecycle lifecycle, Lifecycle.State state, boolean z2, CoroutineDispatcher coroutineDispatcher, Function0 function0, Continuation continuation) { + k kVar = new k(b.intercepted(continuation), 1); + kVar.A(); + WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1 = new WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1(kVar, lifecycle, state, function0, z2, coroutineDispatcher); if (z2) { - zVar.dispatch(f.i, new WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2(withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, lifecycle, state, function0, z2, zVar)); + coroutineDispatcher.dispatch(f.i, new WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$2(withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, lifecycle, state, function0, z2, coroutineDispatcher)); } else { lifecycle.addObserver(withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1); } - jVar.e(new WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3(withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, lifecycle, state, function0, z2, zVar)); - Object u = jVar.u(); + kVar.e(new WithLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$3(withLifecycleStateKt$suspendWithStateAtLeastUnchecked$$inlined$suspendCancellableCoroutine$lambda$1, lifecycle, state, function0, z2, coroutineDispatcher)); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } @@ -34,8 +35,8 @@ public final class WithLifecycleStateKt { public static final Object withCreated(Lifecycle lifecycle, Function0 function0, Continuation continuation) { Lifecycle.State state = Lifecycle.State.CREATED; - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -49,10 +50,10 @@ public final class WithLifecycleStateKt { public static final Object withCreated(LifecycleOwner lifecycleOwner, Function0 function0, Continuation continuation) { Lifecycle lifecycle = lifecycleOwner.getLifecycle(); - d0.z.d.m.checkNotNullExpressionValue(lifecycle, "lifecycle"); + m.checkNotNullExpressionValue(lifecycle, "lifecycle"); Lifecycle.State state = Lifecycle.State.CREATED; - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -66,25 +67,25 @@ public final class WithLifecycleStateKt { private static final Object withCreated$$forInline(Lifecycle lifecycle, Function0 function0, Continuation continuation) { Lifecycle.State state = Lifecycle.State.CREATED; - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } private static final Object withCreated$$forInline(LifecycleOwner lifecycleOwner, Function0 function0, Continuation continuation) { - d0.z.d.m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); + m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); Lifecycle.State state = Lifecycle.State.CREATED; - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } public static final Object withResumed(Lifecycle lifecycle, Function0 function0, Continuation continuation) { Lifecycle.State state = Lifecycle.State.RESUMED; - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -98,10 +99,10 @@ public final class WithLifecycleStateKt { public static final Object withResumed(LifecycleOwner lifecycleOwner, Function0 function0, Continuation continuation) { Lifecycle lifecycle = lifecycleOwner.getLifecycle(); - d0.z.d.m.checkNotNullExpressionValue(lifecycle, "lifecycle"); + m.checkNotNullExpressionValue(lifecycle, "lifecycle"); Lifecycle.State state = Lifecycle.State.RESUMED; - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -115,25 +116,25 @@ public final class WithLifecycleStateKt { private static final Object withResumed$$forInline(Lifecycle lifecycle, Function0 function0, Continuation continuation) { Lifecycle.State state = Lifecycle.State.RESUMED; - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } private static final Object withResumed$$forInline(LifecycleOwner lifecycleOwner, Function0 function0, Continuation continuation) { - d0.z.d.m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); + m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); Lifecycle.State state = Lifecycle.State.RESUMED; - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } public static final Object withStarted(Lifecycle lifecycle, Function0 function0, Continuation continuation) { Lifecycle.State state = Lifecycle.State.STARTED; - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -147,10 +148,10 @@ public final class WithLifecycleStateKt { public static final Object withStarted(LifecycleOwner lifecycleOwner, Function0 function0, Continuation continuation) { Lifecycle lifecycle = lifecycleOwner.getLifecycle(); - d0.z.d.m.checkNotNullExpressionValue(lifecycle, "lifecycle"); + m.checkNotNullExpressionValue(lifecycle, "lifecycle"); Lifecycle.State state = Lifecycle.State.STARTED; - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -164,25 +165,25 @@ public final class WithLifecycleStateKt { private static final Object withStarted$$forInline(Lifecycle lifecycle, Function0 function0, Continuation continuation) { Lifecycle.State state = Lifecycle.State.STARTED; - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } private static final Object withStarted$$forInline(LifecycleOwner lifecycleOwner, Function0 function0, Continuation continuation) { - d0.z.d.m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); + m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); Lifecycle.State state = Lifecycle.State.STARTED; - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } public static final Object withStateAtLeast(Lifecycle lifecycle, Lifecycle.State state, Function0 function0, Continuation continuation) { if (state.compareTo(Lifecycle.State.CREATED) >= 0) { - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -198,10 +199,10 @@ public final class WithLifecycleStateKt { public static final Object withStateAtLeast(LifecycleOwner lifecycleOwner, Lifecycle.State state, Function0 function0, Continuation continuation) { Lifecycle lifecycle = lifecycleOwner.getLifecycle(); - d0.z.d.m.checkNotNullExpressionValue(lifecycle, "lifecycle"); + m.checkNotNullExpressionValue(lifecycle, "lifecycle"); if (state.compareTo(Lifecycle.State.CREATED) >= 0) { - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -219,26 +220,26 @@ public final class WithLifecycleStateKt { if (!(state.compareTo(Lifecycle.State.CREATED) >= 0)) { throw new IllegalArgumentException(("target state must be CREATED or greater, found " + state).toString()); } - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } private static final Object withStateAtLeast$$forInline(LifecycleOwner lifecycleOwner, Lifecycle.State state, Function0 function0, Continuation continuation) { - d0.z.d.m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); + m.checkNotNullExpressionValue(lifecycleOwner.getLifecycle(), "lifecycle"); if (!(state.compareTo(Lifecycle.State.CREATED) >= 0)) { throw new IllegalArgumentException(("target state must be CREATED or greater, found " + state).toString()); } - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } public static final Object withStateAtLeastUnchecked(Lifecycle lifecycle, Lifecycle.State state, Function0 function0, Continuation continuation) { - z zVar = j0.a; - i1 H = m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 H = n.b.H(); boolean isDispatchNeeded = H.isDispatchNeeded(continuation.getContext()); if (!isDispatchNeeded) { if (lifecycle.getCurrentState() == Lifecycle.State.DESTROYED) { @@ -251,8 +252,8 @@ public final class WithLifecycleStateKt { } private static final Object withStateAtLeastUnchecked$$forInline(Lifecycle lifecycle, Lifecycle.State state, Function0 function0, Continuation continuation) { - z zVar = j0.a; - m.b.H(); + CoroutineDispatcher coroutineDispatcher = j0.a; + n.b.H(); l.mark(3); throw null; } diff --git a/app/src/main/java/androidx/work/CoroutineWorker.java b/app/src/main/java/androidx/work/CoroutineWorker.java index 66b40faa5e..63442a170a 100644 --- a/app/src/main/java/androidx/work/CoroutineWorker.java +++ b/app/src/main/java/androidx/work/CoroutineWorker.java @@ -12,16 +12,16 @@ import d0.z.d.m; import java.util.concurrent.ExecutionException; import kotlin.Unit; import kotlin.coroutines.Continuation; -import s.a.c1; -import s.a.j; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.e1; import s.a.j0; -import s.a.s; -import s.a.z; +import s.a.k; +import s.a.t; /* compiled from: CoroutineWorker.kt */ public abstract class CoroutineWorker extends ListenableWorker { - private final z coroutineContext; + private final CoroutineDispatcher coroutineContext; private final SettableFuture future; - private final s job = new c1(null); + private final t job = new e1(null); /* compiled from: CoroutineWorker.kt */ /* renamed from: androidx.work.CoroutineWorker$1 reason: invalid class name */ @@ -35,7 +35,7 @@ public abstract class CoroutineWorker extends ListenableWorker { @Override // java.lang.Runnable public final void run() { if (this.this$0.getFuture$work_runtime_ktx_release().isCancelled()) { - a.j(this.this$0.getJob$work_runtime_ktx_release(), null, 1, null); + a.k(this.this$0.getJob$work_runtime_ktx_release(), null, 1, null); } } } @@ -60,7 +60,7 @@ public abstract class CoroutineWorker extends ListenableWorker { public abstract Object doWork(Continuation continuation); - public z getCoroutineContext() { + public CoroutineDispatcher getCoroutineContext() { return this.coroutineContext; } @@ -68,7 +68,7 @@ public abstract class CoroutineWorker extends ListenableWorker { return this.future; } - public final s getJob$work_runtime_ktx_release() { + public final t getJob$work_runtime_ktx_release() { return this.job; } @@ -93,9 +93,9 @@ public abstract class CoroutineWorker extends ListenableWorker { throw e; } } else { - j jVar = new j(b.intercepted(continuation), 1); - foregroundAsync.addListener(new CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2(jVar, foregroundAsync), DirectExecutor.INSTANCE); - obj = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + foregroundAsync.addListener(new CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$2(kVar, foregroundAsync), DirectExecutor.INSTANCE); + obj = kVar.u(); if (obj == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } @@ -118,9 +118,9 @@ public abstract class CoroutineWorker extends ListenableWorker { throw e; } } else { - j jVar = new j(b.intercepted(continuation), 1); - progressAsync.addListener(new CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1(jVar, progressAsync), DirectExecutor.INSTANCE); - obj = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + progressAsync.addListener(new CoroutineWorker$await$$inlined$suspendCancellableCoroutine$lambda$1(kVar, progressAsync), DirectExecutor.INSTANCE); + obj = kVar.u(); if (obj == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } @@ -130,7 +130,7 @@ public abstract class CoroutineWorker extends ListenableWorker { @Override // androidx.work.ListenableWorker public final c.i.b.d.a.a startWork() { - a.F(a.a(getCoroutineContext().plus(this.job)), null, null, new CoroutineWorker$startWork$1(this, null), 3, null); + a.G(a.a(getCoroutineContext().plus(this.job)), null, null, new CoroutineWorker$startWork$1(this, null), 3, null); return this.future; } } diff --git a/app/src/main/java/androidx/work/ListenableFutureKt.java b/app/src/main/java/androidx/work/ListenableFutureKt.java index aea4296e56..e3d37c82ae 100644 --- a/app/src/main/java/androidx/work/ListenableFutureKt.java +++ b/app/src/main/java/androidx/work/ListenableFutureKt.java @@ -8,7 +8,7 @@ import d0.w.h.a.g; import d0.z.d.l; import java.util.concurrent.ExecutionException; import kotlin.coroutines.Continuation; -import s.a.j; +import s.a.k; /* compiled from: ListenableFuture.kt */ public final class ListenableFutureKt { @RestrictTo({RestrictTo.Scope.LIBRARY_GROUP}) @@ -24,9 +24,9 @@ public final class ListenableFutureKt { throw e; } } else { - j jVar = new j(b.intercepted(continuation), 1); - aVar.addListener(new ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1(jVar, aVar), DirectExecutor.INSTANCE); - Object u = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + aVar.addListener(new ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1(kVar, aVar), DirectExecutor.INSTANCE); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } @@ -48,9 +48,9 @@ public final class ListenableFutureKt { } } else { l.mark(0); - j jVar = new j(b.intercepted(continuation), 1); - aVar.addListener(new ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1(jVar, aVar), DirectExecutor.INSTANCE); - Object u = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + aVar.addListener(new ListenableFutureKt$await$$inlined$suspendCancellableCoroutine$lambda$1(kVar, aVar), DirectExecutor.INSTANCE); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } diff --git a/app/src/main/java/androidx/work/OperationKt.java b/app/src/main/java/androidx/work/OperationKt.java index 3f784a9660..2485a5c245 100644 --- a/app/src/main/java/androidx/work/OperationKt.java +++ b/app/src/main/java/androidx/work/OperationKt.java @@ -9,7 +9,7 @@ import d0.z.d.l; import d0.z.d.m; import java.util.concurrent.ExecutionException; import kotlin.coroutines.Continuation; -import s.a.j; +import s.a.k; /* compiled from: Operation.kt */ public final class OperationKt { public static final Object await(Operation operation, Continuation continuation) { @@ -26,9 +26,9 @@ public final class OperationKt { throw e; } } else { - j jVar = new j(b.intercepted(continuation), 1); - result.addListener(new OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1(jVar, result), DirectExecutor.INSTANCE); - Object u = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + result.addListener(new OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1(kVar, result), DirectExecutor.INSTANCE); + Object u = kVar.u(); if (u != c.getCOROUTINE_SUSPENDED()) { return u; } @@ -52,9 +52,9 @@ public final class OperationKt { } } else { l.mark(0); - j jVar = new j(b.intercepted(continuation), 1); - result.addListener(new OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1(jVar, result), DirectExecutor.INSTANCE); - Object u = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + result.addListener(new OperationKt$await$$inlined$suspendCancellableCoroutine$lambda$1(kVar, result), DirectExecutor.INSTANCE); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } diff --git a/app/src/main/java/c/a/a/a/a.java b/app/src/main/java/c/a/a/a/a.java index 982dc4cd47..bed77c03ec 100644 --- a/app/src/main/java/c/a/a/a/a.java +++ b/app/src/main/java/c/a/a/a/a.java @@ -196,14 +196,14 @@ public final class a extends AppDialog { public z4 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364318; - TextView textView = (TextView) view2.findViewById(2131364318); + int i2 = 2131364321; + TextView textView = (TextView) view2.findViewById(2131364321); if (textView != null) { - i2 = 2131364325; - TextView textView2 = (TextView) view2.findViewById(2131364325); + i2 = 2131364328; + TextView textView2 = (TextView) view2.findViewById(2131364328); if (textView2 != null) { - i2 = 2131364326; - ImageView imageView = (ImageView) view2.findViewById(2131364326); + i2 = 2131364329; + ImageView imageView = (ImageView) view2.findViewById(2131364329); if (imageView != null) { return new z4((LinearLayout) view2, textView, textView2, imageView); } @@ -214,7 +214,7 @@ public final class a extends AppDialog { } public d() { - super(2131559109); + super(2131559110); } public final z4 g() { @@ -290,26 +290,26 @@ public final class a extends AppDialog { public z0 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364319; - LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364319); + int i2 = 2131364322; + LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364322); if (linearLayout != null) { - i2 = 2131364320; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364320); + i2 = 2131364323; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364323); if (materialButton != null) { - i2 = 2131364322; - View findViewById = view2.findViewById(2131364322); + i2 = 2131364325; + View findViewById = view2.findViewById(2131364325); if (findViewById != null) { - i2 = 2131364323; - TabLayout tabLayout = (TabLayout) view2.findViewById(2131364323); + i2 = 2131364326; + TabLayout tabLayout = (TabLayout) view2.findViewById(2131364326); if (tabLayout != null) { - i2 = 2131364324; - MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364324); + i2 = 2131364327; + MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364327); if (materialButton2 != null) { - i2 = 2131364327; - MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131364327); + i2 = 2131364330; + MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131364330); if (materialButton3 != null) { - i2 = 2131364329; - ViewPager2 viewPager2 = (ViewPager2) view2.findViewById(2131364329); + i2 = 2131364332; + ViewPager2 viewPager2 = (ViewPager2) view2.findViewById(2131364332); if (viewPager2 != null) { return new z0((RelativeLayout) view2, linearLayout, materialButton, findViewById, tabLayout, materialButton2, materialButton3, viewPager2); } @@ -363,29 +363,29 @@ public final class a extends AppDialog { String str; super.onCreate(bundle); AppDialog.hideKeyboard$default(this, null, 1, null); - String string2 = getString(2131892311); + String string2 = getString(2131892349); m.checkNotNullExpressionValue(string2, "getString(R.string.premi…psell_tag_passive_mobile)"); - String string3 = getString(2131892310); + String string3 = getString(2131892348); m.checkNotNullExpressionValue(string3, "getString(R.string.premi…l_tag_description_mobile)"); - String string4 = getString(2131892300); + String string4 = getString(2131892338); m.checkNotNullExpressionValue(string4, "getString(R.string.premi…ell_emoji_passive_mobile)"); - String string5 = getString(2131892297); + String string5 = getString(2131892335); m.checkNotNullExpressionValue(string5, "getString(R.string.premi…emoji_description_mobile)"); - String string6 = getString(2131892290); + String string6 = getString(2131892328); m.checkNotNullExpressionValue(string6, "getString(R.string.premi…ed_emojis_passive_mobile)"); - String string7 = getString(2131892289); + String string7 = getString(2131892327); m.checkNotNullExpressionValue(string7, "getString(R.string.premi…mojis_description_mobile)"); - CharSequence j2 = c.a.l.b.j(this, 2131892315, new Object[0], null, 4); - Object[] objArr = {c.a.l.b.j(this, 2131888503, new Object[0], null, 4), c.a.l.b.j(this, 2131888501, new Object[0], null, 4)}; - String string8 = getString(2131892285); + CharSequence j2 = c.a.l.b.j(this, 2131892353, new Object[0], null, 4); + Object[] objArr = {c.a.l.b.j(this, 2131888513, new Object[0], null, 4), c.a.l.b.j(this, 2131888511, new Object[0], null, 4)}; + String string8 = getString(2131892323); m.checkNotNullExpressionValue(string8, "getString(R.string.premi…ed_avatar_passive_mobile)"); - String string9 = getString(2131892284); + String string9 = getString(2131892322); m.checkNotNullExpressionValue(string9, "getString(R.string.premi…vatar_description_mobile)"); - String string10 = getString(2131892293); + String string10 = getString(2131892331); m.checkNotNullExpressionValue(string10, "getString(R.string.premi…ell_badge_passive_mobile)"); - String string11 = getString(2131892292); + String string11 = getString(2131892330); m.checkNotNullExpressionValue(string11, "getString(R.string.premi…badge_description_mobile)"); - List listOf = n.listOf((Object[]) new c[]{new c(2131232236, string2, string3), new c(2131232152, string4, string5), new c(2131232104, string6, string7), new c(2131232237, j2, c.a.l.b.j(this, 2131892314, objArr, null, 4)), new c(2131232107, string8, string9), new c(2131232110, string10, string11)}); + List listOf = n.listOf((Object[]) new c[]{new c(2131232239, string2, string3), new c(2131232155, string4, string5), new c(2131232107, string6, string7), new c(2131232240, j2, c.a.l.b.j(this, 2131892352, objArr, null, 4)), new c(2131232110, string8, string9), new c(2131232113, string10, string11)}); Bundle arguments = getArguments(); int i2 = arguments != null ? arguments.getInt("extra_page_number") : 0; Bundle arguments2 = getArguments(); diff --git a/app/src/main/java/c/a/a/a/b.java b/app/src/main/java/c/a/a/a/b.java index 834f282b03..d8e32de4be 100644 --- a/app/src/main/java/c/a/a/a/b.java +++ b/app/src/main/java/c/a/a/a/b.java @@ -88,17 +88,17 @@ public final class b extends AppDialog { int i2 = 2131362756; TextView textView = (TextView) view2.findViewById(2131362756); if (textView != null) { - i2 = 2131364320; - ImageView imageView = (ImageView) view2.findViewById(2131364320); + i2 = 2131364323; + ImageView imageView = (ImageView) view2.findViewById(2131364323); if (imageView != null) { - i2 = 2131364321; - TextView textView2 = (TextView) view2.findViewById(2131364321); + i2 = 2131364324; + TextView textView2 = (TextView) view2.findViewById(2131364324); if (textView2 != null) { - i2 = 2131364328; - TextView textView3 = (TextView) view2.findViewById(2131364328); + i2 = 2131364331; + TextView textView3 = (TextView) view2.findViewById(2131364331); if (textView3 != null) { - i2 = 2131365339; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131365339); + i2 = 2131365344; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131365344); if (materialButton != null) { return new x0((RelativeLayout) view2, textView, imageView, textView2, textView3, materialButton); } @@ -138,12 +138,12 @@ public final class b extends AppDialog { requireDialog().setCanceledOnTouchOutside(true); TextView textView = g().d; m.checkNotNullExpressionValue(textView, "binding.premiumUpsellDescription"); - c.a.l.b.n(textView, 2131892305, new Object[]{this.m}, null, 4); + c.a.l.b.n(textView, 2131892343, new Object[]{this.m}, null, 4); TextView textView2 = g().e; m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellServerPerk"); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - c.a.l.b.n(textView2, 2131892303, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755292, 2, 2)}, null, 4); + c.a.l.b.n(textView2, 2131892341, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755293, 2, 2)}, null, 4); TextView textView3 = g().b; m.checkNotNullExpressionValue(textView3, "binding.continueButton"); textView3.setVisibility(this.n ^ true ? 0 : 8); diff --git a/app/src/main/java/c/a/a/a/c.java b/app/src/main/java/c/a/a/a/c.java index fce354c742..5feb842ce2 100644 --- a/app/src/main/java/c/a/a/a/c.java +++ b/app/src/main/java/c/a/a/a/c.java @@ -82,20 +82,20 @@ public final class c extends AppDialog { public y0 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364325; - ImageView imageView = (ImageView) view2.findViewById(2131364325); + int i2 = 2131364328; + ImageView imageView = (ImageView) view2.findViewById(2131364328); if (imageView != null) { - i2 = 2131364330; - TextView textView = (TextView) view2.findViewById(2131364330); + i2 = 2131364333; + TextView textView = (TextView) view2.findViewById(2131364333); if (textView != null) { - i2 = 2131364331; - TextView textView2 = (TextView) view2.findViewById(2131364331); + i2 = 2131364334; + TextView textView2 = (TextView) view2.findViewById(2131364334); if (textView2 != null) { - i2 = 2131364379; - TextView textView3 = (TextView) view2.findViewById(2131364379); + i2 = 2131364382; + TextView textView3 = (TextView) view2.findViewById(2131364382); if (textView3 != null) { - i2 = 2131364380; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364380); + i2 = 2131364383; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364383); if (materialButton != null) { return new y0((LinearLayout) view2, imageView, textView, textView2, textView3, materialButton); } @@ -134,17 +134,17 @@ public final class c extends AppDialog { } requireDialog().setCanceledOnTouchOutside(true); boolean z2 = getArgumentsOrDefault().getBoolean("ARG_IS_TIER_1"); - CharSequence j2 = c.a.l.b.j(this, z2 ? 2131892261 : 2131892263, new Object[0], null, 4); + CharSequence j2 = c.a.l.b.j(this, z2 ? 2131892299 : 2131892301, new Object[0], null, 4); TextView textView = g().d; m.checkNotNullExpressionValue(textView, "binding.premiumUpsellYearlyTitle"); - c.a.l.b.n(textView, 2131892318, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f)), j2}, null, 4); + c.a.l.b.n(textView, 2131892356, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f)), j2}, null, 4); TextView textView2 = g().f180c; m.checkNotNullExpressionValue(textView2, "binding.premiumUpsellYearlyDescription"); - c.a.l.b.n(textView2, 2131892317, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f))}, null, 4); + c.a.l.b.n(textView2, 2131892355, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.16f))}, null, 4); MaterialButton materialButton = g().f; m.checkNotNullExpressionValue(materialButton, "binding.purchasePremiumYearly"); - c.a.l.b.n(materialButton, 2131892316, new Object[]{this.m}, null, 4); - g().b.setImageResource(z2 ? 2131232220 : 2131232221); + c.a.l.b.n(materialButton, 2131892354, new Object[]{this.m}, null, 4); + g().b.setImageResource(z2 ? 2131232223 : 2131232224); TextView textView3 = g().e; m.checkNotNullExpressionValue(textView3, "binding.purchasePremiumMonthly"); textView3.setVisibility(this.n ^ true ? 0 : 8); diff --git a/app/src/main/java/c/a/a/a/d.java b/app/src/main/java/c/a/a/a/d.java index c60a85743a..6c763dff8e 100644 --- a/app/src/main/java/c/a/a/a/d.java +++ b/app/src/main/java/c/a/a/a/d.java @@ -60,23 +60,23 @@ public final class d extends AppDialog { public s0 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364238; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364238); + int i2 = 2131364240; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364240); if (materialButton != null) { - i2 = 2131364239; - TextView textView = (TextView) view2.findViewById(2131364239); + i2 = 2131364241; + TextView textView = (TextView) view2.findViewById(2131364241); if (textView != null) { - i2 = 2131364240; - ImageView imageView = (ImageView) view2.findViewById(2131364240); + i2 = 2131364242; + ImageView imageView = (ImageView) view2.findViewById(2131364242); if (imageView != null) { - i2 = 2131364241; - ImageView imageView2 = (ImageView) view2.findViewById(2131364241); + i2 = 2131364243; + ImageView imageView2 = (ImageView) view2.findViewById(2131364243); if (imageView2 != null) { - i2 = 2131364242; - ImageView imageView3 = (ImageView) view2.findViewById(2131364242); + i2 = 2131364244; + ImageView imageView3 = (ImageView) view2.findViewById(2131364244); if (imageView3 != null) { - i2 = 2131364243; - ImageView imageView4 = (ImageView) view2.findViewById(2131364243); + i2 = 2131364245; + ImageView imageView4 = (ImageView) view2.findViewById(2131364245); if (imageView4 != null) { return new s0((LinearLayout) view2, materialButton, textView, imageView, imageView2, imageView3, imageView4); } @@ -124,8 +124,8 @@ public final class d extends AppDialog { } boolean z2 = getArgumentsOrDefault().getBoolean("ARG_IS_TIER_1"); int i3 = z2 ? 2131230924 : 2131230928; - int i4 = z2 ? 2131232173 : 2131232162; - int i5 = z2 ? 2131232251 : 2131232249; + int i4 = z2 ? 2131232176 : 2131232165; + int i5 = z2 ? 2131232254 : 2131232252; if (z2) { Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); @@ -135,7 +135,7 @@ public final class d extends AppDialog { m.checkNotNullExpressionValue(requireContext2, "requireContext()"); i2 = DrawableCompat.getThemedDrawableRes$default(requireContext2, 2130969518, 0, 2, (Object) null); } - int i6 = z2 ? 2131887001 : 2131887003; + int i6 = z2 ? 2131887002 : 2131887004; g().d.setBackgroundResource(i3); g().e.setImageDrawable(ContextCompat.getDrawable(requireContext(), i4)); g().g.setImageDrawable(ContextCompat.getDrawable(requireContext(), i5)); diff --git a/app/src/main/java/c/a/a/a/e.java b/app/src/main/java/c/a/a/a/e.java index a0b4c3070b..0d6a98cef2 100644 --- a/app/src/main/java/c/a/a/a/e.java +++ b/app/src/main/java/c/a/a/a/e.java @@ -44,11 +44,11 @@ public final class e extends AppDialog { public t0 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364238; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364238); + int i2 = 2131364240; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364240); if (materialButton != null) { - i2 = 2131364244; - TextView textView = (TextView) view2.findViewById(2131364244); + i2 = 2131364246; + TextView textView = (TextView) view2.findViewById(2131364246); if (textView != null) { return new t0((LinearLayout) view2, materialButton, textView); } @@ -95,7 +95,7 @@ public final class e extends AppDialog { KProperty[] kPropertyArr = i; TextView textView = ((t0) fragmentViewBindingDelegate.getValue((Fragment) this, kPropertyArr[0])).f153c; m.checkNotNullExpressionValue(textView, "binding.premiumAndPremiumGuildActivatedText"); - c.a.l.b.n(textView, 2131886938, new Object[]{str}, null, 4); + c.a.l.b.n(textView, 2131886939, new Object[]{str}, null, 4); requireDialog().setCanceledOnTouchOutside(true); ((t0) this.l.getValue((Fragment) this, kPropertyArr[0])).b.setOnClickListener(new c(this)); } diff --git a/app/src/main/java/c/a/a/b.java b/app/src/main/java/c/a/a/b.java index 0e33c8ae74..0e421158d9 100644 --- a/app/src/main/java/c/a/a/b.java +++ b/app/src/main/java/c/a/a/b.java @@ -81,7 +81,7 @@ public final class b extends AppDialog { public C0005b(DefaultConstructorMarker defaultConstructorMarker) { } - public final void a(FragmentManager fragmentManager, boolean z2, int i, float f, float f2, Function0 function0, int i2, boolean z3, boolean z4) { + public final void a(FragmentManager fragmentManager, boolean z2, int i, float f, float f2, Function0 function0, int i2, boolean z3, boolean z4, boolean z5) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); float f3 = (float) 1048576; StoreStream.Companion.getAnalytics().trackFileUploadAlertViewed(z2 ? FileUploadAlertType.OVER_MAX_SIZE : FileUploadAlertType.NITRO_UPSELL, i2, (int) (f * f3), (int) (f3 * f2), z3, z4, z2); @@ -89,7 +89,7 @@ public final class b extends AppDialog { bVar.l = function0; Bundle bundle = new Bundle(); bundle.putBoolean("PARAM_IS_USER_PREMIUM", z2); - bundle.putBoolean("PARAM_HAS_VIDEO", z4); + bundle.putBoolean("PARAM_CAN_COMPRESS", !z4 && !z5); bundle.putInt("PARAM_MAX_FILE_SIZE_MB", i); bVar.setArguments(bundle); bVar.show(fragmentManager, ImageUploadDialog.class.getName()); @@ -113,38 +113,38 @@ public final class b extends AppDialog { int i2 = 2131362501; ImageView imageView = (ImageView) view2.findViewById(2131362501); if (imageView != null) { - i2 = 2131363539; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363539); + i2 = 2131363541; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363541); if (materialButton != null) { - i2 = 2131363540; - SwitchMaterial switchMaterial = (SwitchMaterial) view2.findViewById(2131363540); + i2 = 2131363542; + SwitchMaterial switchMaterial = (SwitchMaterial) view2.findViewById(2131363542); if (switchMaterial != null) { - i2 = 2131363541; - RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363541); + i2 = 2131363543; + RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363543); if (relativeLayout != null) { - i2 = 2131363542; - View findViewById = view2.findViewById(2131363542); + i2 = 2131363544; + View findViewById = view2.findViewById(2131363544); if (findViewById != null) { - i2 = 2131363543; - MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363543); + i2 = 2131363545; + MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363545); if (materialButton2 != null) { - i2 = 2131363544; - RelativeLayout relativeLayout2 = (RelativeLayout) view2.findViewById(2131363544); + i2 = 2131363546; + RelativeLayout relativeLayout2 = (RelativeLayout) view2.findViewById(2131363546); if (relativeLayout2 != null) { - i2 = 2131363545; - MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131363545); + i2 = 2131363547; + MaterialButton materialButton3 = (MaterialButton) view2.findViewById(2131363547); if (materialButton3 != null) { - i2 = 2131363546; - MaterialButton materialButton4 = (MaterialButton) view2.findViewById(2131363546); + i2 = 2131363548; + MaterialButton materialButton4 = (MaterialButton) view2.findViewById(2131363548); if (materialButton4 != null) { - i2 = 2131363547; - TextView textView = (TextView) view2.findViewById(2131363547); + i2 = 2131363549; + TextView textView = (TextView) view2.findViewById(2131363549); if (textView != null) { - i2 = 2131364726; - TextView textView2 = (TextView) view2.findViewById(2131364726); + i2 = 2131364729; + TextView textView2 = (TextView) view2.findViewById(2131364729); if (textView2 != null) { - i2 = 2131364727; - TextView textView3 = (TextView) view2.findViewById(2131364727); + i2 = 2131364730; + TextView textView3 = (TextView) view2.findViewById(2131364730); if (textView3 != null) { return new u((RelativeLayout) view2, imageView, materialButton, switchMaterial, relativeLayout, findViewById, materialButton2, relativeLayout2, materialButton3, materialButton4, textView, textView2, textView3); } @@ -189,9 +189,9 @@ public final class b extends AppDialog { super.onViewBound(view); int i2 = getArgumentsOrDefault().getInt("PARAM_MAX_FILE_SIZE_MB"); boolean z2 = getArgumentsOrDefault().getBoolean("PARAM_IS_USER_PREMIUM"); - boolean z3 = this.l != null && !getArgumentsOrDefault().getBoolean("PARAM_HAS_VIDEO"); + boolean z3 = this.l != null && getArgumentsOrDefault().getBoolean("PARAM_CAN_COMPRESS"); int i3 = 8; - int i4 = i2 != 8 ? i2 != 50 ? i2 != 100 ? i2 != 200 ? 0 : 2131888502 : 2131888501 : 2131888500 : 2131888503; + int i4 = i2 != 8 ? i2 != 50 ? i2 != 100 ? i2 != 200 ? 0 : 2131888512 : 2131888511 : 2131888510 : 2131888513; MaterialButton materialButton = g().i; m.checkNotNullExpressionValue(materialButton, "binding.imageUploadFailedSendCompress"); materialButton.setVisibility(z3 ? 0 : 8); @@ -233,7 +233,7 @@ public final class b extends AppDialog { Object[] objArr = new Object[1]; Context context2 = getContext(); objArr[0] = context2 != null ? c.a.l.b.g(context2, i4, new Object[0], null, 4) : null; - charSequence = c.a.l.b.g(context, 2131894078, objArr, null, 4); + charSequence = c.a.l.b.g(context, 2131894117, objArr, null, 4); } } else { Context context3 = getContext(); @@ -241,7 +241,7 @@ public final class b extends AppDialog { Object[] objArr2 = new Object[1]; Context context4 = getContext(); objArr2[0] = context4 != null ? c.a.l.b.g(context4, i4, new Object[0], null, 4) : null; - charSequence = c.a.l.b.g(context3, 2131894079, objArr2, null, 4); + charSequence = c.a.l.b.g(context3, 2131894118, objArr2, null, 4); } } textView.setText(charSequence); diff --git a/app/src/main/java/c/a/a/c/a.java b/app/src/main/java/c/a/a/c/a.java index b8e8b4d7ab..3bb4b42fb9 100644 --- a/app/src/main/java/c/a/a/c/a.java +++ b/app/src/main/java/c/a/a/c/a.java @@ -62,10 +62,10 @@ public final class a extends AppDialog { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.addRelationship$default(h.l, "User Profile", h.k, 2, null, 8, null), false, 1, null), h, null, 2, null), f.class, (Context) null, (Function1) null, new h(h), (Function0) null, (Function0) null, new g(h), 54, (Object) null); } else if (i == 1) { KProperty[] kPropertyArr2 = a.i; - ((a) this.j).h().removeRelationship(2131894190); + ((a) this.j).h().removeRelationship(2131894229); } else if (i == 2) { KProperty[] kPropertyArr3 = a.i; - ((a) this.j).h().removeRelationship(2131888777); + ((a) this.j).h().removeRelationship(2131888787); } else { throw null; } @@ -92,20 +92,20 @@ public final class a extends AppDialog { public k1 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131365357; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131365357); + int i2 = 2131365362; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131365362); if (simpleDraweeView != null) { - i2 = 2131365358; - TextView textView = (TextView) view2.findViewById(2131365358); + i2 = 2131365363; + TextView textView = (TextView) view2.findViewById(2131365363); if (textView != null) { - i2 = 2131365359; - TextView textView2 = (TextView) view2.findViewById(2131365359); + i2 = 2131365364; + TextView textView2 = (TextView) view2.findViewById(2131365364); if (textView2 != null) { - i2 = 2131365360; - TextView textView3 = (TextView) view2.findViewById(2131365360); + i2 = 2131365365; + TextView textView3 = (TextView) view2.findViewById(2131365365); if (textView3 != null) { - i2 = 2131365361; - TextView textView4 = (TextView) view2.findViewById(2131365361); + i2 = 2131365366; + TextView textView4 = (TextView) view2.findViewById(2131365366); if (textView4 != null) { return new k1((LinearLayout) view2, simpleDraweeView, textView, textView2, textView3, textView4); } diff --git a/app/src/main/java/c/a/a/c/b.java b/app/src/main/java/c/a/a/c/b.java index d52a1b9b9f..ce517650da 100644 --- a/app/src/main/java/c/a/a/c/b.java +++ b/app/src/main/java/c/a/a/c/b.java @@ -29,7 +29,7 @@ public final class b extends o implements Function1 { Objects.requireNonNull(fVar); User user = cVar2.a; if (user == null) { - fVar.j.j.onNext(new f.b.a(2131888048)); + fVar.j.j.onNext(new f.b.a(2131888049)); } else { int type = ModelUserRelationship.getType(cVar2.b); boolean z2 = type != 2; diff --git a/app/src/main/java/c/a/a/c/f.java b/app/src/main/java/c/a/a/c/f.java index 65cbb3c237..bf3fd65cbf 100644 --- a/app/src/main/java/c/a/a/c/f.java +++ b/app/src/main/java/c/a/a/c/f.java @@ -246,7 +246,7 @@ public final class f extends AppViewModel { public Unit invoke(Error error) { m.checkNotNullParameter(error, "it"); PublishSubject publishSubject = this.this$0.j; - publishSubject.j.onNext(new b.a(2131888048)); + publishSubject.j.onNext(new b.a(2131888049)); return Unit.a; } } diff --git a/app/src/main/java/c/a/a/c/g.java b/app/src/main/java/c/a/a/c/g.java index 4e9569f813..c0db5a0817 100644 --- a/app/src/main/java/c/a/a/c/g.java +++ b/app/src/main/java/c/a/a/c/g.java @@ -20,7 +20,7 @@ public final class g extends o implements Function1 { @Override // kotlin.jvm.functions.Function1 public Unit invoke(Void r3) { PublishSubject publishSubject = this.this$0.j; - publishSubject.j.onNext(new f.b.C0007b(2131894189)); + publishSubject.j.onNext(new f.b.C0007b(2131894228)); return Unit.a; } } diff --git a/app/src/main/java/c/a/a/c/h.java b/app/src/main/java/c/a/a/c/h.java index 9f50978a1f..5ea1e592cd 100644 --- a/app/src/main/java/c/a/a/c/h.java +++ b/app/src/main/java/c/a/a/c/h.java @@ -23,7 +23,7 @@ public final class h extends o implements Function1 { public Unit invoke(Error error) { m.checkNotNullParameter(error, "it"); PublishSubject publishSubject = this.this$0.j; - publishSubject.j.onNext(new f.b.a(2131888048)); + publishSubject.j.onNext(new f.b.a(2131888049)); return Unit.a; } } diff --git a/app/src/main/java/c/a/a/d/a.java b/app/src/main/java/c/a/a/d/a.java index eaf70e5c43..afcd52ca42 100644 --- a/app/src/main/java/c/a/a/d/a.java +++ b/app/src/main/java/c/a/a/d/a.java @@ -115,26 +115,26 @@ public final class a extends AppDialog { int i2 = 2131361894; ProgressBar progressBar = (ProgressBar) view2.findViewById(2131361894); if (progressBar != null) { - i2 = 2131364028; - LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364028); + i2 = 2131364030; + LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030); if (linearLayout != null) { - i2 = 2131364255; - TextView textView = (TextView) view2.findViewById(2131364255); + i2 = 2131364257; + TextView textView = (TextView) view2.findViewById(2131364257); if (textView != null) { - i2 = 2131364256; - LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364256); + i2 = 2131364258; + LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364258); if (loadingButton != null) { - i2 = 2131364257; - TextView textView2 = (TextView) view2.findViewById(2131364257); + i2 = 2131364259; + TextView textView2 = (TextView) view2.findViewById(2131364259); if (textView2 != null) { - i2 = 2131364258; - AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364258); + i2 = 2131364260; + AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364260); if (appViewFlipper != null) { - i2 = 2131364259; - TextView textView3 = (TextView) view2.findViewById(2131364259); + i2 = 2131364261; + TextView textView3 = (TextView) view2.findViewById(2131364261); if (textView3 != null) { - i2 = 2131364260; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364260); + i2 = 2131364262; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364262); if (materialButton != null) { return new v0((LinearLayout) view2, progressBar, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, materialButton); } @@ -195,25 +195,25 @@ public final class a extends AppDialog { if (eVar.g) { TextView textView2 = aVar.g().b; m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionCancelBody"); - c.a.l.b.n(textView2, 2131892033, new Object[]{renderUtcDate$default}, null, 4); + c.a.l.b.n(textView2, 2131892071, new Object[]{renderUtcDate$default}, null, 4); } else { TextView textView3 = aVar.g().b; m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionCancelBody"); - c.a.l.b.n(textView3, 2131892032, new Object[]{renderUtcDate$default}, null, 4); + c.a.l.b.n(textView3, 2131892070, new Object[]{renderUtcDate$default}, null, 4); } aVar.g().f165c.setBackgroundColor(ColorCompat.getColor(aVar, 2131100324)); } else if (cVar2 instanceof f.c.b) { TextView textView4 = aVar.g().f; m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionCancelHeader"); - textView4.setText(aVar.getString(2131892044)); + textView4.setText(aVar.getString(2131892082)); TextView textView5 = aVar.g().b; m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionCancelBody"); TimeUtils timeUtils2 = TimeUtils.INSTANCE; String currentPeriodEnd2 = ((f.c.b) cVar2).f.getCurrentPeriodEnd(); Context requireContext2 = aVar.requireContext(); m.checkNotNullExpressionValue(requireContext2, "requireContext()"); - c.a.l.b.n(textView5, 2131892045, new Object[]{TimeUtils.renderUtcDate$default(timeUtils2, currentPeriodEnd2, requireContext2, (String) null, (DateFormat) null, 0, 28, (Object) null)}, null, 4); - aVar.g().f165c.setText(aVar.getString(2131891633)); + c.a.l.b.n(textView5, 2131892083, new Object[]{TimeUtils.renderUtcDate$default(timeUtils2, currentPeriodEnd2, requireContext2, (String) null, (DateFormat) null, 0, 28, (Object) null)}, null, 4); + aVar.g().f165c.setText(aVar.getString(2131891666)); aVar.g().f165c.setBackgroundColor(ColorCompat.getThemedColor(aVar, 2130969007)); } else if (cVar2 instanceof f.c.C0012c) { Integer num = ((f.c.C0012c) cVar2).f; diff --git a/app/src/main/java/c/a/a/d/b.java b/app/src/main/java/c/a/a/d/b.java index b7e019dd0f..6a1af9750a 100644 --- a/app/src/main/java/c/a/a/d/b.java +++ b/app/src/main/java/c/a/a/d/b.java @@ -112,29 +112,29 @@ public final class b extends AppDialog { public w0 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364028; - LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364028); + int i2 = 2131364030; + LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030); if (linearLayout != null) { - i2 = 2131364261; - TextView textView = (TextView) view2.findViewById(2131364261); + i2 = 2131364263; + TextView textView = (TextView) view2.findViewById(2131364263); if (textView != null) { - i2 = 2131364262; - LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364262); + i2 = 2131364264; + LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131364264); if (loadingButton != null) { - i2 = 2131364263; - TextView textView2 = (TextView) view2.findViewById(2131364263); + i2 = 2131364265; + TextView textView2 = (TextView) view2.findViewById(2131364265); if (textView2 != null) { - i2 = 2131364264; - AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364264); + i2 = 2131364266; + AppViewFlipper appViewFlipper = (AppViewFlipper) view2.findViewById(2131364266); if (appViewFlipper != null) { - i2 = 2131364265; - TextView textView3 = (TextView) view2.findViewById(2131364265); + i2 = 2131364267; + TextView textView3 = (TextView) view2.findViewById(2131364267); if (textView3 != null) { - i2 = 2131364266; - ImageView imageView = (ImageView) view2.findViewById(2131364266); + i2 = 2131364268; + ImageView imageView = (ImageView) view2.findViewById(2131364268); if (imageView != null) { - i2 = 2131364267; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364267); + i2 = 2131364269; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364269); if (materialButton != null) { return new w0((LinearLayout) view2, linearLayout, textView, loadingButton, textView2, appViewFlipper, textView3, imageView, materialButton); } @@ -195,21 +195,21 @@ public final class b extends AppDialog { if (z3) { TextView textView2 = bVar.g().f; m.checkNotNullExpressionValue(textView2, "binding.premiumGuildSubscriptionUncancelHeader"); - textView2.setText(bVar.getString(2131892068)); + textView2.setText(bVar.getString(2131892106)); TextView textView3 = bVar.g().b; m.checkNotNullExpressionValue(textView3, "binding.premiumGuildSubscriptionUncancelBody"); - textView3.setText(bVar.getString(2131892065)); + textView3.setText(bVar.getString(2131892103)); } else if (m.areEqual(cVar2, k.c.d.a)) { TextView textView4 = bVar.g().f; m.checkNotNullExpressionValue(textView4, "binding.premiumGuildSubscriptionUncancelHeader"); - textView4.setText(bVar.getString(2131892064)); + textView4.setText(bVar.getString(2131892102)); ImageView imageView = bVar.g().g; m.checkNotNullExpressionValue(imageView, "binding.premiumGuildSubscriptionUncancelImage"); imageView.setVisibility(0); TextView textView5 = bVar.g().b; m.checkNotNullExpressionValue(textView5, "binding.premiumGuildSubscriptionUncancelBody"); - textView5.setText(bVar.getString(2131892063)); - bVar.g().f170c.setText(bVar.getString(2131891633)); + textView5.setText(bVar.getString(2131892101)); + bVar.g().f170c.setText(bVar.getString(2131891666)); } else if (cVar2 instanceof k.c.a) { Integer num = ((k.c.a) cVar2).a; if (num != null) { diff --git a/app/src/main/java/c/a/a/d/c.java b/app/src/main/java/c/a/a/d/c.java index a21c120ae3..d745846880 100644 --- a/app/src/main/java/c/a/a/d/c.java +++ b/app/src/main/java/c/a/a/d/c.java @@ -41,8 +41,8 @@ public final class c extends AppDialog { m.checkNotNullParameter(fragmentManager, "fragmentManager"); m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(function0, "dismissListener"); - CharSequence g = z2 ? c.a.l.b.g(context, 2131889957, new Object[0], null, 4) : c.a.l.b.g(context, 2131889940, new Object[0], null, 4); - CharSequence g2 = str == null ? c.a.l.b.g(context, 2131889942, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755177, i, Integer.valueOf(i))}, null, 4) : z2 ? c.a.l.b.g(context, 2131889958, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755178, i, Integer.valueOf(i))}, null, 4) : c.a.l.b.g(context, 2131889941, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755175, i, Integer.valueOf(i))}, null, 4); + CharSequence g = z2 ? c.a.l.b.g(context, 2131889968, new Object[0], null, 4) : c.a.l.b.g(context, 2131889951, new Object[0], null, 4); + CharSequence g2 = str == null ? c.a.l.b.g(context, 2131889953, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755178, i, Integer.valueOf(i))}, null, 4) : z2 ? c.a.l.b.g(context, 2131889969, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755179, i, Integer.valueOf(i))}, null, 4) : c.a.l.b.g(context, 2131889952, new Object[]{str, StringResourceUtilsKt.getI18nPluralString(context, 2131755176, i, Integer.valueOf(i))}, null, 4); c cVar = new c(); cVar.m = function0; Bundle bundle = new Bundle(); @@ -67,17 +67,17 @@ public final class c extends AppDialog { public u0 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364251; - TextView textView = (TextView) view2.findViewById(2131364251); + int i2 = 2131364253; + TextView textView = (TextView) view2.findViewById(2131364253); if (textView != null) { - i2 = 2131364252; - TextView textView2 = (TextView) view2.findViewById(2131364252); + i2 = 2131364254; + TextView textView2 = (TextView) view2.findViewById(2131364254); if (textView2 != null) { - i2 = 2131364253; - LottieAnimationView lottieAnimationView = (LottieAnimationView) view2.findViewById(2131364253); + i2 = 2131364255; + LottieAnimationView lottieAnimationView = (LottieAnimationView) view2.findViewById(2131364255); if (lottieAnimationView != null) { - i2 = 2131364254; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364254); + i2 = 2131364256; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364256); if (materialButton != null) { return new u0((LinearLayout) view2, textView, textView2, lottieAnimationView, materialButton); } diff --git a/app/src/main/java/c/a/a/d/d.java b/app/src/main/java/c/a/a/d/d.java index bbf7a12ec8..cd2e252238 100644 --- a/app/src/main/java/c/a/a/d/d.java +++ b/app/src/main/java/c/a/a/d/d.java @@ -39,13 +39,13 @@ public final class d extends o implements Function1 { if ((state instanceof StorePremiumGuildSubscription.State.Loading) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading)) { obj = f.c.C0013f.f; } else if ((state instanceof StorePremiumGuildSubscription.State.Failure) || (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure)) { - obj = new f.c.C0012c(2131892038); + obj = new f.c.C0012c(2131892076); } else if (!(state instanceof StorePremiumGuildSubscription.State.Loaded) || !(subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded)) { - obj = new f.c.C0012c(2131892038); + obj = new f.c.C0012c(2131892076); } else { ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions()); if (modelSubscription == null) { - obj = new f.c.C0012c(2131892038); + obj = new f.c.C0012c(2131892076); } else if (fVar.getViewState() instanceof f.c.b) { obj = new f.c.b(modelSubscription); } else { diff --git a/app/src/main/java/c/a/a/d/i.java b/app/src/main/java/c/a/a/d/i.java index 508c8b38a0..bc5184c643 100644 --- a/app/src/main/java/c/a/a/d/i.java +++ b/app/src/main/java/c/a/a/d/i.java @@ -32,10 +32,10 @@ public final class i extends o implements Function1 { if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loading) { obj = k.c.C0014c.a; } else if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Failure) { - obj = new k.c.a(2131892038); + obj = new k.c.a(2131892076); } else if (subscriptionsState instanceof StoreSubscriptions.SubscriptionsState.Loaded) { ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List) ((StoreSubscriptions.SubscriptionsState.Loaded) subscriptionsState).getSubscriptions()); - obj = modelSubscription == null ? new k.c.a(2131892038) : new k.c.b(modelSubscription, false, false); + obj = modelSubscription == null ? new k.c.a(2131892076) : new k.c.b(modelSubscription, false, false); } else { obj = new k.c.a(null, 1); } diff --git a/app/src/main/java/c/a/a/f/a.java b/app/src/main/java/c/a/a/f/a.java index 63639483b8..481d7a0ab2 100644 --- a/app/src/main/java/c/a/a/f/a.java +++ b/app/src/main/java/c/a/a/f/a.java @@ -91,20 +91,20 @@ public final class a extends AppDialog { public v4 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131363785; - TextView textView = (TextView) view2.findViewById(2131363785); + int i2 = 2131363788; + TextView textView = (TextView) view2.findViewById(2131363788); if (textView != null) { - i2 = 2131363786; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363786); + i2 = 2131363789; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363789); if (materialButton != null) { - i2 = 2131363787; - MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363787); + i2 = 2131363790; + MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363790); if (materialButton2 != null) { - i2 = 2131363788; - TextView textView2 = (TextView) view2.findViewById(2131363788); + i2 = 2131363791; + TextView textView2 = (TextView) view2.findViewById(2131363791); if (textView2 != null) { - i2 = 2131365485; - TextView textView3 = (TextView) view2.findViewById(2131365485); + i2 = 2131365491; + TextView textView3 = (TextView) view2.findViewById(2131365491); if (textView3 != null) { return new v4((LinearLayout) view2, textView, materialButton, materialButton2, textView2, textView3); } @@ -131,7 +131,7 @@ public final class a extends AppDialog { } public a() { - super(2131559076); + super(2131559077); } public final v4 g() { @@ -165,7 +165,7 @@ public final class a extends AppDialog { } TextView textView = g().b; m.checkNotNullExpressionValue(textView, "binding.maskedLinksBodyText"); - c.a.l.b.n(textView, 2131890942, new Object[]{obj}, null, 4); + c.a.l.b.n(textView, 2131890973, new Object[]{obj}, null, 4); g().f169c.setOnClickListener(new d(this)); g().d.setOnClickListener(new View$OnClickListenerC0016a(0, this, str)); g().e.setOnClickListener(new View$OnClickListenerC0016a(1, this, str)); diff --git a/app/src/main/java/c/a/a/g.java b/app/src/main/java/c/a/a/g.java index 1b5b70bbba..28fef8568e 100644 --- a/app/src/main/java/c/a/a/g.java +++ b/app/src/main/java/c/a/a/g.java @@ -84,8 +84,8 @@ public final class g extends AppDialog { i2 = 2131361858; MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131361858); if (materialButton2 != null) { - i2 = 2131365485; - TextView textView2 = (TextView) view2.findViewById(2131365485); + i2 = 2131365491; + TextView textView2 = (TextView) view2.findViewById(2131365491); if (textView2 != null) { return new c.a.i.a((LinearLayout) view2, textView, materialButton, materialButton2, textView2); } diff --git a/app/src/main/java/c/a/a/h.java b/app/src/main/java/c/a/a/h.java index 0ff976e112..098ed69460 100644 --- a/app/src/main/java/c/a/a/h.java +++ b/app/src/main/java/c/a/a/h.java @@ -48,7 +48,7 @@ public final class h extends AppDialog { m.checkNotNullExpressionValue(requireContext2, "requireContext()"); String str = (String) this.k; m.checkNotNullExpressionValue(str, "username"); - o.a(requireContext2, str, 2131887620); + o.a(requireContext2, str, 2131887622); ((h) this.j).dismiss(); } else { throw null; diff --git a/app/src/main/java/c/a/a/i.java b/app/src/main/java/c/a/a/i.java index 4ec6b9b422..be733df14c 100644 --- a/app/src/main/java/c/a/a/i.java +++ b/app/src/main/java/c/a/a/i.java @@ -57,8 +57,8 @@ public final class i extends AppDialog { i2 = 2131362208; MaterialButton materialButton = (MaterialButton) view2.findViewById(2131362208); if (materialButton != null) { - i2 = 2131364028; - LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364028); + i2 = 2131364030; + LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030); if (linearLayout != null) { return new e((LinearLayout) view2, textView, materialButton, linearLayout); } @@ -97,6 +97,6 @@ public final class i extends AppDialog { Integer valueOf = arguments != null ? Integer.valueOf(arguments.getInt("ARG_MAX_VIDEO_CHANNEL_USERS")) : null; TextView textView = ((e) this.k.getValue((Fragment) this, kPropertyArr[0])).b; m.checkNotNullExpressionValue(textView, "binding.cameraCapacityBody"); - textView.setText(c.a.l.b.j(this, 2131894431, new Object[]{String.valueOf(valueOf)}, null, 4)); + textView.setText(c.a.l.b.j(this, 2131894478, new Object[]{String.valueOf(valueOf)}, null, 4)); } } diff --git a/app/src/main/java/c/a/a/k.java b/app/src/main/java/c/a/a/k.java index 8d2e121a69..4a0edac821 100644 --- a/app/src/main/java/c/a/a/k.java +++ b/app/src/main/java/c/a/a/k.java @@ -20,7 +20,7 @@ public final class k extends o implements Function1 { @Override // kotlin.jvm.functions.Function1 public Unit invoke(View view) { m.checkNotNullParameter(view, ""); - this.$onConfirm.invoke(2131888786); + this.$onConfirm.invoke(2131888796); return Unit.a; } } diff --git a/app/src/main/java/c/a/a/l.java b/app/src/main/java/c/a/a/l.java index 8108b3c65d..d2a0245829 100644 --- a/app/src/main/java/c/a/a/l.java +++ b/app/src/main/java/c/a/a/l.java @@ -45,11 +45,11 @@ public final class l extends AppDialog { public s invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131363459; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363459); + int i2 = 2131363461; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363461); if (materialButton != null) { - i2 = 2131364028; - LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364028); + i2 = 2131364030; + LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131364030); if (linearLayout != null) { return new s((LinearLayout) view2, materialButton, linearLayout); } diff --git a/app/src/main/java/c/a/a/q.java b/app/src/main/java/c/a/a/q.java index b751d912a2..2b2e8fb1a7 100644 --- a/app/src/main/java/c/a/a/q.java +++ b/app/src/main/java/c/a/a/q.java @@ -54,26 +54,26 @@ public final class q extends AppDialog { public p4 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131363052; - LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131363052); + int i2 = 2131363054; + LinearLayout linearLayout = (LinearLayout) view2.findViewById(2131363054); if (linearLayout != null) { - i2 = 2131363053; - TextView textView = (TextView) view2.findViewById(2131363053); + i2 = 2131363055; + TextView textView = (TextView) view2.findViewById(2131363055); if (textView != null) { - i2 = 2131363054; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363054); + i2 = 2131363056; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363056); if (materialButton != null) { - i2 = 2131363055; - TextView textView2 = (TextView) view2.findViewById(2131363055); + i2 = 2131363057; + TextView textView2 = (TextView) view2.findViewById(2131363057); if (textView2 != null) { - i2 = 2131363056; - LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(2131363056); + i2 = 2131363058; + LinearLayout linearLayout2 = (LinearLayout) view2.findViewById(2131363058); if (linearLayout2 != null) { - i2 = 2131363057; - LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131363057); + i2 = 2131363059; + LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131363059); if (loadingButton != null) { - i2 = 2131363058; - TextInputLayout textInputLayout = (TextInputLayout) view2.findViewById(2131363058); + i2 = 2131363060; + TextInputLayout textInputLayout = (TextInputLayout) view2.findViewById(2131363060); if (textInputLayout != null) { return new p4((LinearLayout) view2, linearLayout, textView, materialButton, textView2, linearLayout2, loadingButton, textInputLayout); } @@ -197,7 +197,7 @@ public final class q extends AppDialog { } public q() { - super(2131558997); + super(2131558998); } public final p4 g() { diff --git a/app/src/main/java/c/a/a/r.java b/app/src/main/java/c/a/a/r.java index fb53f5997f..54adca9991 100644 --- a/app/src/main/java/c/a/a/r.java +++ b/app/src/main/java/c/a/a/r.java @@ -57,14 +57,14 @@ public final class r extends AppDialog { public i5 invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131365484; - LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131365484); + int i2 = 2131365490; + LoadingButton loadingButton = (LoadingButton) view2.findViewById(2131365490); if (loadingButton != null) { - i2 = 2131365485; - TextView textView = (TextView) view2.findViewById(2131365485); + i2 = 2131365491; + TextView textView = (TextView) view2.findViewById(2131365491); if (textView != null) { - i2 = 2131365486; - TextView textView2 = (TextView) view2.findViewById(2131365486); + i2 = 2131365492; + TextView textView2 = (TextView) view2.findViewById(2131365492); if (textView2 != null) { return new i5((LinearLayout) view2, loadingButton, textView, textView2); } @@ -94,11 +94,11 @@ public final class r extends AppDialog { KProperty[] kPropertyArr = r.i; TextView textView = rVar.g().f107c; m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader"); - textView.setText(rVar.getString(2131893687)); + textView.setText(rVar.getString(2131893727)); TextView textView2 = rVar.g().d; m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText"); - textView2.setText(rVar.getString(2131893686)); - rVar.g().b.setText(rVar.getString(2131891633)); + textView2.setText(rVar.getString(2131893726)); + rVar.g().b.setText(rVar.getString(2131891666)); rVar.g().b.setIsLoading(dVar2.b); rVar.g().b.setOnClickListener(new s(rVar)); return Unit.a; @@ -127,7 +127,7 @@ public final class r extends AppDialog { if (m.areEqual(bVar2, v.b.a.a)) { rVar.dismiss(); } else if (m.areEqual(bVar2, v.b.C0018b.a)) { - c.a.d.o.g(rVar.getContext(), 2131890433, 0, null, 12); + c.a.d.o.g(rVar.getContext(), 2131890463, 0, null, 12); } else { throw new NoWhenBranchMatchedException(); } @@ -152,7 +152,7 @@ public final class r extends AppDialog { } public r() { - super(2131559255); + super(2131559256); e eVar = e.i; h0 h0Var = new h0(this); this.l = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(v.class), new m(1, h0Var), new j0(eVar)); diff --git a/app/src/main/java/c/a/a/y/a.java b/app/src/main/java/c/a/a/y/a.java index 65a84e533b..1f89a3c259 100644 --- a/app/src/main/java/c/a/a/y/a.java +++ b/app/src/main/java/c/a/a/y/a.java @@ -61,26 +61,26 @@ public final class a extends AppDialog { public p invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131363291; - TextView textView = (TextView) view2.findViewById(2131363291); + int i2 = 2131363293; + TextView textView = (TextView) view2.findViewById(2131363293); if (textView != null) { - i2 = 2131363292; - RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363292); + i2 = 2131363294; + RelativeLayout relativeLayout = (RelativeLayout) view2.findViewById(2131363294); if (relativeLayout != null) { - i2 = 2131363294; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363294); + i2 = 2131363296; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131363296); if (materialButton != null) { - i2 = 2131363299; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(2131363299); + i2 = 2131363301; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view2.findViewById(2131363301); if (linkifiedTextView != null) { - i2 = 2131363300; - MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363300); + i2 = 2131363302; + MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131363302); if (materialButton2 != null) { - i2 = 2131363301; - TextView textView2 = (TextView) view2.findViewById(2131363301); + i2 = 2131363303; + TextView textView2 = (TextView) view2.findViewById(2131363303); if (textView2 != null) { - i2 = 2131363302; - ImageView imageView = (ImageView) view2.findViewById(2131363302); + i2 = 2131363304; + ImageView imageView = (ImageView) view2.findViewById(2131363304); if (imageView != null) { return new p((LinearLayout) view2, textView, relativeLayout, materialButton, linkifiedTextView, materialButton2, textView2, imageView); } @@ -160,7 +160,7 @@ public final class a extends AppDialog { KProperty[] kPropertyArr = a.i; MaterialButton materialButton = aVar.g().d; m.checkNotNullExpressionValue(materialButton, "binding.giftEntitlementCopy"); - materialButton.setText(context.getString(2131887619)); + materialButton.setText(context.getString(2131887621)); this.i.g().f137c.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969333, 0, 2, (Object) null)); } } @@ -205,7 +205,7 @@ public final class a extends AppDialog { Pair pair = SubscriptionPlanType.Companion.from(inAppSku.getPaymentGatewaySkuId()).getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131886533, 2131755023) : new Pair(2131886536, 2131755026); int intValue = ((Number) pair.component1()).intValue(); int intValue2 = ((Number) pair.component2()).intValue(); - String string2 = getString(giftingUtils.getTierForSku(inAppSku.getSkuId()) == PremiumTier.TIER_1 ? 2131892261 : 2131892263); + String string2 = getString(giftingUtils.getTierForSku(inAppSku.getSkuId()) == PremiumTier.TIER_1 ? 2131892299 : 2131892301); m.checkNotNullExpressionValue(string2, "getString(\n if (G…ring.premium_tier_2\n )"); TextView textView = g().g; m.checkNotNullExpressionValue(textView, "binding.giftPurchasedDialogSubtext"); diff --git a/app/src/main/java/c/a/a/y/c.java b/app/src/main/java/c/a/a/y/c.java index e496a2c0be..5836869d51 100644 --- a/app/src/main/java/c/a/a/y/c.java +++ b/app/src/main/java/c/a/a/y/c.java @@ -216,14 +216,14 @@ public final class c extends AppDialog { str = ""; } CharSequence i2 = cVar2.i(gift); - LinearLayout linearLayout = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar2.h().h, "binding.acceptGiftHeader", gift.isAnyNitroGift() ? c.a.l.b.j(cVar2, 2131889021, new Object[]{str}, null, 4) : c.a.l.b.j(cVar2, 2131889020, new Object[0], null, 4), cVar2).f177c, "binding.acceptGiftBodyText", gift.isNitroClassicGift() ? c.a.l.b.j(cVar2, 2131889002, new Object[]{i2}, null, 4) : gift.isNitroGift() ? c.a.l.b.j(cVar2, 2131889003, new Object[]{i2}, null, 4) : c.a.l.b.j(cVar2, 2131889001, new Object[]{str}, null, 4), cVar2).e; + LinearLayout linearLayout = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar2.h().h, "binding.acceptGiftHeader", gift.isAnyNitroGift() ? c.a.l.b.j(cVar2, 2131889031, new Object[]{str}, null, 4) : c.a.l.b.j(cVar2, 2131889030, new Object[0], null, 4), cVar2).f177c, "binding.acceptGiftBodyText", gift.isNitroClassicGift() ? c.a.l.b.j(cVar2, 2131889012, new Object[]{i2}, null, 4) : gift.isNitroGift() ? c.a.l.b.j(cVar2, 2131889013, new Object[]{i2}, null, 4) : c.a.l.b.j(cVar2, 2131889011, new Object[]{str}, null, 4), cVar2).e; m.checkNotNullExpressionValue(linearLayout, "binding.acceptGiftDisclaimerContainer"); linearLayout.setVisibility(8); MaterialButton materialButton = cVar2.h().d; m.checkNotNullExpressionValue(materialButton, "binding.acceptGiftConfirm"); Context context = cVar2.getContext(); if (context != null) { - charSequence = context.getText(2131889016); + charSequence = context.getText(2131889026); } materialButton.setText(charSequence); cVar2.h().d.setOnClickListener(new d(cVar2)); @@ -234,16 +234,16 @@ public final class c extends AppDialog { cVar3.g(gift2); TextView textView = cVar3.h().h; m.checkNotNullExpressionValue(textView, "binding.acceptGiftHeader"); - c.a.l.b.n(textView, 2131889019, new Object[0], null, 4); + c.a.l.b.n(textView, 2131889029, new Object[0], null, 4); TextView textView2 = cVar3.h().f177c; m.checkNotNullExpressionValue(textView2, "binding.acceptGiftBodyText"); - c.a.l.b.n(textView2, 2131888986, new Object[0], null, 4); + c.a.l.b.n(textView2, 2131888996, new Object[0], null, 4); LinearLayout linearLayout2 = cVar3.h().e; m.checkNotNullExpressionValue(linearLayout2, "binding.acceptGiftDisclaimerContainer"); linearLayout2.setVisibility(8); MaterialButton materialButton2 = cVar3.h().d; m.checkNotNullExpressionValue(materialButton2, "binding.acceptGiftConfirm"); - c.a.l.b.n(materialButton2, 2131889012, new Object[0], null, 4); + c.a.l.b.n(materialButton2, 2131889022, new Object[0], null, 4); cVar3.h().d.setOnClickListener(new e(cVar3)); } else { c cVar4 = this.this$0; @@ -252,7 +252,7 @@ public final class c extends AppDialog { cVar4.g(gift3); ModelStoreListing storeListing2 = gift3.getStoreListing(); String name = (storeListing2 == null || (sku2 = storeListing2.getSku()) == null) ? null : sku2.getName(); - LinearLayout linearLayout3 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar4.h().h, "binding.acceptGiftHeader", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131889018, new Object[]{name}, null, 4) : c.a.l.b.j(cVar4, 2131889017, new Object[0], null, 4), cVar4).f177c, "binding.acceptGiftBodyText", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131888988, new Object[]{name, cVar4.i(gift3)}, null, 4) : c.a.l.b.j(cVar4, 2131888987, new Object[]{name}, null, 4), cVar4).e; + LinearLayout linearLayout3 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar4.h().h, "binding.acceptGiftHeader", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131889028, new Object[]{name}, null, 4) : c.a.l.b.j(cVar4, 2131889027, new Object[0], null, 4), cVar4).f177c, "binding.acceptGiftBodyText", gift3.isAnyNitroGift() ? c.a.l.b.j(cVar4, 2131888998, new Object[]{name, cVar4.i(gift3)}, null, 4) : c.a.l.b.j(cVar4, 2131888997, new Object[]{name}, null, 4), cVar4).e; m.checkNotNullExpressionValue(linearLayout3, "binding.acceptGiftDisclaimerContainer"); if (!gift3.isAnyNitroGift()) { i = 8; @@ -262,7 +262,7 @@ public final class c extends AppDialog { m.checkNotNullExpressionValue(materialButton3, "binding.acceptGiftConfirm"); Context context2 = cVar4.getContext(); if (context2 != null) { - charSequence = context2.getText(2131889010); + charSequence = context2.getText(2131889020); } materialButton3.setText(charSequence); cVar4.h().d.setOnClickListener(new f(gift3)); @@ -280,7 +280,7 @@ public final class c extends AppDialog { ProgressBar progressBar = cVar5.h().i; m.checkNotNullExpressionValue(progressBar, "binding.acceptGiftProgress"); progressBar.setVisibility(0); - LinearLayout linearLayout4 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar5.h().h, "binding.acceptGiftHeader", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131889018, new Object[]{name2}, null, 4) : c.a.l.b.j(cVar5, 2131889017, new Object[0], null, 4), cVar5).f177c, "binding.acceptGiftBodyText", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131888988, new Object[]{name2, cVar5.i(gift4)}, null, 4) : c.a.l.b.j(cVar5, 2131888987, new Object[]{name2}, null, 4), cVar5).e; + LinearLayout linearLayout4 = c.d.b.a.a.o0(c.d.b.a.a.o0(cVar5.h().h, "binding.acceptGiftHeader", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131889028, new Object[]{name2}, null, 4) : c.a.l.b.j(cVar5, 2131889027, new Object[0], null, 4), cVar5).f177c, "binding.acceptGiftBodyText", gift4.isAnyNitroGift() ? c.a.l.b.j(cVar5, 2131888998, new Object[]{name2, cVar5.i(gift4)}, null, 4) : c.a.l.b.j(cVar5, 2131888997, new Object[]{name2}, null, 4), cVar5).e; m.checkNotNullExpressionValue(linearLayout4, "binding.acceptGiftDisclaimerContainer"); if (!gift4.isAnyNitroGift()) { i = 8; @@ -294,38 +294,38 @@ public final class c extends AppDialog { cVar6.g(redeemedFailed.getGift()); TextView textView3 = cVar6.h().h; m.checkNotNullExpressionValue(textView3, "binding.acceptGiftHeader"); - textView3.setText(c.a.l.b.j(cVar6, 2131889019, new Object[0], null, 4)); + textView3.setText(c.a.l.b.j(cVar6, 2131889029, new Object[0], null, 4)); TextView textView4 = cVar6.h().f177c; m.checkNotNullExpressionValue(textView4, "binding.acceptGiftBodyText"); - c.a.l.b.n(textView4, 2131889008, new Object[0], null, 4); + c.a.l.b.n(textView4, 2131889018, new Object[0], null, 4); if (redeemedFailed.getCanRetry()) { TextView textView5 = cVar6.h().f177c; m.checkNotNullExpressionValue(textView5, "binding.acceptGiftBodyText"); - c.a.l.b.n(textView5, 2131889008, new Object[0], null, 4); + c.a.l.b.n(textView5, 2131889018, new Object[0], null, 4); MaterialButton materialButton5 = cVar6.h().d; m.checkNotNullExpressionValue(materialButton5, "binding.acceptGiftConfirm"); Context context3 = cVar6.getContext(); if (context3 != null) { - charSequence = context3.getText(2131892611); + charSequence = context3.getText(2131892653); } materialButton5.setText(charSequence); cVar6.h().d.setOnClickListener(new f(0, redeemedFailed)); } else { Integer errorCode = redeemedFailed.getErrorCode(); if (errorCode != null && errorCode.intValue() == 50054) { - cVar6.h().f177c.setText(2131888995); + cVar6.h().f177c.setText(2131889005); } else if (errorCode != null && errorCode.intValue() == 100024) { - cVar6.h().f177c.setText(2131888991); + cVar6.h().f177c.setText(2131889001); } else if (errorCode != null && errorCode.intValue() == 100022) { - cVar6.h().f177c.setText(2131888992); + cVar6.h().f177c.setText(2131889002); } else if (errorCode != null && errorCode.intValue() == 100025) { - cVar6.h().f177c.setText(2131888990); + cVar6.h().f177c.setText(2131889000); } MaterialButton materialButton6 = cVar6.h().d; m.checkNotNullExpressionValue(materialButton6, "binding.acceptGiftConfirm"); Context context4 = cVar6.getContext(); if (context4 != null) { - charSequence = context4.getText(2131889012); + charSequence = context4.getText(2131889022); } materialButton6.setText(charSequence); cVar6.h().d.setOnClickListener(new f(1, cVar6)); @@ -386,9 +386,9 @@ public final class c extends AppDialog { } int ordinal = subscriptionPlan.b().ordinal(); if (ordinal == 0) { - i2 = 2131755117; - } else if (ordinal == 1) { i2 = 2131755118; + } else if (ordinal == 1) { + i2 = 2131755119; } else { throw new NoWhenBranchMatchedException(); } @@ -397,10 +397,10 @@ public final class c extends AppDialog { CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, i2, subscriptionPlan.c(), Integer.valueOf(subscriptionPlan.c())); int ordinal2 = subscriptionPlan.b().ordinal(); if (ordinal2 == 0) { - return c.a.l.b.j(this, 2131889022, new Object[]{i18nPluralString}, null, 4); + return c.a.l.b.j(this, 2131889032, new Object[]{i18nPluralString}, null, 4); } if (ordinal2 == 1) { - return c.a.l.b.j(this, 2131889023, new Object[]{i18nPluralString}, null, 4); + return c.a.l.b.j(this, 2131889033, new Object[]{i18nPluralString}, null, 4); } throw new NoWhenBranchMatchedException(); } @@ -434,7 +434,7 @@ public final class c extends AppDialog { } LinkifiedTextView linkifiedTextView = h().f; m.checkNotNullExpressionValue(linkifiedTextView, "binding.acceptGiftDisclaimerText"); - c.a.l.b.n(linkifiedTextView, 2131888989, new Object[]{f.a.a(360055386693L, null)}, null, 4); + c.a.l.b.n(linkifiedTextView, 2131888999, new Object[]{f.a.a(360055386693L, null)}, null, 4); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getGifting().requestGift(string), this, null, 2, null), c.class, (Context) null, (Function1) null, new C0021c(this), (Function0) null, (Function0) null, new d(this), 54, (Object) null); } } diff --git a/app/src/main/java/c/a/d/e.java b/app/src/main/java/c/a/d/e.java index 9f10c0a8b7..fa45f28400 100644 --- a/app/src/main/java/c/a/d/e.java +++ b/app/src/main/java/c/a/d/e.java @@ -23,7 +23,7 @@ public final class e extends o implements Function1 { Exception exc2 = exc; m.checkNotNullParameter(exc2, "e"); AppFragment appFragment = this.this$0.this$0; - o.j(appFragment, b.j(appFragment, 2131894003, new Object[]{exc2.getMessage()}, null, 4), 0, 4); + o.j(appFragment, b.j(appFragment, 2131894042, new Object[]{exc2.getMessage()}, null, 4), 0, 4); return Unit.a; } } diff --git a/app/src/main/java/c/a/d/j.java b/app/src/main/java/c/a/d/j.java index 5f8ef07d86..8ada65000c 100644 --- a/app/src/main/java/c/a/d/j.java +++ b/app/src/main/java/c/a/d/j.java @@ -86,7 +86,7 @@ public final class j implements AppPermissionsRequests { m.checkNotNullParameter(map, "it"); Function0 function0 = this.$onFailure; if (function0 == null || ((Unit) function0.mo1invoke()) == null) { - j.a(this.this$0, 2131891823); + j.a(this.this$0, 2131891860); } return Unit.a; } @@ -127,7 +127,7 @@ public final class j implements AppPermissionsRequests { @Override // kotlin.jvm.functions.Function1 public Unit invoke(Map map) { m.checkNotNullParameter(map, "it"); - j.a(this.this$0, 2131891816); + j.a(this.this$0, 2131891853); return Unit.a; } } @@ -147,7 +147,7 @@ public final class j implements AppPermissionsRequests { @Override // kotlin.jvm.functions.Function1 public Unit invoke(Map map) { m.checkNotNullParameter(map, "it"); - j.a(this.this$0, 2131891817); + j.a(this.this$0, 2131891854); return Unit.a; } } @@ -196,7 +196,7 @@ public final class j implements AppPermissionsRequests { m.checkNotNullParameter(map, "it"); Function0 function0 = this.$onFailure; if (function0 == null || ((Unit) function0.mo1invoke()) == null) { - j.a(this.this$0, 2131891818); + j.a(this.this$0, 2131891855); } return Unit.a; } @@ -223,16 +223,16 @@ public final class j implements AppPermissionsRequests { obj = Boolean.FALSE; } if (!((Boolean) obj).booleanValue()) { - j.a(this.this$0, 2131891818); + j.a(this.this$0, 2131891855); } else { Object obj2 = map2.get("android.permission.CAMERA"); if (obj2 == null) { obj2 = Boolean.FALSE; } if (!((Boolean) obj2).booleanValue()) { - j.a(this.this$0, 2131891340); + j.a(this.this$0, 2131891373); } else { - j.a(this.this$0, 2131891340); + j.a(this.this$0, 2131891373); } } return Unit.a; diff --git a/app/src/main/java/c/a/d/o.java b/app/src/main/java/c/a/d/o.java index 9ff634b311..3a68dc99aa 100644 --- a/app/src/main/java/c/a/d/o.java +++ b/app/src/main/java/c/a/d/o.java @@ -40,7 +40,7 @@ public final class o { public static /* synthetic */ void c(Context context, CharSequence charSequence, int i, int i2) { if ((i2 & 4) != 0) { - i = 2131887620; + i = 2131887622; } a(context, charSequence, i); } diff --git a/app/src/main/java/c/a/d/q0.java b/app/src/main/java/c/a/d/q0.java index 763272f1c4..9880f20573 100644 --- a/app/src/main/java/c/a/d/q0.java +++ b/app/src/main/java/c/a/d/q0.java @@ -21,7 +21,7 @@ public final class q0 extends o implements Function1 { public Unit invoke(Experiment experiment) { Experiment experiment2 = experiment; this.this$0.d = experiment2 != null ? experiment2.getBucket() : -1; - RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1593c; + RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c; boolean z2 = true; if (this.this$0.d < 1) { z2 = false; diff --git a/app/src/main/java/c/a/i/g4.java b/app/src/main/java/c/a/i/g4.java index a26cbe5255..e8849c59de 100644 --- a/app/src/main/java/c/a/i/g4.java +++ b/app/src/main/java/c/a/i/g4.java @@ -23,8 +23,6 @@ public final class g4 implements ViewBinding { public final StickerView e; @NonNull public final ImageView f; - @NonNull - public final ImageView g; public g4(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = linearLayout; @@ -32,8 +30,7 @@ public final class g4 implements ViewBinding { this.f96c = stickerView2; this.d = stickerView3; this.e = stickerView4; - this.f = imageView; - this.g = imageView2; + this.f = imageView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/c/a/i/h1.java b/app/src/main/java/c/a/i/h1.java index 5a2de0e2e7..45c1c66a8e 100644 --- a/app/src/main/java/c/a/i/h1.java +++ b/app/src/main/java/c/a/i/h1.java @@ -1,8 +1,6 @@ package c.a.i; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.viewbinding.ViewBinding; @@ -28,25 +26,6 @@ public final class h1 implements ViewBinding { this.d = imageView; } - @NonNull - public static h1 a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) { - layoutInflater.inflate(2131558673, viewGroup); - int i = 2131365106; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131365106); - if (simpleDraweeView != null) { - i = 2131365107; - RLottieImageView rLottieImageView = (RLottieImageView) viewGroup.findViewById(2131365107); - if (rLottieImageView != null) { - i = 2131365108; - ImageView imageView = (ImageView) viewGroup.findViewById(2131365108); - if (imageView != null) { - return new h1(viewGroup, simpleDraweeView, rLottieImageView, imageView); - } - } - } - throw new NullPointerException("Missing required view with ID: ".concat(viewGroup.getResources().getResourceName(i))); - } - @Override // androidx.viewbinding.ViewBinding @NonNull public View getRoot() { diff --git a/app/src/main/java/c/a/i/i0.java b/app/src/main/java/c/a/i/i0.java index d4d8e641b3..d9e2295f25 100644 --- a/app/src/main/java/c/a/i/i0.java +++ b/app/src/main/java/c/a/i/i0.java @@ -27,23 +27,23 @@ public final class i0 implements ViewBinding { @NonNull public static i0 a(@NonNull View view) { - int i = 2131363528; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363528); + int i = 2131363530; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363530); if (simpleDraweeView != null) { - i = 2131363529; - ImageView imageView = (ImageView) view.findViewById(2131363529); + i = 2131363531; + ImageView imageView = (ImageView) view.findViewById(2131363531); if (imageView != null) { - i = 2131363530; - ImageView imageView2 = (ImageView) view.findViewById(2131363530); + i = 2131363532; + ImageView imageView2 = (ImageView) view.findViewById(2131363532); if (imageView2 != null) { - i = 2131363531; - TextView textView = (TextView) view.findViewById(2131363531); + i = 2131363533; + TextView textView = (TextView) view.findViewById(2131363533); if (textView != null) { - i = 2131363532; - ImageView imageView3 = (ImageView) view.findViewById(2131363532); + i = 2131363534; + ImageView imageView3 = (ImageView) view.findViewById(2131363534); if (imageView3 != null) { - i = 2131364219; - Group group = (Group) view.findViewById(2131364219); + i = 2131364221; + Group group = (Group) view.findViewById(2131364221); if (group != null) { return new i0((ConstraintLayout) view, simpleDraweeView, imageView, imageView2, textView, imageView3, group); } diff --git a/app/src/main/java/c/a/i/i1.java b/app/src/main/java/c/a/i/i1.java index 019e425c2b..0ee8080a28 100644 --- a/app/src/main/java/c/a/i/i1.java +++ b/app/src/main/java/c/a/i/i1.java @@ -30,17 +30,17 @@ public final class i1 implements ViewBinding { @NonNull public static i1 a(@NonNull View view) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - int i = 2131365231; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365231); + int i = 2131365235; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365235); if (materialButton != null) { - i = 2131365232; - TextView textView = (TextView) view.findViewById(2131365232); + i = 2131365236; + TextView textView = (TextView) view.findViewById(2131365236); if (textView != null) { - i = 2131365233; - TextView textView2 = (TextView) view.findViewById(2131365233); + i = 2131365237; + TextView textView2 = (TextView) view.findViewById(2131365237); if (textView2 != null) { - i = 2131365257; - ImageView imageView = (ImageView) view.findViewById(2131365257); + i = 2131365261; + ImageView imageView = (ImageView) view.findViewById(2131365261); if (imageView != null) { return new i1(constraintLayout, constraintLayout, materialButton, textView, textView2, imageView); } diff --git a/app/src/main/java/c/a/i/i3.java b/app/src/main/java/c/a/i/i3.java index c7d7014492..f8aed83b84 100644 --- a/app/src/main/java/c/a/i/i3.java +++ b/app/src/main/java/c/a/i/i3.java @@ -22,18 +22,21 @@ public final class i3 implements ViewBinding { @NonNull public final ImageView e; @NonNull - public final TextView f; + public final ImageView f; @NonNull - public final SpeakerPulseView g; + public final TextView g; + @NonNull + public final SpeakerPulseView h; - public i3(@NonNull View view, @NonNull VoiceUserView voiceUserView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull TextView textView, @NonNull SpeakerPulseView speakerPulseView) { + public i3(@NonNull View view, @NonNull VoiceUserView voiceUserView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull TextView textView, @NonNull SpeakerPulseView speakerPulseView) { this.a = view; this.b = voiceUserView; this.f105c = imageView; this.d = imageView2; this.e = imageView3; - this.f = textView; - this.g = speakerPulseView; + this.f = imageView4; + this.g = textView; + this.h = speakerPulseView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/c/a/i/j5.java b/app/src/main/java/c/a/i/j5.java index 9bf952d3f0..a5f30e13bd 100644 --- a/app/src/main/java/c/a/i/j5.java +++ b/app/src/main/java/c/a/i/j5.java @@ -25,11 +25,11 @@ public final class j5 implements ViewBinding { @NonNull public static j5 a(@NonNull View view) { - int i = 2131365385; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365385); + int i = 2131365390; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365390); if (simpleDraweeView != null) { - i = 2131365386; - TextView textView = (TextView) view.findViewById(2131365386); + i = 2131365391; + TextView textView = (TextView) view.findViewById(2131365391); if (textView != null) { return new j5((RelativeLayout) view, simpleDraweeView, textView); } diff --git a/app/src/main/java/c/a/i/k4.java b/app/src/main/java/c/a/i/k4.java index ebc786e77e..50189808d6 100644 --- a/app/src/main/java/c/a/i/k4.java +++ b/app/src/main/java/c/a/i/k4.java @@ -33,11 +33,11 @@ public final class k4 implements ViewBinding { i = 2131361885; View findViewById = view.findViewById(2131361885); if (findViewById != null) { - int i2 = 2131365488; - ImageView imageView = (ImageView) findViewById.findViewById(2131365488); + int i2 = 2131365494; + ImageView imageView = (ImageView) findViewById.findViewById(2131365494); if (imageView != null) { - i2 = 2131365489; - TextView textView = (TextView) findViewById.findViewById(2131365489); + i2 = 2131365495; + TextView textView = (TextView) findViewById.findViewById(2131365495); if (textView != null) { return new k4((ActionRowComponentView) view, flexboxLayout, new a2((ConstraintLayout) findViewById, imageView, textView)); } diff --git a/app/src/main/java/c/a/i/k5.java b/app/src/main/java/c/a/i/k5.java index a6dc257c64..6d275dddef 100644 --- a/app/src/main/java/c/a/i/k5.java +++ b/app/src/main/java/c/a/i/k5.java @@ -55,45 +55,45 @@ public final class k5 implements ViewBinding { @NonNull public static k5 a(@NonNull LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, boolean z2) { - View inflate = layoutInflater.inflate(2131559272, viewGroup, false); + View inflate = layoutInflater.inflate(2131559273, viewGroup, false); if (z2) { viewGroup.addView(inflate); } int i = 2131362092; Barrier barrier = (Barrier) inflate.findViewById(2131362092); if (barrier != null) { - i = 2131363538; - Space space = (Space) inflate.findViewById(2131363538); + i = 2131363540; + Space space = (Space) inflate.findViewById(2131363540); if (space != null) { - i = 2131364435; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364435); + i = 2131364438; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364438); if (linearLayout != null) { - i = 2131364436; - TextView textView = (TextView) inflate.findViewById(2131364436); + i = 2131364439; + TextView textView = (TextView) inflate.findViewById(2131364439); if (textView != null) { - i = 2131364437; - TextView textView2 = (TextView) inflate.findViewById(2131364437); + i = 2131364440; + TextView textView2 = (TextView) inflate.findViewById(2131364440); if (textView2 != null) { - i = 2131364438; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364438); + i = 2131364441; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364441); if (simpleDraweeView != null) { - i = 2131364441; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364441); + i = 2131364444; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364444); if (simpleDraweeView2 != null) { - i = 2131364445; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364445); + i = 2131364448; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364448); if (materialButton != null) { - i = 2131364446; - MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364446); + i = 2131364449; + MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364449); if (materialButton2 != null) { - i = 2131364448; - TextView textView3 = (TextView) inflate.findViewById(2131364448); + i = 2131364451; + TextView textView3 = (TextView) inflate.findViewById(2131364451); if (textView3 != null) { - i = 2131364449; - TextView textView4 = (TextView) inflate.findViewById(2131364449); + i = 2131364452; + TextView textView4 = (TextView) inflate.findViewById(2131364452); if (textView4 != null) { - i = 2131364450; - TextView textView5 = (TextView) inflate.findViewById(2131364450); + i = 2131364453; + TextView textView5 = (TextView) inflate.findViewById(2131364453); if (textView5 != null) { return new k5((LinearLayout) inflate, barrier, space, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, materialButton, materialButton2, textView3, textView4, textView5); } diff --git a/app/src/main/java/c/a/i/l4.java b/app/src/main/java/c/a/i/l4.java index 5607982781..6400cba868 100644 --- a/app/src/main/java/c/a/i/l4.java +++ b/app/src/main/java/c/a/i/l4.java @@ -37,20 +37,20 @@ public final class l4 implements ViewBinding { @NonNull public static l4 a(@NonNull View view) { - int i = 2131364562; - ImageView imageView = (ImageView) view.findViewById(2131364562); + int i = 2131364565; + ImageView imageView = (ImageView) view.findViewById(2131364565); if (imageView != null) { - i = 2131364563; - TypingDots typingDots = (TypingDots) view.findViewById(2131364563); + i = 2131364566; + TypingDots typingDots = (TypingDots) view.findViewById(2131364566); if (typingDots != null) { - i = 2131364564; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364564); + i = 2131364567; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364567); if (simpleDraweeView != null) { - i = 2131364565; - MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364565); + i = 2131364568; + MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364568); if (materialTextView != null) { - i = 2131364566; - FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131364566); + i = 2131364569; + FlexboxLayout flexboxLayout = (FlexboxLayout) view.findViewById(2131364569); if (flexboxLayout != null) { return new l4((SelectComponentView) view, imageView, typingDots, simpleDraweeView, materialTextView, flexboxLayout); } diff --git a/app/src/main/java/c/a/i/o2.java b/app/src/main/java/c/a/i/o2.java index 4f059379e6..a398297ec2 100644 --- a/app/src/main/java/c/a/i/o2.java +++ b/app/src/main/java/c/a/i/o2.java @@ -17,12 +17,15 @@ public final class o2 implements ViewBinding { public final TextView f134c; @NonNull public final TextView d; + @NonNull + public final TextView e; - public o2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { + public o2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = linearLayout; this.b = textView; this.f134c = textView2; this.d = textView3; + this.e = textView4; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/c/a/i/p2.java b/app/src/main/java/c/a/i/p2.java index 8bc25702c0..4d88c77094 100644 --- a/app/src/main/java/c/a/i/p2.java +++ b/app/src/main/java/c/a/i/p2.java @@ -23,14 +23,17 @@ public final class p2 implements ViewBinding { public final TextView e; @NonNull public final MaterialButton f; + @NonNull + public final TextView g; - public p2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView2, @NonNull MaterialButton materialButton) { + public p2(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView2, @NonNull MaterialButton materialButton, @NonNull TextView textView5) { this.a = linearLayout; this.b = textView; this.f138c = textView2; this.d = textView3; this.e = textView4; this.f = materialButton; + this.g = textView5; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/c/a/i/q3.java b/app/src/main/java/c/a/i/q3.java index 384ab57894..1dc9e89206 100644 --- a/app/src/main/java/c/a/i/q3.java +++ b/app/src/main/java/c/a/i/q3.java @@ -28,14 +28,14 @@ public final class q3 implements ViewBinding { @NonNull public static q3 a(@NonNull View view) { - int i = 2131365455; - ImageView imageView = (ImageView) view.findViewById(2131365455); + int i = 2131365461; + ImageView imageView = (ImageView) view.findViewById(2131365461); if (imageView != null) { - i = 2131365456; - TextView textView = (TextView) view.findViewById(2131365456); + i = 2131365462; + TextView textView = (TextView) view.findViewById(2131365462); if (textView != null) { - i = 2131365457; - TextView textView2 = (TextView) view.findViewById(2131365457); + i = 2131365463; + TextView textView2 = (TextView) view.findViewById(2131365463); if (textView2 != null) { LinearLayout linearLayout = (LinearLayout) view; return new q3(linearLayout, imageView, textView, textView2, linearLayout); diff --git a/app/src/main/java/c/a/i/r0.java b/app/src/main/java/c/a/i/r0.java index 17d23ddd97..0e2af8d23c 100644 --- a/app/src/main/java/c/a/i/r0.java +++ b/app/src/main/java/c/a/i/r0.java @@ -47,17 +47,17 @@ public final class r0 implements ViewBinding { ImageView imageView = (ImageView) inflate.findViewById(2131362631); if (imageView != null) { CardView cardView = (CardView) inflate; - i = 2131363031; - TextView textView = (TextView) inflate.findViewById(2131363031); + i = 2131363033; + TextView textView = (TextView) inflate.findViewById(2131363033); if (textView != null) { - i = 2131364112; - TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131364112); + i = 2131364114; + TextInputLayout textInputLayout = (TextInputLayout) inflate.findViewById(2131364114); if (textInputLayout != null) { - i = 2131364430; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364430); + i = 2131364433; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364433); if (recyclerView != null) { - i = 2131365197; - TextView textView2 = (TextView) inflate.findViewById(2131365197); + i = 2131365201; + TextView textView2 = (TextView) inflate.findViewById(2131365201); if (textView2 != null) { return new r0(cardView, imageView, cardView, textView, textInputLayout, recyclerView, textView2); } diff --git a/app/src/main/java/c/a/l/b.java b/app/src/main/java/c/a/l/b.java index c7b8f8d3f6..6d6d330ac0 100644 --- a/app/src/main/java/c/a/l/b.java +++ b/app/src/main/java/c/a/l/b.java @@ -209,7 +209,7 @@ public final class b { m.checkNotNullParameter(objArr, "formatArgs"); m.checkNotNullParameter(renderContext, "renderContext"); Map map = renderContext.a; - List list = renderContext.f2010c; + List list = renderContext.f2012c; boolean z2 = true; if (!map.isEmpty()) { charSequence = a.replace(charSequence, new f(map)); diff --git a/app/src/main/java/c/a/l/f/c.java b/app/src/main/java/c/a/l/f/c.java index 7be1965637..1e413c38fe 100644 --- a/app/src/main/java/c/a/l/f/c.java +++ b/app/src/main/java/c/a/l/f/c.java @@ -38,7 +38,7 @@ public final class c extends Node.a { spannableStringBuilder.setSpan(obj2, length, spannableStringBuilder.length(), 33); } } - Hook.a aVar2 = hook != null ? hook.f2009c : null; + Hook.a aVar2 = hook != null ? hook.f2011c : null; if (aVar2 != null) { aVar = aVar2; } else if (URLUtil.isValidUrl(this.a)) { diff --git a/app/src/main/java/c/a/n/a/a0.java b/app/src/main/java/c/a/n/a/a0.java index 81296fb5df..5e0ce29210 100644 --- a/app/src/main/java/c/a/n/a/a0.java +++ b/app/src/main/java/c/a/n/a/a0.java @@ -1,8 +1,7 @@ package c.a.n.a; -import com.discord.api.guildmember.GuildMember; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.experiments.dto.UserExperimentDto; /* compiled from: lambda */ public final /* synthetic */ class a0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class a0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (GuildMember) InboundGatewayGsonParser.fromJson(this.a, GuildMember.class); + return UserExperimentDto.Parser.parse(this.a); } } diff --git a/app/src/main/java/c/a/n/a/b0.java b/app/src/main/java/c/a/n/a/b0.java index 35135360fa..a873db1ca9 100644 --- a/app/src/main/java/c/a/n/a/b0.java +++ b/app/src/main/java/c/a/n/a/b0.java @@ -1,6 +1,6 @@ package c.a.n.a; -import com.discord.api.presence.Presence; +import com.discord.api.channel.Channel; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; /* compiled from: lambda */ @@ -13,6 +13,6 @@ public final /* synthetic */ class b0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Presence) InboundGatewayGsonParser.fromJson(this.a, Presence.class); + return (Channel) InboundGatewayGsonParser.fromJson(this.a, Channel.class); } } diff --git a/app/src/main/java/c/a/n/a/c0.java b/app/src/main/java/c/a/n/a/c0.java index 7f52c538a2..dd63ed7a82 100644 --- a/app/src/main/java/c/a/n/a/c0.java +++ b/app/src/main/java/c/a/n/a/c0.java @@ -1,7 +1,8 @@ package c.a.n.a; +import com.discord.api.activity.Activity; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelConnectedAccount; /* compiled from: lambda */ public final /* synthetic */ class c0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class c0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelConnectedAccount) this.a.parse(new ModelConnectedAccount()); + return (Activity) InboundGatewayGsonParser.fromJson(this.a, Activity.class); } } diff --git a/app/src/main/java/c/a/n/a/d0.java b/app/src/main/java/c/a/n/a/d0.java index bb7521615f..b6f96d0554 100644 --- a/app/src/main/java/c/a/n/a/d0.java +++ b/app/src/main/java/c/a/n/a/d0.java @@ -1,8 +1,7 @@ package c.a.n.a; -import com.discord.api.user.User; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelUserProfile; /* compiled from: lambda */ public final /* synthetic */ class d0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class d0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (User) InboundGatewayGsonParser.fromJson(this.a, User.class); + return (ModelUserProfile.GuildReference) this.a.parse(new ModelUserProfile.GuildReference()); } } diff --git a/app/src/main/java/c/a/n/a/e0.java b/app/src/main/java/c/a/n/a/e0.java index 38c3456035..21c9248542 100644 --- a/app/src/main/java/c/a/n/a/e0.java +++ b/app/src/main/java/c/a/n/a/e0.java @@ -1,7 +1,7 @@ package c.a.n.a; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelUserRelationship; +import com.discord.models.domain.ModelConnectedAccount; /* compiled from: lambda */ public final /* synthetic */ class e0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +12,6 @@ public final /* synthetic */ class e0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelUserRelationship) this.a.parse(new ModelUserRelationship()); + return (ModelConnectedAccount) this.a.parse(new ModelConnectedAccount()); } } diff --git a/app/src/main/java/c/a/n/a/f0.java b/app/src/main/java/c/a/n/a/f0.java index c6879e84f5..8cf075c275 100644 --- a/app/src/main/java/c/a/n/a/f0.java +++ b/app/src/main/java/c/a/n/a/f0.java @@ -1,8 +1,8 @@ package c.a.n.a; -import com.discord.api.guildjoinrequest.GuildJoinRequest; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelGuildFolder; +import com.discord.models.domain.ModelUserSettings; /* compiled from: lambda */ public final /* synthetic */ class f0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +13,8 @@ public final /* synthetic */ class f0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (GuildJoinRequest) InboundGatewayGsonParser.fromJson(this.a, GuildJoinRequest.class); + Model.JsonReader jsonReader = this.a; + int i = ModelUserSettings.EXPLICIT_CONTENT_FILTER_DISABLED; + return ModelGuildFolder.Parser.INSTANCE.parse(jsonReader); } } diff --git a/app/src/main/java/c/a/n/a/g0.java b/app/src/main/java/c/a/n/a/g0.java index 5d8dadc575..800ba64aa8 100644 --- a/app/src/main/java/c/a/n/a/g0.java +++ b/app/src/main/java/c/a/n/a/g0.java @@ -1,17 +1,13 @@ package c.a.n.a; import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.GuildExperimentDto; +import com.discord.models.domain.ModelUserProfile; /* compiled from: lambda */ -public final /* synthetic */ class g0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; +public final /* synthetic */ class g0 implements Model.JsonReader.KeySelector { + public static final /* synthetic */ g0 a = new g0(); - public /* synthetic */ g0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return GuildExperimentDto.Parser.parse(this.a); + @Override // com.discord.models.domain.Model.JsonReader.KeySelector + public final Object get(Object obj) { + return Long.valueOf(((ModelUserProfile.GuildReference) obj).getGuildId()); } } diff --git a/app/src/main/java/c/a/n/a/h0.java b/app/src/main/java/c/a/n/a/h0.java index 92352dd256..d6d74d1788 100644 --- a/app/src/main/java/c/a/n/a/h0.java +++ b/app/src/main/java/c/a/n/a/h0.java @@ -1,17 +1,13 @@ package c.a.n.a; -import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.UserExperimentDto; +import java.util.HashMap; +import rx.functions.Func0; /* compiled from: lambda */ -public final /* synthetic */ class h0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; +public final /* synthetic */ class h0 implements Func0 { + public static final /* synthetic */ h0 i = new h0(); - public /* synthetic */ h0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return UserExperimentDto.Parser.parse(this.a); + @Override // rx.functions.Func0, java.util.concurrent.Callable + public final Object call() { + return new HashMap(); } } diff --git a/app/src/main/java/c/a/n/a/i0.java b/app/src/main/java/c/a/n/a/i0.java index 56136ebe29..c5eccd7bb1 100644 --- a/app/src/main/java/c/a/n/a/i0.java +++ b/app/src/main/java/c/a/n/a/i0.java @@ -1,18 +1,13 @@ package c.a.n.a; -import com.discord.api.channel.Channel; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.experiments.dto.UserExperimentDto; /* compiled from: lambda */ -public final /* synthetic */ class i0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; +public final /* synthetic */ class i0 implements Model.JsonReader.KeySelector { + public static final /* synthetic */ i0 a = new i0(); - public /* synthetic */ i0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return (Channel) InboundGatewayGsonParser.fromJson(this.a, Channel.class); + @Override // com.discord.models.domain.Model.JsonReader.KeySelector + public final Object get(Object obj) { + return Long.valueOf(((UserExperimentDto) obj).getNameHash()); } } diff --git a/app/src/main/java/c/a/n/a/j0.java b/app/src/main/java/c/a/n/a/j0.java index acf481ff7f..7e30aef2e8 100644 --- a/app/src/main/java/c/a/n/a/j0.java +++ b/app/src/main/java/c/a/n/a/j0.java @@ -1,7 +1,5 @@ package c.a.n.a; -import com.discord.api.activity.Activity; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; /* compiled from: lambda */ public final /* synthetic */ class j0 implements Model.JsonReader.ItemFactory { @@ -13,6 +11,6 @@ public final /* synthetic */ class j0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Activity) InboundGatewayGsonParser.fromJson(this.a, Activity.class); + return this.a.nextStringOrNull(); } } diff --git a/app/src/main/java/c/a/n/a/k.java b/app/src/main/java/c/a/n/a/k.java index cd4d78038a..3a32c8e563 100644 --- a/app/src/main/java/c/a/n/a/k.java +++ b/app/src/main/java/c/a/n/a/k.java @@ -1,9 +1,7 @@ package c.a.n.a; -import com.discord.api.botuikit.Component; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; +import com.discord.models.domain.ModelNotificationSettings; /* compiled from: lambda */ public final /* synthetic */ class k implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -14,8 +12,6 @@ public final /* synthetic */ class k implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return (Component) InboundGatewayGsonParser.fromJson(jsonReader.in, Component.class); + return (ModelNotificationSettings.ChannelOverride) this.a.parse(new ModelNotificationSettings.ChannelOverride()); } } diff --git a/app/src/main/java/c/a/n/a/k0.java b/app/src/main/java/c/a/n/a/k0.java deleted file mode 100644 index 351e8da873..0000000000 --- a/app/src/main/java/c/a/n/a/k0.java +++ /dev/null @@ -1,17 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.Model; -import com.discord.models.domain.ModelUserProfile; -/* compiled from: lambda */ -public final /* synthetic */ class k0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; - - public /* synthetic */ k0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return (ModelUserProfile.GuildReference) this.a.parse(new ModelUserProfile.GuildReference()); - } -} diff --git a/app/src/main/java/c/a/n/a/t0/a.java b/app/src/main/java/c/a/n/a/k0/a.java similarity index 96% rename from app/src/main/java/c/a/n/a/t0/a.java rename to app/src/main/java/c/a/n/a/k0/a.java index e48589d15d..def0fd7df4 100644 --- a/app/src/main/java/c/a/n/a/t0/a.java +++ b/app/src/main/java/c/a/n/a/k0/a.java @@ -1,4 +1,4 @@ -package c.a.n.a.t0; +package c.a.n.a.k0; import com.discord.models.domain.Model; import com.discord.models.domain.emoji.ModelEmojiUnicode; diff --git a/app/src/main/java/c/a/n/a/t0/b.java b/app/src/main/java/c/a/n/a/k0/b.java similarity index 96% rename from app/src/main/java/c/a/n/a/t0/b.java rename to app/src/main/java/c/a/n/a/k0/b.java index 9a3cac69b5..0986d189a6 100644 --- a/app/src/main/java/c/a/n/a/t0/b.java +++ b/app/src/main/java/c/a/n/a/k0/b.java @@ -1,4 +1,4 @@ -package c.a.n.a.t0; +package c.a.n.a.k0; import com.discord.models.domain.Model; import com.discord.models.domain.emoji.ModelEmojiUnicode; diff --git a/app/src/main/java/c/a/n/a/t0/c.java b/app/src/main/java/c/a/n/a/k0/c.java similarity index 97% rename from app/src/main/java/c/a/n/a/t0/c.java rename to app/src/main/java/c/a/n/a/k0/c.java index bb948bb7b6..eb8c591597 100644 --- a/app/src/main/java/c/a/n/a/t0/c.java +++ b/app/src/main/java/c/a/n/a/k0/c.java @@ -1,4 +1,4 @@ -package c.a.n.a.t0; +package c.a.n.a.k0; import android.os.Parcelable; import com.discord.models.domain.Model; diff --git a/app/src/main/java/c/a/n/a/l.java b/app/src/main/java/c/a/n/a/l.java index cf3eab1ec0..6abfd8c34b 100644 --- a/app/src/main/java/c/a/n/a/l.java +++ b/app/src/main/java/c/a/n/a/l.java @@ -1,9 +1,8 @@ package c.a.n.a; -import com.discord.api.sticker.Sticker; +import com.discord.api.guild.Guild; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; /* compiled from: lambda */ public final /* synthetic */ class l implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -14,8 +13,6 @@ public final /* synthetic */ class l implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return (Sticker) InboundGatewayGsonParser.fromJson(jsonReader, Sticker.class); + return (Guild) InboundGatewayGsonParser.fromJson(this.a, Guild.class); } } diff --git a/app/src/main/java/c/a/n/a/l0.java b/app/src/main/java/c/a/n/a/l0.java deleted file mode 100644 index 94d998359b..0000000000 --- a/app/src/main/java/c/a/n/a/l0.java +++ /dev/null @@ -1,17 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.Model; -import com.discord.models.domain.ModelConnectedAccount; -/* compiled from: lambda */ -public final /* synthetic */ class l0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; - - public /* synthetic */ l0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return (ModelConnectedAccount) this.a.parse(new ModelConnectedAccount()); - } -} diff --git a/app/src/main/java/c/a/n/a/m.java b/app/src/main/java/c/a/n/a/m.java index 5577917753..6e31d46678 100644 --- a/app/src/main/java/c/a/n/a/m.java +++ b/app/src/main/java/c/a/n/a/m.java @@ -1,9 +1,7 @@ package c.a.n.a; -import com.discord.api.message.reaction.MessageReaction; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; +import com.discord.models.domain.ModelSession; /* compiled from: lambda */ public final /* synthetic */ class m implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -14,8 +12,6 @@ public final /* synthetic */ class m implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return (MessageReaction) InboundGatewayGsonParser.fromJson(jsonReader, MessageReaction.class); + return (ModelSession) this.a.parse(new ModelSession()); } } diff --git a/app/src/main/java/c/a/n/a/m0.java b/app/src/main/java/c/a/n/a/m0.java deleted file mode 100644 index aa443c55f6..0000000000 --- a/app/src/main/java/c/a/n/a/m0.java +++ /dev/null @@ -1,20 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.Model; -import com.discord.models.domain.ModelGuildFolder; -import com.discord.models.domain.ModelUserSettings; -/* compiled from: lambda */ -public final /* synthetic */ class m0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; - - public /* synthetic */ m0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - Model.JsonReader jsonReader = this.a; - int i = ModelUserSettings.EXPLICIT_CONTENT_FILTER_DISABLED; - return ModelGuildFolder.Parser.INSTANCE.parse(jsonReader); - } -} diff --git a/app/src/main/java/c/a/n/a/n.java b/app/src/main/java/c/a/n/a/n.java index bc598c7e8d..9d12f0bdbd 100644 --- a/app/src/main/java/c/a/n/a/n.java +++ b/app/src/main/java/c/a/n/a/n.java @@ -1,9 +1,6 @@ package c.a.n.a; -import com.discord.api.message.attachment.MessageAttachment; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; /* compiled from: lambda */ public final /* synthetic */ class n implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -14,8 +11,6 @@ public final /* synthetic */ class n implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return (MessageAttachment) InboundGatewayGsonParser.fromJson(jsonReader, MessageAttachment.class); + return this.a.nextString(null); } } diff --git a/app/src/main/java/c/a/n/a/n0.java b/app/src/main/java/c/a/n/a/n0.java deleted file mode 100644 index 4fa0d59696..0000000000 --- a/app/src/main/java/c/a/n/a/n0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.Model; -import com.discord.models.domain.ModelUserProfile; -/* compiled from: lambda */ -public final /* synthetic */ class n0 implements Model.JsonReader.KeySelector { - public static final /* synthetic */ n0 a = new n0(); - - @Override // com.discord.models.domain.Model.JsonReader.KeySelector - public final Object get(Object obj) { - return Long.valueOf(((ModelUserProfile.GuildReference) obj).getGuildId()); - } -} diff --git a/app/src/main/java/c/a/n/a/o.java b/app/src/main/java/c/a/n/a/o.java index bc138952eb..9bc7bfd913 100644 --- a/app/src/main/java/c/a/n/a/o.java +++ b/app/src/main/java/c/a/n/a/o.java @@ -1,15 +1,18 @@ package c.a.n.a; -import com.discord.api.message.reaction.MessageReaction; +import com.discord.api.presence.Presence; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; /* compiled from: lambda */ -public final /* synthetic */ class o implements Model.JsonReader.KeySelector { - public static final /* synthetic */ o a = new o(); +public final /* synthetic */ class o implements Model.JsonReader.ItemFactory { + public final /* synthetic */ Model.JsonReader a; - @Override // com.discord.models.domain.Model.JsonReader.KeySelector - public final Object get(Object obj) { - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return ((MessageReaction) obj).b().c(); + public /* synthetic */ o(Model.JsonReader jsonReader) { + this.a = jsonReader; + } + + @Override // com.discord.models.domain.Model.JsonReader.ItemFactory + public final Object get() { + return (Presence) InboundGatewayGsonParser.fromJson(this.a, Presence.class); } } diff --git a/app/src/main/java/c/a/n/a/o0.java b/app/src/main/java/c/a/n/a/o0.java deleted file mode 100644 index 753a8d2771..0000000000 --- a/app/src/main/java/c/a/n/a/o0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.n.a; - -import java.util.HashMap; -import rx.functions.Func0; -/* compiled from: lambda */ -public final /* synthetic */ class o0 implements Func0 { - public static final /* synthetic */ o0 i = new o0(); - - @Override // rx.functions.Func0, java.util.concurrent.Callable - public final Object call() { - return new HashMap(); - } -} diff --git a/app/src/main/java/c/a/n/a/p.java b/app/src/main/java/c/a/n/a/p.java index 65df0ecda0..ecea8a8575 100644 --- a/app/src/main/java/c/a/n/a/p.java +++ b/app/src/main/java/c/a/n/a/p.java @@ -1,9 +1,8 @@ package c.a.n.a; -import com.discord.api.user.User; +import com.discord.api.presence.Presence; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; /* compiled from: lambda */ public final /* synthetic */ class p implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -14,8 +13,6 @@ public final /* synthetic */ class p implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class); + return (Presence) InboundGatewayGsonParser.fromJson(this.a, Presence.class); } } diff --git a/app/src/main/java/c/a/n/a/p0.java b/app/src/main/java/c/a/n/a/p0.java deleted file mode 100644 index d59ae92a91..0000000000 --- a/app/src/main/java/c/a/n/a/p0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.UserExperimentDto; -/* compiled from: lambda */ -public final /* synthetic */ class p0 implements Model.JsonReader.KeySelector { - public static final /* synthetic */ p0 a = new p0(); - - @Override // com.discord.models.domain.Model.JsonReader.KeySelector - public final Object get(Object obj) { - return Long.valueOf(((UserExperimentDto) obj).getNameHash()); - } -} diff --git a/app/src/main/java/c/a/n/a/q.java b/app/src/main/java/c/a/n/a/q.java index 51ead2ac53..9a60f89b45 100644 --- a/app/src/main/java/c/a/n/a/q.java +++ b/app/src/main/java/c/a/n/a/q.java @@ -1,9 +1,6 @@ package c.a.n.a; -import com.discord.api.message.embed.MessageEmbed; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; /* compiled from: lambda */ public final /* synthetic */ class q implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -15,7 +12,6 @@ public final /* synthetic */ class q implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { Model.JsonReader jsonReader = this.a; - int i = ModelMessage.TYPE_LOCAL_APPLICATION_COMMAND; - return (MessageEmbed) InboundGatewayGsonParser.fromJson(jsonReader, MessageEmbed.class); + return jsonReader.nextList(new p(jsonReader)); } } diff --git a/app/src/main/java/c/a/n/a/q0.java b/app/src/main/java/c/a/n/a/q0.java deleted file mode 100644 index c94402c671..0000000000 --- a/app/src/main/java/c/a/n/a/q0.java +++ /dev/null @@ -1,16 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.Model; -/* compiled from: lambda */ -public final /* synthetic */ class q0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; - - public /* synthetic */ q0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return this.a.nextStringOrNull(); - } -} diff --git a/app/src/main/java/c/a/n/a/r.java b/app/src/main/java/c/a/n/a/r.java index b485a6be09..42d4740ca8 100644 --- a/app/src/main/java/c/a/n/a/r.java +++ b/app/src/main/java/c/a/n/a/r.java @@ -1,7 +1,6 @@ package c.a.n.a; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelNotificationSettings; /* compiled from: lambda */ public final /* synthetic */ class r implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +11,7 @@ public final /* synthetic */ class r implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelNotificationSettings.ChannelOverride) this.a.parse(new ModelNotificationSettings.ChannelOverride()); + Model.JsonReader jsonReader = this.a; + return jsonReader.nextList(new t(jsonReader)); } } diff --git a/app/src/main/java/c/a/n/a/r0.java b/app/src/main/java/c/a/n/a/r0.java deleted file mode 100644 index 94d2e0a40e..0000000000 --- a/app/src/main/java/c/a/n/a/r0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.n.a; - -import java.util.LinkedHashMap; -import rx.functions.Func0; -/* compiled from: lambda */ -public final /* synthetic */ class r0 implements Func0 { - public static final /* synthetic */ r0 i = new r0(); - - @Override // rx.functions.Func0, java.util.concurrent.Callable - public final Object call() { - return new LinkedHashMap(); - } -} diff --git a/app/src/main/java/c/a/n/a/s.java b/app/src/main/java/c/a/n/a/s.java index 0cc556db22..f7327b7f94 100644 --- a/app/src/main/java/c/a/n/a/s.java +++ b/app/src/main/java/c/a/n/a/s.java @@ -1,18 +1,19 @@ package c.a.n.a; -import com.discord.api.guild.Guild; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelPayload; /* compiled from: lambda */ public final /* synthetic */ class s implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; + public final /* synthetic */ ModelPayload.VersionedModel a; + public final /* synthetic */ Model.JsonReader b; - public /* synthetic */ s(Model.JsonReader jsonReader) { - this.a = jsonReader; + public /* synthetic */ s(ModelPayload.VersionedModel versionedModel, Model.JsonReader jsonReader) { + this.a = versionedModel; + this.b = jsonReader; } @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Guild) InboundGatewayGsonParser.fromJson(this.a, Guild.class); + return this.a.parseEntry(this.b); } } diff --git a/app/src/main/java/c/a/n/a/s0.java b/app/src/main/java/c/a/n/a/s0.java deleted file mode 100644 index d83a465f12..0000000000 --- a/app/src/main/java/c/a/n/a/s0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.n.a; - -import com.discord.models.domain.ModelMessage; -import java.util.Comparator; -/* compiled from: lambda */ -public final /* synthetic */ class s0 implements Comparator { - public static final /* synthetic */ s0 i = new s0(); - - @Override // java.util.Comparator - public final int compare(Object obj, Object obj2) { - return ModelMessage.compare((Long) obj, (Long) obj2); - } -} diff --git a/app/src/main/java/c/a/n/a/t.java b/app/src/main/java/c/a/n/a/t.java index a0671a4bb8..0bac71e6ed 100644 --- a/app/src/main/java/c/a/n/a/t.java +++ b/app/src/main/java/c/a/n/a/t.java @@ -1,7 +1,8 @@ package c.a.n.a; +import com.discord.api.guildmember.GuildMember; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelSession; /* compiled from: lambda */ public final /* synthetic */ class t implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class t implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelSession) this.a.parse(new ModelSession()); + return (GuildMember) InboundGatewayGsonParser.fromJson(this.a, GuildMember.class); } } diff --git a/app/src/main/java/c/a/n/a/u.java b/app/src/main/java/c/a/n/a/u.java index 6123eff72e..23cf1225ae 100644 --- a/app/src/main/java/c/a/n/a/u.java +++ b/app/src/main/java/c/a/n/a/u.java @@ -1,5 +1,7 @@ package c.a.n.a; +import com.discord.api.presence.Presence; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; /* compiled from: lambda */ public final /* synthetic */ class u implements Model.JsonReader.ItemFactory { @@ -11,6 +13,6 @@ public final /* synthetic */ class u implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return this.a.nextString(null); + return (Presence) InboundGatewayGsonParser.fromJson(this.a, Presence.class); } } diff --git a/app/src/main/java/c/a/n/a/v.java b/app/src/main/java/c/a/n/a/v.java index f392c50436..c8adc0ec03 100644 --- a/app/src/main/java/c/a/n/a/v.java +++ b/app/src/main/java/c/a/n/a/v.java @@ -1,8 +1,7 @@ package c.a.n.a; -import com.discord.api.presence.Presence; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelConnectedAccount; /* compiled from: lambda */ public final /* synthetic */ class v implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class v implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Presence) InboundGatewayGsonParser.fromJson(this.a, Presence.class); + return (ModelConnectedAccount) this.a.parse(new ModelConnectedAccount()); } } diff --git a/app/src/main/java/c/a/n/a/w.java b/app/src/main/java/c/a/n/a/w.java index fdd814008d..1c7911ed47 100644 --- a/app/src/main/java/c/a/n/a/w.java +++ b/app/src/main/java/c/a/n/a/w.java @@ -1,6 +1,6 @@ package c.a.n.a; -import com.discord.api.presence.Presence; +import com.discord.api.user.User; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; /* compiled from: lambda */ @@ -13,6 +13,6 @@ public final /* synthetic */ class w implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Presence) InboundGatewayGsonParser.fromJson(this.a, Presence.class); + return (User) InboundGatewayGsonParser.fromJson(this.a, User.class); } } diff --git a/app/src/main/java/c/a/n/a/x.java b/app/src/main/java/c/a/n/a/x.java index 9f68329293..7d286aca18 100644 --- a/app/src/main/java/c/a/n/a/x.java +++ b/app/src/main/java/c/a/n/a/x.java @@ -1,6 +1,7 @@ package c.a.n.a; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelUserRelationship; /* compiled from: lambda */ public final /* synthetic */ class x implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -11,7 +12,6 @@ public final /* synthetic */ class x implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - return jsonReader.nextList(new w(jsonReader)); + return (ModelUserRelationship) this.a.parse(new ModelUserRelationship()); } } diff --git a/app/src/main/java/c/a/n/a/y.java b/app/src/main/java/c/a/n/a/y.java index a6a40cce78..baf0430107 100644 --- a/app/src/main/java/c/a/n/a/y.java +++ b/app/src/main/java/c/a/n/a/y.java @@ -1,5 +1,7 @@ package c.a.n.a; +import com.discord.api.guildjoinrequest.GuildJoinRequest; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; /* compiled from: lambda */ public final /* synthetic */ class y implements Model.JsonReader.ItemFactory { @@ -11,7 +13,6 @@ public final /* synthetic */ class y implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - Model.JsonReader jsonReader = this.a; - return jsonReader.nextList(new a0(jsonReader)); + return (GuildJoinRequest) InboundGatewayGsonParser.fromJson(this.a, GuildJoinRequest.class); } } diff --git a/app/src/main/java/c/a/n/a/z.java b/app/src/main/java/c/a/n/a/z.java index 33cf8d375b..a8cf18b44c 100644 --- a/app/src/main/java/c/a/n/a/z.java +++ b/app/src/main/java/c/a/n/a/z.java @@ -1,19 +1,17 @@ package c.a.n.a; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelPayload; +import com.discord.models.experiments.dto.GuildExperimentDto; /* compiled from: lambda */ public final /* synthetic */ class z implements Model.JsonReader.ItemFactory { - public final /* synthetic */ ModelPayload.VersionedModel a; - public final /* synthetic */ Model.JsonReader b; + public final /* synthetic */ Model.JsonReader a; - public /* synthetic */ z(ModelPayload.VersionedModel versionedModel, Model.JsonReader jsonReader) { - this.a = versionedModel; - this.b = jsonReader; + public /* synthetic */ z(Model.JsonReader jsonReader) { + this.a = jsonReader; } @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return this.a.parseEntry(this.b); + return GuildExperimentDto.Parser.parse(this.a); } } diff --git a/app/src/main/java/c/a/r/a0.java b/app/src/main/java/c/a/r/a0.java index 02ac859040..0925e0d9d4 100644 --- a/app/src/main/java/c/a/r/a0.java +++ b/app/src/main/java/c/a/r/a0.java @@ -1,24 +1,201 @@ package c.a.r; +import c.a.r.j0.a; +import c.a.r.l0.b; +import c.a.r.l0.c; +import c.a.r.l0.d; +import c.a.r.l0.e; +import co.discord.media_engine.VoiceQuality; +import com.discord.rtcconnection.KrispOveruseDetector; +import com.discord.rtcconnection.MediaSinkWantsManager; import com.discord.rtcconnection.RtcConnection; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; +import com.discord.rtcconnection.mediaengine.MediaEngineConnection; +import com.discord.rtcconnection.socket.io.Payloads; +import d0.t.h0; +import d0.t.n; +import d0.t.o; +import d0.z.d.m; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.TimeUnit; +import kotlin.NoWhenBranchMatchedException; +import rx.Observable; +import rx.Subscription; /* compiled from: RtcConnection.kt */ -public final class a0 extends o implements Function0 { - public final /* synthetic */ RtcConnection this$0; +public final class a0 implements MediaEngineConnection.c { + public final /* synthetic */ RtcConnection a; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public a0(RtcConnection rtcConnection) { - super(0); - this.this$0 = rtcConnection; + this.a = rtcConnection; } - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - this.this$0.q(); - return Unit.a; + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List list) { + m.checkNotNullParameter(mediaEngineConnection, "connection"); + m.checkNotNullParameter(transportInfo, "transportInfo"); + m.checkNotNullParameter(list, "supportedVideoCodecs"); + RtcConnection rtcConnection = this.a; + rtcConnection.g.succeed(); + rtcConnection.h = transportInfo; + MediaEngineConnection mediaEngineConnection2 = rtcConnection.n; + if (mediaEngineConnection2 != null) { + d dVar = new d(1000, rtcConnection.J, mediaEngineConnection2, new VoiceQuality(), new e(null, 1), new KrispOveruseDetector(mediaEngineConnection2), 0, 64); + rtcConnection.f = dVar; + dVar.a.clear(); + Subscription subscription = dVar.b; + if (subscription != null && !subscription.isUnsubscribed()) { + dVar.a(); + } + dVar.b = Observable.E(0, dVar.f217c, TimeUnit.MILLISECONDS).X(new b(dVar), new c(dVar)); + } + if (transportInfo.f2090c.ordinal() != 0) { + StringBuilder L = c.d.b.a.a.L("Unsupported protocol: "); + L.append(transportInfo.f2090c); + L.append('.'); + RtcConnection.j(rtcConnection, true, L.toString(), null, false, 12); + } else { + rtcConnection.J.recordBreadcrumb("Sending UDP info to RTC server.", rtcConnection.f2074c); + c.a.r.k0.a aVar = rtcConnection.m; + if (aVar == null) { + RtcConnection.o(rtcConnection, "onEngineConnectionConnected() socket was null.", null, null, 6); + return; + } + String str = transportInfo.a; + int i = transportInfo.b; + m.checkNotNullParameter("udp", "protocol"); + m.checkNotNullParameter(str, "address"); + m.checkNotNullParameter("xsalsa20_poly1305", "mode"); + m.checkNotNullParameter(list, "codecs"); + aVar.b(); + Payloads.Protocol.ProtocolInfo protocolInfo = new Payloads.Protocol.ProtocolInfo(str, i, "xsalsa20_poly1305"); + ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10)); + for (a aVar2 : list) { + arrayList.add(new Payloads.Protocol.CodecInfo(aVar2.a, aVar2.b, aVar2.f207c, aVar2.d, aVar2.e)); + } + aVar.o(1, new Payloads.Protocol("udp", protocolInfo, arrayList)); + } + for (RtcConnection.c cVar : rtcConnection.e) { + cVar.onMediaEngineConnectionConnected(rtcConnection); + } + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onConnectionStateChange(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.ConnectionState connectionState) { + RtcConnection.State state; + m.checkNotNullParameter(mediaEngineConnection, "connection"); + m.checkNotNullParameter(connectionState, "connectionState"); + RtcConnection rtcConnection = this.a; + RtcConnection.StateChange stateChange = rtcConnection.i; + rtcConnection.r("Connection state change: " + connectionState); + int ordinal = connectionState.ordinal(); + if (ordinal == 0) { + state = RtcConnection.State.h.a; + } else if (ordinal == 1) { + state = RtcConnection.State.g.a; + } else if (ordinal == 2) { + state = RtcConnection.State.f.a; + } else if (ordinal == 3) { + state = RtcConnection.State.e.a; + } else { + throw new NoWhenBranchMatchedException(); + } + rtcConnection.u(state); + if (stateChange.a == RtcConnection.State.g.a && rtcConnection.i.a == RtcConnection.State.h.a) { + rtcConnection.q(); + } + if (rtcConnection.i.a == RtcConnection.State.f.a) { + rtcConnection.f2075s = Long.valueOf(rtcConnection.K.currentTimeMillis()); + rtcConnection.f2076x = true; + Map mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.t))); + Long l = rtcConnection.r; + Long l2 = rtcConnection.f2075s; + Long valueOf = (l2 == null || l == null) ? null : Long.valueOf(l2.longValue() - l.longValue()); + if (valueOf != null) { + mutableMapOf.put("connect_time", Long.valueOf(valueOf.longValue())); + } + rtcConnection.b(mutableMapOf); + rtcConnection.p(RtcConnection.AnalyticsEvent.VOICE_CONNECTION_SUCCESS, mutableMapOf); + MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; + if (mediaSinkWantsManager != null) { + mediaSinkWantsManager.b(new i(mediaSinkWantsManager, rtcConnection.n)); + } + } + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onDestroy(MediaEngineConnection mediaEngineConnection) { + m.checkNotNullParameter(mediaEngineConnection, "connection"); + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onError(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.FailedConnectionException failedConnectionException) { + m.checkNotNullParameter(mediaEngineConnection, "connection"); + m.checkNotNullParameter(failedConnectionException, "exception"); + RtcConnection rtcConnection = this.a; + Objects.requireNonNull(rtcConnection); + String str = "connection error: " + failedConnectionException.a(); + int ordinal = failedConnectionException.a().ordinal(); + if (ordinal == 0 || ordinal == 1 || ordinal == 2) { + StringBuilder P = c.d.b.a.a.P(str, " -- "); + P.append(failedConnectionException.getMessage()); + rtcConnection.r(P.toString()); + } else { + RtcConnection.AnalyticsEvent analyticsEvent = RtcConnection.AnalyticsEvent.VOICE_CONNECTION_FAILURE; + Map mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.t))); + rtcConnection.b(mutableMapOf); + rtcConnection.p(analyticsEvent, mutableMapOf); + } + RtcConnection.j(rtcConnection, true, str, failedConnectionException, false, 8); + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onKrispStatus(MediaEngineConnection mediaEngineConnection, KrispOveruseDetector.Status status) { + m.checkNotNullParameter(mediaEngineConnection, "connection"); + m.checkNotNullParameter(status, "status"); + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onLocalMute(long j, boolean z2) { + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onLocalVideoOffScreen(long j, boolean z2) { + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onSpeaking(long j, int i, boolean z2) { + c.a.r.k0.a aVar; + RtcConnection rtcConnection = this.a; + if (j == rtcConnection.H && (aVar = rtcConnection.m) != null) { + aVar.b(); + aVar.o(5, new Payloads.Speaking(i, Integer.valueOf(z2 ? 1 : 0), 0, null, 8, null)); + } + for (RtcConnection.c cVar : rtcConnection.e) { + cVar.onSpeaking(j, z2); + } + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c + public void onVideo(long j, Integer num, int i, int i2, int i3) { + RtcConnection rtcConnection = this.a; + if (j == rtcConnection.H) { + c.a.r.k0.a aVar = rtcConnection.m; + if (aVar == null) { + RtcConnection.o(rtcConnection, "sendVideo() socket was null.", null, null, 6); + } else { + rtcConnection.f2078z = i2; + aVar.b(); + aVar.o(12, new Payloads.Video(i, i2, i3, null, n.emptyList(), 8, null)); + } + MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; + if (mediaSinkWantsManager != null) { + mediaSinkWantsManager.b(new k(mediaSinkWantsManager, i2 != 0)); + } + } + for (RtcConnection.c cVar : rtcConnection.e) { + cVar.onVideoStream(j, num); + } } } diff --git a/app/src/main/java/c/a/r/b0.java b/app/src/main/java/c/a/r/b0.java index 41ff9e86df..a1248eb325 100644 --- a/app/src/main/java/c/a/r/b0.java +++ b/app/src/main/java/c/a/r/b0.java @@ -1,32 +1,24 @@ package c.a.r; -import c.d.b.a.a; import com.discord.rtcconnection.RtcConnection; -import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class b0 extends o implements Function1 { +public final class b0 extends o implements Function0 { public final /* synthetic */ RtcConnection this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public b0(RtcConnection rtcConnection) { - super(1); + super(0); this.this$0 = rtcConnection; } /* 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 Unit invoke(Exception exc) { - Exception exc2 = exc; - m.checkNotNullParameter(exc2, "it"); - RtcConnection rtcConnection = this.this$0; - StringBuilder L = a.L("Error occurred while connecting to RTC server: "); - L.append(exc2.getMessage()); - L.append('.'); - RtcConnection.j(rtcConnection, true, L.toString(), null, false, 12); + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + this.this$0.q(); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/c.java b/app/src/main/java/c/a/r/c.java index 7ad6c667ee..be9e05e872 100644 --- a/app/src/main/java/c/a/r/c.java +++ b/app/src/main/java/c/a/r/c.java @@ -4,7 +4,6 @@ import android.os.Process; import d0.z.d.m; import java.util.Collection; import java.util.List; -import java.util.Objects; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; @@ -13,7 +12,9 @@ import java.util.concurrent.atomic.AtomicInteger; /* compiled from: MediaEngineExecutorService.kt */ public final class c implements ExecutorService { public static final AtomicInteger i = new AtomicInteger(); - public final ExecutorService j; + public volatile int j = -1; + public final ExecutorService k; + public final boolean l; /* compiled from: MediaEngineExecutorService.kt */ public static final class a implements Runnable { @@ -25,83 +26,82 @@ public final class c implements ExecutorService { @Override // java.lang.Runnable public final void run() { - c cVar = this.i; - Process.myTid(); - Objects.requireNonNull(cVar); + this.i.j = Process.myTid(); Thread currentThread = Thread.currentThread(); m.checkNotNullExpressionValue(currentThread, "Thread.currentThread()"); currentThread.setName("MediaEngineExecutor-" + c.i.getAndIncrement()); } } - public c(ExecutorService executorService) { + public c(ExecutorService executorService, boolean z2) { m.checkNotNullParameter(executorService, "es"); - this.j = executorService; + this.k = executorService; + this.l = z2; executorService.submit(new a(this)); } @Override // java.util.concurrent.ExecutorService public boolean awaitTermination(long j, TimeUnit timeUnit) { - return this.j.awaitTermination(j, timeUnit); + return this.k.awaitTermination(j, timeUnit); } @Override // java.util.concurrent.Executor public void execute(Runnable runnable) { - this.j.execute(runnable); + this.k.execute(runnable); } @Override // java.util.concurrent.ExecutorService public List> invokeAll(Collection> collection) { - return this.j.invokeAll(collection); + return this.k.invokeAll(collection); } @Override // java.util.concurrent.ExecutorService public List> invokeAll(Collection> collection, long j, TimeUnit timeUnit) { - return this.j.invokeAll(collection, j, timeUnit); + return this.k.invokeAll(collection, j, timeUnit); } @Override // java.util.concurrent.ExecutorService public T invokeAny(Collection> collection) { - return (T) this.j.invokeAny(collection); + return (T) this.k.invokeAny(collection); } @Override // java.util.concurrent.ExecutorService public T invokeAny(Collection> collection, long j, TimeUnit timeUnit) { - return (T) this.j.invokeAny(collection, j, timeUnit); + return (T) this.k.invokeAny(collection, j, timeUnit); } @Override // java.util.concurrent.ExecutorService public boolean isShutdown() { - return this.j.isShutdown(); + return this.k.isShutdown(); } @Override // java.util.concurrent.ExecutorService public boolean isTerminated() { - return this.j.isTerminated(); + return this.k.isTerminated(); } @Override // java.util.concurrent.ExecutorService public void shutdown() { - this.j.shutdown(); + this.k.shutdown(); } @Override // java.util.concurrent.ExecutorService public List shutdownNow() { - return this.j.shutdownNow(); + return this.k.shutdownNow(); } @Override // java.util.concurrent.ExecutorService public Future submit(Runnable runnable) { - return this.j.submit(runnable); + return this.k.submit(runnable); } @Override // java.util.concurrent.ExecutorService public Future submit(Runnable runnable, T t) { - return this.j.submit(runnable, t); + return this.k.submit(runnable, t); } @Override // java.util.concurrent.ExecutorService public Future submit(Callable callable) { - return this.j.submit(callable); + return this.k.submit(callable); } } diff --git a/app/src/main/java/c/a/r/c0.java b/app/src/main/java/c/a/r/c0.java index c3fc9bd7e4..551ff9467d 100644 --- a/app/src/main/java/c/a/r/c0.java +++ b/app/src/main/java/c/a/r/c0.java @@ -1,368 +1,32 @@ package c.a.r; -import c.a.r.d; -import c.a.r.j0.a; -import c.a.r.k0.d; -import c.a.r.k0.e; -import com.discord.rtcconnection.EncodeQuality; -import com.discord.rtcconnection.MediaSinkWantsManager; +import c.d.b.a.a; import com.discord.rtcconnection.RtcConnection; -import com.discord.rtcconnection.VideoMetadata; -import com.discord.rtcconnection.mediaengine.MediaEngine; -import com.discord.rtcconnection.mediaengine.MediaEngineConnection; -import com.discord.rtcconnection.socket.io.Payloads; -import com.discord.utilities.logging.Logger; -import d0.t.n; -import d0.t.o; -import d0.t.r; -import d0.t.u; import d0.z.d.m; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Objects; -import kotlin.NoWhenBranchMatchedException; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; /* compiled from: RtcConnection.kt */ -public final class c0 implements a.d { - public final /* synthetic */ RtcConnection a; +public final class c0 extends o implements Function1 { + public final /* synthetic */ RtcConnection this$0; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public c0(RtcConnection rtcConnection) { - this.a = rtcConnection; + super(1); + this.this$0 = rtcConnection; } - @Override // c.a.r.j0.a.d - public void a(String str, String str2) { - m.checkNotNullParameter(str, "audioCodec"); - m.checkNotNullParameter(str2, "videoCodec"); - MediaEngineConnection mediaEngineConnection = this.a.n; - if (mediaEngineConnection != null) { - mediaEngineConnection.r(str, str2); - } - } - - @Override // c.a.r.j0.a.d - public void b(boolean z2, Integer num, String str) { - RtcConnection rtcConnection = this.a; - Objects.requireNonNull(rtcConnection); - rtcConnection.r("Disconnected from RTC server. wasFatal: " + z2 + " -- code: " + num + " -- reason: " + str); - MediaEngineConnection mediaEngineConnection = rtcConnection.n; - if (mediaEngineConnection != null) { - mediaEngineConnection.destroy(); - } - MediaEngineConnection mediaEngineConnection2 = rtcConnection.n; - if (mediaEngineConnection2 != null) { - mediaEngineConnection2.o(rtcConnection.B); - } - boolean z3 = num == null || num.intValue() != 1000; - if (!(rtcConnection.i.a instanceof RtcConnection.State.d)) { - rtcConnection.n(z3, str); - d dVar = rtcConnection.f; - if (dVar != null) { - dVar.a(); - } - rtcConnection.f = null; - } - rtcConnection.q = 0; - rtcConnection.f2075s = null; - MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; - if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.b(new f(mediaSinkWantsManager)); - } - rtcConnection.u(new RtcConnection.State.d(z3)); - if (z3) { - long fail = rtcConnection.g.fail(new a0(rtcConnection)); - Logger.w$default(rtcConnection.J, rtcConnection.f2074c, "Disconnect was not clean! Reason: " + str + ", code: " + num + ". Reconnecting in " + (fail / ((long) 1000)) + " seconds.", null, 4, null); - } - } - - @Override // c.a.r.j0.a.d - public void c(String str, List list) { - m.checkNotNullParameter(str, "mode"); - m.checkNotNullParameter(list, "secretKey"); - MediaEngineConnection mediaEngineConnection = this.a.n; - if (mediaEngineConnection != null) { - mediaEngineConnection.t(str, u.toIntArray(list)); - } - } - - @Override // c.a.r.j0.a.d - public void d(String str) { - m.checkNotNullParameter(str, "mediaSessionId"); - RtcConnection rtcConnection = this.a; - rtcConnection.f2077y = str; - for (RtcConnection.c cVar : rtcConnection.e) { - cVar.onMediaSessionIdReceived(); - rtcConnection.p(RtcConnection.AnalyticsEvent.MEDIA_SESSION_JOINED, new LinkedHashMap()); - } - } - - /* JADX DEBUG: Failed to insert an additional move for type inference into block B:41:0x0058 */ - /* JADX WARN: Multi-variable type inference failed */ - /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: java.util.Iterator, java.util.Iterator */ - /* JADX DEBUG: Type inference failed for r0v11. Raw type applied. Possible types: java.util.Iterator, java.util.Iterator */ - /* JADX WARNING: Unknown variable types count: 1 */ - @Override // c.a.r.j0.a.d - public void e(long j, int i, int i2, List list) { - VideoMetadata videoMetadata; - Object obj; - boolean z2; - ?? r1; - RtcConnection rtcConnection = this.a; - if (j != rtcConnection.H) { - boolean z3 = false; - if (rtcConnection.v != null) { - if (list != null) { - r1 = new ArrayList(o.collectionSizeOrDefault(list, 10)); - for (Payloads.Stream stream : list) { - r1.add(Payloads.Stream.copy$default(stream, null, null, null, null, null, null, Boolean.valueOf(i2 > 0), null, 191, null)); - } - } else { - r1 = n.emptyList(); - } - boolean isEmpty = r1.isEmpty(); - List list2 = r1; - if (isEmpty) { - Integer valueOf = Integer.valueOf(i2); - Integer valueOf2 = Integer.valueOf(i2 + 1); - if (i2 > 0) { - z3 = true; - } - list2 = d0.t.m.listOf(new Payloads.Stream("100", null, 100, valueOf, valueOf2, null, Boolean.valueOf(z3), null)); - } - rtcConnection.v.c(j, Integer.valueOf(i)); - MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; - Objects.requireNonNull(mediaSinkWantsManager); - m.checkNotNullParameter(list2, "ssrcs"); - mediaSinkWantsManager.b(new k(mediaSinkWantsManager, list2, j)); - return; - } - if (list != null) { - Iterator it = list.iterator(); - while (true) { - if (!it.hasNext()) { - obj = null; - break; - } - obj = it.next(); - Payloads.Stream stream2 = (Payloads.Stream) obj; - Integer ssrc = stream2.getSsrc(); - if (ssrc == null || ssrc.intValue() != i2 || stream2.getMaxResolution() == null) { - z2 = false; - continue; - } else { - z2 = true; - continue; - } - if (z2) { - break; - } - } - Payloads.Stream stream3 = (Payloads.Stream) obj; - if (stream3 != null) { - Payloads.Stream.MaxResolution maxResolution = stream3.getMaxResolution(); - m.checkNotNull(maxResolution); - int width = maxResolution.getWidth(); - Payloads.Stream.MaxResolution maxResolution2 = stream3.getMaxResolution(); - m.checkNotNull(maxResolution2); - int height = maxResolution2.getHeight(); - Integer maxFrameRate = stream3.getMaxFrameRate(); - Payloads.Stream.MaxResolution maxResolution3 = stream3.getMaxResolution(); - m.checkNotNull(maxResolution3); - videoMetadata = new VideoMetadata(j, width, height, maxFrameRate, maxResolution3.getType()); - rtcConnection.d(j, i, i2, videoMetadata); - } - } - videoMetadata = null; - rtcConnection.d(j, i, i2, videoMetadata); - } - } - - @Override // c.a.r.j0.a.d - public void f(Map map) { - boolean z2; - Integer num; - m.checkNotNullParameter(map, "wants"); - RtcConnection rtcConnection = this.a; - if (rtcConnection.v != null) { - int i = rtcConnection.f2078z; - int intValue = (i == 0 || (num = map.get(String.valueOf(i))) == null) ? 0 : num.intValue(); - Integer num2 = map.get("any"); - int intValue2 = num2 != null ? num2.intValue() : 0; - if (intValue <= 0) { - intValue = intValue2 > 0 ? intValue2 : 100; - } - d.c cVar = null; - rtcConnection.J.i(rtcConnection.f2074c, "remote MediaSinkWants: " + map + ", decided on encode quality " + intValue, null); - EncodeQuality[] values = EncodeQuality.values(); - for (int i2 = 10; i2 >= 0; i2--) { - EncodeQuality encodeQuality = values[i2]; - if (encodeQuality.getValue() <= intValue) { - d dVar = rtcConnection.v.j; - f0 f0Var = dVar.e; - m.checkNotNullParameter(encodeQuality, "wantValue"); - List list = dVar.d; - ListIterator listIterator = list.listIterator(list.size()); - while (true) { - if (!listIterator.hasPrevious()) { - break; - } - d.c previous = listIterator.previous(); - if (encodeQuality.compareTo(previous.f202c) >= 0) { - z2 = true; - continue; - } else { - z2 = false; - continue; - } - if (z2) { - cVar = previous; - break; - } - } - d.c cVar2 = cVar; - if (cVar2 == null) { - cVar2 = (d.c) u.first((List) dVar.d); - } - m mVar = cVar2.a; - int max = Math.max((int) (((double) f0Var.f203c.a) * mVar.f222c), f0Var.d); - int max2 = Math.max((int) (((double) f0Var.f203c.b) * mVar.f222c), f0Var.d); - MediaEngineConnection mediaEngineConnection = rtcConnection.n; - if (mediaEngineConnection != null) { - mediaEngineConnection.m(new MediaEngineConnection.a(max, max2, mVar.a, mVar.b, mVar.d, mVar.e)); - return; - } - return; - } - } - throw new NoSuchElementException("Array contains no element matching the predicate."); - } - } - - @Override // c.a.r.j0.a.d - public void g(long j) { - RtcConnection rtcConnection = this.a; - rtcConnection.l.add(Long.valueOf(j)); - if (rtcConnection.l.size() > 5) { - r.removeFirst(rtcConnection.l); - } - if (j > ((long) 500)) { - rtcConnection.q++; - } - double d = (double) j; - Objects.requireNonNull(RtcConnection.Quality.Companion); - RtcConnection.Quality quality = Double.isNaN(d) ? RtcConnection.Quality.UNKNOWN : d < ((double) 250) ? RtcConnection.Quality.FINE : d < ((double) 500) ? RtcConnection.Quality.AVERAGE : RtcConnection.Quality.BAD; - for (RtcConnection.c cVar : rtcConnection.e) { - cVar.onQualityUpdate(quality); - } - } - - @Override // c.a.r.j0.a.d - public void h() { - } - - @Override // c.a.r.j0.a.d - public void i() { - RtcConnection rtcConnection = this.a; - rtcConnection.g.cancel(); - StringBuilder sb = new StringBuilder(); - sb.append("Connecting to RTC server "); - a aVar = rtcConnection.m; - sb.append(aVar != null ? aVar.u : null); - rtcConnection.r(sb.toString()); - rtcConnection.u(RtcConnection.State.c.a); - } - - @Override // c.a.r.j0.a.d - public void j() { - RtcConnection rtcConnection = this.a; - rtcConnection.g.cancel(); - rtcConnection.J.recordBreadcrumb("Connected to RTC server.", rtcConnection.f2074c); - a aVar = rtcConnection.m; - if (aVar == null) { - RtcConnection.o(rtcConnection, "onSocketConnect() socket was null.", null, null, 6); - return; - } - String str = rtcConnection.G; - long j = rtcConnection.H; - String str2 = rtcConnection.E; - boolean z2 = rtcConnection.F; - m.checkNotNullParameter(str, "serverId"); - m.checkNotNullParameter(str2, "sessionId"); - aVar.j = str; - aVar.k = str2; - aVar.r = a.c.IDENTIFYING; - aVar.n(0, new Payloads.Identify(str, j, str2, aVar.v, z2)); - rtcConnection.u(RtcConnection.State.a.a); - } - - @Override // c.a.r.j0.a.d - public void k(long j) { - c.a.r.k0.d dVar; - e eVar; - Map b; - RtcConnection rtcConnection = this.a; - if (!(!(rtcConnection.L instanceof RtcConnection.d.a) || (dVar = rtcConnection.f) == null || (eVar = dVar.g) == null || (b = eVar.b(String.valueOf(j))) == null)) { - rtcConnection.l(j, b); - } - MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; - if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.c(j, null); - } - MediaSinkWantsManager mediaSinkWantsManager2 = rtcConnection.v; - if (mediaSinkWantsManager2 != null) { - List emptyList = n.emptyList(); - m.checkNotNullParameter(emptyList, "ssrcs"); - mediaSinkWantsManager2.b(new k(mediaSinkWantsManager2, emptyList, j)); - } - } - - @Override // c.a.r.j0.a.d - public void l(int i, int i2, String str) { - MediaEngineConnection.Type type; - m.checkNotNullParameter(str, "ip"); - RtcConnection rtcConnection = this.a; - Objects.requireNonNull(rtcConnection); - rtcConnection.r("Discovered dedicated UDP server on port " + i); - rtcConnection.u(RtcConnection.State.g.a); - MediaEngine mediaEngine = rtcConnection.I; - long j = rtcConnection.H; - MediaEngine.a aVar = new MediaEngine.a(i2, str, i); - RtcConnection.d dVar = rtcConnection.L; - if (m.areEqual(dVar, RtcConnection.d.a.a)) { - type = MediaEngineConnection.Type.DEFAULT; - } else if (dVar instanceof RtcConnection.d.b) { - type = MediaEngineConnection.Type.STREAM; - } else { - throw new NoWhenBranchMatchedException(); - } - MediaEngineConnection h = mediaEngine.h(j, aVar, type, new b0(rtcConnection)); - if (h != null) { - h.l(rtcConnection.B); - rtcConnection.n = h; - return; - } - RtcConnection.o(rtcConnection, "onSocketHello(): connect() return null.", null, null, 6); - } - - @Override // c.a.r.j0.a.d - public void onSpeaking(long j, int i, boolean z2) { - RtcConnection rtcConnection = this.a; - if (j != rtcConnection.H) { - MediaEngineConnection mediaEngineConnection = rtcConnection.n; - if (mediaEngineConnection != null) { - mediaEngineConnection.s(j, i, null, rtcConnection.g(j), rtcConnection.h(j)); - } - MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; - if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.c(j, Integer.valueOf(i)); - } - for (RtcConnection.c cVar : rtcConnection.e) { - cVar.onUserCreated(rtcConnection, j); - } - } + /* 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 Unit invoke(Exception exc) { + Exception exc2 = exc; + m.checkNotNullParameter(exc2, "it"); + RtcConnection rtcConnection = this.this$0; + StringBuilder L = a.L("Error occurred while connecting to RTC server: "); + L.append(exc2.getMessage()); + L.append('.'); + RtcConnection.j(rtcConnection, true, L.toString(), null, false, 12); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/d.java b/app/src/main/java/c/a/r/d.java index d1ccee8ff0..29f25a4059 100644 --- a/app/src/main/java/c/a/r/d.java +++ b/app/src/main/java/c/a/r/d.java @@ -1,203 +1,14 @@ package c.a.r; +/* compiled from: MediaEngineExecutorService.kt */ +public final class d implements Runnable { + public final /* synthetic */ IllegalStateException i; -import com.discord.rtcconnection.EncodeQuality; -import d0.t.n0; -import d0.t.u; -import d0.z.d.m; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Set; -import kotlin.jvm.internal.DefaultConstructorMarker; -/* compiled from: MediaSinkWantsLadder.kt */ -public final class d { - public static final b a = new b(null); - public final int b; - - /* renamed from: c reason: collision with root package name */ - public final Map f200c; - public final List d; - public final f0 e; - - /* compiled from: MediaSinkWantsLadder.kt */ - public static final class a { - public final int a; - public final int b; - - /* renamed from: c reason: collision with root package name */ - public final double f201c; - public final int d; - - public a(int i, int i2, double d, int i3) { - this.a = i; - this.b = i2; - this.f201c = d; - this.d = i3; - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof a)) { - return false; - } - a aVar = (a) obj; - return this.a == aVar.a && this.b == aVar.b && Double.compare(this.f201c, aVar.f201c) == 0 && this.d == aVar.d; - } - - public int hashCode() { - return ((a0.a.a.a.a(this.f201c) + (((this.a * 31) + this.b) * 31)) * 31) + this.d; - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("CandidateResolution(width="); - L.append(this.a); - L.append(", height="); - L.append(this.b); - L.append(", budgetPortion="); - L.append(this.f201c); - L.append(", pixelCount="); - return c.d.b.a.a.z(L, this.d, ")"); - } + public d(IllegalStateException illegalStateException) { + this.i = illegalStateException; } - /* compiled from: MediaSinkWantsLadder.kt */ - public static final class b { - public b(DefaultConstructorMarker defaultConstructorMarker) { - } - } - - /* compiled from: MediaSinkWantsLadder.kt */ - public static final class c { - public final m a; - public final int b; - - /* renamed from: c reason: collision with root package name */ - public final EncodeQuality f202c; - - public c(m mVar, int i, EncodeQuality encodeQuality) { - m.checkNotNullParameter(mVar, "budget"); - m.checkNotNullParameter(encodeQuality, "wantValue"); - this.a = mVar; - this.b = i; - this.f202c = encodeQuality; - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof c)) { - return false; - } - c cVar = (c) obj; - return m.areEqual(this.a, cVar.a) && this.b == cVar.b && m.areEqual(this.f202c, cVar.f202c); - } - - public int hashCode() { - m mVar = this.a; - int i = 0; - int hashCode = (((mVar != null ? mVar.hashCode() : 0) * 31) + this.b) * 31; - EncodeQuality encodeQuality = this.f202c; - if (encodeQuality != null) { - i = encodeQuality.hashCode(); - } - return hashCode + i; - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("OrderedLadder(budget="); - L.append(this.a); - L.append(", pixelCount="); - L.append(this.b); - L.append(", wantValue="); - L.append(this.f202c); - L.append(")"); - return L.toString(); - } - } - - public d(f0 f0Var, int i) { - m mVar; - Object obj; - int i2; - EncodeQuality encodeQuality; - boolean z2; - f0 f0Var2 = (i & 1) != 0 ? e.a : null; - m.checkNotNullParameter(f0Var2, "options"); - this.e = f0Var2; - b bVar = f0Var2.a; - int i3 = bVar.a * bVar.b; - this.b = i3; - Set of = n0.setOf((Object[]) new Double[]{Double.valueOf(0.0d), Double.valueOf(4.0d), Double.valueOf(8.0d), Double.valueOf(10.0d)}); - ArrayList arrayList = new ArrayList(); - for (int i4 = 1; i4 < 4096; i4++) { - double d = (double) i4; - double d2 = (d * 16.0d) / 9.0d; - if (of.contains(Double.valueOf(d2 % 16.0d)) && of.contains(Double.valueOf(d % 16.0d))) { - double d3 = d * d2; - arrayList.add(new a((int) d2, i4, d3 / ((double) i3), (int) d3)); - } - } - LinkedHashMap linkedHashMap = new LinkedHashMap(); - EncodeQuality encodeQuality2 = EncodeQuality.Hundred; - int i5 = 1; - int i6 = 0; - while (i5 <= 25) { - ListIterator listIterator = arrayList.listIterator(arrayList.size()); - while (true) { - if (!listIterator.hasPrevious()) { - obj = null; - break; - } - obj = listIterator.previous(); - if (((a) obj).d * i5 <= i3) { - z2 = true; - continue; - } else { - z2 = false; - continue; - } - if (z2) { - break; - } - } - a aVar = (a) obj; - aVar = aVar == null ? (a) u.first((List) arrayList) : aVar; - if (i6 != aVar.a) { - i2 = i3; - linkedHashMap.put(encodeQuality2, new m(aVar.a, aVar.b, aVar.f201c, encodeQuality2.compareTo(EncodeQuality.Twenty) <= 0 ? 12 : 20, 30)); - EncodeQuality[] values = EncodeQuality.values(); - int i7 = 10; - while (true) { - if (i7 < 0) { - encodeQuality = null; - break; - } - encodeQuality = values[i7]; - if (encodeQuality.getValue() < encodeQuality2.getValue()) { - break; - } - i7--; - } - encodeQuality2 = encodeQuality == null ? EncodeQuality.Zero : encodeQuality; - i6 = aVar.a; - } else { - i2 = i3; - } - i5++; - i3 = i2; - } - this.f200c = linkedHashMap; - EncodeQuality[] values2 = EncodeQuality.values(); - ArrayList arrayList2 = new ArrayList(11); - for (int i8 = 0; i8 < 11; i8++) { - EncodeQuality encodeQuality3 = values2[i8]; - arrayList2.add((encodeQuality3 == EncodeQuality.Zero || (mVar = (m) linkedHashMap.get(encodeQuality3)) == null) ? null : new c(mVar, mVar.b * mVar.a, encodeQuality3)); - } - this.d = u.filterNotNull(arrayList2); + @Override // java.lang.Runnable + public final void run() { + throw this.i; } } diff --git a/app/src/main/java/c/a/r/d0.java b/app/src/main/java/c/a/r/d0.java index db1caba82f..8f22fe9c06 100644 --- a/app/src/main/java/c/a/r/d0.java +++ b/app/src/main/java/c/a/r/d0.java @@ -1,17 +1,361 @@ package c.a.r; +import c.a.r.e; +import c.a.r.k0.a; +import c.a.r.l0.d; +import com.discord.rtcconnection.EncodeQuality; +import com.discord.rtcconnection.MediaSinkWantsManager; +import com.discord.rtcconnection.RtcConnection; +import com.discord.rtcconnection.VideoMetadata; +import com.discord.rtcconnection.mediaengine.MediaEngine; +import com.discord.rtcconnection.mediaengine.MediaEngineConnection; +import com.discord.rtcconnection.socket.io.Payloads; +import com.discord.utilities.logging.Logger; +import d0.t.n; +import d0.t.o; +import d0.t.r; +import d0.t.u; import d0.z.d.m; -import kotlin.jvm.functions.Function0; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Objects; +import kotlin.NoWhenBranchMatchedException; /* compiled from: RtcConnection.kt */ -public final class d0 implements Runnable { - public final /* synthetic */ Function0 i; +public final class d0 implements a.d { + public final /* synthetic */ RtcConnection a; - public d0(Function0 function0) { - this.i = function0; + public d0(RtcConnection rtcConnection) { + this.a = rtcConnection; } - @Override // java.lang.Runnable - public final /* synthetic */ void run() { - m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)"); + @Override // c.a.r.k0.a.d + public void a(String str, String str2) { + m.checkNotNullParameter(str, "audioCodec"); + m.checkNotNullParameter(str2, "videoCodec"); + MediaEngineConnection mediaEngineConnection = this.a.n; + if (mediaEngineConnection != null) { + mediaEngineConnection.r(str, str2); + } + } + + @Override // c.a.r.k0.a.d + public void b(boolean z2, Integer num, String str) { + RtcConnection rtcConnection = this.a; + Objects.requireNonNull(rtcConnection); + rtcConnection.r("Disconnected from RTC server. wasFatal: " + z2 + " -- code: " + num + " -- reason: " + str); + MediaEngineConnection mediaEngineConnection = rtcConnection.n; + if (mediaEngineConnection != null) { + mediaEngineConnection.destroy(); + } + MediaEngineConnection mediaEngineConnection2 = rtcConnection.n; + if (mediaEngineConnection2 != null) { + mediaEngineConnection2.o(rtcConnection.B); + } + boolean z3 = num == null || num.intValue() != 1000; + if (!(rtcConnection.i.a instanceof RtcConnection.State.d)) { + rtcConnection.n(z3, str); + d dVar = rtcConnection.f; + if (dVar != null) { + dVar.a(); + } + rtcConnection.f = null; + } + rtcConnection.q = 0; + rtcConnection.f2075s = null; + MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; + if (mediaSinkWantsManager != null) { + mediaSinkWantsManager.b(new g(mediaSinkWantsManager)); + } + rtcConnection.u(new RtcConnection.State.d(z3)); + if (z3) { + long fail = rtcConnection.g.fail(new b0(rtcConnection)); + Logger.w$default(rtcConnection.J, rtcConnection.f2074c, "Disconnect was not clean! Reason: " + str + ", code: " + num + ". Reconnecting in " + (fail / ((long) 1000)) + " seconds.", null, 4, null); + } + } + + @Override // c.a.r.k0.a.d + public void c(String str, List list) { + m.checkNotNullParameter(str, "mode"); + m.checkNotNullParameter(list, "secretKey"); + MediaEngineConnection mediaEngineConnection = this.a.n; + if (mediaEngineConnection != null) { + mediaEngineConnection.t(str, u.toIntArray(list)); + } + } + + @Override // c.a.r.k0.a.d + public void d(String str) { + m.checkNotNullParameter(str, "mediaSessionId"); + RtcConnection rtcConnection = this.a; + rtcConnection.f2077y = str; + for (RtcConnection.c cVar : rtcConnection.e) { + cVar.onMediaSessionIdReceived(); + rtcConnection.p(RtcConnection.AnalyticsEvent.MEDIA_SESSION_JOINED, new LinkedHashMap()); + } + } + + /* JADX DEBUG: Failed to insert an additional move for type inference into block B:41:0x0058 */ + /* JADX WARN: Multi-variable type inference failed */ + /* JADX DEBUG: Type inference failed for r0v2. Raw type applied. Possible types: java.util.Iterator, java.util.Iterator */ + /* JADX DEBUG: Type inference failed for r0v11. Raw type applied. Possible types: java.util.Iterator, java.util.Iterator */ + /* JADX WARNING: Unknown variable types count: 1 */ + @Override // c.a.r.k0.a.d + public void e(long j, int i, int i2, List list) { + VideoMetadata videoMetadata; + Object obj; + boolean z2; + ?? r1; + RtcConnection rtcConnection = this.a; + if (j != rtcConnection.H) { + boolean z3 = false; + if (rtcConnection.v != null) { + if (list != null) { + r1 = new ArrayList(o.collectionSizeOrDefault(list, 10)); + for (Payloads.Stream stream : list) { + r1.add(Payloads.Stream.copy$default(stream, null, null, null, null, null, null, Boolean.valueOf(i2 > 0), null, 191, null)); + } + } else { + r1 = n.emptyList(); + } + boolean isEmpty = r1.isEmpty(); + List list2 = r1; + if (isEmpty) { + Integer valueOf = Integer.valueOf(i2); + Integer valueOf2 = Integer.valueOf(i2 + 1); + if (i2 > 0) { + z3 = true; + } + list2 = d0.t.m.listOf(new Payloads.Stream("100", null, 100, valueOf, valueOf2, null, Boolean.valueOf(z3), null)); + } + rtcConnection.v.c(j, Integer.valueOf(i)); + MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; + Objects.requireNonNull(mediaSinkWantsManager); + m.checkNotNullParameter(list2, "ssrcs"); + mediaSinkWantsManager.b(new l(mediaSinkWantsManager, list2, j)); + return; + } + if (list != null) { + Iterator it = list.iterator(); + while (true) { + if (!it.hasNext()) { + obj = null; + break; + } + obj = it.next(); + Payloads.Stream stream2 = (Payloads.Stream) obj; + Integer ssrc = stream2.getSsrc(); + if (ssrc == null || ssrc.intValue() != i2 || stream2.getMaxResolution() == null) { + z2 = false; + continue; + } else { + z2 = true; + continue; + } + if (z2) { + break; + } + } + Payloads.Stream stream3 = (Payloads.Stream) obj; + if (stream3 != null) { + Payloads.Stream.MaxResolution maxResolution = stream3.getMaxResolution(); + m.checkNotNull(maxResolution); + videoMetadata = new VideoMetadata(j, maxResolution.getWidth(), stream3.getMaxResolution().getHeight(), stream3.getMaxFrameRate(), stream3.getMaxResolution().getType()); + rtcConnection.d(j, i, i2, videoMetadata); + } + } + videoMetadata = null; + rtcConnection.d(j, i, i2, videoMetadata); + } + } + + @Override // c.a.r.k0.a.d + public void f(Map map) { + boolean z2; + Integer num; + m.checkNotNullParameter(map, "wants"); + RtcConnection rtcConnection = this.a; + if (rtcConnection.v != null) { + int i = rtcConnection.f2078z; + int intValue = (i == 0 || (num = map.get(String.valueOf(i))) == null) ? 0 : num.intValue(); + Integer num2 = map.get("any"); + int intValue2 = num2 != null ? num2.intValue() : 0; + if (intValue <= 0) { + intValue = intValue2 > 0 ? intValue2 : 100; + } + e.c cVar = null; + rtcConnection.J.i(rtcConnection.f2074c, "remote MediaSinkWants: " + map + ", decided on encode quality " + intValue, null); + EncodeQuality[] values = EncodeQuality.values(); + for (int i2 = 10; i2 >= 0; i2--) { + EncodeQuality encodeQuality = values[i2]; + if (encodeQuality.getValue() <= intValue) { + e eVar = rtcConnection.v.j; + g0 g0Var = eVar.e; + m.checkNotNullParameter(encodeQuality, "wantValue"); + List list = eVar.d; + ListIterator listIterator = list.listIterator(list.size()); + while (true) { + if (!listIterator.hasPrevious()) { + break; + } + e.c previous = listIterator.previous(); + if (encodeQuality.compareTo(previous.f202c) >= 0) { + z2 = true; + continue; + } else { + z2 = false; + continue; + } + if (z2) { + cVar = previous; + break; + } + } + e.c cVar2 = cVar; + if (cVar2 == null) { + cVar2 = (e.c) u.first((List) eVar.d); + } + n nVar = cVar2.a; + int max = Math.max((int) (((double) g0Var.f203c.a) * nVar.f222c), g0Var.d); + int max2 = Math.max((int) (((double) g0Var.f203c.b) * nVar.f222c), g0Var.d); + MediaEngineConnection mediaEngineConnection = rtcConnection.n; + if (mediaEngineConnection != null) { + mediaEngineConnection.m(new MediaEngineConnection.a(max, max2, nVar.a, nVar.b, nVar.d, nVar.e)); + return; + } + return; + } + } + throw new NoSuchElementException("Array contains no element matching the predicate."); + } + } + + @Override // c.a.r.k0.a.d + public void g(long j) { + RtcConnection rtcConnection = this.a; + rtcConnection.l.add(Long.valueOf(j)); + if (rtcConnection.l.size() > 5) { + r.removeFirst(rtcConnection.l); + } + if (j > ((long) 500)) { + rtcConnection.q++; + } + double d = (double) j; + Objects.requireNonNull(RtcConnection.Quality.Companion); + RtcConnection.Quality quality = Double.isNaN(d) ? RtcConnection.Quality.UNKNOWN : d < ((double) 250) ? RtcConnection.Quality.FINE : d < ((double) 500) ? RtcConnection.Quality.AVERAGE : RtcConnection.Quality.BAD; + for (RtcConnection.c cVar : rtcConnection.e) { + cVar.onQualityUpdate(quality); + } + } + + @Override // c.a.r.k0.a.d + public void h() { + } + + @Override // c.a.r.k0.a.d + public void i() { + RtcConnection rtcConnection = this.a; + rtcConnection.g.cancel(); + StringBuilder sb = new StringBuilder(); + sb.append("Connecting to RTC server "); + a aVar = rtcConnection.m; + sb.append(aVar != null ? aVar.u : null); + rtcConnection.r(sb.toString()); + rtcConnection.u(RtcConnection.State.c.a); + } + + @Override // c.a.r.k0.a.d + public void j() { + RtcConnection rtcConnection = this.a; + rtcConnection.g.cancel(); + rtcConnection.J.recordBreadcrumb("Connected to RTC server.", rtcConnection.f2074c); + a aVar = rtcConnection.m; + if (aVar == null) { + RtcConnection.o(rtcConnection, "onSocketConnect() socket was null.", null, null, 6); + return; + } + String str = rtcConnection.G; + long j = rtcConnection.H; + String str2 = rtcConnection.E; + boolean z2 = rtcConnection.F; + m.checkNotNullParameter(str, "serverId"); + m.checkNotNullParameter(str2, "sessionId"); + aVar.b(); + aVar.j = str; + aVar.k = str2; + aVar.r = a.c.IDENTIFYING; + aVar.o(0, new Payloads.Identify(str, j, str2, aVar.v, z2)); + rtcConnection.u(RtcConnection.State.a.a); + } + + @Override // c.a.r.k0.a.d + public void k(long j) { + d dVar; + c.a.r.l0.e eVar; + Map b; + RtcConnection rtcConnection = this.a; + if (!(!(rtcConnection.L instanceof RtcConnection.d.a) || (dVar = rtcConnection.f) == null || (eVar = dVar.g) == null || (b = eVar.b(String.valueOf(j))) == null)) { + rtcConnection.l(j, b); + } + MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; + if (mediaSinkWantsManager != null) { + mediaSinkWantsManager.c(j, null); + } + MediaSinkWantsManager mediaSinkWantsManager2 = rtcConnection.v; + if (mediaSinkWantsManager2 != null) { + List emptyList = n.emptyList(); + m.checkNotNullParameter(emptyList, "ssrcs"); + mediaSinkWantsManager2.b(new l(mediaSinkWantsManager2, emptyList, j)); + } + } + + @Override // c.a.r.k0.a.d + public void l(int i, int i2, String str) { + MediaEngineConnection.Type type; + m.checkNotNullParameter(str, "ip"); + RtcConnection rtcConnection = this.a; + Objects.requireNonNull(rtcConnection); + rtcConnection.r("Discovered dedicated UDP server on port " + i); + rtcConnection.u(RtcConnection.State.g.a); + MediaEngine mediaEngine = rtcConnection.I; + long j = rtcConnection.H; + MediaEngine.a aVar = new MediaEngine.a(i2, str, i); + RtcConnection.d dVar = rtcConnection.L; + if (m.areEqual(dVar, RtcConnection.d.a.a)) { + type = MediaEngineConnection.Type.DEFAULT; + } else if (dVar instanceof RtcConnection.d.b) { + type = MediaEngineConnection.Type.STREAM; + } else { + throw new NoWhenBranchMatchedException(); + } + MediaEngineConnection h = mediaEngine.h(j, aVar, type, new c0(rtcConnection)); + if (h != null) { + h.l(rtcConnection.B); + rtcConnection.n = h; + return; + } + RtcConnection.o(rtcConnection, "onSocketHello(): connect() return null.", null, null, 6); + } + + @Override // c.a.r.k0.a.d + public void onSpeaking(long j, int i, boolean z2) { + RtcConnection rtcConnection = this.a; + if (j != rtcConnection.H) { + MediaEngineConnection mediaEngineConnection = rtcConnection.n; + if (mediaEngineConnection != null) { + mediaEngineConnection.s(j, i, null, rtcConnection.g(j), rtcConnection.h(j)); + } + MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; + if (mediaSinkWantsManager != null) { + mediaSinkWantsManager.c(j, Integer.valueOf(i)); + } + for (RtcConnection.c cVar : rtcConnection.e) { + cVar.onUserCreated(rtcConnection, j); + } + } } } diff --git a/app/src/main/java/c/a/r/e.java b/app/src/main/java/c/a/r/e.java index 778f8e2b9d..1818a45ea1 100644 --- a/app/src/main/java/c/a/r/e.java +++ b/app/src/main/java/c/a/r/e.java @@ -1,5 +1,203 @@ package c.a.r; + +import com.discord.rtcconnection.EncodeQuality; +import d0.t.n0; +import d0.t.u; +import d0.z.d.m; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Set; +import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: MediaSinkWantsLadder.kt */ public final class e { - public static final f0 a = new f0(new b(1280, 720, 30, null), new b(1280, 720, 30, null), new a(150000, 2500000, null), 150000, new a(500000, 4000000, 600000)); + public static final b a = new b(null); + public final int b; + + /* renamed from: c reason: collision with root package name */ + public final Map f200c; + public final List d; + public final g0 e; + + /* compiled from: MediaSinkWantsLadder.kt */ + public static final class a { + public final int a; + public final int b; + + /* renamed from: c reason: collision with root package name */ + public final double f201c; + public final int d; + + public a(int i, int i2, double d, int i3) { + this.a = i; + this.b = i2; + this.f201c = d; + this.d = i3; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof a)) { + return false; + } + a aVar = (a) obj; + return this.a == aVar.a && this.b == aVar.b && Double.compare(this.f201c, aVar.f201c) == 0 && this.d == aVar.d; + } + + public int hashCode() { + return ((a0.a.a.a.a(this.f201c) + (((this.a * 31) + this.b) * 31)) * 31) + this.d; + } + + public String toString() { + StringBuilder L = c.d.b.a.a.L("CandidateResolution(width="); + L.append(this.a); + L.append(", height="); + L.append(this.b); + L.append(", budgetPortion="); + L.append(this.f201c); + L.append(", pixelCount="); + return c.d.b.a.a.z(L, this.d, ")"); + } + } + + /* compiled from: MediaSinkWantsLadder.kt */ + public static final class b { + public b(DefaultConstructorMarker defaultConstructorMarker) { + } + } + + /* compiled from: MediaSinkWantsLadder.kt */ + public static final class c { + public final n a; + public final int b; + + /* renamed from: c reason: collision with root package name */ + public final EncodeQuality f202c; + + public c(n nVar, int i, EncodeQuality encodeQuality) { + m.checkNotNullParameter(nVar, "budget"); + m.checkNotNullParameter(encodeQuality, "wantValue"); + this.a = nVar; + this.b = i; + this.f202c = encodeQuality; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof c)) { + return false; + } + c cVar = (c) obj; + return m.areEqual(this.a, cVar.a) && this.b == cVar.b && m.areEqual(this.f202c, cVar.f202c); + } + + public int hashCode() { + n nVar = this.a; + int i = 0; + int hashCode = (((nVar != null ? nVar.hashCode() : 0) * 31) + this.b) * 31; + EncodeQuality encodeQuality = this.f202c; + if (encodeQuality != null) { + i = encodeQuality.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder L = c.d.b.a.a.L("OrderedLadder(budget="); + L.append(this.a); + L.append(", pixelCount="); + L.append(this.b); + L.append(", wantValue="); + L.append(this.f202c); + L.append(")"); + return L.toString(); + } + } + + public e(g0 g0Var, int i) { + n nVar; + Object obj; + int i2; + EncodeQuality encodeQuality; + boolean z2; + g0 g0Var2 = (i & 1) != 0 ? f.a : null; + m.checkNotNullParameter(g0Var2, "options"); + this.e = g0Var2; + b bVar = g0Var2.a; + int i3 = bVar.a * bVar.b; + this.b = i3; + Set of = n0.setOf((Object[]) new Double[]{Double.valueOf(0.0d), Double.valueOf(4.0d), Double.valueOf(8.0d), Double.valueOf(10.0d)}); + ArrayList arrayList = new ArrayList(); + for (int i4 = 1; i4 < 4096; i4++) { + double d = (double) i4; + double d2 = (d * 16.0d) / 9.0d; + if (of.contains(Double.valueOf(d2 % 16.0d)) && of.contains(Double.valueOf(d % 16.0d))) { + double d3 = d * d2; + arrayList.add(new a((int) d2, i4, d3 / ((double) i3), (int) d3)); + } + } + LinkedHashMap linkedHashMap = new LinkedHashMap(); + EncodeQuality encodeQuality2 = EncodeQuality.Hundred; + int i5 = 1; + int i6 = 0; + while (i5 <= 25) { + ListIterator listIterator = arrayList.listIterator(arrayList.size()); + while (true) { + if (!listIterator.hasPrevious()) { + obj = null; + break; + } + obj = listIterator.previous(); + if (((a) obj).d * i5 <= i3) { + z2 = true; + continue; + } else { + z2 = false; + continue; + } + if (z2) { + break; + } + } + a aVar = (a) obj; + aVar = aVar == null ? (a) u.first((List) arrayList) : aVar; + if (i6 != aVar.a) { + i2 = i3; + linkedHashMap.put(encodeQuality2, new n(aVar.a, aVar.b, aVar.f201c, encodeQuality2.compareTo(EncodeQuality.Twenty) <= 0 ? 12 : 20, 30)); + EncodeQuality[] values = EncodeQuality.values(); + int i7 = 10; + while (true) { + if (i7 < 0) { + encodeQuality = null; + break; + } + encodeQuality = values[i7]; + if (encodeQuality.getValue() < encodeQuality2.getValue()) { + break; + } + i7--; + } + encodeQuality2 = encodeQuality == null ? EncodeQuality.Zero : encodeQuality; + i6 = aVar.a; + } else { + i2 = i3; + } + i5++; + i3 = i2; + } + this.f200c = linkedHashMap; + EncodeQuality[] values2 = EncodeQuality.values(); + ArrayList arrayList2 = new ArrayList(11); + for (int i8 = 0; i8 < 11; i8++) { + EncodeQuality encodeQuality3 = values2[i8]; + arrayList2.add((encodeQuality3 == EncodeQuality.Zero || (nVar = (n) linkedHashMap.get(encodeQuality3)) == null) ? null : new c(nVar, nVar.b * nVar.a, encodeQuality3)); + } + this.d = u.filterNotNull(arrayList2); + } } diff --git a/app/src/main/java/c/a/r/e0.java b/app/src/main/java/c/a/r/e0.java index e74cd5af37..b741d7bab2 100644 --- a/app/src/main/java/c/a/r/e0.java +++ b/app/src/main/java/c/a/r/e0.java @@ -1,18 +1,17 @@ package c.a.r; import d0.z.d.m; -import kotlin.jvm.functions.Function1; -import rx.functions.Action1; +import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class e0 implements Action1 { - public final /* synthetic */ Function1 i; +public final class e0 implements Runnable { + public final /* synthetic */ Function0 i; - public e0(Function1 function1) { - this.i = function1; + public e0(Function0 function0) { + this.i = function0; } - @Override // rx.functions.Action1 - public final /* synthetic */ void call(Object obj) { - m.checkNotNullExpressionValue(this.i.invoke(obj), "invoke(...)"); + @Override // java.lang.Runnable + public final /* synthetic */ void run() { + m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)"); } } diff --git a/app/src/main/java/c/a/r/f.java b/app/src/main/java/c/a/r/f.java index aa50dc2f94..bc19323e1a 100644 --- a/app/src/main/java/c/a/r/f.java +++ b/app/src/main/java/c/a/r/f.java @@ -1,29 +1,5 @@ package c.a.r; - -import com.discord.rtcconnection.MediaSinkWantsManager; -import d0.z.d.o; -import java.util.Objects; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: MediaSinkWantsManager.kt */ -public final class f extends o implements Function0 { - public final /* synthetic */ MediaSinkWantsManager this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public f(MediaSinkWantsManager mediaSinkWantsManager) { - super(0); - this.this$0 = mediaSinkWantsManager; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - MediaSinkWantsManager mediaSinkWantsManager = this.this$0; - Objects.requireNonNull(mediaSinkWantsManager); - mediaSinkWantsManager.b(new h(mediaSinkWantsManager, null)); - this.this$0.a.clear(); - this.this$0.b.clear(); - return Unit.a; - } +/* compiled from: MediaSinkWantsLadder.kt */ +public final class f { + public static final g0 a = new g0(new b(1280, 720, 30, null), new b(1280, 720, 30, null), new a(150000, 2500000, null), 150000, new a(500000, 4000000, 600000)); } diff --git a/app/src/main/java/c/a/r/f0.java b/app/src/main/java/c/a/r/f0.java index 0fd374b991..9c63bf51a1 100644 --- a/app/src/main/java/c/a/r/f0.java +++ b/app/src/main/java/c/a/r/f0.java @@ -1,67 +1,18 @@ package c.a.r; -import c.d.b.a.a; import d0.z.d.m; -/* compiled from: MediaSinkWantsLadder.kt */ -public final class f0 { - public final b a; - public final b b; +import kotlin.jvm.functions.Function1; +import rx.functions.Action1; +/* compiled from: RtcConnection.kt */ +public final class f0 implements Action1 { + public final /* synthetic */ Function1 i; - /* renamed from: c reason: collision with root package name */ - public final a f203c; - public final int d; - public final a e; - - public f0(b bVar, b bVar2, a aVar, int i, a aVar2) { - m.checkNotNullParameter(bVar, "videoBudget"); - m.checkNotNullParameter(bVar2, "videoCapture"); - m.checkNotNullParameter(aVar, "videoBitrate"); - m.checkNotNullParameter(aVar2, "desktopBitrate"); - this.a = bVar; - this.b = bVar2; - this.f203c = aVar; - this.d = i; - this.e = aVar2; + public f0(Function1 function1) { + this.i = function1; } - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof f0)) { - return false; - } - f0 f0Var = (f0) obj; - return m.areEqual(this.a, f0Var.a) && m.areEqual(this.b, f0Var.b) && m.areEqual(this.f203c, f0Var.f203c) && this.d == f0Var.d && m.areEqual(this.e, f0Var.e); - } - - public int hashCode() { - b bVar = this.a; - int i = 0; - int hashCode = (bVar != null ? bVar.hashCode() : 0) * 31; - b bVar2 = this.b; - int hashCode2 = (hashCode + (bVar2 != null ? bVar2.hashCode() : 0)) * 31; - a aVar = this.f203c; - int hashCode3 = (((hashCode2 + (aVar != null ? aVar.hashCode() : 0)) * 31) + this.d) * 31; - a aVar2 = this.e; - if (aVar2 != null) { - i = aVar2.hashCode(); - } - return hashCode3 + i; - } - - public String toString() { - StringBuilder L = a.L("VideoQualityManagerOptions(videoBudget="); - L.append(this.a); - L.append(", videoCapture="); - L.append(this.b); - L.append(", videoBitrate="); - L.append(this.f203c); - L.append(", videoBitrateFloor="); - L.append(this.d); - L.append(", desktopBitrate="); - L.append(this.e); - L.append(")"); - return L.toString(); + @Override // rx.functions.Action1 + public final /* synthetic */ void call(Object obj) { + m.checkNotNullExpressionValue(this.i.invoke(obj), "invoke(...)"); } } diff --git a/app/src/main/java/c/a/r/g.java b/app/src/main/java/c/a/r/g.java index 58755e07dd..c8fb7a2b6b 100644 --- a/app/src/main/java/c/a/r/g.java +++ b/app/src/main/java/c/a/r/g.java @@ -2,6 +2,7 @@ package c.a.r; import com.discord.rtcconnection.MediaSinkWantsManager; import d0.z.d.o; +import java.util.Objects; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: MediaSinkWantsManager.kt */ @@ -18,7 +19,11 @@ public final class g extends o implements Function0 { @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Unit mo1invoke() { - MediaSinkWantsManager.e(this.this$0, null, 1); + MediaSinkWantsManager mediaSinkWantsManager = this.this$0; + Objects.requireNonNull(mediaSinkWantsManager); + mediaSinkWantsManager.b(new i(mediaSinkWantsManager, null)); + this.this$0.a.clear(); + this.this$0.b.clear(); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/g0.java b/app/src/main/java/c/a/r/g0.java new file mode 100644 index 0000000000..13ea6e8795 --- /dev/null +++ b/app/src/main/java/c/a/r/g0.java @@ -0,0 +1,67 @@ +package c.a.r; + +import c.d.b.a.a; +import d0.z.d.m; +/* compiled from: MediaSinkWantsLadder.kt */ +public final class g0 { + public final b a; + public final b b; + + /* renamed from: c reason: collision with root package name */ + public final a f203c; + public final int d; + public final a e; + + public g0(b bVar, b bVar2, a aVar, int i, a aVar2) { + m.checkNotNullParameter(bVar, "videoBudget"); + m.checkNotNullParameter(bVar2, "videoCapture"); + m.checkNotNullParameter(aVar, "videoBitrate"); + m.checkNotNullParameter(aVar2, "desktopBitrate"); + this.a = bVar; + this.b = bVar2; + this.f203c = aVar; + this.d = i; + this.e = aVar2; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof g0)) { + return false; + } + g0 g0Var = (g0) obj; + return m.areEqual(this.a, g0Var.a) && m.areEqual(this.b, g0Var.b) && m.areEqual(this.f203c, g0Var.f203c) && this.d == g0Var.d && m.areEqual(this.e, g0Var.e); + } + + public int hashCode() { + b bVar = this.a; + int i = 0; + int hashCode = (bVar != null ? bVar.hashCode() : 0) * 31; + b bVar2 = this.b; + int hashCode2 = (hashCode + (bVar2 != null ? bVar2.hashCode() : 0)) * 31; + a aVar = this.f203c; + int hashCode3 = (((hashCode2 + (aVar != null ? aVar.hashCode() : 0)) * 31) + this.d) * 31; + a aVar2 = this.e; + if (aVar2 != null) { + i = aVar2.hashCode(); + } + return hashCode3 + i; + } + + public String toString() { + StringBuilder L = a.L("VideoQualityManagerOptions(videoBudget="); + L.append(this.a); + L.append(", videoCapture="); + L.append(this.b); + L.append(", videoBitrate="); + L.append(this.f203c); + L.append(", videoBitrateFloor="); + L.append(this.d); + L.append(", desktopBitrate="); + L.append(this.e); + L.append(")"); + return L.toString(); + } +} diff --git a/app/src/main/java/c/a/r/g0/a.java b/app/src/main/java/c/a/r/g0/a.java deleted file mode 100644 index 3ee60c8652..0000000000 --- a/app/src/main/java/c/a/r/g0/a.java +++ /dev/null @@ -1,118 +0,0 @@ -package c.a.r.g0; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.media.AudioManager; -import androidx.annotation.MainThread; -import c.a.r.h0.a; -import com.airbnb.lottie.parser.AnimatableValueParser; -import com.discord.rtcconnection.enums.AudioManagerBroadcastAction; -import com.discord.rtcconnection.enums.ScoAudioState; -import d0.z.d.m; -import java.util.Objects; -import kotlin.jvm.internal.DefaultConstructorMarker; -import org.webrtc.ThreadUtils; -/* compiled from: AudioManagerBroadcastReceiver.kt */ -public final class a extends BroadcastReceiver { - public static final C0033a a = new C0033a(null); - public final Context b; - - /* renamed from: c reason: collision with root package name */ - public final f f204c; - - /* compiled from: AudioManagerBroadcastReceiver.kt */ - /* renamed from: c.a.r.g0.a$a reason: collision with other inner class name */ - public static final class C0033a { - public C0033a(DefaultConstructorMarker defaultConstructorMarker) { - } - } - - public a(Context context, f fVar) { - m.checkNotNullParameter(context, "context"); - m.checkNotNullParameter(fVar, "listener"); - this.b = context; - this.f204c = fVar; - } - - @Override // android.content.BroadcastReceiver - @MainThread - public void onReceive(Context context, Intent intent) { - c.a.r.h0.a aVar; - m.checkNotNullParameter(context, "context"); - ThreadUtils.checkIsOnMainThread(); - if (intent != null) { - Objects.requireNonNull(AudioManagerBroadcastAction.Companion); - m.checkNotNullParameter(intent, "intent"); - String action = intent.getAction(); - AudioManagerBroadcastAction audioManagerBroadcastAction = null; - boolean z2 = false; - if (action != null) { - m.checkNotNullParameter(action, "action"); - AudioManagerBroadcastAction[] values = AudioManagerBroadcastAction.values(); - int i = 0; - while (true) { - if (i >= 5) { - break; - } - AudioManagerBroadcastAction audioManagerBroadcastAction2 = values[i]; - if (m.areEqual(audioManagerBroadcastAction2.getAction(), action)) { - audioManagerBroadcastAction = audioManagerBroadcastAction2; - break; - } - i++; - } - } - if (audioManagerBroadcastAction == null) { - StringBuilder L = c.d.b.a.a.L("unable to parse AudioManagerBroadcastAction for action: "); - L.append(intent.getAction()); - AnimatableValueParser.E1("AudioManagerBroadcastReceiver", L.toString()); - return; - } - AnimatableValueParser.D1("AudioManagerBroadcastReceiver", "onReceive: action = " + audioManagerBroadcastAction); - try { - f fVar = this.f204c; - int ordinal = audioManagerBroadcastAction.ordinal(); - if (ordinal == 0) { - fVar.c(context); - } else if (ordinal == 1) { - m.checkNotNullParameter(intent, "intent"); - if (m.areEqual(intent.getAction(), "android.intent.action.HEADSET_PLUG")) { - if (!(intent.getIntExtra("state", 0) == 1)) { - aVar = a.b.a; - } else { - String stringExtra = intent.getStringExtra("name"); - if (stringExtra == null) { - stringExtra = "unknown"; - } - m.checkNotNullExpressionValue(stringExtra, "intent.getStringExtra(\"name\") ?: \"unknown\""); - if (intent.getIntExtra("microphone", 0) == 1) { - z2 = true; - } - aVar = new a.C0034a(stringExtra, z2); - } - fVar.e(context, aVar); - return; - } - throw new IllegalArgumentException("Failed requirement.".toString()); - } else if (ordinal == 2) { - fVar.b(context, ScoAudioState.Companion.b(intent)); - } else if (ordinal == 3) { - m.checkNotNullParameter(context, "$this$isMicrophoneMute"); - m.checkNotNullParameter(context, "$this$getAudioManager"); - Object systemService = context.getSystemService("audio"); - Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.AudioManager"); - fVar.a(context, ((AudioManager) systemService).isMicrophoneMute()); - } else if (ordinal == 4) { - m.checkNotNullParameter(context, "$this$isSpeakerphoneOn"); - m.checkNotNullParameter(context, "$this$getAudioManager"); - Object systemService2 = context.getSystemService("audio"); - Objects.requireNonNull(systemService2, "null cannot be cast to non-null type android.media.AudioManager"); - fVar.d(context, ((AudioManager) systemService2).isSpeakerphoneOn()); - } - } catch (Throwable th) { - AnimatableValueParser.B1("AudioManagerBroadcastReceiver", "error handling " + audioManagerBroadcastAction, th); - } - } - } -} diff --git a/app/src/main/java/c/a/r/h.java b/app/src/main/java/c/a/r/h.java index 831b196baa..8feb0851bd 100644 --- a/app/src/main/java/c/a/r/h.java +++ b/app/src/main/java/c/a/r/h.java @@ -1,48 +1,24 @@ package c.a.r; import com.discord.rtcconnection.MediaSinkWantsManager; -import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import d0.z.d.o; -import java.util.ArrayList; -import java.util.Set; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: MediaSinkWantsManager.kt */ public final class h extends o implements Function0 { - public final /* synthetic */ MediaEngineConnection $connection; public final /* synthetic */ MediaSinkWantsManager this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public h(MediaSinkWantsManager mediaSinkWantsManager, MediaEngineConnection mediaEngineConnection) { + public h(MediaSinkWantsManager mediaSinkWantsManager) { super(0); this.this$0 = mediaSinkWantsManager; - this.$connection = mediaEngineConnection; } /* Return type fixed from 'java.lang.Object' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Unit mo1invoke() { - MediaSinkWantsManager mediaSinkWantsManager = this.this$0; - MediaEngineConnection mediaEngineConnection = mediaSinkWantsManager.d; - if (mediaEngineConnection != null) { - mediaEngineConnection.o(mediaSinkWantsManager); - } - MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0; - MediaEngineConnection mediaEngineConnection2 = this.$connection; - mediaSinkWantsManager2.d = mediaEngineConnection2; - if (mediaEngineConnection2 != null) { - mediaEngineConnection2.l(mediaSinkWantsManager2); - } - if (this.$connection != null) { - MediaSinkWantsManager mediaSinkWantsManager3 = this.this$0; - Set keySet = mediaSinkWantsManager3.b.keySet(); - ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(keySet, 10)); - for (Number number : keySet) { - arrayList.add(String.valueOf(number.longValue())); - } - mediaSinkWantsManager3.d(arrayList); - } + MediaSinkWantsManager.e(this.this$0, null, 1); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/h0/a.java b/app/src/main/java/c/a/r/h0/a.java index b70c469bd4..765f601bff 100644 --- a/app/src/main/java/c/a/r/h0/a.java +++ b/app/src/main/java/c/a/r/h0/a.java @@ -1,69 +1,118 @@ package c.a.r.h0; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.media.AudioManager; +import androidx.annotation.MainThread; +import c.a.r.i0.a; +import com.airbnb.lottie.parser.AnimatableValueParser; +import com.discord.rtcconnection.enums.AudioManagerBroadcastAction; +import com.discord.rtcconnection.enums.ScoAudioState; import d0.z.d.m; +import java.util.Objects; import kotlin.jvm.internal.DefaultConstructorMarker; -/* compiled from: WiredHeadsetState.kt */ -public abstract class a { +import org.webrtc.ThreadUtils; +/* compiled from: AudioManagerBroadcastReceiver.kt */ +public final class a extends BroadcastReceiver { + public static final C0033a a = new C0033a(null); + public final Context b; - /* compiled from: WiredHeadsetState.kt */ + /* renamed from: c reason: collision with root package name */ + public final f f204c; + + /* compiled from: AudioManagerBroadcastReceiver.kt */ /* renamed from: c.a.r.h0.a$a reason: collision with other inner class name */ - public static final class C0034a extends a { - public final String a; - public final boolean b; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public C0034a(String str, boolean z2) { - super(false, null); - m.checkNotNullParameter(str, "name"); - this.a = str; - this.b = z2; - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof C0034a)) { - return false; - } - C0034a aVar = (C0034a) obj; - return m.areEqual(this.a, aVar.a) && this.b == aVar.b; - } - - public int hashCode() { - String str = this.a; - int hashCode = (str != null ? str.hashCode() : 0) * 31; - boolean z2 = this.b; - if (z2) { - z2 = true; - } - int i = z2 ? 1 : 0; - int i2 = z2 ? 1 : 0; - int i3 = z2 ? 1 : 0; - return hashCode + i; - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("PluggedIn(name="); - L.append(this.a); - L.append(", hasMic="); - return c.d.b.a.a.G(L, this.b, ")"); + public static final class C0033a { + public C0033a(DefaultConstructorMarker defaultConstructorMarker) { } } - /* compiled from: WiredHeadsetState.kt */ - public static final class b extends a { - public static final b a = new b(); - - public b() { - super(false, null); - } - - public String toString() { - return "WiredHeadsetState.Unplugged"; - } + public a(Context context, f fVar) { + m.checkNotNullParameter(context, "context"); + m.checkNotNullParameter(fVar, "listener"); + this.b = context; + this.f204c = fVar; } - public a(boolean z2, DefaultConstructorMarker defaultConstructorMarker) { + @Override // android.content.BroadcastReceiver + @MainThread + public void onReceive(Context context, Intent intent) { + c.a.r.i0.a aVar; + m.checkNotNullParameter(context, "context"); + ThreadUtils.checkIsOnMainThread(); + if (intent != null) { + Objects.requireNonNull(AudioManagerBroadcastAction.Companion); + m.checkNotNullParameter(intent, "intent"); + String action = intent.getAction(); + AudioManagerBroadcastAction audioManagerBroadcastAction = null; + boolean z2 = false; + if (action != null) { + m.checkNotNullParameter(action, "action"); + AudioManagerBroadcastAction[] values = AudioManagerBroadcastAction.values(); + int i = 0; + while (true) { + if (i >= 5) { + break; + } + AudioManagerBroadcastAction audioManagerBroadcastAction2 = values[i]; + if (m.areEqual(audioManagerBroadcastAction2.getAction(), action)) { + audioManagerBroadcastAction = audioManagerBroadcastAction2; + break; + } + i++; + } + } + if (audioManagerBroadcastAction == null) { + StringBuilder L = c.d.b.a.a.L("unable to parse AudioManagerBroadcastAction for action: "); + L.append(intent.getAction()); + AnimatableValueParser.E1("AudioManagerBroadcastReceiver", L.toString()); + return; + } + AnimatableValueParser.D1("AudioManagerBroadcastReceiver", "onReceive: action = " + audioManagerBroadcastAction); + try { + f fVar = this.f204c; + int ordinal = audioManagerBroadcastAction.ordinal(); + if (ordinal == 0) { + fVar.c(context); + } else if (ordinal == 1) { + m.checkNotNullParameter(intent, "intent"); + if (m.areEqual(intent.getAction(), "android.intent.action.HEADSET_PLUG")) { + if (!(intent.getIntExtra("state", 0) == 1)) { + aVar = a.b.a; + } else { + String stringExtra = intent.getStringExtra("name"); + if (stringExtra == null) { + stringExtra = "unknown"; + } + m.checkNotNullExpressionValue(stringExtra, "intent.getStringExtra(\"name\") ?: \"unknown\""); + if (intent.getIntExtra("microphone", 0) == 1) { + z2 = true; + } + aVar = new a.C0034a(stringExtra, z2); + } + fVar.e(context, aVar); + return; + } + throw new IllegalArgumentException("Failed requirement.".toString()); + } else if (ordinal == 2) { + fVar.b(context, ScoAudioState.Companion.b(intent)); + } else if (ordinal == 3) { + m.checkNotNullParameter(context, "$this$isMicrophoneMute"); + m.checkNotNullParameter(context, "$this$getAudioManager"); + Object systemService = context.getSystemService("audio"); + Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.media.AudioManager"); + fVar.a(context, ((AudioManager) systemService).isMicrophoneMute()); + } else if (ordinal == 4) { + m.checkNotNullParameter(context, "$this$isSpeakerphoneOn"); + m.checkNotNullParameter(context, "$this$getAudioManager"); + Object systemService2 = context.getSystemService("audio"); + Objects.requireNonNull(systemService2, "null cannot be cast to non-null type android.media.AudioManager"); + fVar.d(context, ((AudioManager) systemService2).isSpeakerphoneOn()); + } + } catch (Throwable th) { + AnimatableValueParser.B1("AudioManagerBroadcastReceiver", "error handling " + audioManagerBroadcastAction, th); + } + } } } diff --git a/app/src/main/java/c/a/r/g0/b.java b/app/src/main/java/c/a/r/h0/b.java similarity index 99% rename from app/src/main/java/c/a/r/g0/b.java rename to app/src/main/java/c/a/r/h0/b.java index 1d66760941..84fc58707a 100644 --- a/app/src/main/java/c/a/r/g0/b.java +++ b/app/src/main/java/c/a/r/h0/b.java @@ -1,4 +1,4 @@ -package c.a.r.g0; +package c.a.r.h0; import android.content.Context; import android.os.Process; diff --git a/app/src/main/java/c/a/r/g0/c.java b/app/src/main/java/c/a/r/h0/c.java similarity index 99% rename from app/src/main/java/c/a/r/g0/c.java rename to app/src/main/java/c/a/r/h0/c.java index d998f31f74..1109e696cf 100644 --- a/app/src/main/java/c/a/r/g0/c.java +++ b/app/src/main/java/c/a/r/h0/c.java @@ -1,4 +1,4 @@ -package c.a.r.g0; +package c.a.r.h0; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHeadset; diff --git a/app/src/main/java/c/a/r/g0/d.java b/app/src/main/java/c/a/r/h0/d.java similarity index 99% rename from app/src/main/java/c/a/r/g0/d.java rename to app/src/main/java/c/a/r/h0/d.java index 7e44bbfdd0..7a7c807837 100644 --- a/app/src/main/java/c/a/r/g0/d.java +++ b/app/src/main/java/c/a/r/h0/d.java @@ -1,4 +1,4 @@ -package c.a.r.g0; +package c.a.r.h0; import android.annotation.SuppressLint; import android.bluetooth.BluetoothHeadset; diff --git a/app/src/main/java/c/a/r/g0/e.java b/app/src/main/java/c/a/r/h0/e.java similarity index 97% rename from app/src/main/java/c/a/r/g0/e.java rename to app/src/main/java/c/a/r/h0/e.java index 24ad469de0..632277a455 100644 --- a/app/src/main/java/c/a/r/g0/e.java +++ b/app/src/main/java/c/a/r/h0/e.java @@ -1,4 +1,4 @@ -package c.a.r.g0; +package c.a.r.h0; import android.media.AudioManager; import com.airbnb.lottie.parser.AnimatableValueParser; diff --git a/app/src/main/java/c/a/r/g0/f.java b/app/src/main/java/c/a/r/h0/f.java similarity index 91% rename from app/src/main/java/c/a/r/g0/f.java rename to app/src/main/java/c/a/r/h0/f.java index 33bfc0cc8a..21e53568af 100644 --- a/app/src/main/java/c/a/r/g0/f.java +++ b/app/src/main/java/c/a/r/h0/f.java @@ -1,8 +1,8 @@ -package c.a.r.g0; +package c.a.r.h0; import android.content.Context; import androidx.annotation.MainThread; -import c.a.r.h0.a; +import c.a.r.i0.a; import com.discord.rtcconnection.enums.ScoAudioState; /* compiled from: OnAudioManagerBroadcastListener.kt */ @MainThread diff --git a/app/src/main/java/c/a/r/g0/g.java b/app/src/main/java/c/a/r/h0/g.java similarity index 97% rename from app/src/main/java/c/a/r/g0/g.java rename to app/src/main/java/c/a/r/h0/g.java index 4cd7b6a72a..19c095fe49 100644 --- a/app/src/main/java/c/a/r/g0/g.java +++ b/app/src/main/java/c/a/r/h0/g.java @@ -1,4 +1,4 @@ -package c.a.r.g0; +package c.a.r.h0; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothHeadset; diff --git a/app/src/main/java/c/a/r/i.java b/app/src/main/java/c/a/r/i.java index 48d79eef31..6966494cb8 100644 --- a/app/src/main/java/c/a/r/i.java +++ b/app/src/main/java/c/a/r/i.java @@ -1,64 +1,48 @@ package c.a.r; -import c.d.b.a.a; import com.discord.rtcconnection.MediaSinkWantsManager; +import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import d0.z.d.o; import java.util.ArrayList; -import java.util.Iterator; +import java.util.Set; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: MediaSinkWantsManager.kt */ public final class i extends o implements Function0 { - public final /* synthetic */ Long $userId; + public final /* synthetic */ MediaEngineConnection $connection; public final /* synthetic */ MediaSinkWantsManager this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public i(MediaSinkWantsManager mediaSinkWantsManager, Long l) { + public i(MediaSinkWantsManager mediaSinkWantsManager, MediaEngineConnection mediaEngineConnection) { super(0); this.this$0 = mediaSinkWantsManager; - this.$userId = l; + this.$connection = mediaEngineConnection; } /* Return type fixed from 'java.lang.Object' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Unit mo1invoke() { - ArrayList arrayList = new ArrayList(); MediaSinkWantsManager mediaSinkWantsManager = this.this$0; - Long l = mediaSinkWantsManager.e; - if (l != null) { - if (l.longValue() != mediaSinkWantsManager.h) { - arrayList.add(l); + MediaEngineConnection mediaEngineConnection = mediaSinkWantsManager.d; + if (mediaEngineConnection != null) { + mediaEngineConnection.o(mediaSinkWantsManager); + } + MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0; + MediaEngineConnection mediaEngineConnection2 = this.$connection; + mediaSinkWantsManager2.d = mediaEngineConnection2; + if (mediaEngineConnection2 != null) { + mediaEngineConnection2.l(mediaSinkWantsManager2); + } + if (this.$connection != null) { + MediaSinkWantsManager mediaSinkWantsManager3 = this.this$0; + Set keySet = mediaSinkWantsManager3.b.keySet(); + ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(keySet, 10)); + for (Number number : keySet) { + arrayList.add(String.valueOf(number.longValue())); } + mediaSinkWantsManager3.d(arrayList); } - Long l2 = this.$userId; - if (l2 == null) { - this.this$0.e = null; - } else if (this.this$0.f2072c.contains(l2)) { - MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0; - Long l3 = this.$userId; - mediaSinkWantsManager2.e = l3; - arrayList.add(l3); - } else { - long j = this.this$0.h; - Long l4 = this.$userId; - if (l4 != null && j == l4.longValue()) { - this.this$0.e = this.$userId; - } else { - MediaSinkWantsManager mediaSinkWantsManager3 = this.this$0; - StringBuilder L = a.L("Participant not found: "); - L.append(this.$userId); - mediaSinkWantsManager3.a(L.toString()); - return Unit.a; - } - } - MediaSinkWantsManager mediaSinkWantsManager4 = this.this$0; - ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10)); - Iterator it = arrayList.iterator(); - while (it.hasNext()) { - arrayList2.add(String.valueOf(((Number) it.next()).longValue())); - } - mediaSinkWantsManager4.d(arrayList2); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/i0/a.java b/app/src/main/java/c/a/r/i0/a.java index 29fe7fa022..dbab19f91d 100644 --- a/app/src/main/java/c/a/r/i0/a.java +++ b/app/src/main/java/c/a/r/i0/a.java @@ -1,60 +1,69 @@ package c.a.r.i0; import d0.z.d.m; -/* compiled from: Codec.kt */ -public final class a { - public final String a; - public final int b; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: WiredHeadsetState.kt */ +public abstract class a { - /* renamed from: c reason: collision with root package name */ - public final String f207c; - public final int d; - public final Integer e; + /* compiled from: WiredHeadsetState.kt */ + /* renamed from: c.a.r.i0.a$a reason: collision with other inner class name */ + public static final class C0034a extends a { + public final String a; + public final boolean b; - public a(String str, int i, String str2, int i2, Integer num) { - m.checkNotNullParameter(str, "name"); - m.checkNotNullParameter(str2, "type"); - this.a = str; - this.b = i; - this.f207c = str2; - this.d = i2; - this.e = num; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public C0034a(String str, boolean z2) { + super(false, null); + m.checkNotNullParameter(str, "name"); + this.a = str; + this.b = z2; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof C0034a)) { + return false; + } + C0034a aVar = (C0034a) obj; + return m.areEqual(this.a, aVar.a) && this.b == aVar.b; + } + + public int hashCode() { + String str = this.a; + int hashCode = (str != null ? str.hashCode() : 0) * 31; + boolean z2 = this.b; + if (z2) { + z2 = true; + } + int i = z2 ? 1 : 0; + int i2 = z2 ? 1 : 0; + int i3 = z2 ? 1 : 0; + return hashCode + i; + } + + public String toString() { + StringBuilder L = c.d.b.a.a.L("PluggedIn(name="); + L.append(this.a); + L.append(", hasMic="); + return c.d.b.a.a.G(L, this.b, ")"); + } } - public boolean equals(Object obj) { - if (this == obj) { - return true; + /* compiled from: WiredHeadsetState.kt */ + public static final class b extends a { + public static final b a = new b(); + + public b() { + super(false, null); } - if (!(obj instanceof a)) { - return false; + + public String toString() { + return "WiredHeadsetState.Unplugged"; } - a aVar = (a) obj; - return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f207c, aVar.f207c) && this.d == aVar.d && m.areEqual(this.e, aVar.e); } - public int hashCode() { - String str = this.a; - int i = 0; - int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.b) * 31; - String str2 = this.f207c; - int hashCode2 = (((hashCode + (str2 != null ? str2.hashCode() : 0)) * 31) + this.d) * 31; - Integer num = this.e; - if (num != null) { - i = num.hashCode(); - } - return hashCode2 + i; - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("Codec(name="); - L.append(this.a); - L.append(", priority="); - L.append(this.b); - L.append(", type="); - L.append(this.f207c); - L.append(", payloadType="); - L.append(this.d); - L.append(", rtxPayloadType="); - return c.d.b.a.a.B(L, this.e, ")"); + public a(boolean z2, DefaultConstructorMarker defaultConstructorMarker) { } } diff --git a/app/src/main/java/c/a/r/i0/b.java b/app/src/main/java/c/a/r/i0/b.java deleted file mode 100644 index 5cce979757..0000000000 --- a/app/src/main/java/c/a/r/i0/b.java +++ /dev/null @@ -1,288 +0,0 @@ -package c.a.r.i0; - -import android.content.Context; -import android.content.Intent; -import android.graphics.Point; -import android.graphics.Rect; -import android.media.AudioFormat; -import android.media.AudioPlaybackCaptureConfiguration; -import android.media.AudioRecord; -import android.media.projection.MediaProjection; -import android.os.Build; -import android.os.Handler; -import android.os.Looper; -import android.util.Log; -import androidx.annotation.RequiresApi; -import co.discord.media_engine.NativeCapturerObserver; -import co.discord.media_engine.SoundshareAudioSource; -import com.discord.rtcconnection.mediaengine.ThumbnailEmitter; -import com.discord.utilities.display.DisplayUtils; -import com.discord.utilities.logging.Logger; -import d0.z.d.m; -import java.util.Objects; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import kotlin.jvm.internal.DefaultConstructorMarker; -import org.webrtc.CapturerObserver; -import org.webrtc.JniCommon; -import org.webrtc.ScreenCapturerAndroid; -import org.webrtc.SurfaceTextureHelper; -import org.webrtc.TimestampAligner; -import org.webrtc.VideoFrame; -import rx.Observable; -import rx.Subscription; -import rx.functions.Action1; -/* compiled from: ScreenCapturer.kt */ -public final class b extends ScreenCapturerAndroid { - public static final a i = new a(null); - public final RunnableC0035b j = new RunnableC0035b(); - public NativeCapturerObserver k; - public SurfaceTextureHelper l; - public Context m; - public final SoundshareAudioSource n = new SoundshareAudioSource(); - public int o; - public int p; - public Long q; - public final Rect r = new Rect(); - - /* renamed from: s reason: collision with root package name */ - public final Rect f208s = new Rect(); - public final Point t = new Point(); - public int u; - public Subscription v; - public final Logger w; - - /* renamed from: x reason: collision with root package name */ - public final ThumbnailEmitter f209x; - - /* compiled from: ScreenCapturer.kt */ - public static final class a { - public a(DefaultConstructorMarker defaultConstructorMarker) { - } - } - - /* compiled from: ScreenCapturer.kt */ - /* renamed from: c.a.r.i0.b$b reason: collision with other inner class name */ - public final class RunnableC0035b implements Runnable { - public RunnableC0035b() { - } - - @Override // java.lang.Runnable - public void run() { - b bVar = b.this; - if (bVar.o > 0) { - Long l = bVar.q; - if (l != null) { - long rtcTimeNanos = TimestampAligner.getRtcTimeNanos() - l.longValue(); - b bVar2 = b.this; - if (rtcTimeNanos > ((long) bVar2.p)) { - NativeCapturerObserver nativeCapturerObserver = bVar2.k; - if (nativeCapturerObserver == null) { - m.throwUninitializedPropertyAccessException("nativeObserver"); - } - nativeCapturerObserver.repeatLastFrame(); - } - } - b.this.c(); - } - } - } - - /* compiled from: ScreenCapturer.kt */ - public static final class c implements Action1 { - public final /* synthetic */ b i; - - public c(b bVar) { - this.i = bVar; - } - - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Long l) { - this.i.j.run(); - } - } - - /* compiled from: ScreenCapturer.kt */ - public static final class d implements Action1 { - public static final d i = new d(); - - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Throwable th) { - } - } - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public b(Intent intent, MediaProjection.Callback callback, Logger logger, ThumbnailEmitter thumbnailEmitter) { - super(intent, callback); - m.checkNotNullParameter(intent, "mediaProjectionPermissionResultData"); - m.checkNotNullParameter(callback, "mediaProjectionCallback"); - m.checkNotNullParameter(logger, "logger"); - this.w = logger; - this.f209x = thumbnailEmitter; - } - - public final synchronized void a(Rect rect, int i2) { - m.checkNotNullParameter(rect, "measuredSize"); - int max = Math.max(rect.width(), rect.height()); - if (max > 0) { - float f = ((float) i2) / ((float) max); - this.t.set((int) (((float) rect.width()) * f), (int) (((float) rect.height()) * f)); - Point point = this.t; - int i3 = point.x; - int i4 = i3 % 16; - if (i4 >= 8) { - i3 += 16; - } - int i5 = i3 - i4; - int i6 = point.y; - int i7 = i6 % 16; - if (i7 >= 8) { - i6 += 16; - } - point.set(i5, i6 - i7); - Point point2 = this.t; - super.changeCaptureFormat(point2.x, point2.y, this.o); - } - } - - @RequiresApi(29) - public final AudioRecord b() { - MediaProjection mediaProjection = this.mediaProjection; - if (mediaProjection == null) { - return null; - } - AudioPlaybackCaptureConfiguration build = new AudioPlaybackCaptureConfiguration.Builder(mediaProjection).addMatchingUsage(1).addMatchingUsage(14).addMatchingUsage(0).build(); - m.checkNotNullExpressionValue(build, "AudioPlaybackCaptureConf…KNOWN)\n .build()"); - try { - return new AudioRecord.Builder().setAudioFormat(new AudioFormat.Builder().setEncoding(2).setSampleRate(44100).setChannelMask(16).build()).setAudioPlaybackCaptureConfig(build).build(); - } catch (SecurityException unused) { - Log.w(b.class.getName(), "Failed to record audio"); - return null; - } - } - - public final void c() { - if (this.o > 0) { - Subscription subscription = this.v; - if (subscription != null) { - subscription.unsubscribe(); - } - Observable e02 = Observable.e0(((long) this.p) / 1000000, TimeUnit.MILLISECONDS); - SurfaceTextureHelper surfaceTextureHelper = this.l; - if (surfaceTextureHelper == null) { - m.throwUninitializedPropertyAccessException("surfaceTextureHelper"); - } - Handler handler = surfaceTextureHelper.getHandler(); - m.checkNotNullExpressionValue(handler, "surfaceTextureHelper.handler"); - Looper looper = handler.getLooper(); - AtomicReference atomicReference = j0.j.b.a.a; - Objects.requireNonNull(looper, "looper == null"); - this.v = e02.Y(new j0.j.b.b(looper)).X(new c(this), d.i); - } - } - - @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer - public synchronized void changeCaptureFormat(int i2, int i3, int i4) { - a(this.r, Math.max(i2, i3)); - d(i4); - } - - @Override // org.webrtc.ScreenCapturerAndroid - public void createVirtualDisplay() { - try { - super.createVirtualDisplay(); - } catch (Throwable th) { - Logger.e$default(this.w, "ScreenCapturer", "error in createVirtualDisplay", th, null, 8, null); - } - } - - public final void d(int i2) { - if (i2 <= 0) { - this.o = 0; - this.p = 0; - return; - } - this.o = i2; - this.p = 1000000000 / Math.max(10, i2 / 2); - } - - @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer - public void dispose() { - stopCapture(); - ThumbnailEmitter thumbnailEmitter = this.f209x; - if (thumbnailEmitter != null) { - synchronized (thumbnailEmitter) { - thumbnailEmitter.d.release(); - thumbnailEmitter.f2093c.release(); - JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b); - thumbnailEmitter.a = Long.MAX_VALUE; - } - } - this.n.release(); - super.dispose(); - } - - @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer - public synchronized void initialize(SurfaceTextureHelper surfaceTextureHelper, Context context, CapturerObserver capturerObserver) { - m.checkNotNullParameter(surfaceTextureHelper, "surfaceTextureHelper"); - m.checkNotNullParameter(context, "applicationContext"); - m.checkNotNullParameter(capturerObserver, "capturerObserver"); - this.l = surfaceTextureHelper; - this.m = context; - this.k = (NativeCapturerObserver) capturerObserver; - super.initialize(surfaceTextureHelper, context, capturerObserver); - } - - @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoSink - public void onFrame(VideoFrame videoFrame) { - Rect rect = this.f208s; - Context context = this.m; - if (context == null) { - m.throwUninitializedPropertyAccessException("context"); - } - rect.set(DisplayUtils.getScreenSize(context)); - if (!m.areEqual(this.f208s, this.r)) { - this.r.set(this.f208s); - a(this.f208s, this.u); - } - this.q = Long.valueOf(videoFrame.getTimestampNs()); - ThumbnailEmitter thumbnailEmitter = this.f209x; - if (thumbnailEmitter != null) { - synchronized (thumbnailEmitter) { - m.checkNotNullParameter(videoFrame, "frame"); - long currentTimeMillis = thumbnailEmitter.k.currentTimeMillis() - thumbnailEmitter.e; - long timestampNs = videoFrame.getTimestampNs() - thumbnailEmitter.a; - if (currentTimeMillis > thumbnailEmitter.j) { - long j = (long) 1000; - if (timestampNs > thumbnailEmitter.i * j * j) { - thumbnailEmitter.a = videoFrame.getTimestampNs(); - thumbnailEmitter.l.invoke(thumbnailEmitter.a(videoFrame)); - } - } - } - } - super.onFrame(videoFrame); - } - - @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer - public synchronized void startCapture(int i2, int i3, int i4) { - AudioRecord b; - super.startCapture(i2, i3, i4); - this.u = Math.max(i2, i3); - d(i4); - if (Build.VERSION.SDK_INT >= 29 && (b = b()) != null) { - this.n.startRecording(b); - } - c(); - } - - @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer - public synchronized void stopCapture() { - super.stopCapture(); - this.n.stopRecording(); - this.o = 0; - this.q = null; - } -} diff --git a/app/src/main/java/c/a/r/j.java b/app/src/main/java/c/a/r/j.java index 5414a13d83..d15c96d073 100644 --- a/app/src/main/java/c/a/r/j.java +++ b/app/src/main/java/c/a/r/j.java @@ -1,28 +1,64 @@ package c.a.r; +import c.d.b.a.a; import com.discord.rtcconnection.MediaSinkWantsManager; import d0.z.d.o; -import java.util.Objects; +import java.util.ArrayList; +import java.util.Iterator; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: MediaSinkWantsManager.kt */ public final class j extends o implements Function0 { - public final /* synthetic */ boolean $sendVideo; + public final /* synthetic */ Long $userId; public final /* synthetic */ MediaSinkWantsManager this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public j(MediaSinkWantsManager mediaSinkWantsManager, boolean z2) { + public j(MediaSinkWantsManager mediaSinkWantsManager, Long l) { super(0); this.this$0 = mediaSinkWantsManager; - this.$sendVideo = z2; + this.$userId = l; } /* Return type fixed from 'java.lang.Object' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Unit mo1invoke() { - Objects.requireNonNull(this.this$0); - MediaSinkWantsManager.e(this.this$0, null, 1); + ArrayList arrayList = new ArrayList(); + MediaSinkWantsManager mediaSinkWantsManager = this.this$0; + Long l = mediaSinkWantsManager.e; + if (l != null) { + if (l.longValue() != mediaSinkWantsManager.h) { + arrayList.add(l); + } + } + Long l2 = this.$userId; + if (l2 == null) { + this.this$0.e = null; + } else if (this.this$0.f2072c.contains(l2)) { + MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0; + Long l3 = this.$userId; + mediaSinkWantsManager2.e = l3; + arrayList.add(l3); + } else { + long j = this.this$0.h; + Long l4 = this.$userId; + if (l4 != null && j == l4.longValue()) { + this.this$0.e = this.$userId; + } else { + MediaSinkWantsManager mediaSinkWantsManager3 = this.this$0; + StringBuilder L = a.L("Participant not found: "); + L.append(this.$userId); + mediaSinkWantsManager3.a(L.toString()); + return Unit.a; + } + } + MediaSinkWantsManager mediaSinkWantsManager4 = this.this$0; + ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10)); + Iterator it = arrayList.iterator(); + while (it.hasNext()) { + arrayList2.add(String.valueOf(((Number) it.next()).longValue())); + } + mediaSinkWantsManager4.d(arrayList2); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/j0/a.java b/app/src/main/java/c/a/r/j0/a.java index 66d5389f81..9583895666 100644 --- a/app/src/main/java/c/a/r/j0/a.java +++ b/app/src/main/java/c/a/r/j0/a.java @@ -1,766 +1,60 @@ package c.a.r.j0; -import com.discord.rtcconnection.socket.io.Opcodes; -import com.discord.rtcconnection.socket.io.Payloads; -import com.discord.utilities.debug.DebugPrintBuilder; -import com.discord.utilities.debug.DebugPrintable; -import com.discord.utilities.logging.Logger; -import com.discord.utilities.networking.Backoff; -import com.discord.utilities.time.Clock; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.reflect.TypeToken; import d0.z.d.m; -import d0.z.d.o; -import f0.f0.k.h; -import f0.x; -import f0.z; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSocketFactory; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; -import kotlin.jvm.internal.DefaultConstructorMarker; -import okhttp3.Response; -import okhttp3.WebSocket; -import okhttp3.WebSocketListener; -/* compiled from: RtcControlSocket.kt */ -public final class a extends WebSocketListener implements DebugPrintable { - public static int a; - public static final Type b = new C0038a().getType(); +/* compiled from: Codec.kt */ +public final class a { + public final String a; + public final int b; /* renamed from: c reason: collision with root package name */ - public static final b f212c = new b(null); - public final String A; - public final Gson d = new c.i.d.e().a(); - public final Timer e = new Timer(); - public final Backoff f = new Backoff(1000, 5000, 3, false, null, 24, null); - public final List g = new ArrayList(); - public int h = 3; - public WebSocket i; - public String j; - public String k; - public Long l; - public boolean m; - public b n = new b(this); - public Long o; - public TimerTask p; - public Long q; - public c r = c.DISCONNECTED; + public final String f207c; + public final int d; + public final Integer e; - /* renamed from: s reason: collision with root package name */ - public boolean f213s; - public final String t; - public final String u; - public final String v; - public final SSLSocketFactory w; - - /* renamed from: x reason: collision with root package name */ - public final Logger f214x; - - /* renamed from: y reason: collision with root package name */ - public final c.a.r.c f215y; - - /* renamed from: z reason: collision with root package name */ - public final Clock f216z; - - /* compiled from: RtcControlSocket.kt */ - /* renamed from: c.a.r.j0.a$a reason: collision with other inner class name */ - public static final class C0038a extends TypeToken> { + public a(String str, int i, String str2, int i2, Integer num) { + m.checkNotNullParameter(str, "name"); + m.checkNotNullParameter(str2, "type"); + this.a = str; + this.b = i; + this.f207c = str2; + this.d = i2; + this.e = num; } - /* compiled from: RtcControlSocket.kt */ - public static final class b { - public b(DefaultConstructorMarker defaultConstructorMarker) { + public boolean equals(Object obj) { + if (this == obj) { + return true; } - } - - /* compiled from: RtcControlSocket.kt */ - public enum c { - DISCONNECTED, - CONNECTING, - IDENTIFYING, - RESUMING, - CONNECTED, - RECONNECTING - } - - /* compiled from: RtcControlSocket.kt */ - public interface d { - void a(String str, String str2); - - void b(boolean z2, Integer num, String str); - - void c(String str, List list); - - void d(String str); - - void e(long j, int i, int i2, List list); - - void f(Map map); - - void g(long j); - - void h(); - - void i(); - - void j(); - - void k(long j); - - void l(int i, int i2, String str); - - void onSpeaking(long j, int i, boolean z2); - } - - /* compiled from: RtcControlSocket.kt */ - public static final class e extends o implements Function1 { - public static final e i = new e(); - - public e() { - 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 Unit invoke(WebSocket webSocket) { - WebSocket webSocket2 = webSocket; - m.checkNotNullParameter(webSocket2, "it"); - webSocket2.e(1000, "Force Close"); - return Unit.a; - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class f extends o implements Function1 { - public static final f i = new f(); - - public f() { - 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 Unit invoke(WebSocket webSocket) { - WebSocket webSocket2 = webSocket; - m.checkNotNullParameter(webSocket2, "it"); - webSocket2.e(4000, "close reason"); - return Unit.a; - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class g extends TimerTask { - public final /* synthetic */ a i; - - /* compiled from: RtcControlSocket.kt */ - /* renamed from: c.a.r.j0.a$g$a reason: collision with other inner class name */ - public static final class C0039a extends o implements Function0 { - public final /* synthetic */ g this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public C0039a(g gVar) { - super(0); - this.this$0 = gVar; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - a.a(this.this$0.i, true, null, "The connection timed out. Did not receive OP_HELLO in time."); - return Unit.a; - } - } - - public g(a aVar) { - this.i = aVar; - } - - @Override // java.util.TimerTask, java.lang.Runnable - public void run() { - this.i.m(new C0039a(this)); - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class h extends o implements Function0 { - public final /* synthetic */ int $code; - public final /* synthetic */ String $reason; - public final /* synthetic */ WebSocket $webSocket; - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public h(a aVar, WebSocket webSocket, int i, String str) { - super(0); - this.this$0 = aVar; - this.$webSocket = webSocket; - this.$code = i; - this.$reason = str; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { - a.a(this.this$0, true, Integer.valueOf(this.$code), this.$reason); - } - return Unit.a; - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class i extends o implements Function0 { - public final /* synthetic */ Throwable $throwable; - public final /* synthetic */ WebSocket $webSocket; - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public i(a aVar, WebSocket webSocket, Throwable th) { - super(0); - this.this$0 = aVar; - this.$webSocket = webSocket; - this.$throwable = th; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { - if (this.$throwable instanceof SSLException) { - a.c(this.this$0, null, 1); - for (d dVar : this.this$0.g) { - dVar.b(false, 1001, null); - } - } else { - a aVar = this.this$0; - StringBuilder L = c.d.b.a.a.L("An error with the websocket occurred: "); - L.append(this.$throwable.getMessage()); - a.a(aVar, true, null, L.toString()); - } - } - return Unit.a; - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class j extends o implements Function0 { - public final /* synthetic */ Payloads.Incoming $message; - public final /* synthetic */ WebSocket $webSocket; - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public j(a aVar, WebSocket webSocket, Payloads.Incoming incoming) { - super(0); - this.this$0 = aVar; - this.$webSocket = webSocket; - this.$message = incoming; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - boolean z2 = true; - if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { - switch (this.$message.getOpcode()) { - case 2: - a aVar = this.this$0; - Object c2 = aVar.d.c(this.$message.getData(), Payloads.Ready.class); - m.checkNotNullExpressionValue(c2, "gson.fromJson(message.da…yloads.Ready::class.java)"); - Payloads.Ready ready = (Payloads.Ready) c2; - aVar.f.succeed(); - long currentTimeMillis = aVar.f216z.currentTimeMillis(); - Long l = aVar.q; - long longValue = currentTimeMillis - (l != null ? l.longValue() : 0); - aVar.i("[READY] took " + longValue + " ms"); - for (d dVar : aVar.g) { - dVar.l(ready.getPort(), ready.getSsrc(), ready.getIp()); - } - break; - case 3: - a aVar2 = this.this$0; - aVar2.n(3, String.valueOf(aVar2.f216z.currentTimeMillis())); - break; - case 4: - a aVar3 = this.this$0; - Object c3 = aVar3.d.c(this.$message.getData(), Payloads.Description.class); - m.checkNotNullExpressionValue(c3, "gson.fromJson(message.da….Description::class.java)"); - Payloads.Description description = (Payloads.Description) c3; - for (d dVar2 : aVar3.g) { - dVar2.c(description.getMode(), description.getSecretKey()); - dVar2.a(description.getAudioCodec(), description.getVideoCodec()); - String mediaSessionId = description.getMediaSessionId(); - if (mediaSessionId != null) { - dVar2.d(mediaSessionId); - } - } - aVar3.f213s = true; - break; - case 5: - a aVar4 = this.this$0; - Object c4 = aVar4.d.c(this.$message.getData(), Payloads.Speaking.class); - m.checkNotNullExpressionValue(c4, "gson.fromJson(message.da…ads.Speaking::class.java)"); - Payloads.Speaking speaking = (Payloads.Speaking) c4; - if (!(speaking.getUserId() == null || speaking.getSpeaking() == null)) { - Integer speaking2 = speaking.getSpeaking(); - if (speaking2 == null || speaking2.intValue() != 1) { - z2 = false; - } - for (d dVar3 : aVar4.g) { - dVar3.onSpeaking(speaking.getUserId().longValue(), speaking.getSsrc(), z2); - } - break; - } - case 6: - a aVar5 = this.this$0; - Object c5 = aVar5.d.c(this.$message.getData(), Long.TYPE); - m.checkNotNullExpressionValue(c5, "gson.fromJson(message.data, Long::class.java)"); - long longValue2 = ((Number) c5).longValue(); - long currentTimeMillis2 = aVar5.f216z.currentTimeMillis(); - long j = currentTimeMillis2 - longValue2; - Logger.d$default(aVar5.f214x, aVar5.t, c.d.b.a.a.r("got heartbeat ack after ", j, " ms"), null, 4, null); - aVar5.o = Long.valueOf(currentTimeMillis2); - aVar5.m = true; - for (d dVar4 : aVar5.g) { - dVar4.g(j); - } - break; - case 7: - case 10: - case 11: - default: - a aVar6 = this.this$0; - StringBuilder L = c.d.b.a.a.L("unknown opcode: "); - L.append(this.$message.getOpcode()); - aVar6.i(L.toString()); - break; - case 8: - a aVar7 = this.this$0; - Object c6 = aVar7.d.c(this.$message.getData(), Payloads.Hello.class); - m.checkNotNullExpressionValue(c6, "gson.fromJson(message.da…yloads.Hello::class.java)"); - Payloads.Hello hello = (Payloads.Hello) c6; - TimerTask timerTask = aVar7.p; - if (timerTask != null) { - timerTask.cancel(); - } - aVar7.i("[HELLO] raw: " + hello); - aVar7.l = Long.valueOf(hello.getHeartbeatIntervalMs()); - aVar7.h = hello.getServerVersion(); - aVar7.n.cancel(); - aVar7.m = true; - aVar7.k(); - break; - case 9: - this.this$0.f.succeed(); - break; - case 12: - a aVar8 = this.this$0; - Object c7 = aVar8.d.c(this.$message.getData(), Payloads.Video.class); - m.checkNotNullExpressionValue(c7, "gson.fromJson(message.da…yloads.Video::class.java)"); - Payloads.Video video = (Payloads.Video) c7; - if (video.getUserId() != null) { - for (d dVar5 : aVar8.g) { - dVar5.e(video.getUserId().longValue(), video.getAudioSsrc(), video.getVideoSsrc(), video.getStreams()); - } - break; - } - break; - case 13: - a aVar9 = this.this$0; - Object c8 = aVar9.d.c(this.$message.getData(), Payloads.ClientDisconnect.class); - m.checkNotNullExpressionValue(c8, "gson.fromJson(message.da…ntDisconnect::class.java)"); - Payloads.ClientDisconnect clientDisconnect = (Payloads.ClientDisconnect) c8; - for (d dVar6 : aVar9.g) { - dVar6.k(clientDisconnect.getUserId()); - } - break; - case 14: - a aVar10 = this.this$0; - Object c9 = aVar10.d.c(this.$message.getData(), Payloads.SessionUpdate.class); - m.checkNotNullExpressionValue(c9, "gson.fromJson(message.da…essionUpdate::class.java)"); - Payloads.SessionUpdate sessionUpdate = (Payloads.SessionUpdate) c9; - for (d dVar7 : aVar10.g) { - String mediaSessionId2 = sessionUpdate.getMediaSessionId(); - if (mediaSessionId2 != null) { - dVar7.d(mediaSessionId2); - } - } - break; - case 15: - a aVar11 = this.this$0; - Gson gson = aVar11.d; - JsonElement data = this.$message.getData(); - Type type = a.b; - Objects.requireNonNull(gson); - Object d = data == null ? null : gson.d(new c.i.d.q.x.a(data), type); - m.checkNotNullExpressionValue(d, "gson.fromJson(message.data, MEDIA_SINK_WANTS_TYPE)"); - Map map = (Map) d; - for (d dVar8 : aVar11.g) { - dVar8.f(map); - } - break; - } - } - return Unit.a; - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class k extends o implements Function0 { - public final /* synthetic */ WebSocket $webSocket; - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public k(a aVar, WebSocket webSocket) { - super(0); - this.this$0 = aVar; - this.$webSocket = webSocket; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - boolean z2 = true; - if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { - a aVar = this.this$0; - c cVar = aVar.r; - if (cVar == c.CONNECTING) { - for (d dVar : aVar.g) { - dVar.j(); - } - } else if (cVar == c.RECONNECTING) { - String str = aVar.k; - String str2 = aVar.j; - String str3 = aVar.v; - Long l = aVar.o; - if (l != null && aVar.f216z.currentTimeMillis() - l.longValue() > 60000) { - z2 = false; - } - if (str == null || str2 == null || !aVar.f213s || !z2) { - StringBuilder L = c.d.b.a.a.L("Cannot resume connection. resumable: "); - L.append(aVar.f213s); - L.append(" -- isHeartbeatRecentEnough: "); - L.append(z2); - aVar.g(false, 4801, L.toString()); - } else { - aVar.i("[RESUME] resuming session. serverId=" + str2 + " sessionId=" + str); - for (d dVar2 : aVar.g) { - dVar2.h(); - } - aVar.r = c.RESUMING; - aVar.n(7, new Payloads.Resume(str3, str, str2)); - } - } - a aVar2 = this.this$0; - aVar2.r = c.CONNECTED; - long currentTimeMillis = aVar2.f216z.currentTimeMillis(); - Long l2 = this.this$0.q; - long longValue = currentTimeMillis - (l2 != null ? l2.longValue() : 0); - a aVar3 = this.this$0; - Logger logger = aVar3.f214x; - String str4 = aVar3.t; - StringBuilder L2 = c.d.b.a.a.L("[CONNECTED] to "); - L2.append(this.this$0.u); - Logger.i$default(logger, str4, L2.toString(), null, 4, null); - for (d dVar3 : this.this$0.g) { - dVar3.g(longValue / ((long) 2)); - } - } - return Unit.a; - } - } - - /* compiled from: RtcControlSocket.kt */ - public static final class l extends o implements Function1 { - public static final l i = new l(); - - public l() { - 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 Unit invoke(WebSocket webSocket) { - WebSocket webSocket2 = webSocket; - m.checkNotNullParameter(webSocket2, "it"); - webSocket2.e(4000, "reconnecting"); - return Unit.a; - } - } - - public a(String str, String str2, SSLSocketFactory sSLSocketFactory, Logger logger, c.a.r.c cVar, Clock clock, String str3) { - m.checkNotNullParameter(str, "endpoint"); - m.checkNotNullParameter(str2, "token"); - m.checkNotNullParameter(logger, "logger"); - m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor"); - m.checkNotNullParameter(clock, "clock"); - m.checkNotNullParameter(str3, "loggingTagPrefix"); - this.u = str; - this.v = str2; - this.w = sSLSocketFactory; - this.f214x = logger; - this.f215y = cVar; - this.f216z = clock; - this.A = str3; - StringBuilder P = c.d.b.a.a.P(str3, "->RtcControlSocket "); - int i2 = a + 1; - a = i2; - P.append(i2); - this.t = P.toString(); - } - - public static final void a(a aVar, boolean z2, Integer num, String str) { - aVar.r = c.DISCONNECTED; - if ((num != null && num.intValue() == 4004) || ((num != null && num.intValue() == 4015) || ((num != null && num.intValue() == 4011) || (num != null && num.intValue() == 4006)))) { - aVar.g(true, num, str); - } else if (aVar.f.hasReachedFailureThreshold()) { - aVar.j("[WS CLOSED] Backoff exceeded. Resetting."); - aVar.g(z2, num, str); - } else { - aVar.b(null); - String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) aVar.f.fail(new c(aVar, z2, num, str))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)"); - aVar.j("`[WS CLOSED] (" + z2 + ", " + num + ", " + str + ") retrying in " + H + " seconds."); - } - } - - public static /* synthetic */ void c(a aVar, Function1 function1, int i2) { - int i3 = i2 & 1; - aVar.b(null); - } - - public final void b(Function1 function1) { - this.f.cancel(); - this.n.cancel(); - TimerTask timerTask = this.p; - if (timerTask != null) { - timerTask.cancel(); - } - WebSocket webSocket = this.i; - if (!(webSocket == null || function1 == null)) { - function1.invoke(webSocket); - } - this.i = null; - } - - public final void d() { - i("[CLOSE]"); - b(e.i); - this.j = null; - this.k = null; - this.f213s = false; - this.r = c.DISCONNECTED; - for (d dVar : this.g) { - dVar.b(false, 1000, "Force Close"); - } - } - - @Override // com.discord.utilities.debug.DebugPrintable - public void debugPrint(DebugPrintBuilder debugPrintBuilder) { - m.checkNotNullParameter(debugPrintBuilder, "dp"); - debugPrintBuilder.appendKeyValue("serverId", this.j); - debugPrintBuilder.appendKeyValue("sessionId", this.k); - debugPrintBuilder.appendKeyValue("heartbeatInterval", this.l); - debugPrintBuilder.appendKeyValue("lastHeartbeatAckTime", this.o); - debugPrintBuilder.appendKeyValue("connectionStartTime", this.q); - debugPrintBuilder.appendKeyValue("connectionState", this.r); - debugPrintBuilder.appendKeyValue("resumable", Boolean.valueOf(this.f213s)); - debugPrintBuilder.appendKeyValue("isCanceled", Boolean.FALSE); - } - - public final boolean e() { - if (this.r != c.DISCONNECTED) { - j("Cannot start a new connection, connection state is not disconnected"); + if (!(obj instanceof a)) { return false; } - this.r = c.CONNECTING; - f(); - for (d dVar : this.g) { - dVar.i(); + a aVar = (a) obj; + return m.areEqual(this.a, aVar.a) && this.b == aVar.b && m.areEqual(this.f207c, aVar.f207c) && this.d == aVar.d && m.areEqual(this.e, aVar.e); + } + + public int hashCode() { + String str = this.a; + int i = 0; + int hashCode = (((str != null ? str.hashCode() : 0) * 31) + this.b) * 31; + String str2 = this.f207c; + int hashCode2 = (((hashCode + (str2 != null ? str2.hashCode() : 0)) * 31) + this.d) * 31; + Integer num = this.e; + if (num != null) { + i = num.hashCode(); } - return true; + return hashCode2 + i; } - public final void f() { - StringBuilder L = c.d.b.a.a.L("[CONNECT] "); - L.append(this.u); - i(L.toString()); - if (this.i != null) { - this.f214x.e(this.t, "Connect called with already existing websocket", null, null); - b(f.i); - return; - } - this.q = Long.valueOf(this.f216z.currentTimeMillis()); - TimerTask timerTask = this.p; - if (timerTask != null) { - timerTask.cancel(); - } - g gVar = new g(this); - this.p = gVar; - this.e.schedule(gVar, 20000); - x.a aVar = new x.a(); - aVar.a(1, TimeUnit.MINUTES); - SSLSocketFactory sSLSocketFactory = this.w; - if (sSLSocketFactory != null) { - h.a aVar2 = f0.f0.k.h.f2731c; - aVar.b(sSLSocketFactory, f0.f0.k.h.a.n()); - } - String D = c.d.b.a.a.D(new StringBuilder(), this.u, "?v=5"); - i("attempting WSS connection with " + D); - x xVar = new x(aVar); - z.a aVar3 = new z.a(); - aVar3.f(D); - this.i = xVar.g(aVar3.a(), this); - } - - public final void g(boolean z2, Integer num, String str) { - j("[DISCONNECT] (" + z2 + ", " + num + ", " + str + ')'); - b(null); - this.j = null; - this.k = null; - this.f213s = false; - this.r = c.DISCONNECTED; - for (d dVar : this.g) { - dVar.b(z2, num, str); - } - } - - public final void h(long j2, String str, boolean z2) { - m.checkNotNullParameter(str, "reason"); - if (this.i != null) { - i("Performing an immediate heartbeat on existing socket: " + str); - this.n.cancel(); - b bVar = new b(this); - this.n = bVar; - this.e.schedule(bVar, j2); - } else if (!z2) { - i("Immediate heartbeat requested, but is disconnected and a reset was not requested: " + str); - } else if (this.f.isPending() && this.i == null) { - i("Connection backoff reset Immediate heartbeat when socket was disconnected."); - this.f.succeed(); - l(false, 4802, "Reset backoff."); - } - } - - public final void i(String str) { - Logger.i$default(this.f214x, this.t, str, null, 4, null); - } - - public final void j(String str) { - Logger.w$default(this.f214x, this.t, str, null, 4, null); - } - - public final void k() { - if (this.m) { - this.m = false; - n(3, String.valueOf(this.f216z.currentTimeMillis())); - Long l2 = this.l; - if (l2 != null) { - b bVar = new b(this); - this.n = bVar; - this.e.schedule(bVar, l2.longValue()); - return; - } - j("onHeartbeatInterval called when heartbeatInterval was null"); - return; - } - b(d.i); - String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) this.f.fail(new e(this))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)"); - j("[ACK TIMEOUT] reconnecting in " + H + " seconds."); - } - - public final void l(boolean z2, Integer num, String str) { - i("[RECONNECT] wasFatal=" + z2 + " code=" + num + " reason=" + str); - b(l.i); - this.r = c.RECONNECTING; - f(); - } - - /* JADX WARN: Multi-variable type inference failed */ - /* JADX WARNING: Unknown variable types count: 1 */ - public final Future m(Function0 function0) { - c.a.r.c cVar = this.f215y; - if (function0 != null) { - function0 = new f(function0); - } - return cVar.submit((Runnable) function0); - } - - public final void n(int i2, Object obj) { - WebSocket webSocket = this.i; - if (webSocket == null) { - StringBuilder L = c.d.b.a.a.L("opcode() websocket null. opcode: "); - L.append(Opcodes.INSTANCE.getNameOf(i2)); - this.f214x.e(this.t, L.toString(), null, null); - return; - } - try { - String m = this.d.m(new Payloads.Outgoing(i2, obj)); - Logger logger = this.f214x; - String str = this.t; - Logger.d$default(logger, str, "sending (" + Opcodes.INSTANCE.getNameOf(i2) + "): " + m, null, 4, null); - m.checkNotNullExpressionValue(m, "json"); - webSocket.a(m); - } catch (Exception unused) { - Logger logger2 = this.f214x; - String str2 = this.t; - Logger.w$default(logger2, str2, "exception sending opcode: " + i2 + " and payload: " + obj, null, 4, null); - } - } - - @Override // okhttp3.WebSocketListener - public void onClosed(WebSocket webSocket, int i2, String str) { - m.checkNotNullParameter(webSocket, "webSocket"); - m.checkNotNullParameter(str, "reason"); - super.onClosed(webSocket, i2, str); - m(new h(this, webSocket, i2, str)); - } - - @Override // okhttp3.WebSocketListener - public void onClosing(WebSocket webSocket, int i2, String str) { - m.checkNotNullParameter(webSocket, "webSocket"); - m.checkNotNullParameter(str, "reason"); - ((f0.f0.n.d) webSocket).e(i2, str); - } - - @Override // okhttp3.WebSocketListener - public void onFailure(WebSocket webSocket, Throwable th, Response response) { - m.checkNotNullParameter(webSocket, "webSocket"); - m.checkNotNullParameter(th, "throwable"); - super.onFailure(webSocket, th, response); - m(new i(this, webSocket, th)); - } - - @Override // okhttp3.WebSocketListener - public void onMessage(WebSocket webSocket, String str) { - m.checkNotNullParameter(webSocket, "webSocket"); - m.checkNotNullParameter(str, "text"); - Object g2 = this.d.g(str, Payloads.Incoming.class); - super.onMessage(webSocket, str); - m(new j(this, webSocket, (Payloads.Incoming) c.i.a.f.e.o.c.q0(Payloads.Incoming.class).cast(g2))); - } - - @Override // okhttp3.WebSocketListener - public void onOpen(WebSocket webSocket, Response response) { - m.checkNotNullParameter(webSocket, "webSocket"); - m.checkNotNullParameter(response, "response"); - super.onOpen(webSocket, response); - m(new k(this, webSocket)); + public String toString() { + StringBuilder L = c.d.b.a.a.L("Codec(name="); + L.append(this.a); + L.append(", priority="); + L.append(this.b); + L.append(", type="); + L.append(this.f207c); + L.append(", payloadType="); + L.append(this.d); + L.append(", rtxPayloadType="); + return c.d.b.a.a.B(L, this.e, ")"); } } diff --git a/app/src/main/java/c/a/r/j0/b.java b/app/src/main/java/c/a/r/j0/b.java index b655be7340..0993c3762a 100644 --- a/app/src/main/java/c/a/r/j0/b.java +++ b/app/src/main/java/c/a/r/j0/b.java @@ -1,40 +1,288 @@ package c.a.r.j0; -import d0.z.d.o; -import java.util.TimerTask; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: RtcControlSocket.kt */ -public final class b extends TimerTask { - public final /* synthetic */ a i; +import android.content.Context; +import android.content.Intent; +import android.graphics.Point; +import android.graphics.Rect; +import android.media.AudioFormat; +import android.media.AudioPlaybackCaptureConfiguration; +import android.media.AudioRecord; +import android.media.projection.MediaProjection; +import android.os.Build; +import android.os.Handler; +import android.os.Looper; +import android.util.Log; +import androidx.annotation.RequiresApi; +import co.discord.media_engine.NativeCapturerObserver; +import co.discord.media_engine.SoundshareAudioSource; +import com.discord.rtcconnection.mediaengine.ThumbnailEmitter; +import com.discord.utilities.display.DisplayUtils; +import com.discord.utilities.logging.Logger; +import d0.z.d.m; +import java.util.Objects; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import kotlin.jvm.internal.DefaultConstructorMarker; +import org.webrtc.CapturerObserver; +import org.webrtc.JniCommon; +import org.webrtc.ScreenCapturerAndroid; +import org.webrtc.SurfaceTextureHelper; +import org.webrtc.TimestampAligner; +import org.webrtc.VideoFrame; +import rx.Observable; +import rx.Subscription; +import rx.functions.Action1; +/* compiled from: ScreenCapturer.kt */ +public final class b extends ScreenCapturerAndroid { + public static final a i = new a(null); + public final RunnableC0035b j = new RunnableC0035b(); + public NativeCapturerObserver k; + public SurfaceTextureHelper l; + public Context m; + public final SoundshareAudioSource n = new SoundshareAudioSource(); + public int o; + public int p; + public Long q; + public final Rect r = new Rect(); - /* compiled from: RtcControlSocket.kt */ - public static final class a extends o implements Function0 { - public final /* synthetic */ b this$0; + /* renamed from: s reason: collision with root package name */ + public final Rect f208s = new Rect(); + public final Point t = new Point(); + public int u; + public Subscription v; + public final Logger w; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public a(b bVar) { - super(0); - this.this$0 = bVar; - } + /* renamed from: x reason: collision with root package name */ + public final ThumbnailEmitter f209x; - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - a aVar = this.this$0.i; - int i = a.a; - aVar.k(); - return Unit.a; + /* compiled from: ScreenCapturer.kt */ + public static final class a { + public a(DefaultConstructorMarker defaultConstructorMarker) { } } - public b(a aVar) { - this.i = aVar; + /* compiled from: ScreenCapturer.kt */ + /* renamed from: c.a.r.j0.b$b reason: collision with other inner class name */ + public final class RunnableC0035b implements Runnable { + public RunnableC0035b() { + } + + @Override // java.lang.Runnable + public void run() { + b bVar = b.this; + if (bVar.o > 0) { + Long l = bVar.q; + if (l != null) { + long rtcTimeNanos = TimestampAligner.getRtcTimeNanos() - l.longValue(); + b bVar2 = b.this; + if (rtcTimeNanos > ((long) bVar2.p)) { + NativeCapturerObserver nativeCapturerObserver = bVar2.k; + if (nativeCapturerObserver == null) { + m.throwUninitializedPropertyAccessException("nativeObserver"); + } + nativeCapturerObserver.repeatLastFrame(); + } + } + b.this.c(); + } + } } - @Override // java.util.TimerTask, java.lang.Runnable - public void run() { - this.i.m(new a(this)); + /* compiled from: ScreenCapturer.kt */ + public static final class c implements Action1 { + public final /* synthetic */ b i; + + public c(b bVar) { + this.i = bVar; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Long l) { + this.i.j.run(); + } + } + + /* compiled from: ScreenCapturer.kt */ + public static final class d implements Action1 { + public static final d i = new d(); + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Throwable th) { + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public b(Intent intent, MediaProjection.Callback callback, Logger logger, ThumbnailEmitter thumbnailEmitter) { + super(intent, callback); + m.checkNotNullParameter(intent, "mediaProjectionPermissionResultData"); + m.checkNotNullParameter(callback, "mediaProjectionCallback"); + m.checkNotNullParameter(logger, "logger"); + this.w = logger; + this.f209x = thumbnailEmitter; + } + + public final synchronized void a(Rect rect, int i2) { + m.checkNotNullParameter(rect, "measuredSize"); + int max = Math.max(rect.width(), rect.height()); + if (max > 0) { + float f = ((float) i2) / ((float) max); + this.t.set((int) (((float) rect.width()) * f), (int) (((float) rect.height()) * f)); + Point point = this.t; + int i3 = point.x; + int i4 = i3 % 16; + if (i4 >= 8) { + i3 += 16; + } + int i5 = i3 - i4; + int i6 = point.y; + int i7 = i6 % 16; + if (i7 >= 8) { + i6 += 16; + } + point.set(i5, i6 - i7); + Point point2 = this.t; + super.changeCaptureFormat(point2.x, point2.y, this.o); + } + } + + @RequiresApi(29) + public final AudioRecord b() { + MediaProjection mediaProjection = this.mediaProjection; + if (mediaProjection == null) { + return null; + } + AudioPlaybackCaptureConfiguration build = new AudioPlaybackCaptureConfiguration.Builder(mediaProjection).addMatchingUsage(1).addMatchingUsage(14).addMatchingUsage(0).build(); + m.checkNotNullExpressionValue(build, "AudioPlaybackCaptureConf…KNOWN)\n .build()"); + try { + return new AudioRecord.Builder().setAudioFormat(new AudioFormat.Builder().setEncoding(2).setSampleRate(44100).setChannelMask(16).build()).setAudioPlaybackCaptureConfig(build).build(); + } catch (SecurityException unused) { + Log.w(b.class.getName(), "Failed to record audio"); + return null; + } + } + + public final void c() { + if (this.o > 0) { + Subscription subscription = this.v; + if (subscription != null) { + subscription.unsubscribe(); + } + Observable e02 = Observable.e0(((long) this.p) / 1000000, TimeUnit.MILLISECONDS); + SurfaceTextureHelper surfaceTextureHelper = this.l; + if (surfaceTextureHelper == null) { + m.throwUninitializedPropertyAccessException("surfaceTextureHelper"); + } + Handler handler = surfaceTextureHelper.getHandler(); + m.checkNotNullExpressionValue(handler, "surfaceTextureHelper.handler"); + Looper looper = handler.getLooper(); + AtomicReference atomicReference = j0.j.b.a.a; + Objects.requireNonNull(looper, "looper == null"); + this.v = e02.Y(new j0.j.b.b(looper)).X(new c(this), d.i); + } + } + + @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer + public synchronized void changeCaptureFormat(int i2, int i3, int i4) { + a(this.r, Math.max(i2, i3)); + d(i4); + } + + @Override // org.webrtc.ScreenCapturerAndroid + public void createVirtualDisplay() { + try { + super.createVirtualDisplay(); + } catch (Throwable th) { + Logger.e$default(this.w, "ScreenCapturer", "error in createVirtualDisplay", th, null, 8, null); + } + } + + public final void d(int i2) { + if (i2 <= 0) { + this.o = 0; + this.p = 0; + return; + } + this.o = i2; + this.p = 1000000000 / Math.max(10, i2 / 2); + } + + @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer + public void dispose() { + stopCapture(); + ThumbnailEmitter thumbnailEmitter = this.f209x; + if (thumbnailEmitter != null) { + synchronized (thumbnailEmitter) { + thumbnailEmitter.d.release(); + thumbnailEmitter.f2093c.release(); + JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b); + thumbnailEmitter.a = Long.MAX_VALUE; + } + } + this.n.release(); + super.dispose(); + } + + @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer + public synchronized void initialize(SurfaceTextureHelper surfaceTextureHelper, Context context, CapturerObserver capturerObserver) { + m.checkNotNullParameter(surfaceTextureHelper, "surfaceTextureHelper"); + m.checkNotNullParameter(context, "applicationContext"); + m.checkNotNullParameter(capturerObserver, "capturerObserver"); + this.l = surfaceTextureHelper; + this.m = context; + this.k = (NativeCapturerObserver) capturerObserver; + super.initialize(surfaceTextureHelper, context, capturerObserver); + } + + @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoSink + public void onFrame(VideoFrame videoFrame) { + Rect rect = this.f208s; + Context context = this.m; + if (context == null) { + m.throwUninitializedPropertyAccessException("context"); + } + rect.set(DisplayUtils.getScreenSize(context)); + if (!m.areEqual(this.f208s, this.r)) { + this.r.set(this.f208s); + a(this.f208s, this.u); + } + this.q = Long.valueOf(videoFrame.getTimestampNs()); + ThumbnailEmitter thumbnailEmitter = this.f209x; + if (thumbnailEmitter != null) { + synchronized (thumbnailEmitter) { + m.checkNotNullParameter(videoFrame, "frame"); + long currentTimeMillis = thumbnailEmitter.k.currentTimeMillis() - thumbnailEmitter.e; + long timestampNs = videoFrame.getTimestampNs() - thumbnailEmitter.a; + if (currentTimeMillis > thumbnailEmitter.j) { + long j = (long) 1000; + if (timestampNs > thumbnailEmitter.i * j * j) { + thumbnailEmitter.a = videoFrame.getTimestampNs(); + thumbnailEmitter.l.invoke(thumbnailEmitter.a(videoFrame)); + } + } + } + } + super.onFrame(videoFrame); + } + + @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer + public synchronized void startCapture(int i2, int i3, int i4) { + AudioRecord b; + super.startCapture(i2, i3, i4); + this.u = Math.max(i2, i3); + d(i4); + if (Build.VERSION.SDK_INT >= 29 && (b = b()) != null) { + this.n.startRecording(b); + } + c(); + } + + @Override // org.webrtc.ScreenCapturerAndroid, org.webrtc.VideoCapturer + public synchronized void stopCapture() { + super.stopCapture(); + this.n.stopRecording(); + this.o = 0; + this.q = null; } } diff --git a/app/src/main/java/c/a/r/j0/c.java b/app/src/main/java/c/a/r/j0/c.java deleted file mode 100644 index d8e78babd7..0000000000 --- a/app/src/main/java/c/a/r/j0/c.java +++ /dev/null @@ -1,34 +0,0 @@ -package c.a.r.j0; - -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: RtcControlSocket.kt */ -public final class c extends o implements Function0 { - public final /* synthetic */ Integer $code; - public final /* synthetic */ String $reason; - public final /* synthetic */ boolean $wasFatal; - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public c(a aVar, boolean z2, Integer num, String str) { - super(0); - this.this$0 = aVar; - this.$wasFatal = z2; - this.$code = num; - this.$reason = str; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - a aVar = this.this$0; - boolean z2 = this.$wasFatal; - Integer num = this.$code; - String str = this.$reason; - int i = a.a; - aVar.l(z2, num, str); - return Unit.a; - } -} diff --git a/app/src/main/java/c/a/r/i0/c/a.java b/app/src/main/java/c/a/r/j0/c/a.java similarity index 98% rename from app/src/main/java/c/a/r/i0/c/a.java rename to app/src/main/java/c/a/r/j0/c/a.java index ca9b999b8d..a4081402ea 100644 --- a/app/src/main/java/c/a/r/i0/c/a.java +++ b/app/src/main/java/c/a/r/j0/c/a.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import d0.z.d.m; diff --git a/app/src/main/java/c/a/r/i0/c/b.java b/app/src/main/java/c/a/r/j0/c/b.java similarity index 98% rename from app/src/main/java/c/a/r/i0/c/b.java rename to app/src/main/java/c/a/r/j0/c/b.java index 87ff58700d..336982dbb7 100644 --- a/app/src/main/java/c/a/r/i0/c/b.java +++ b/app/src/main/java/c/a/r/j0/c/b.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import co.discord.media_engine.Connection; import d0.z.d.m; diff --git a/app/src/main/java/c/a/r/i0/c/c.java b/app/src/main/java/c/a/r/j0/c/c.java similarity index 98% rename from app/src/main/java/c/a/r/i0/c/c.java rename to app/src/main/java/c/a/r/j0/c/c.java index f84225a920..1035135d9e 100644 --- a/app/src/main/java/c/a/r/i0/c/c.java +++ b/app/src/main/java/c/a/r/j0/c/c.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import co.discord.media_engine.Connection; import d0.z.d.o; diff --git a/app/src/main/java/c/a/r/i0/c/d.java b/app/src/main/java/c/a/r/j0/c/d.java similarity index 97% rename from app/src/main/java/c/a/r/i0/c/d.java rename to app/src/main/java/c/a/r/j0/c/d.java index 080259c69b..5e7d08ea7d 100644 --- a/app/src/main/java/c/a/r/i0/c/d.java +++ b/app/src/main/java/c/a/r/j0/c/d.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import com.discord.utilities.logging.Logger; @@ -51,7 +51,7 @@ public final class d implements Discord.ConnectToServerCallback { MediaEngineConnection.ConnectionState connectionState = MediaEngineConnection.ConnectionState.CONNECTED; eVar.f210c = connectionState; eVar.y(new a(eVar, connectionState)); - c.a.r.i0.a aVar = new c.a.r.i0.a("opus", 1, "audio", 120, null); + c.a.r.j0.a aVar = new c.a.r.j0.a("opus", 1, "audio", 120, null); eVar.j.clear(); eVar.j.add(aVar); eVar.j.addAll(eVar.p); diff --git a/app/src/main/java/c/a/r/i0/c/e.java b/app/src/main/java/c/a/r/j0/c/e.java similarity index 97% rename from app/src/main/java/c/a/r/i0/c/e.java rename to app/src/main/java/c/a/r/j0/c/e.java index ddce016eb9..a000965cb3 100644 --- a/app/src/main/java/c/a/r/i0/c/e.java +++ b/app/src/main/java/c/a/r/j0/c/e.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import android.content.Intent; import android.media.projection.MediaProjection; @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; import kotlin.Unit; import kotlin.jvm.functions.Function0; @@ -32,7 +33,7 @@ import kotlin.jvm.functions.Function1; /* compiled from: MediaEngineConnectionLegacy.kt */ public final class e implements MediaEngineConnection { public static final String a = "e"; - public final List b; + public final CopyOnWriteArrayList b; /* renamed from: c reason: collision with root package name */ public MediaEngineConnection.ConnectionState f210c; @@ -42,13 +43,13 @@ public final class e implements MediaEngineConnection { public final Set g = new LinkedHashSet(); public final Set h = new LinkedHashSet(); public final Set i = new LinkedHashSet(); - public final List j = new ArrayList(); + public final List j = new ArrayList(); public final Connection k; public final c.a.r.c l; public final Logger m; public final r n; public final Discord o; - public final List p; + public final List p; public final MediaEngineConnection.Type q; public final long r; @@ -154,7 +155,7 @@ public final class e implements MediaEngineConnection { } /* compiled from: MediaEngineConnectionLegacy.kt */ - /* renamed from: c.a.r.i0.c.e$e reason: collision with other inner class name */ + /* renamed from: c.a.r.j0.c.e$e reason: collision with other inner class name */ public static final class C0036e extends d0.z.d.o implements Function1 { public final /* synthetic */ KrispOveruseDetector.Status $status; public final /* synthetic */ e this$0; @@ -503,10 +504,10 @@ public final class e implements MediaEngineConnection { /* compiled from: MediaEngineConnectionLegacy.kt */ public static final class t extends d0.z.d.o implements Function1 { - public final /* synthetic */ c.a.r.i0.b $screenCapturer; + public final /* synthetic */ c.a.r.j0.b $screenCapturer; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public t(c.a.r.i0.b bVar) { + public t(c.a.r.j0.b bVar) { super(1); this.$screenCapturer = bVar; } @@ -517,7 +518,7 @@ public final class e implements MediaEngineConnection { public Unit invoke(Connection connection) { Connection connection2 = connection; d0.z.d.m.checkNotNullParameter(connection2, "$receiver"); - c.a.r.i0.b bVar = this.$screenCapturer; + c.a.r.j0.b bVar = this.$screenCapturer; connection2.startScreenshareBroadcast(bVar, bVar.n.getNativeInstance()); return Unit.a; } @@ -549,7 +550,7 @@ public final class e implements MediaEngineConnection { } } - public e(c.a.r.c cVar, Logger logger, r rVar, Discord discord, List list, MediaEngineConnection.Type type, long j2, MediaEngine.a aVar, List list2) { + public e(c.a.r.c cVar, Logger logger, r rVar, Discord discord, List list, MediaEngineConnection.Type type, long j2, MediaEngine.a aVar, List list2) { d0.z.d.m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor"); d0.z.d.m.checkNotNullParameter(logger, "logger"); d0.z.d.m.checkNotNullParameter(rVar, "noiseCancellationConfig"); @@ -573,20 +574,20 @@ public final class e implements MediaEngineConnection { connectToServer.setOnVideoCallback(new b(this)); connectToServer.setUserSpeakingStatusChangedCallback(new c(this)); this.k = connectToServer; - this.b = new ArrayList(list2); + this.b = new CopyOnWriteArrayList<>(list2); this.f210c = connectionState; y(new a(this, connectionState)); } public static final Future x(e eVar, Function0 function0) { c.a.r.c cVar = eVar.l; - return cVar.j.submit(new i(function0)); + return cVar.k.submit(new i(function0)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public synchronized void a(Intent intent, ThumbnailEmitter thumbnailEmitter) { d0.z.d.m.checkNotNullParameter(intent, "permission"); - z(new t(new c.a.r.i0.b(intent, new u(), this.m, thumbnailEmitter))); + z(new t(new c.a.r.j0.b(intent, new u(), this.m, thumbnailEmitter))); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection @@ -717,23 +718,23 @@ public final class e implements MediaEngineConnection { break; } obj2 = it.next(); - if (d0.z.d.m.areEqual(((c.a.r.i0.a) obj2).a, str)) { + if (d0.z.d.m.areEqual(((c.a.r.j0.a) obj2).a, str)) { break; } } - c.a.r.i0.a aVar = (c.a.r.i0.a) obj2; + c.a.r.j0.a aVar = (c.a.r.j0.a) obj2; Iterator it2 = this.j.iterator(); while (true) { if (!it2.hasNext()) { break; } Object next = it2.next(); - if (d0.z.d.m.areEqual(((c.a.r.i0.a) next).a, str2)) { + if (d0.z.d.m.areEqual(((c.a.r.j0.a) next).a, str2)) { obj = next; break; } } - c.a.r.i0.a aVar2 = (c.a.r.i0.a) obj; + c.a.r.j0.a aVar2 = (c.a.r.j0.a) obj; if (aVar == null) { throw new MediaEngineConnection.FailedConnectionException("Missing audio codec: " + str + '.', MediaEngineConnection.FailedConnectionException.FailureType.CODEC_NEGOTIATION_FAILED); } else if (aVar2 != null) { @@ -821,6 +822,7 @@ public final class e implements MediaEngineConnection { public final void y(Function1 function1) { for (MediaEngineConnection.c cVar : this.b) { try { + d0.z.d.m.checkNotNullExpressionValue(cVar, "it"); function1.invoke(cVar); } catch (Exception e) { Logger logger = this.m; diff --git a/app/src/main/java/c/a/r/i0/c/f.java b/app/src/main/java/c/a/r/j0/c/f.java similarity index 95% rename from app/src/main/java/c/a/r/i0/c/f.java rename to app/src/main/java/c/a/r/j0/c/f.java index 76ac24a84a..410449a02e 100644 --- a/app/src/main/java/c/a/r/i0/c/f.java +++ b/app/src/main/java/c/a/r/j0/c/f.java @@ -1,6 +1,6 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; -import c.a.r.i0.c.e; +import c.a.r.j0.c.e; import co.discord.media_engine.Connection; import co.discord.media_engine.Stats; import com.discord.utilities.logging.Logger; diff --git a/app/src/main/java/c/a/r/i0/c/g.java b/app/src/main/java/c/a/r/j0/c/g.java similarity index 98% rename from app/src/main/java/c/a/r/i0/c/g.java rename to app/src/main/java/c/a/r/j0/c/g.java index f374720807..e758835890 100644 --- a/app/src/main/java/c/a/r/i0/c/g.java +++ b/app/src/main/java/c/a/r/j0/c/g.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import d0.z.d.m; diff --git a/app/src/main/java/c/a/r/i0/c/h.java b/app/src/main/java/c/a/r/j0/c/h.java similarity index 98% rename from app/src/main/java/c/a/r/i0/c/h.java rename to app/src/main/java/c/a/r/j0/c/h.java index 96a099f0f0..85f9203f44 100644 --- a/app/src/main/java/c/a/r/i0/c/h.java +++ b/app/src/main/java/c/a/r/j0/c/h.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import d0.g0.s; diff --git a/app/src/main/java/c/a/r/i0/c/i.java b/app/src/main/java/c/a/r/j0/c/i.java similarity index 95% rename from app/src/main/java/c/a/r/i0/c/i.java rename to app/src/main/java/c/a/r/j0/c/i.java index 0f4393a9d8..e2435dcccf 100644 --- a/app/src/main/java/c/a/r/i0/c/i.java +++ b/app/src/main/java/c/a/r/j0/c/i.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import d0.z.d.m; import kotlin.jvm.functions.Function0; diff --git a/app/src/main/java/c/a/r/i0/c/j.java b/app/src/main/java/c/a/r/j0/c/j.java similarity index 97% rename from app/src/main/java/c/a/r/i0/c/j.java rename to app/src/main/java/c/a/r/j0/c/j.java index c683604528..edd71ce1e7 100644 --- a/app/src/main/java/c/a/r/i0/c/j.java +++ b/app/src/main/java/c/a/r/j0/c/j.java @@ -1,8 +1,8 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import android.content.Context; import android.os.Build; -import c.a.r.b0; +import c.a.r.c0; import co.discord.media_engine.RtcRegion; import co.discord.media_engine.VideoInputDeviceDescription; import com.discord.rtcconnection.KrispOveruseDetector; @@ -38,7 +38,7 @@ public final class j implements MediaEngine { public final List e; public boolean f; public Discord g; - public List h; + public List h; public MediaEngine.OpenSLUsageMode i; public final Context j; public final c.a.r.c k; @@ -52,7 +52,7 @@ public final class j implements MediaEngine { public final /* synthetic */ j a; /* compiled from: MediaEngineLegacy.kt */ - /* renamed from: c.a.r.i0.c.j$a$a reason: collision with other inner class name */ + /* renamed from: c.a.r.j0.c.j$a$a reason: collision with other inner class name */ public static final class C0037a extends o implements Function0 { public final /* synthetic */ MediaEngineConnection $connection; public final /* synthetic */ a this$0; @@ -120,7 +120,7 @@ public final class j implements MediaEngine { } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List list) { + public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List list) { m.checkNotNullParameter(mediaEngineConnection, "connection"); m.checkNotNullParameter(transportInfo, "transportInfo"); m.checkNotNullParameter(list, "supportedVideoCodecs"); @@ -212,7 +212,7 @@ public final class j implements MediaEngine { } /* compiled from: MediaEngineLegacy.kt */ - public static final class d implements Action1> { + public static final class d implements Action1> { public final /* synthetic */ j i; public d(j jVar) { @@ -220,11 +220,11 @@ public final class j implements MediaEngine { } /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List */ + /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List */ /* JADX WARN: Multi-variable type inference failed */ @Override // rx.functions.Action1 - public void call(List list) { - List list2 = list; + public void call(List list) { + List list2 = list; j jVar = this.i; m.checkNotNullExpressionValue(list2, "codecs"); jVar.h = list2; @@ -232,13 +232,13 @@ public final class j implements MediaEngine { } /* compiled from: MediaEngineLegacy.kt */ - public static final class e implements j0.k.b, Unit> { + public static final class e implements j0.k.b, Unit> { public static final e i = new e(); /* 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 // j0.k.b - public Unit call(List list) { + public Unit call(List list) { return Unit.a; } } @@ -332,7 +332,7 @@ public final class j implements MediaEngine { public static final Future r(j jVar, Function0 function0) { c.a.r.c cVar = jVar.k; - return cVar.j.submit(new q(function0)); + return cVar.k.submit(new q(function0)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngine @@ -415,7 +415,7 @@ public final class j implements MediaEngine { m.checkNotNullParameter(function1, "onFailure"); e eVar = null; if (!(this.h != null)) { - ((b0) function1).invoke(new IllegalStateException("connect called on unprepared media engine.")); + ((c0) function1).invoke(new IllegalStateException("connect called on unprepared media engine.")); return null; } Discord discord = this.g; @@ -426,7 +426,7 @@ public final class j implements MediaEngine { c.a.r.c cVar = this.k; Logger logger2 = this.m; r rVar = this.f211c; - List list = this.h; + List list = this.h; if (list == null) { m.throwUninitializedPropertyAccessException("supportedVideoCodecs"); } diff --git a/app/src/main/java/c/a/r/i0/c/k.java b/app/src/main/java/c/a/r/j0/c/k.java similarity index 94% rename from app/src/main/java/c/a/r/i0/c/k.java rename to app/src/main/java/c/a/r/j0/c/k.java index e00252597d..2782b432f8 100644 --- a/app/src/main/java/c/a/r/i0/c/k.java +++ b/app/src/main/java/c/a/r/j0/c/k.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import d0.u.a; import d0.z.d.m; diff --git a/app/src/main/java/c/a/r/i0/c/l.java b/app/src/main/java/c/a/r/j0/c/l.java similarity index 97% rename from app/src/main/java/c/a/r/i0/c/l.java rename to app/src/main/java/c/a/r/j0/c/l.java index 43d1305cdd..0f586e7937 100644 --- a/app/src/main/java/c/a/r/i0/c/l.java +++ b/app/src/main/java/c/a/r/j0/c/l.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import com.discord.rtcconnection.mediaengine.MediaEngine; import com.hammerandchisel.libdiscord.Discord; diff --git a/app/src/main/java/c/a/r/i0/c/m.java b/app/src/main/java/c/a/r/j0/c/m.java similarity index 98% rename from app/src/main/java/c/a/r/i0/c/m.java rename to app/src/main/java/c/a/r/j0/c/m.java index 638db7bb8c..3fc5066061 100644 --- a/app/src/main/java/c/a/r/i0/c/m.java +++ b/app/src/main/java/c/a/r/j0/c/m.java @@ -1,6 +1,6 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; -import c.a.r.i0.a; +import c.a.r.j0.a; import com.hammerandchisel.libdiscord.Discord; import d0.t.n; import d0.t.o; diff --git a/app/src/main/java/c/a/r/i0/c/n.java b/app/src/main/java/c/a/r/j0/c/n.java similarity index 94% rename from app/src/main/java/c/a/r/i0/c/n.java rename to app/src/main/java/c/a/r/j0/c/n.java index c5a46a6718..ec9b0fd2a5 100644 --- a/app/src/main/java/c/a/r/i0/c/n.java +++ b/app/src/main/java/c/a/r/j0/c/n.java @@ -1,6 +1,6 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; -import c.a.r.i0.a; +import c.a.r.j0.a; import com.hammerandchisel.libdiscord.Discord; import java.util.List; import rx.Emitter; diff --git a/app/src/main/java/c/a/r/i0/c/o.java b/app/src/main/java/c/a/r/j0/c/o.java similarity index 97% rename from app/src/main/java/c/a/r/i0/c/o.java rename to app/src/main/java/c/a/r/j0/c/o.java index d64be743a2..36f0c4350d 100644 --- a/app/src/main/java/c/a/r/i0/c/o.java +++ b/app/src/main/java/c/a/r/j0/c/o.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import androidx.annotation.NonNull; import com.hammerandchisel.libdiscord.Discord; diff --git a/app/src/main/java/c/a/r/i0/c/p.java b/app/src/main/java/c/a/r/j0/c/p.java similarity index 97% rename from app/src/main/java/c/a/r/i0/c/p.java rename to app/src/main/java/c/a/r/j0/c/p.java index 44ce332d68..8526189b0f 100644 --- a/app/src/main/java/c/a/r/i0/c/p.java +++ b/app/src/main/java/c/a/r/j0/c/p.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import androidx.annotation.NonNull; import co.discord.media_engine.VideoInputDeviceDescription; diff --git a/app/src/main/java/c/a/r/i0/c/q.java b/app/src/main/java/c/a/r/j0/c/q.java similarity index 95% rename from app/src/main/java/c/a/r/i0/c/q.java rename to app/src/main/java/c/a/r/j0/c/q.java index 32d8e4a423..4312257796 100644 --- a/app/src/main/java/c/a/r/i0/c/q.java +++ b/app/src/main/java/c/a/r/j0/c/q.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; import d0.z.d.m; import kotlin.jvm.functions.Function0; diff --git a/app/src/main/java/c/a/r/i0/c/r.java b/app/src/main/java/c/a/r/j0/c/r.java similarity index 82% rename from app/src/main/java/c/a/r/i0/c/r.java rename to app/src/main/java/c/a/r/j0/c/r.java index 5730b0a9e6..f729a0a984 100644 --- a/app/src/main/java/c/a/r/i0/c/r.java +++ b/app/src/main/java/c/a/r/j0/c/r.java @@ -1,4 +1,4 @@ -package c.a.r.i0.c; +package c.a.r.j0.c; /* compiled from: NoiseCancellationConfig.kt */ public final class r { public boolean a; diff --git a/app/src/main/java/c/a/r/j0/d.java b/app/src/main/java/c/a/r/j0/d.java deleted file mode 100644 index 3071adfcf0..0000000000 --- a/app/src/main/java/c/a/r/j0/d.java +++ /dev/null @@ -1,25 +0,0 @@ -package c.a.r.j0; - -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -import okhttp3.WebSocket; -/* compiled from: RtcControlSocket.kt */ -public final class d extends o implements Function1 { - public static final d i = new d(); - - public d() { - 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 Unit invoke(WebSocket webSocket) { - WebSocket webSocket2 = webSocket; - m.checkNotNullParameter(webSocket2, "it"); - webSocket2.e(4800, "Heartbeat timeout."); - return Unit.a; - } -} diff --git a/app/src/main/java/c/a/r/j0/e.java b/app/src/main/java/c/a/r/j0/e.java deleted file mode 100644 index 648d5e5e17..0000000000 --- a/app/src/main/java/c/a/r/j0/e.java +++ /dev/null @@ -1,25 +0,0 @@ -package c.a.r.j0; - -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: RtcControlSocket.kt */ -public final class e extends o implements Function0 { - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public e(a aVar) { - super(0); - this.this$0 = aVar; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - a aVar = this.this$0; - int i = a.a; - aVar.l(true, 4800, "Heartbeat timeout."); - return Unit.a; - } -} diff --git a/app/src/main/java/c/a/r/j0/f.java b/app/src/main/java/c/a/r/j0/f.java deleted file mode 100644 index ace2adc08f..0000000000 --- a/app/src/main/java/c/a/r/j0/f.java +++ /dev/null @@ -1,17 +0,0 @@ -package c.a.r.j0; - -import d0.z.d.m; -import kotlin.jvm.functions.Function0; -/* compiled from: RtcControlSocket.kt */ -public final class f implements Runnable { - public final /* synthetic */ Function0 i; - - public f(Function0 function0) { - this.i = function0; - } - - @Override // java.lang.Runnable - public final /* synthetic */ void run() { - m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)"); - } -} diff --git a/app/src/main/java/c/a/r/k.java b/app/src/main/java/c/a/r/k.java index c9aae48877..f2efe5f213 100644 --- a/app/src/main/java/c/a/r/k.java +++ b/app/src/main/java/c/a/r/k.java @@ -1,107 +1,28 @@ package c.a.r; -import com.discord.rtcconnection.EncodeQuality; import com.discord.rtcconnection.MediaSinkWantsManager; -import com.discord.rtcconnection.VideoMetadata; -import com.discord.rtcconnection.socket.io.Payloads; -import d0.t.n; -import d0.z.d.m; import d0.z.d.o; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import java.util.Objects; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: MediaSinkWantsManager.kt */ public final class k extends o implements Function0 { - public final /* synthetic */ List $ssrcs; - public final /* synthetic */ long $userId; + public final /* synthetic */ boolean $sendVideo; public final /* synthetic */ MediaSinkWantsManager this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public k(MediaSinkWantsManager mediaSinkWantsManager, List list, long j) { + public k(MediaSinkWantsManager mediaSinkWantsManager, boolean z2) { super(0); this.this$0 = mediaSinkWantsManager; - this.$ssrcs = list; - this.$userId = j; + this.$sendVideo = z2; } /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX WARNING: Code restructure failed: missing block: B:12:0x0036, code lost: - if ((r6 != null ? r6.intValue() : 0) > 0) goto L_0x003a; - */ - /* JADX WARNING: Code restructure failed: missing block: B:31:0x0086, code lost: - if (r10 != null) goto L_0x008b; - */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Unit mo1invoke() { - EncodeQuality encodeQuality; - List list = this.$ssrcs; - ArrayList arrayList = new ArrayList(); - Iterator it = list.iterator(); - while (true) { - boolean z2 = true; - if (!it.hasNext()) { - break; - } - Object next = it.next(); - Payloads.Stream stream = (Payloads.Stream) next; - Boolean active = stream.getActive(); - if (active != null ? active.booleanValue() : false) { - Integer ssrc = stream.getSsrc(); - } - z2 = false; - if (z2) { - arrayList.add(next); - } - } - ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10)); - Iterator it2 = arrayList.iterator(); - while (it2.hasNext()) { - Payloads.Stream stream2 = (Payloads.Stream) it2.next(); - Integer quality = stream2.getQuality(); - VideoMetadata videoMetadata = null; - if (quality != null) { - int intValue = quality.intValue(); - Objects.requireNonNull(EncodeQuality.Companion); - EncodeQuality[] values = EncodeQuality.values(); - int i = 0; - while (true) { - if (i >= 11) { - encodeQuality = null; - break; - } - encodeQuality = values[i]; - if (encodeQuality.getValue() == intValue) { - break; - } - i++; - } - } - encodeQuality = EncodeQuality.Hundred; - Integer ssrc2 = stream2.getSsrc(); - m.checkNotNull(ssrc2); - int intValue2 = ssrc2.intValue(); - MediaSinkWantsManager mediaSinkWantsManager = this.this$0; - long j = this.$userId; - Objects.requireNonNull(mediaSinkWantsManager); - if (stream2.getMaxResolution() != null) { - videoMetadata = new VideoMetadata(j, stream2.getMaxResolution().getWidth(), stream2.getMaxResolution().getHeight(), stream2.getMaxFrameRate(), stream2.getMaxResolution().getType()); - } else { - mediaSinkWantsManager.a("metadataOf: " + stream2 + " has no maxResolution!"); - } - arrayList2.add(new MediaSinkWantsManager.b(encodeQuality, intValue2, videoMetadata)); - } - if (arrayList2.isEmpty()) { - this.this$0.b.remove(Long.valueOf(this.$userId)); - this.this$0.f2072c.remove(Long.valueOf(this.$userId)); - } else { - this.this$0.b.put(Long.valueOf(this.$userId), arrayList2); - this.this$0.f2072c.add(Long.valueOf(this.$userId)); - } - this.this$0.d(arrayList2.isEmpty() ? n.emptyList() : d0.t.m.listOf(String.valueOf(this.$userId))); + Objects.requireNonNull(this.this$0); + MediaSinkWantsManager.e(this.this$0, null, 1); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/k0/a.java b/app/src/main/java/c/a/r/k0/a.java index 8f602a6115..b2bf74d78e 100644 --- a/app/src/main/java/c/a/r/k0/a.java +++ b/app/src/main/java/c/a/r/k0/a.java @@ -1,114 +1,816 @@ package c.a.r.k0; -import c.a.r.k0.e; -import co.discord.media_engine.InboundRtpVideo; -import co.discord.media_engine.OutboundRtpAudio; -import co.discord.media_engine.OutboundRtpVideo; -import co.discord.media_engine.ReceiverReport; -import co.discord.media_engine.Stats; -import co.discord.media_engine.Transport; -import com.discord.rtcconnection.KrispOveruseDetector; -import com.discord.rtcconnection.mediaengine.MediaEngineConnection; -import d0.t.r; -import d0.z.d.k; +import android.os.Handler; +import android.os.Looper; +import android.os.Process; +import com.airbnb.lottie.parser.AnimatableValueParser; +import com.discord.rtcconnection.socket.io.Opcodes; +import com.discord.rtcconnection.socket.io.Payloads; +import com.discord.utilities.debug.DebugPrintBuilder; +import com.discord.utilities.debug.DebugPrintable; +import com.discord.utilities.logging.Logger; +import com.discord.utilities.networking.Backoff; +import com.discord.utilities.time.Clock; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.reflect.TypeToken; import d0.z.d.m; +import d0.z.d.o; +import f0.f0.k.h; +import f0.x; +import f0.z; +import java.lang.reflect.Type; +import java.util.List; import java.util.Map; import java.util.Objects; -import kotlin.Pair; +import java.util.Timer; +import java.util.TimerTask; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSocketFactory; import kotlin.Unit; +import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; -/* compiled from: RtcStatsCollector.kt */ -public final /* synthetic */ class a extends k implements Function1 { - public a(d dVar) { - super(1, dVar, d.class, "onStatsReceived", "onStatsReceived(Lco/discord/media_engine/Stats;)V", 0); +import kotlin.jvm.internal.DefaultConstructorMarker; +import okhttp3.Response; +import okhttp3.WebSocket; +import okhttp3.WebSocketListener; +/* compiled from: RtcControlSocket.kt */ +public final class a extends WebSocketListener implements DebugPrintable { + public static int a; + public static final Type b = new C0038a().getType(); + + /* renamed from: c reason: collision with root package name */ + public static final b f212c = new b(null); + public final String A; + public final Gson d = new c.i.d.e().a(); + public final Timer e = new Timer(); + public final Backoff f = new Backoff(1000, 5000, 3, false, null, 24, null); + public final CopyOnWriteArraySet g = new CopyOnWriteArraySet<>(); + public int h = 3; + public WebSocket i; + public String j; + public String k; + public Long l; + public boolean m; + public b n = new b(this); + public Long o; + public TimerTask p; + public Long q; + public c r = c.DISCONNECTED; + + /* renamed from: s reason: collision with root package name */ + public boolean f213s; + public final String t; + public final String u; + public final String v; + public final SSLSocketFactory w; + + /* renamed from: x reason: collision with root package name */ + public final Logger f214x; + + /* renamed from: y reason: collision with root package name */ + public final c.a.r.c f215y; + + /* renamed from: z reason: collision with root package name */ + public final Clock f216z; + + /* compiled from: RtcControlSocket.kt */ + /* renamed from: c.a.r.k0.a$a reason: collision with other inner class name */ + public static final class C0038a extends TypeToken> { } - /* 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 Unit invoke(Stats stats) { - OutboundRtpVideo outboundRtpVideo; - ReceiverReport[] receiverReports; - Stats stats2 = stats; - m.checkNotNullParameter(stats2, "p1"); - d dVar = (d) this.receiver; - dVar.a.add(stats2); - if (dVar.a.size() > dVar.i) { - r.removeFirst(dVar.a); + /* compiled from: RtcControlSocket.kt */ + public static final class b { + public b(DefaultConstructorMarker defaultConstructorMarker) { } - dVar.f.update(stats2); - e eVar = dVar.g; - Objects.requireNonNull(eVar); - m.checkNotNullParameter(stats2, "stats"); - long currentTimeMillis = eVar.l.currentTimeMillis(); - Transport transport = stats2.getTransport(); - Integer valueOf = Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length); - if (valueOf != null) { - eVar.g.b(valueOf.intValue() == 0, currentTimeMillis); + } + + /* compiled from: RtcControlSocket.kt */ + public enum c { + DISCONNECTED, + CONNECTING, + IDENTIFYING, + RESUMING, + CONNECTED, + RECONNECTING + } + + /* compiled from: RtcControlSocket.kt */ + public interface d { + void a(String str, String str2); + + void b(boolean z2, Integer num, String str); + + void c(String str, List list); + + void d(String str); + + void e(long j, int i, int i2, List list); + + void f(Map map); + + void g(long j); + + void h(); + + void i(); + + void j(); + + void k(long j); + + void l(int i, int i2, String str); + + void onSpeaking(long j, int i, boolean z2); + } + + /* compiled from: RtcControlSocket.kt */ + public static final class e extends o implements Function1 { + public static final e i = new e(); + + public e() { + super(1); } - boolean z2 = eVar.f.a() || eVar.g.a(); - if (z2 != eVar.h.a()) { - eVar.h.b(z2, currentTimeMillis); - eVar.i.a.clear(); + + /* 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 Unit invoke(WebSocket webSocket) { + WebSocket webSocket2 = webSocket; + m.checkNotNullParameter(webSocket2, "it"); + webSocket2.e(1000, "Force Close"); + return Unit.a; } - if (!eVar.h.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) { - eVar.a(eVar.i, new e.C0040e((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a((long) outboundRtpVideo.getFramesEncoded(), (long) outboundRtpVideo.getFramesSent(), (long) outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), (long) outboundRtpVideo.getNackCount(), (long) outboundRtpVideo.getPliCount()))); - if (eVar.i.b == null && outboundRtpVideo.getFramesEncoded() > 0) { - eVar.i.b = Long.valueOf(currentTimeMillis - eVar.e); + } + + /* compiled from: RtcControlSocket.kt */ + public static final class f extends o implements Function1 { + public static final f i = new f(); + + public f() { + 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 Unit invoke(WebSocket webSocket) { + WebSocket webSocket2 = webSocket; + m.checkNotNullParameter(webSocket2, "it"); + webSocket2.e(4000, "close reason"); + return Unit.a; + } + } + + /* compiled from: RtcControlSocket.kt */ + public static final class g extends TimerTask { + public final /* synthetic */ a i; + + /* compiled from: RtcControlSocket.kt */ + /* renamed from: c.a.r.k0.a$g$a reason: collision with other inner class name */ + public static final class C0039a extends o implements Function0 { + public final /* synthetic */ g this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public C0039a(g gVar) { + super(0); + this.this$0 = gVar; } - eVar.k = outboundRtpVideo.getBitrateTarget(); - } - if (!eVar.f.a()) { - for (Map.Entry entry : stats2.getInboundRtpVideo().entrySet()) { - String key = entry.getKey(); - InboundRtpVideo value = entry.getValue(); - Map map = eVar.j; - e.d dVar2 = map.get(key); - if (dVar2 == null) { - dVar2 = new e.d(); - map.put(key, dVar2); - } - e.d dVar3 = dVar2; - eVar.a(dVar3, new e.C0040e((long) value.getResolution().getHeight(), currentTimeMillis, new e.a((long) value.getFramesDecoded(), (long) value.getFramesReceived(), (long) value.getPacketsReceived(), (long) value.getPacketsLost(), (long) value.getFramesDropped(), value.getBytesReceived(), (long) value.getNackCount(), (long) value.getPliCount()))); - if (dVar3.b == null && value.getFramesDecoded() > 0) { - dVar3.b = Long.valueOf(currentTimeMillis - eVar.e); - } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + a.a(this.this$0.i, true, null, "The connection timed out. Did not receive OP_HELLO in time."); + return Unit.a; } } - KrispOveruseDetector krispOveruseDetector = dVar.h; - Objects.requireNonNull(krispOveruseDetector); - m.checkNotNullParameter(stats2, "stats"); - if (krispOveruseDetector.d.getType() == MediaEngineConnection.Type.DEFAULT && krispOveruseDetector.d.b()) { - OutboundRtpAudio outboundRtpAudio = stats2.getOutboundRtpAudio(); - if (outboundRtpAudio != null && outboundRtpAudio.getNoiseCancellerIsEnabled()) { - OutboundRtpAudio outboundRtpAudio2 = krispOveruseDetector.b; - if (outboundRtpAudio2 != null) { - Pair a = krispOveruseDetector.a(outboundRtpAudio2, stats2.getOutboundRtpAudio(), 8.0d); - boolean booleanValue = a.component1().booleanValue(); - long longValue = a.component2().longValue(); - if (booleanValue) { - krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE); - } else if (longValue == 0) { - int i = krispOveruseDetector.f2071c + 1; - krispOveruseDetector.f2071c = i; - if (i > 2) { - krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED); + + public g(a aVar) { + this.i = aVar; + } + + @Override // java.util.TimerTask, java.lang.Runnable + public void run() { + this.i.n(new C0039a(this)); + } + } + + /* compiled from: RtcControlSocket.kt */ + public static final class h extends o implements Function0 { + public final /* synthetic */ int $code; + public final /* synthetic */ String $reason; + public final /* synthetic */ WebSocket $webSocket; + public final /* synthetic */ a this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public h(a aVar, WebSocket webSocket, int i, String str) { + super(0); + this.this$0 = aVar; + this.$webSocket = webSocket; + this.$code = i; + this.$reason = str; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { + a.a(this.this$0, true, Integer.valueOf(this.$code), this.$reason); + } + return Unit.a; + } + } + + /* compiled from: RtcControlSocket.kt */ + public static final class i extends o implements Function0 { + public final /* synthetic */ Throwable $t; + public final /* synthetic */ WebSocket $webSocket; + public final /* synthetic */ a this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public i(a aVar, WebSocket webSocket, Throwable th) { + super(0); + this.this$0 = aVar; + this.$webSocket = webSocket; + this.$t = th; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { + if (this.$t instanceof SSLException) { + a.d(this.this$0, null, 1); + a aVar = this.this$0; + aVar.b(); + for (d dVar : aVar.g) { + m.checkNotNullExpressionValue(dVar, "it"); + dVar.b(false, 1001, null); + } + } else { + a aVar2 = this.this$0; + StringBuilder L = c.d.b.a.a.L("An error with the websocket occurred: "); + L.append(this.$t.getMessage()); + a.a(aVar2, true, null, L.toString()); + } + } + return Unit.a; + } + } + + /* compiled from: RtcControlSocket.kt */ + public static final class j extends o implements Function0 { + public final /* synthetic */ Payloads.Incoming $message; + public final /* synthetic */ WebSocket $webSocket; + public final /* synthetic */ a this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public j(a aVar, WebSocket webSocket, Payloads.Incoming incoming) { + super(0); + this.this$0 = aVar; + this.$webSocket = webSocket; + this.$message = incoming; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + boolean z2 = true; + if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { + switch (this.$message.getOpcode()) { + case 2: + a aVar = this.this$0; + Object c2 = aVar.d.c(this.$message.getData(), Payloads.Ready.class); + m.checkNotNullExpressionValue(c2, "gson.fromJson(message.da…yloads.Ready::class.java)"); + Payloads.Ready ready = (Payloads.Ready) c2; + aVar.f.succeed(); + long currentTimeMillis = aVar.f216z.currentTimeMillis(); + Long l = aVar.q; + long longValue = currentTimeMillis - (l != null ? l.longValue() : 0); + aVar.j("[READY] took " + longValue + " ms"); + aVar.b(); + for (d dVar : aVar.g) { + m.checkNotNullExpressionValue(dVar, "it"); + dVar.l(ready.getPort(), ready.getSsrc(), ready.getIp()); } + break; + case 3: + a aVar2 = this.this$0; + aVar2.o(3, String.valueOf(aVar2.f216z.currentTimeMillis())); + break; + case 4: + a aVar3 = this.this$0; + Object c3 = aVar3.d.c(this.$message.getData(), Payloads.Description.class); + m.checkNotNullExpressionValue(c3, "gson.fromJson(message.da….Description::class.java)"); + Payloads.Description description = (Payloads.Description) c3; + aVar3.b(); + for (d dVar2 : aVar3.g) { + m.checkNotNullExpressionValue(dVar2, "it"); + dVar2.c(description.getMode(), description.getSecretKey()); + dVar2.a(description.getAudioCodec(), description.getVideoCodec()); + String mediaSessionId = description.getMediaSessionId(); + if (mediaSessionId != null) { + dVar2.d(mediaSessionId); + } + } + aVar3.f213s = true; + break; + case 5: + a aVar4 = this.this$0; + Object c4 = aVar4.d.c(this.$message.getData(), Payloads.Speaking.class); + m.checkNotNullExpressionValue(c4, "gson.fromJson(message.da…ads.Speaking::class.java)"); + Payloads.Speaking speaking = (Payloads.Speaking) c4; + if (!(speaking.getUserId() == null || speaking.getSpeaking() == null)) { + Integer speaking2 = speaking.getSpeaking(); + if (speaking2 == null || speaking2.intValue() != 1) { + z2 = false; + } + aVar4.b(); + for (d dVar3 : aVar4.g) { + m.checkNotNullExpressionValue(dVar3, "it"); + dVar3.onSpeaking(speaking.getUserId().longValue(), speaking.getSsrc(), z2); + } + break; + } + case 6: + a aVar5 = this.this$0; + Object c5 = aVar5.d.c(this.$message.getData(), Long.TYPE); + m.checkNotNullExpressionValue(c5, "gson.fromJson(message.data, Long::class.java)"); + long longValue2 = ((Number) c5).longValue(); + long currentTimeMillis2 = aVar5.f216z.currentTimeMillis(); + long j = currentTimeMillis2 - longValue2; + Logger.d$default(aVar5.f214x, aVar5.t, c.d.b.a.a.r("got heartbeat ack after ", j, " ms"), null, 4, null); + aVar5.o = Long.valueOf(currentTimeMillis2); + aVar5.m = true; + aVar5.b(); + for (d dVar4 : aVar5.g) { + m.checkNotNullExpressionValue(dVar4, "it"); + dVar4.g(j); + } + break; + case 7: + case 10: + case 11: + default: + a aVar6 = this.this$0; + StringBuilder L = c.d.b.a.a.L("unknown opcode: "); + L.append(this.$message.getOpcode()); + aVar6.j(L.toString()); + break; + case 8: + a aVar7 = this.this$0; + Object c6 = aVar7.d.c(this.$message.getData(), Payloads.Hello.class); + m.checkNotNullExpressionValue(c6, "gson.fromJson(message.da…yloads.Hello::class.java)"); + Payloads.Hello hello = (Payloads.Hello) c6; + TimerTask timerTask = aVar7.p; + if (timerTask != null) { + timerTask.cancel(); + } + aVar7.j("[HELLO] raw: " + hello); + aVar7.l = Long.valueOf(hello.getHeartbeatIntervalMs()); + aVar7.h = hello.getServerVersion(); + aVar7.n.cancel(); + aVar7.m = true; + aVar7.l(); + break; + case 9: + this.this$0.f.succeed(); + break; + case 12: + a aVar8 = this.this$0; + Object c7 = aVar8.d.c(this.$message.getData(), Payloads.Video.class); + m.checkNotNullExpressionValue(c7, "gson.fromJson(message.da…yloads.Video::class.java)"); + Payloads.Video video = (Payloads.Video) c7; + if (video.getUserId() != null) { + aVar8.b(); + for (d dVar5 : aVar8.g) { + m.checkNotNullExpressionValue(dVar5, "it"); + dVar5.e(video.getUserId().longValue(), video.getAudioSsrc(), video.getVideoSsrc(), video.getStreams()); + } + break; + } + break; + case 13: + a aVar9 = this.this$0; + Object c8 = aVar9.d.c(this.$message.getData(), Payloads.ClientDisconnect.class); + m.checkNotNullExpressionValue(c8, "gson.fromJson(message.da…ntDisconnect::class.java)"); + Payloads.ClientDisconnect clientDisconnect = (Payloads.ClientDisconnect) c8; + aVar9.b(); + for (d dVar6 : aVar9.g) { + m.checkNotNullExpressionValue(dVar6, "it"); + dVar6.k(clientDisconnect.getUserId()); + } + break; + case 14: + a aVar10 = this.this$0; + Object c9 = aVar10.d.c(this.$message.getData(), Payloads.SessionUpdate.class); + m.checkNotNullExpressionValue(c9, "gson.fromJson(message.da…essionUpdate::class.java)"); + Payloads.SessionUpdate sessionUpdate = (Payloads.SessionUpdate) c9; + aVar10.b(); + for (d dVar7 : aVar10.g) { + m.checkNotNullExpressionValue(dVar7, "it"); + String mediaSessionId2 = sessionUpdate.getMediaSessionId(); + if (mediaSessionId2 != null) { + dVar7.d(mediaSessionId2); + } + } + break; + case 15: + a aVar11 = this.this$0; + Gson gson = aVar11.d; + JsonElement data = this.$message.getData(); + Type type = a.b; + Objects.requireNonNull(gson); + Object d = data == null ? null : gson.d(new c.i.d.q.x.a(data), type); + m.checkNotNullExpressionValue(d, "gson.fromJson(message.data, MEDIA_SINK_WANTS_TYPE)"); + Map map = (Map) d; + aVar11.b(); + for (d dVar8 : aVar11.g) { + m.checkNotNullExpressionValue(dVar8, "it"); + dVar8.f(map); + } + break; + } + } + return Unit.a; + } + } + + /* compiled from: RtcControlSocket.kt */ + public static final class k extends o implements Function0 { + public final /* synthetic */ WebSocket $webSocket; + public final /* synthetic */ a this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public k(a aVar, WebSocket webSocket) { + super(0); + this.this$0 = aVar; + this.$webSocket = webSocket; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + boolean z2 = true; + if (!(!m.areEqual(this.$webSocket, this.this$0.i))) { + a aVar = this.this$0; + c cVar = aVar.r; + if (cVar == c.CONNECTING) { + aVar.b(); + for (d dVar : aVar.g) { + m.checkNotNullExpressionValue(dVar, "it"); + dVar.j(); + } + } else if (cVar == c.RECONNECTING) { + String str = aVar.k; + String str2 = aVar.j; + String str3 = aVar.v; + Long l = aVar.o; + if (l != null && aVar.f216z.currentTimeMillis() - l.longValue() > 60000) { + z2 = false; + } + if (str == null || str2 == null || !aVar.f213s || !z2) { + StringBuilder L = c.d.b.a.a.L("Cannot resume connection. resumable: "); + L.append(aVar.f213s); + L.append(" -- isHeartbeatRecentEnough: "); + L.append(z2); + aVar.h(false, 4801, L.toString()); } else { - krispOveruseDetector.f2071c = 0; + aVar.j("[RESUME] resuming session. serverId=" + str2 + " sessionId=" + str); + aVar.b(); + for (d dVar2 : aVar.g) { + m.checkNotNullExpressionValue(dVar2, "it"); + dVar2.h(); + } + aVar.r = c.RESUMING; + aVar.o(7, new Payloads.Resume(str3, str, str2)); } } - krispOveruseDetector.b = stats2.getOutboundRtpAudio(); - } - OutboundRtpAudio outboundRtpAudio3 = stats2.getOutboundRtpAudio(); - if (outboundRtpAudio3 != null && outboundRtpAudio3.getVoiceActivityDetectorIsEnabled()) { - OutboundRtpAudio outboundRtpAudio4 = krispOveruseDetector.a; - if (outboundRtpAudio4 != null && krispOveruseDetector.a(outboundRtpAudio4, stats2.getOutboundRtpAudio(), 4.0d).component1().booleanValue()) { - krispOveruseDetector.d.f(KrispOveruseDetector.Status.VAD_CPU_OVERUSE); + a aVar2 = this.this$0; + aVar2.r = c.CONNECTED; + long currentTimeMillis = aVar2.f216z.currentTimeMillis(); + Long l2 = this.this$0.q; + long longValue = currentTimeMillis - (l2 != null ? l2.longValue() : 0); + a aVar3 = this.this$0; + Logger logger = aVar3.f214x; + String str4 = aVar3.t; + StringBuilder L2 = c.d.b.a.a.L("[CONNECTED] to "); + L2.append(this.this$0.u); + Logger.i$default(logger, str4, L2.toString(), null, 4, null); + a aVar4 = this.this$0; + aVar4.b(); + for (d dVar3 : aVar4.g) { + m.checkNotNullExpressionValue(dVar3, "it"); + dVar3.g(longValue / ((long) 2)); } - krispOveruseDetector.a = stats2.getOutboundRtpAudio(); + } + return Unit.a; + } + } + + /* compiled from: RtcControlSocket.kt */ + public static final class l extends o implements Function1 { + public static final l i = new l(); + + public l() { + 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 Unit invoke(WebSocket webSocket) { + WebSocket webSocket2 = webSocket; + m.checkNotNullParameter(webSocket2, "it"); + webSocket2.e(4000, "reconnecting"); + return Unit.a; + } + } + + public a(String str, String str2, SSLSocketFactory sSLSocketFactory, Logger logger, c.a.r.c cVar, Clock clock, String str3) { + m.checkNotNullParameter(str, "endpoint"); + m.checkNotNullParameter(str2, "token"); + m.checkNotNullParameter(logger, "logger"); + m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor"); + m.checkNotNullParameter(clock, "clock"); + m.checkNotNullParameter(str3, "loggingTagPrefix"); + this.u = str; + this.v = str2; + this.w = sSLSocketFactory; + this.f214x = logger; + this.f215y = cVar; + this.f216z = clock; + this.A = str3; + StringBuilder P = c.d.b.a.a.P(str3, "->RtcControlSocket "); + int i2 = a + 1; + a = i2; + P.append(i2); + this.t = P.toString(); + } + + public static final void a(a aVar, boolean z2, Integer num, String str) { + aVar.r = c.DISCONNECTED; + if ((num != null && num.intValue() == 4004) || ((num != null && num.intValue() == 4015) || ((num != null && num.intValue() == 4011) || (num != null && num.intValue() == 4006)))) { + aVar.h(true, num, str); + } else if (aVar.f.hasReachedFailureThreshold()) { + aVar.k("[WS CLOSED] Backoff exceeded. Resetting."); + aVar.h(z2, num, str); + } else { + aVar.c(null); + String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) aVar.f.fail(new c(aVar, z2, num, str))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)"); + aVar.k("`[WS CLOSED] (" + z2 + ", " + num + ", " + str + ") retrying in " + H + " seconds."); + } + } + + public static /* synthetic */ void d(a aVar, Function1 function1, int i2) { + int i3 = i2 & 1; + aVar.c(null); + } + + public final void b() { + c.a.r.c cVar = this.f215y; + Objects.requireNonNull(cVar); + if (Process.myTid() != cVar.j) { + IllegalStateException illegalStateException = new IllegalStateException("oops! not called on the MediaEngineExecutor"); + AnimatableValueParser.B1("MediaEngineExecutor", "oops! not called on the MediaEngineExecutor", illegalStateException); + if (cVar.l) { + new Handler(Looper.getMainLooper()).post(new c.a.r.d(illegalStateException)); } } - return Unit.a; + } + + public final void c(Function1 function1) { + this.f.cancel(); + this.n.cancel(); + TimerTask timerTask = this.p; + if (timerTask != null) { + timerTask.cancel(); + } + WebSocket webSocket = this.i; + if (!(webSocket == null || function1 == null)) { + function1.invoke(webSocket); + } + this.i = null; + } + + @Override // com.discord.utilities.debug.DebugPrintable + public void debugPrint(DebugPrintBuilder debugPrintBuilder) { + m.checkNotNullParameter(debugPrintBuilder, "dp"); + debugPrintBuilder.appendKeyValue("serverId", this.j); + debugPrintBuilder.appendKeyValue("sessionId", this.k); + debugPrintBuilder.appendKeyValue("heartbeatInterval", this.l); + debugPrintBuilder.appendKeyValue("lastHeartbeatAckTime", this.o); + debugPrintBuilder.appendKeyValue("connectionStartTime", this.q); + debugPrintBuilder.appendKeyValue("connectionState", this.r); + debugPrintBuilder.appendKeyValue("resumable", Boolean.valueOf(this.f213s)); + } + + public final void e() { + b(); + j("[CLOSE]"); + c(e.i); + this.j = null; + this.k = null; + this.f213s = false; + this.r = c.DISCONNECTED; + b(); + for (d dVar : this.g) { + m.checkNotNullExpressionValue(dVar, "it"); + dVar.b(false, 1000, "Force Close"); + } + } + + public final boolean f() { + b(); + if (this.r != c.DISCONNECTED) { + k("Cannot start a new connection, connection state is not disconnected"); + return false; + } + this.r = c.CONNECTING; + g(); + b(); + for (d dVar : this.g) { + m.checkNotNullExpressionValue(dVar, "it"); + dVar.i(); + } + return true; + } + + public final void g() { + StringBuilder L = c.d.b.a.a.L("[CONNECT] "); + L.append(this.u); + j(L.toString()); + if (this.i != null) { + this.f214x.e(this.t, "Connect called with already existing websocket", null, null); + c(f.i); + return; + } + this.q = Long.valueOf(this.f216z.currentTimeMillis()); + TimerTask timerTask = this.p; + if (timerTask != null) { + timerTask.cancel(); + } + g gVar = new g(this); + this.p = gVar; + this.e.schedule(gVar, 20000); + x.a aVar = new x.a(); + aVar.a(1, TimeUnit.MINUTES); + SSLSocketFactory sSLSocketFactory = this.w; + if (sSLSocketFactory != null) { + h.a aVar2 = f0.f0.k.h.f2731c; + aVar.b(sSLSocketFactory, f0.f0.k.h.a.n()); + } + String D = c.d.b.a.a.D(new StringBuilder(), this.u, "?v=5"); + j("attempting WSS connection with " + D); + x xVar = new x(aVar); + z.a aVar3 = new z.a(); + aVar3.f(D); + this.i = xVar.g(aVar3.a(), this); + } + + public final void h(boolean z2, Integer num, String str) { + k("[DISCONNECT] (" + z2 + ", " + num + ", " + str + ')'); + c(null); + this.j = null; + this.k = null; + this.f213s = false; + this.r = c.DISCONNECTED; + b(); + for (d dVar : this.g) { + m.checkNotNullExpressionValue(dVar, "it"); + dVar.b(z2, num, str); + } + } + + public final void i(long j2, String str, boolean z2) { + m.checkNotNullParameter(str, "reason"); + b(); + if (this.i != null) { + j("Performing an immediate heartbeat on existing socket: " + str); + this.n.cancel(); + b bVar = new b(this); + this.n = bVar; + this.e.schedule(bVar, j2); + } else if (!z2) { + j("Immediate heartbeat requested, but is disconnected and a reset was not requested: " + str); + } else if (this.f.isPending() && this.i == null) { + j("Connection backoff reset Immediate heartbeat when socket was disconnected."); + this.f.succeed(); + m(false, 4802, "Reset backoff."); + } + } + + public final void j(String str) { + Logger.i$default(this.f214x, this.t, str, null, 4, null); + } + + public final void k(String str) { + Logger.w$default(this.f214x, this.t, str, null, 4, null); + } + + public final void l() { + if (this.m) { + this.m = false; + o(3, String.valueOf(this.f216z.currentTimeMillis())); + Long l2 = this.l; + if (l2 != null) { + b bVar = new b(this); + this.n = bVar; + this.e.schedule(bVar, l2.longValue()); + return; + } + k("onHeartbeatInterval called when heartbeatInterval was null"); + return; + } + c(d.i); + String H = c.d.b.a.a.H(new Object[]{Double.valueOf(((double) this.f.fail(new e(this))) / 1000.0d)}, 1, "%.2f", "java.lang.String.format(this, *args)"); + k("[ACK TIMEOUT] reconnecting in " + H + " seconds."); + } + + public final void m(boolean z2, Integer num, String str) { + j("[RECONNECT] wasFatal=" + z2 + " code=" + num + " reason=" + str); + c(l.i); + this.r = c.RECONNECTING; + g(); + } + + /* JADX WARN: Multi-variable type inference failed */ + /* JADX WARNING: Unknown variable types count: 1 */ + public final Future n(Function0 function0) { + c.a.r.c cVar = this.f215y; + if (function0 != null) { + function0 = new f(function0); + } + return cVar.submit((Runnable) function0); + } + + public final void o(int i2, Object obj) { + WebSocket webSocket = this.i; + if (webSocket == null) { + StringBuilder L = c.d.b.a.a.L("opcode() websocket null. opcode: "); + L.append(Opcodes.INSTANCE.getNameOf(i2)); + this.f214x.e(this.t, L.toString(), null, null); + return; + } + try { + String m = this.d.m(new Payloads.Outgoing(i2, obj)); + Logger logger = this.f214x; + String str = this.t; + Logger.d$default(logger, str, "sending (" + Opcodes.INSTANCE.getNameOf(i2) + "): " + m, null, 4, null); + m.checkNotNullExpressionValue(m, "json"); + webSocket.a(m); + } catch (Exception unused) { + Logger logger2 = this.f214x; + String str2 = this.t; + Logger.w$default(logger2, str2, "exception sending opcode: " + i2 + " and payload: " + obj, null, 4, null); + } + } + + @Override // okhttp3.WebSocketListener + public void onClosed(WebSocket webSocket, int i2, String str) { + m.checkNotNullParameter(webSocket, "webSocket"); + m.checkNotNullParameter(str, "reason"); + super.onClosed(webSocket, i2, str); + n(new h(this, webSocket, i2, str)); + } + + @Override // okhttp3.WebSocketListener + public void onClosing(WebSocket webSocket, int i2, String str) { + m.checkNotNullParameter(webSocket, "webSocket"); + m.checkNotNullParameter(str, "reason"); + ((f0.f0.n.d) webSocket).e(i2, str); + } + + @Override // okhttp3.WebSocketListener + public void onFailure(WebSocket webSocket, Throwable th, Response response) { + m.checkNotNullParameter(webSocket, "webSocket"); + m.checkNotNullParameter(th, "t"); + super.onFailure(webSocket, th, response); + n(new i(this, webSocket, th)); + } + + @Override // okhttp3.WebSocketListener + public void onMessage(WebSocket webSocket, String str) { + m.checkNotNullParameter(webSocket, "webSocket"); + m.checkNotNullParameter(str, "text"); + Object g2 = this.d.g(str, Payloads.Incoming.class); + super.onMessage(webSocket, str); + n(new j(this, webSocket, (Payloads.Incoming) c.i.a.f.e.o.c.q0(Payloads.Incoming.class).cast(g2))); + } + + @Override // okhttp3.WebSocketListener + public void onOpen(WebSocket webSocket, Response response) { + m.checkNotNullParameter(webSocket, "webSocket"); + m.checkNotNullParameter(response, "response"); + super.onOpen(webSocket, response); + n(new k(this, webSocket)); } } diff --git a/app/src/main/java/c/a/r/k0/b.java b/app/src/main/java/c/a/r/k0/b.java index d496a71dda..8cab7781b4 100644 --- a/app/src/main/java/c/a/r/k0/b.java +++ b/app/src/main/java/c/a/r/k0/b.java @@ -1,17 +1,40 @@ package c.a.r.k0; -import rx.functions.Action1; -/* compiled from: RtcStatsCollector.kt */ -public final class b implements Action1 { - public final /* synthetic */ d i; +import d0.z.d.o; +import java.util.TimerTask; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: RtcControlSocket.kt */ +public final class b extends TimerTask { + public final /* synthetic */ a i; - public b(d dVar) { - this.i = dVar; + /* compiled from: RtcControlSocket.kt */ + public static final class a extends o implements Function0 { + public final /* synthetic */ b this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public a(b bVar) { + super(0); + this.this$0 = bVar; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + a aVar = this.this$0.i; + int i = a.a; + aVar.l(); + return Unit.a; + } } - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Long l) { - this.i.e.n(new a(this.i)); + public b(a aVar) { + this.i = aVar; + } + + @Override // java.util.TimerTask, java.lang.Runnable + public void run() { + this.i.n(new a(this)); } } diff --git a/app/src/main/java/c/a/r/k0/c.java b/app/src/main/java/c/a/r/k0/c.java index bd40c777d2..275c70f6d6 100644 --- a/app/src/main/java/c/a/r/k0/c.java +++ b/app/src/main/java/c/a/r/k0/c.java @@ -1,18 +1,34 @@ package c.a.r.k0; -import com.discord.utilities.logging.Logger; -import rx.functions.Action1; -/* compiled from: RtcStatsCollector.kt */ -public final class c implements Action1 { - public final /* synthetic */ d i; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: RtcControlSocket.kt */ +public final class c extends o implements Function0 { + public final /* synthetic */ Integer $code; + public final /* synthetic */ String $reason; + public final /* synthetic */ boolean $wasFatal; + public final /* synthetic */ a this$0; - public c(d dVar) { - this.i = dVar; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public c(a aVar, boolean z2, Integer num, String str) { + super(0); + this.this$0 = aVar; + this.$wasFatal = z2; + this.$code = num; + this.$reason = str; } - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Throwable th) { - Logger.e$default(this.i.d, "RtcStatsCollector: Error collecting stats", th, null, 4, null); + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + a aVar = this.this$0; + boolean z2 = this.$wasFatal; + Integer num = this.$code; + String str = this.$reason; + int i = a.a; + aVar.m(z2, num, str); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/k0/d.java b/app/src/main/java/c/a/r/k0/d.java index 0d884f19fa..768f03a46c 100644 --- a/app/src/main/java/c/a/r/k0/d.java +++ b/app/src/main/java/c/a/r/k0/d.java @@ -1,49 +1,25 @@ package c.a.r.k0; -import co.discord.media_engine.Stats; -import co.discord.media_engine.VoiceQuality; -import com.discord.rtcconnection.KrispOveruseDetector; -import com.discord.rtcconnection.mediaengine.MediaEngineConnection; -import com.discord.utilities.logging.Logger; import d0.z.d.m; -import java.util.ArrayList; -import java.util.List; -import rx.Subscription; -/* compiled from: RtcStatsCollector.kt */ -public final class d { - public final List a; - public Subscription b; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +import okhttp3.WebSocket; +/* compiled from: RtcControlSocket.kt */ +public final class d extends o implements Function1 { + public static final d i = new d(); - /* renamed from: c reason: collision with root package name */ - public final long f217c; - public final Logger d; - public final MediaEngineConnection e; - public final VoiceQuality f; - public final e g; - public final KrispOveruseDetector h; - public final int i; - - public d(long j, Logger logger, MediaEngineConnection mediaEngineConnection, VoiceQuality voiceQuality, e eVar, KrispOveruseDetector krispOveruseDetector, int i, int i2) { - i = (i2 & 64) != 0 ? 30 : i; - m.checkNotNullParameter(logger, "logger"); - m.checkNotNullParameter(mediaEngineConnection, "connection"); - m.checkNotNullParameter(voiceQuality, "voiceQuality"); - m.checkNotNullParameter(eVar, "videoQuality"); - m.checkNotNullParameter(krispOveruseDetector, "krispOveruseDetector"); - this.f217c = j; - this.d = logger; - this.e = mediaEngineConnection; - this.f = voiceQuality; - this.g = eVar; - this.h = krispOveruseDetector; - this.i = i; - this.a = new ArrayList(); + public d() { + super(1); } - public final void a() { - Subscription subscription = this.b; - if (subscription != null) { - subscription.unsubscribe(); - } + /* 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 Unit invoke(WebSocket webSocket) { + WebSocket webSocket2 = webSocket; + m.checkNotNullParameter(webSocket2, "it"); + webSocket2.e(4800, "Heartbeat timeout."); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/k0/e.java b/app/src/main/java/c/a/r/k0/e.java index 66668b88ea..655b51f740 100644 --- a/app/src/main/java/c/a/r/k0/e.java +++ b/app/src/main/java/c/a/r/k0/e.java @@ -1,372 +1,25 @@ package c.a.r.k0; -import com.discord.utilities.time.Clock; -import com.discord.utilities.time.ClockFactory; -import d0.o; -import d0.t.h0; -import d0.t.n; -import d0.t.r; -import d0.z.d.m; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import kotlin.Pair; -import kotlin.jvm.internal.DefaultConstructorMarker; -/* compiled from: VideoQuality.kt */ -public final class e { - public static final List a = n.listOf((Object[]) new Integer[]{0, 500000, 1000000, 1500000, 2000000, 3000000, 4000000, 5000000, 6000000, 7000000, 8000000}); - public static final List b = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60}); +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: RtcControlSocket.kt */ +public final class e extends o implements Function0 { + public final /* synthetic */ a this$0; - /* renamed from: c reason: collision with root package name */ - public static final List f218c = n.listOf((Object[]) new Integer[]{720, 480, 360}); - public static final b d = new b(null); - public final long e; - public final c f; - public final c g; - public final c h; - public final d i; - public final Map j; - public int k; - public final Clock l; - - /* compiled from: VideoQuality.kt */ - public static final class a { - public long a; - public long b; - - /* renamed from: c reason: collision with root package name */ - public long f219c; - public long d; - public long e; - public long f; - public long g; - public long h; - - public a() { - this(0, 0, 0, 0, 0, 0, 0, 0, 255); - } - - public a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8) { - this.a = j; - this.b = j2; - this.f219c = j3; - this.d = j4; - this.e = j5; - this.f = j6; - this.g = j7; - this.h = j8; - } - - /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, int i) { - this((i & 1) != 0 ? 0 : j, (i & 2) != 0 ? 0 : j2, (i & 4) != 0 ? 0 : j3, (i & 8) != 0 ? 0 : j4, (i & 16) != 0 ? 0 : j5, (i & 32) != 0 ? 0 : j6, (i & 64) != 0 ? 0 : j7, (i & 128) == 0 ? j8 : 0); - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof a)) { - return false; - } - a aVar = (a) obj; - return this.a == aVar.a && this.b == aVar.b && this.f219c == aVar.f219c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f && this.g == aVar.g && this.h == aVar.h; - } - - public int hashCode() { - int a = a0.a.a.b.a(this.b); - int a2 = a0.a.a.b.a(this.f219c); - int a3 = a0.a.a.b.a(this.d); - int a4 = a0.a.a.b.a(this.e); - int a5 = a0.a.a.b.a(this.f); - int a6 = a0.a.a.b.a(this.g); - return a0.a.a.b.a(this.h) + ((a6 + ((a5 + ((a4 + ((a3 + ((a2 + ((a + (a0.a.a.b.a(this.a) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31); - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("AggregatedProperties(framesCodec="); - L.append(this.a); - L.append(", framesNetwork="); - L.append(this.b); - L.append(", packets="); - L.append(this.f219c); - L.append(", packetsLost="); - L.append(this.d); - L.append(", framesDropped="); - L.append(this.e); - L.append(", bytes="); - L.append(this.f); - L.append(", nackCount="); - L.append(this.g); - L.append(", pliCount="); - return c.d.b.a.a.A(L, this.h, ")"); - } + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public e(a aVar) { + super(0); + this.this$0 = aVar; } - /* compiled from: VideoQuality.kt */ - public static final class b { - public b(DefaultConstructorMarker defaultConstructorMarker) { - } - - public static final long a(b bVar, Float f) { - if (f != null) { - return d0.a0.a.roundToLong(f.floatValue()); - } - return 0; - } - } - - /* compiled from: VideoQuality.kt */ - public static final class c { - public Long a; - public long b; - - public c(boolean z2, long j) { - this.a = z2 ? Long.valueOf(j) : null; - } - - public final boolean a() { - return this.a != null; - } - - public final void b(boolean z2, long j) { - Long l = this.a; - if (l == null) { - if (z2) { - this.a = Long.valueOf(j); - } - } else if (l != null) { - long longValue = l.longValue(); - if (!z2) { - this.b = (j - longValue) + this.b; - this.a = null; - } - } - } - - public final long c(long j) { - Long l = this.a; - if (l == null) { - return this.b; - } - return (this.b + j) - l.longValue(); - } - } - - /* compiled from: VideoQuality.kt */ - public static final class d { - public List a = new ArrayList(); - public Long b; - - /* renamed from: c reason: collision with root package name */ - public a f220c = new a(0, 0, 0, 0, 0, 0, 0, 0, 255); - public long d; - public Map e = new LinkedHashMap(); - public Map f = new LinkedHashMap(); - public float g; - public Map h = new LinkedHashMap(); - - public d() { - for (Number number : e.a) { - this.e.put(Integer.valueOf(number.intValue()), Float.valueOf(0.0f)); - } - for (Number number2 : e.b) { - this.f.put(Integer.valueOf(number2.intValue()), Float.valueOf(0.0f)); - } - for (Number number3 : e.f218c) { - this.h.put(Integer.valueOf(number3.intValue()), Float.valueOf(0.0f)); - } - } - } - - /* compiled from: VideoQuality.kt */ - /* renamed from: c.a.r.k0.e$e reason: collision with other inner class name */ - public static final class C0040e { - public final long a; - public final long b; - - /* renamed from: c reason: collision with root package name */ - public final a f221c; - - public C0040e() { - this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 255)); - } - - public C0040e(long j, long j2, a aVar) { - m.checkNotNullParameter(aVar, "aggregatedProperties"); - this.a = j; - this.b = j2; - this.f221c = aVar; - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof C0040e)) { - return false; - } - C0040e eVar = (C0040e) obj; - return this.a == eVar.a && this.b == eVar.b && m.areEqual(this.f221c, eVar.f221c); - } - - public int hashCode() { - int a = (a0.a.a.b.a(this.b) + (a0.a.a.b.a(this.a) * 31)) * 31; - a aVar = this.f221c; - return a + (aVar != null ? aVar.hashCode() : 0); - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("RawVideoStats(resolution="); - L.append(this.a); - L.append(", timestamp="); - L.append(this.b); - L.append(", aggregatedProperties="); - L.append(this.f221c); - L.append(")"); - return L.toString(); - } - } - - public e(Clock clock, int i) { - Clock clock2 = (i & 1) != 0 ? ClockFactory.get() : null; - m.checkNotNullParameter(clock2, "clock"); - this.l = clock2; - long currentTimeMillis = clock2.currentTimeMillis(); - this.e = currentTimeMillis; - this.f = new c(false, currentTimeMillis); - this.g = new c(false, currentTimeMillis); - this.h = new c(false, currentTimeMillis); - this.i = new d(); - this.j = new LinkedHashMap(); - } - - public final void a(d dVar, C0040e eVar) { - dVar.a.add(eVar); - if (dVar.a.size() >= 2) { - List list = dVar.a; - C0040e eVar2 = list.get(list.size() - 1); - List list2 = dVar.a; - C0040e eVar3 = list2.get(list2.size() - 2); - f fVar = f.i; - dVar.d = (eVar2.b - eVar3.b) + dVar.d; - a aVar = dVar.f220c; - a aVar2 = eVar2.f221c; - a aVar3 = eVar3.f221c; - aVar.a = fVar.a(aVar2.a, aVar3.a) + aVar.a; - aVar.b = fVar.a(aVar2.b, aVar3.b) + aVar.b; - aVar.f219c = fVar.a(aVar2.f219c, aVar3.f219c) + aVar.f219c; - aVar.d = fVar.a(aVar2.d, aVar3.d) + aVar.d; - aVar.e = fVar.a(aVar2.e, aVar3.e) + aVar.e; - aVar.f = fVar.a(aVar2.f, aVar3.f) + aVar.f; - aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g; - aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h; - a aVar4 = eVar2.f221c; - long j = aVar4.f; - long j2 = aVar4.a; - long j3 = eVar2.b; - long j4 = eVar2.a; - float f = ((float) (j3 - eVar3.b)) / 1000.0f; - dVar.g = (((float) j4) * f) + dVar.g; - if (dVar.a.size() >= 6) { - List list3 = dVar.a; - C0040e eVar4 = list3.get(list3.size() - 3); - a aVar5 = eVar4.f221c; - long j5 = aVar5.f; - long j6 = aVar5.a; - long j7 = eVar4.b; - Iterator it = f218c.iterator(); - while (true) { - float f2 = 0.0f; - if (!it.hasNext()) { - break; - } - int intValue = ((Number) it.next()).intValue(); - if (j4 <= ((long) intValue)) { - Map map = dVar.h; - Integer valueOf = Integer.valueOf(intValue); - Float f3 = dVar.h.get(Integer.valueOf(intValue)); - if (f3 != null) { - f2 = f3.floatValue(); - } - map.put(valueOf, Float.valueOf(f2 + f)); - } - j2 = j2; - j6 = j6; - } - float f4 = ((float) (j3 - j7)) / 1000.0f; - float f5 = ((float) ((j - j5) * ((long) 8))) / f4; - float f6 = ((float) (j2 - j6)) / f4; - for (Number number : a) { - int intValue2 = number.intValue(); - if (f5 <= ((float) intValue2)) { - Map map2 = dVar.e; - Integer valueOf2 = Integer.valueOf(intValue2); - Float f7 = dVar.e.get(Integer.valueOf(intValue2)); - map2.put(valueOf2, Float.valueOf((f7 != null ? f7.floatValue() : 0.0f) + f)); - } - } - for (Number number2 : b) { - int intValue3 = number2.intValue(); - if (f6 <= ((float) intValue3)) { - Map map3 = dVar.f; - Integer valueOf3 = Integer.valueOf(intValue3); - Float f8 = dVar.f.get(Integer.valueOf(intValue3)); - map3.put(valueOf3, Float.valueOf((f8 != null ? f8.floatValue() : 0.0f) + f)); - } - } - r.removeFirst(dVar.a); - } - } - } - - public final Map b(String str) { - m.checkNotNullParameter(str, "userId"); - d dVar = this.j.get(str); - if (dVar != null) { - return d(dVar); - } - return null; - } - - public final Map c() { - return h0.plus(d(this.i), h0.mapOf(o.to("target_bitrate", Integer.valueOf(this.k)), o.to("duration_encoder_nvidia_cuda", 0), o.to("duration_encoder_nvidia_direct3d", 0), o.to("duration_encoder_openh264", 0), o.to("duration_encoder_videotoolbox", 0), o.to("duration_encoder_amd_direct3d", 0), o.to("duration_encoder_intel", 0), o.to("duration_encoder_intel_direct3d", 0), o.to("duration_encoder_unknown", 0))); - } - - /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x03d6: APUT - (r4v4 kotlin.Pair[]) - (6 ??[int, float, short, byte, char]) - (wrap: kotlin.Pair : 0x03d1: INVOKE (r15v3 kotlin.Pair) = - ("time_to_first_frame_ms") - (wrap: java.lang.Long : 0x03ca: INVOKE (r15v2 java.lang.Long) = (r2v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long) - type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) - */ - public final Map d(d dVar) { - Float valueOf; - long currentTimeMillis = this.l.currentTimeMillis(); - float f = ((float) (currentTimeMillis - this.e)) / 1000.0f; - float f2 = ((float) dVar.d) / 1000.0f; - int i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); - long roundToLong = (i <= 0 || (valueOf = Float.valueOf(dVar.g / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()); - b bVar = d; - Map mapOf = h0.mapOf(o.to("duration", Double.valueOf(Math.floor((double) f))), c.d.b.a.a.U(bVar, dVar.e.get(8000000), "duration_stream_under_8mbps"), c.d.b.a.a.U(bVar, dVar.e.get(7000000), "duration_stream_under_7mbps"), c.d.b.a.a.U(bVar, dVar.e.get(6000000), "duration_stream_under_6mbps"), c.d.b.a.a.U(bVar, dVar.e.get(5000000), "duration_stream_under_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(4000000), "duration_stream_under_4mbps"), c.d.b.a.a.U(bVar, dVar.e.get(3000000), "duration_stream_under_3mbps"), c.d.b.a.a.U(bVar, dVar.e.get(2000000), "duration_stream_under_2mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1500000), "duration_stream_under_1_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1000000), "duration_stream_under_1mbps"), c.d.b.a.a.U(bVar, dVar.e.get(500000), "duration_stream_under_0_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(0), "duration_stream_at_0mbps"), c.d.b.a.a.U(bVar, dVar.f.get(60), "duration_fps_under_60"), c.d.b.a.a.U(bVar, dVar.f.get(55), "duration_fps_under_55"), c.d.b.a.a.U(bVar, dVar.f.get(50), "duration_fps_under_50"), c.d.b.a.a.U(bVar, dVar.f.get(45), "duration_fps_under_45"), c.d.b.a.a.U(bVar, dVar.f.get(40), "duration_fps_under_40"), c.d.b.a.a.U(bVar, dVar.f.get(35), "duration_fps_under_35"), c.d.b.a.a.U(bVar, dVar.f.get(30), "duration_fps_under_30"), c.d.b.a.a.U(bVar, dVar.f.get(25), "duration_fps_under_25"), c.d.b.a.a.U(bVar, dVar.f.get(20), "duration_fps_under_20"), c.d.b.a.a.U(bVar, dVar.f.get(15), "duration_fps_under_15"), c.d.b.a.a.U(bVar, dVar.f.get(10), "duration_fps_under_10"), c.d.b.a.a.U(bVar, dVar.f.get(5), "duration_fps_under_5"), c.d.b.a.a.U(bVar, dVar.f.get(0), "duration_fps_at_0"), o.to("avg_resolution", Long.valueOf(roundToLong)), c.d.b.a.a.U(bVar, dVar.h.get(720), "duration_resolution_under_720"), c.d.b.a.a.U(bVar, dVar.h.get(480), "duration_resolution_under_480"), c.d.b.a.a.U(bVar, dVar.h.get(360), "duration_resolution_under_360"), o.to("num_pauses", 0), o.to("duration_paused", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.f.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_zero_receivers", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.g.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_video_stopped", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.h.c(currentTimeMillis)) / 1000.0f))))); - a aVar = dVar.f220c; - long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0; - long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0; - Pair[] pairArr = new Pair[10]; - pairArr[0] = o.to("avg_bitrate", Long.valueOf(a2)); - pairArr[1] = o.to("avg_fps", Long.valueOf(a3)); - pairArr[2] = o.to("num_bytes", Long.valueOf(aVar.f)); - pairArr[3] = o.to("num_packets_lost", Long.valueOf(aVar.d)); - pairArr[4] = o.to("num_packets", Long.valueOf(aVar.f219c)); - pairArr[5] = o.to("num_frames", Long.valueOf(aVar.b)); - Long l = dVar.b; - pairArr[6] = o.to("time_to_first_frame_ms", Long.valueOf(l != null ? l.longValue() : 0)); - pairArr[7] = o.to("num_frames_dropped", Long.valueOf(aVar.e)); - pairArr[8] = o.to("num_nacks", Long.valueOf(aVar.g)); - pairArr[9] = o.to("num_plis", Long.valueOf(aVar.h)); - return h0.plus(mapOf, h0.mapOf(pairArr)); + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + a aVar = this.this$0; + int i = a.a; + aVar.m(true, 4800, "Heartbeat timeout."); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/k0/f.java b/app/src/main/java/c/a/r/k0/f.java index a358f7bf8b..a5306bc767 100644 --- a/app/src/main/java/c/a/r/k0/f.java +++ b/app/src/main/java/c/a/r/k0/f.java @@ -1,23 +1,17 @@ package c.a.r.k0; -import d0.z.d.o; -import kotlin.jvm.functions.Function2; -/* compiled from: VideoQuality.kt */ -public final class f extends o implements Function2 { - public static final f i = new f(); +import d0.z.d.m; +import kotlin.jvm.functions.Function0; +/* compiled from: RtcControlSocket.kt */ +public final class f implements Runnable { + public final /* synthetic */ Function0 i; - public f() { - super(2); + public f(Function0 function0) { + this.i = function0; } - public final long a(long j, long j2) { - return j2 > j ? j : j - j2; - } - - /* 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, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function2 - public /* bridge */ /* synthetic */ Long invoke(Long l, Long l2) { - return Long.valueOf(a(l.longValue(), l2.longValue())); + @Override // java.lang.Runnable + public final /* synthetic */ void run() { + m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)"); } } diff --git a/app/src/main/java/c/a/r/l.java b/app/src/main/java/c/a/r/l.java index c7e6a97c24..eaf9a22177 100644 --- a/app/src/main/java/c/a/r/l.java +++ b/app/src/main/java/c/a/r/l.java @@ -1,17 +1,107 @@ package c.a.r; +import com.discord.rtcconnection.EncodeQuality; +import com.discord.rtcconnection.MediaSinkWantsManager; +import com.discord.rtcconnection.VideoMetadata; +import com.discord.rtcconnection.socket.io.Payloads; +import d0.t.n; import d0.z.d.m; +import d0.z.d.o; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: MediaSinkWantsManager.kt */ -public final class l implements Runnable { - public final /* synthetic */ Function0 i; +public final class l extends o implements Function0 { + public final /* synthetic */ List $ssrcs; + public final /* synthetic */ long $userId; + public final /* synthetic */ MediaSinkWantsManager this$0; - public l(Function0 function0) { - this.i = function0; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public l(MediaSinkWantsManager mediaSinkWantsManager, List list, long j) { + super(0); + this.this$0 = mediaSinkWantsManager; + this.$ssrcs = list; + this.$userId = j; } - @Override // java.lang.Runnable - public final /* synthetic */ void run() { - m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)"); + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX WARNING: Code restructure failed: missing block: B:12:0x0036, code lost: + if ((r6 != null ? r6.intValue() : 0) > 0) goto L_0x003a; + */ + /* JADX WARNING: Code restructure failed: missing block: B:31:0x0086, code lost: + if (r10 != null) goto L_0x008b; + */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + EncodeQuality encodeQuality; + List list = this.$ssrcs; + ArrayList arrayList = new ArrayList(); + Iterator it = list.iterator(); + while (true) { + boolean z2 = true; + if (!it.hasNext()) { + break; + } + Object next = it.next(); + Payloads.Stream stream = (Payloads.Stream) next; + Boolean active = stream.getActive(); + if (active != null ? active.booleanValue() : false) { + Integer ssrc = stream.getSsrc(); + } + z2 = false; + if (z2) { + arrayList.add(next); + } + } + ArrayList arrayList2 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10)); + Iterator it2 = arrayList.iterator(); + while (it2.hasNext()) { + Payloads.Stream stream2 = (Payloads.Stream) it2.next(); + Integer quality = stream2.getQuality(); + VideoMetadata videoMetadata = null; + if (quality != null) { + int intValue = quality.intValue(); + Objects.requireNonNull(EncodeQuality.Companion); + EncodeQuality[] values = EncodeQuality.values(); + int i = 0; + while (true) { + if (i >= 11) { + encodeQuality = null; + break; + } + encodeQuality = values[i]; + if (encodeQuality.getValue() == intValue) { + break; + } + i++; + } + } + encodeQuality = EncodeQuality.Hundred; + Integer ssrc2 = stream2.getSsrc(); + m.checkNotNull(ssrc2); + int intValue2 = ssrc2.intValue(); + MediaSinkWantsManager mediaSinkWantsManager = this.this$0; + long j = this.$userId; + Objects.requireNonNull(mediaSinkWantsManager); + if (stream2.getMaxResolution() != null) { + videoMetadata = new VideoMetadata(j, stream2.getMaxResolution().getWidth(), stream2.getMaxResolution().getHeight(), stream2.getMaxFrameRate(), stream2.getMaxResolution().getType()); + } else { + mediaSinkWantsManager.a("metadataOf: " + stream2 + " has no maxResolution!"); + } + arrayList2.add(new MediaSinkWantsManager.b(encodeQuality, intValue2, videoMetadata)); + } + if (arrayList2.isEmpty()) { + this.this$0.b.remove(Long.valueOf(this.$userId)); + this.this$0.f2072c.remove(Long.valueOf(this.$userId)); + } else { + this.this$0.b.put(Long.valueOf(this.$userId), arrayList2); + this.this$0.f2072c.add(Long.valueOf(this.$userId)); + } + this.this$0.d(arrayList2.isEmpty() ? n.emptyList() : d0.t.m.listOf(String.valueOf(this.$userId))); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/l0/a.java b/app/src/main/java/c/a/r/l0/a.java new file mode 100644 index 0000000000..3a3e15a000 --- /dev/null +++ b/app/src/main/java/c/a/r/l0/a.java @@ -0,0 +1,113 @@ +package c.a.r.l0; + +import c.a.r.l0.e; +import co.discord.media_engine.InboundRtpVideo; +import co.discord.media_engine.OutboundRtpAudio; +import co.discord.media_engine.OutboundRtpVideo; +import co.discord.media_engine.ReceiverReport; +import co.discord.media_engine.Stats; +import co.discord.media_engine.Transport; +import com.discord.rtcconnection.KrispOveruseDetector; +import com.discord.rtcconnection.mediaengine.MediaEngineConnection; +import d0.z.d.k; +import d0.z.d.m; +import java.util.Map; +import java.util.Objects; +import kotlin.Pair; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: RtcStatsCollector.kt */ +public final /* synthetic */ class a extends k implements Function1 { + public a(d dVar) { + super(1, dVar, d.class, "onStatsReceived", "onStatsReceived(Lco/discord/media_engine/Stats;)V", 0); + } + + /* 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 Unit invoke(Stats stats) { + OutboundRtpVideo outboundRtpVideo; + ReceiverReport[] receiverReports; + Stats stats2 = stats; + m.checkNotNullParameter(stats2, "p1"); + d dVar = (d) this.receiver; + dVar.a.add(stats2); + if (dVar.a.size() > dVar.i) { + dVar.a.removeFirst(); + } + dVar.f.update(stats2); + e eVar = dVar.g; + Objects.requireNonNull(eVar); + m.checkNotNullParameter(stats2, "stats"); + long currentTimeMillis = eVar.l.currentTimeMillis(); + Transport transport = stats2.getTransport(); + Integer valueOf = Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length); + if (valueOf != null) { + eVar.g.b(valueOf.intValue() == 0, currentTimeMillis); + } + boolean z2 = eVar.f.a() || eVar.g.a(); + if (z2 != eVar.h.a()) { + eVar.h.b(z2, currentTimeMillis); + eVar.i.a.clear(); + } + if (!eVar.h.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) { + eVar.a(eVar.i, new e.C0040e((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a((long) outboundRtpVideo.getFramesEncoded(), (long) outboundRtpVideo.getFramesSent(), (long) outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), (long) outboundRtpVideo.getNackCount(), (long) outboundRtpVideo.getPliCount()))); + if (eVar.i.b == null && outboundRtpVideo.getFramesEncoded() > 0) { + eVar.i.b = Long.valueOf(currentTimeMillis - eVar.e); + } + eVar.k = outboundRtpVideo.getBitrateTarget(); + } + if (!eVar.f.a()) { + for (Map.Entry entry : stats2.getInboundRtpVideo().entrySet()) { + String key = entry.getKey(); + InboundRtpVideo value = entry.getValue(); + Map map = eVar.j; + e.d dVar2 = map.get(key); + if (dVar2 == null) { + dVar2 = new e.d(); + map.put(key, dVar2); + } + e.d dVar3 = dVar2; + eVar.a(dVar3, new e.C0040e((long) value.getResolution().getHeight(), currentTimeMillis, new e.a((long) value.getFramesDecoded(), (long) value.getFramesReceived(), (long) value.getPacketsReceived(), (long) value.getPacketsLost(), (long) value.getFramesDropped(), value.getBytesReceived(), (long) value.getNackCount(), (long) value.getPliCount()))); + if (dVar3.b == null && value.getFramesDecoded() > 0) { + dVar3.b = Long.valueOf(currentTimeMillis - eVar.e); + } + } + } + KrispOveruseDetector krispOveruseDetector = dVar.h; + Objects.requireNonNull(krispOveruseDetector); + m.checkNotNullParameter(stats2, "stats"); + if (krispOveruseDetector.d.getType() == MediaEngineConnection.Type.DEFAULT && krispOveruseDetector.d.b()) { + OutboundRtpAudio outboundRtpAudio = stats2.getOutboundRtpAudio(); + if (outboundRtpAudio != null && outboundRtpAudio.getNoiseCancellerIsEnabled()) { + OutboundRtpAudio outboundRtpAudio2 = krispOveruseDetector.b; + if (outboundRtpAudio2 != null) { + Pair a = krispOveruseDetector.a(outboundRtpAudio2, stats2.getOutboundRtpAudio(), 8.0d); + boolean booleanValue = a.component1().booleanValue(); + long longValue = a.component2().longValue(); + if (booleanValue) { + krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE); + } else if (longValue == 0) { + int i = krispOveruseDetector.f2071c + 1; + krispOveruseDetector.f2071c = i; + if (i > 2) { + krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED); + } + } else { + krispOveruseDetector.f2071c = 0; + } + } + krispOveruseDetector.b = stats2.getOutboundRtpAudio(); + } + OutboundRtpAudio outboundRtpAudio3 = stats2.getOutboundRtpAudio(); + if (outboundRtpAudio3 != null && outboundRtpAudio3.getVoiceActivityDetectorIsEnabled()) { + OutboundRtpAudio outboundRtpAudio4 = krispOveruseDetector.a; + if (outboundRtpAudio4 != null && krispOveruseDetector.a(outboundRtpAudio4, stats2.getOutboundRtpAudio(), 4.0d).component1().booleanValue()) { + krispOveruseDetector.d.f(KrispOveruseDetector.Status.VAD_CPU_OVERUSE); + } + krispOveruseDetector.a = stats2.getOutboundRtpAudio(); + } + } + return Unit.a; + } +} diff --git a/app/src/main/java/c/a/r/l0/b.java b/app/src/main/java/c/a/r/l0/b.java new file mode 100644 index 0000000000..690725c564 --- /dev/null +++ b/app/src/main/java/c/a/r/l0/b.java @@ -0,0 +1,17 @@ +package c.a.r.l0; + +import rx.functions.Action1; +/* compiled from: RtcStatsCollector.kt */ +public final class b implements Action1 { + public final /* synthetic */ d i; + + public b(d dVar) { + this.i = dVar; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Long l) { + this.i.e.n(new a(this.i)); + } +} diff --git a/app/src/main/java/c/a/r/l0/c.java b/app/src/main/java/c/a/r/l0/c.java new file mode 100644 index 0000000000..af9a05ffd1 --- /dev/null +++ b/app/src/main/java/c/a/r/l0/c.java @@ -0,0 +1,18 @@ +package c.a.r.l0; + +import com.discord.utilities.logging.Logger; +import rx.functions.Action1; +/* compiled from: RtcStatsCollector.kt */ +public final class c implements Action1 { + public final /* synthetic */ d i; + + public c(d dVar) { + this.i = dVar; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Throwable th) { + Logger.e$default(this.i.d, "RtcStatsCollector: Error collecting stats", th, null, 4, null); + } +} diff --git a/app/src/main/java/c/a/r/l0/d.java b/app/src/main/java/c/a/r/l0/d.java new file mode 100644 index 0000000000..d34024af24 --- /dev/null +++ b/app/src/main/java/c/a/r/l0/d.java @@ -0,0 +1,49 @@ +package c.a.r.l0; + +import co.discord.media_engine.Stats; +import co.discord.media_engine.VoiceQuality; +import com.discord.rtcconnection.KrispOveruseDetector; +import com.discord.rtcconnection.mediaengine.MediaEngineConnection; +import com.discord.utilities.logging.Logger; +import d0.z.d.m; +import java.util.Deque; +import java.util.LinkedList; +import rx.Subscription; +/* compiled from: RtcStatsCollector.kt */ +public final class d { + public final Deque a; + public Subscription b; + + /* renamed from: c reason: collision with root package name */ + public final long f217c; + public final Logger d; + public final MediaEngineConnection e; + public final VoiceQuality f; + public final e g; + public final KrispOveruseDetector h; + public final int i; + + public d(long j, Logger logger, MediaEngineConnection mediaEngineConnection, VoiceQuality voiceQuality, e eVar, KrispOveruseDetector krispOveruseDetector, int i, int i2) { + i = (i2 & 64) != 0 ? 30 : i; + m.checkNotNullParameter(logger, "logger"); + m.checkNotNullParameter(mediaEngineConnection, "connection"); + m.checkNotNullParameter(voiceQuality, "voiceQuality"); + m.checkNotNullParameter(eVar, "videoQuality"); + m.checkNotNullParameter(krispOveruseDetector, "krispOveruseDetector"); + this.f217c = j; + this.d = logger; + this.e = mediaEngineConnection; + this.f = voiceQuality; + this.g = eVar; + this.h = krispOveruseDetector; + this.i = i; + this.a = new LinkedList(); + } + + public final void a() { + Subscription subscription = this.b; + if (subscription != null) { + subscription.unsubscribe(); + } + } +} diff --git a/app/src/main/java/c/a/r/l0/e.java b/app/src/main/java/c/a/r/l0/e.java new file mode 100644 index 0000000000..08b710de7d --- /dev/null +++ b/app/src/main/java/c/a/r/l0/e.java @@ -0,0 +1,372 @@ +package c.a.r.l0; + +import com.discord.utilities.time.Clock; +import com.discord.utilities.time.ClockFactory; +import d0.o; +import d0.t.h0; +import d0.t.n; +import d0.t.r; +import d0.z.d.m; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import kotlin.Pair; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: VideoQuality.kt */ +public final class e { + public static final List a = n.listOf((Object[]) new Integer[]{0, 500000, 1000000, 1500000, 2000000, 3000000, 4000000, 5000000, 6000000, 7000000, 8000000}); + public static final List b = n.listOf((Object[]) new Integer[]{0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60}); + + /* renamed from: c reason: collision with root package name */ + public static final List f218c = n.listOf((Object[]) new Integer[]{720, 480, 360}); + public static final b d = new b(null); + public final long e; + public final c f; + public final c g; + public final c h; + public final d i; + public final Map j; + public int k; + public final Clock l; + + /* compiled from: VideoQuality.kt */ + public static final class a { + public long a; + public long b; + + /* renamed from: c reason: collision with root package name */ + public long f219c; + public long d; + public long e; + public long f; + public long g; + public long h; + + public a() { + this(0, 0, 0, 0, 0, 0, 0, 0, 255); + } + + public a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8) { + this.a = j; + this.b = j2; + this.f219c = j3; + this.d = j4; + this.e = j5; + this.f = j6; + this.g = j7; + this.h = j8; + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, int i) { + this((i & 1) != 0 ? 0 : j, (i & 2) != 0 ? 0 : j2, (i & 4) != 0 ? 0 : j3, (i & 8) != 0 ? 0 : j4, (i & 16) != 0 ? 0 : j5, (i & 32) != 0 ? 0 : j6, (i & 64) != 0 ? 0 : j7, (i & 128) == 0 ? j8 : 0); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof a)) { + return false; + } + a aVar = (a) obj; + return this.a == aVar.a && this.b == aVar.b && this.f219c == aVar.f219c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f && this.g == aVar.g && this.h == aVar.h; + } + + public int hashCode() { + int a = a0.a.a.b.a(this.b); + int a2 = a0.a.a.b.a(this.f219c); + int a3 = a0.a.a.b.a(this.d); + int a4 = a0.a.a.b.a(this.e); + int a5 = a0.a.a.b.a(this.f); + int a6 = a0.a.a.b.a(this.g); + return a0.a.a.b.a(this.h) + ((a6 + ((a5 + ((a4 + ((a3 + ((a2 + ((a + (a0.a.a.b.a(this.a) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31); + } + + public String toString() { + StringBuilder L = c.d.b.a.a.L("AggregatedProperties(framesCodec="); + L.append(this.a); + L.append(", framesNetwork="); + L.append(this.b); + L.append(", packets="); + L.append(this.f219c); + L.append(", packetsLost="); + L.append(this.d); + L.append(", framesDropped="); + L.append(this.e); + L.append(", bytes="); + L.append(this.f); + L.append(", nackCount="); + L.append(this.g); + L.append(", pliCount="); + return c.d.b.a.a.A(L, this.h, ")"); + } + } + + /* compiled from: VideoQuality.kt */ + public static final class b { + public b(DefaultConstructorMarker defaultConstructorMarker) { + } + + public static final long a(b bVar, Float f) { + if (f != null) { + return d0.a0.a.roundToLong(f.floatValue()); + } + return 0; + } + } + + /* compiled from: VideoQuality.kt */ + public static final class c { + public Long a; + public long b; + + public c(boolean z2, long j) { + this.a = z2 ? Long.valueOf(j) : null; + } + + public final boolean a() { + return this.a != null; + } + + public final void b(boolean z2, long j) { + Long l = this.a; + if (l == null) { + if (z2) { + this.a = Long.valueOf(j); + } + } else if (l != null) { + long longValue = l.longValue(); + if (!z2) { + this.b = (j - longValue) + this.b; + this.a = null; + } + } + } + + public final long c(long j) { + Long l = this.a; + if (l == null) { + return this.b; + } + return (this.b + j) - l.longValue(); + } + } + + /* compiled from: VideoQuality.kt */ + public static final class d { + public List a = new ArrayList(); + public Long b; + + /* renamed from: c reason: collision with root package name */ + public a f220c = new a(0, 0, 0, 0, 0, 0, 0, 0, 255); + public long d; + public Map e = new LinkedHashMap(); + public Map f = new LinkedHashMap(); + public float g; + public Map h = new LinkedHashMap(); + + public d() { + for (Number number : e.a) { + this.e.put(Integer.valueOf(number.intValue()), Float.valueOf(0.0f)); + } + for (Number number2 : e.b) { + this.f.put(Integer.valueOf(number2.intValue()), Float.valueOf(0.0f)); + } + for (Number number3 : e.f218c) { + this.h.put(Integer.valueOf(number3.intValue()), Float.valueOf(0.0f)); + } + } + } + + /* compiled from: VideoQuality.kt */ + /* renamed from: c.a.r.l0.e$e reason: collision with other inner class name */ + public static final class C0040e { + public final long a; + public final long b; + + /* renamed from: c reason: collision with root package name */ + public final a f221c; + + public C0040e() { + this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 255)); + } + + public C0040e(long j, long j2, a aVar) { + m.checkNotNullParameter(aVar, "aggregatedProperties"); + this.a = j; + this.b = j2; + this.f221c = aVar; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof C0040e)) { + return false; + } + C0040e eVar = (C0040e) obj; + return this.a == eVar.a && this.b == eVar.b && m.areEqual(this.f221c, eVar.f221c); + } + + public int hashCode() { + int a = (a0.a.a.b.a(this.b) + (a0.a.a.b.a(this.a) * 31)) * 31; + a aVar = this.f221c; + return a + (aVar != null ? aVar.hashCode() : 0); + } + + public String toString() { + StringBuilder L = c.d.b.a.a.L("RawVideoStats(resolution="); + L.append(this.a); + L.append(", timestamp="); + L.append(this.b); + L.append(", aggregatedProperties="); + L.append(this.f221c); + L.append(")"); + return L.toString(); + } + } + + public e(Clock clock, int i) { + Clock clock2 = (i & 1) != 0 ? ClockFactory.get() : null; + m.checkNotNullParameter(clock2, "clock"); + this.l = clock2; + long currentTimeMillis = clock2.currentTimeMillis(); + this.e = currentTimeMillis; + this.f = new c(false, currentTimeMillis); + this.g = new c(false, currentTimeMillis); + this.h = new c(false, currentTimeMillis); + this.i = new d(); + this.j = new LinkedHashMap(); + } + + public final void a(d dVar, C0040e eVar) { + dVar.a.add(eVar); + if (dVar.a.size() >= 2) { + List list = dVar.a; + C0040e eVar2 = list.get(list.size() - 1); + List list2 = dVar.a; + C0040e eVar3 = list2.get(list2.size() - 2); + f fVar = f.i; + dVar.d = (eVar2.b - eVar3.b) + dVar.d; + a aVar = dVar.f220c; + a aVar2 = eVar2.f221c; + a aVar3 = eVar3.f221c; + aVar.a = fVar.a(aVar2.a, aVar3.a) + aVar.a; + aVar.b = fVar.a(aVar2.b, aVar3.b) + aVar.b; + aVar.f219c = fVar.a(aVar2.f219c, aVar3.f219c) + aVar.f219c; + aVar.d = fVar.a(aVar2.d, aVar3.d) + aVar.d; + aVar.e = fVar.a(aVar2.e, aVar3.e) + aVar.e; + aVar.f = fVar.a(aVar2.f, aVar3.f) + aVar.f; + aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g; + aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h; + a aVar4 = eVar2.f221c; + long j = aVar4.f; + long j2 = aVar4.a; + long j3 = eVar2.b; + long j4 = eVar2.a; + float f = ((float) (j3 - eVar3.b)) / 1000.0f; + dVar.g = (((float) j4) * f) + dVar.g; + if (dVar.a.size() >= 6) { + List list3 = dVar.a; + C0040e eVar4 = list3.get(list3.size() - 3); + a aVar5 = eVar4.f221c; + long j5 = aVar5.f; + long j6 = aVar5.a; + long j7 = eVar4.b; + Iterator it = f218c.iterator(); + while (true) { + float f2 = 0.0f; + if (!it.hasNext()) { + break; + } + int intValue = ((Number) it.next()).intValue(); + if (j4 <= ((long) intValue)) { + Map map = dVar.h; + Integer valueOf = Integer.valueOf(intValue); + Float f3 = dVar.h.get(Integer.valueOf(intValue)); + if (f3 != null) { + f2 = f3.floatValue(); + } + map.put(valueOf, Float.valueOf(f2 + f)); + } + j2 = j2; + j6 = j6; + } + float f4 = ((float) (j3 - j7)) / 1000.0f; + float f5 = ((float) ((j - j5) * ((long) 8))) / f4; + float f6 = ((float) (j2 - j6)) / f4; + for (Number number : a) { + int intValue2 = number.intValue(); + if (f5 <= ((float) intValue2)) { + Map map2 = dVar.e; + Integer valueOf2 = Integer.valueOf(intValue2); + Float f7 = dVar.e.get(Integer.valueOf(intValue2)); + map2.put(valueOf2, Float.valueOf((f7 != null ? f7.floatValue() : 0.0f) + f)); + } + } + for (Number number2 : b) { + int intValue3 = number2.intValue(); + if (f6 <= ((float) intValue3)) { + Map map3 = dVar.f; + Integer valueOf3 = Integer.valueOf(intValue3); + Float f8 = dVar.f.get(Integer.valueOf(intValue3)); + map3.put(valueOf3, Float.valueOf((f8 != null ? f8.floatValue() : 0.0f) + f)); + } + } + r.removeFirst(dVar.a); + } + } + } + + public final Map b(String str) { + m.checkNotNullParameter(str, "userId"); + d dVar = this.j.get(str); + if (dVar != null) { + return d(dVar); + } + return null; + } + + public final Map c() { + return h0.plus(d(this.i), h0.mapOf(o.to("target_bitrate", Integer.valueOf(this.k)), o.to("duration_encoder_nvidia_cuda", 0), o.to("duration_encoder_nvidia_direct3d", 0), o.to("duration_encoder_openh264", 0), o.to("duration_encoder_videotoolbox", 0), o.to("duration_encoder_amd_direct3d", 0), o.to("duration_encoder_intel", 0), o.to("duration_encoder_intel_direct3d", 0), o.to("duration_encoder_unknown", 0))); + } + + /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x03d6: APUT + (r4v4 kotlin.Pair[]) + (6 ??[int, float, short, byte, char]) + (wrap: kotlin.Pair : 0x03d1: INVOKE (r15v3 kotlin.Pair) = + ("time_to_first_frame_ms") + (wrap: java.lang.Long : 0x03ca: INVOKE (r15v2 java.lang.Long) = (r2v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long) + type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) + */ + public final Map d(d dVar) { + Float valueOf; + long currentTimeMillis = this.l.currentTimeMillis(); + float f = ((float) (currentTimeMillis - this.e)) / 1000.0f; + float f2 = ((float) dVar.d) / 1000.0f; + int i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); + long roundToLong = (i <= 0 || (valueOf = Float.valueOf(dVar.g / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()); + b bVar = d; + Map mapOf = h0.mapOf(o.to("duration", Double.valueOf(Math.floor((double) f))), c.d.b.a.a.U(bVar, dVar.e.get(8000000), "duration_stream_under_8mbps"), c.d.b.a.a.U(bVar, dVar.e.get(7000000), "duration_stream_under_7mbps"), c.d.b.a.a.U(bVar, dVar.e.get(6000000), "duration_stream_under_6mbps"), c.d.b.a.a.U(bVar, dVar.e.get(5000000), "duration_stream_under_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(4000000), "duration_stream_under_4mbps"), c.d.b.a.a.U(bVar, dVar.e.get(3000000), "duration_stream_under_3mbps"), c.d.b.a.a.U(bVar, dVar.e.get(2000000), "duration_stream_under_2mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1500000), "duration_stream_under_1_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(1000000), "duration_stream_under_1mbps"), c.d.b.a.a.U(bVar, dVar.e.get(500000), "duration_stream_under_0_5mbps"), c.d.b.a.a.U(bVar, dVar.e.get(0), "duration_stream_at_0mbps"), c.d.b.a.a.U(bVar, dVar.f.get(60), "duration_fps_under_60"), c.d.b.a.a.U(bVar, dVar.f.get(55), "duration_fps_under_55"), c.d.b.a.a.U(bVar, dVar.f.get(50), "duration_fps_under_50"), c.d.b.a.a.U(bVar, dVar.f.get(45), "duration_fps_under_45"), c.d.b.a.a.U(bVar, dVar.f.get(40), "duration_fps_under_40"), c.d.b.a.a.U(bVar, dVar.f.get(35), "duration_fps_under_35"), c.d.b.a.a.U(bVar, dVar.f.get(30), "duration_fps_under_30"), c.d.b.a.a.U(bVar, dVar.f.get(25), "duration_fps_under_25"), c.d.b.a.a.U(bVar, dVar.f.get(20), "duration_fps_under_20"), c.d.b.a.a.U(bVar, dVar.f.get(15), "duration_fps_under_15"), c.d.b.a.a.U(bVar, dVar.f.get(10), "duration_fps_under_10"), c.d.b.a.a.U(bVar, dVar.f.get(5), "duration_fps_under_5"), c.d.b.a.a.U(bVar, dVar.f.get(0), "duration_fps_at_0"), o.to("avg_resolution", Long.valueOf(roundToLong)), c.d.b.a.a.U(bVar, dVar.h.get(720), "duration_resolution_under_720"), c.d.b.a.a.U(bVar, dVar.h.get(480), "duration_resolution_under_480"), c.d.b.a.a.U(bVar, dVar.h.get(360), "duration_resolution_under_360"), o.to("num_pauses", 0), o.to("duration_paused", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.f.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_zero_receivers", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.g.c(currentTimeMillis)) / 1000.0f)))), o.to("duration_video_stopped", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.h.c(currentTimeMillis)) / 1000.0f))))); + a aVar = dVar.f220c; + long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0; + long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0; + Pair[] pairArr = new Pair[10]; + pairArr[0] = o.to("avg_bitrate", Long.valueOf(a2)); + pairArr[1] = o.to("avg_fps", Long.valueOf(a3)); + pairArr[2] = o.to("num_bytes", Long.valueOf(aVar.f)); + pairArr[3] = o.to("num_packets_lost", Long.valueOf(aVar.d)); + pairArr[4] = o.to("num_packets", Long.valueOf(aVar.f219c)); + pairArr[5] = o.to("num_frames", Long.valueOf(aVar.b)); + Long l = dVar.b; + pairArr[6] = o.to("time_to_first_frame_ms", Long.valueOf(l != null ? l.longValue() : 0)); + pairArr[7] = o.to("num_frames_dropped", Long.valueOf(aVar.e)); + pairArr[8] = o.to("num_nacks", Long.valueOf(aVar.g)); + pairArr[9] = o.to("num_plis", Long.valueOf(aVar.h)); + return h0.plus(mapOf, h0.mapOf(pairArr)); + } +} diff --git a/app/src/main/java/c/a/r/l0/f.java b/app/src/main/java/c/a/r/l0/f.java new file mode 100644 index 0000000000..b5835d79d5 --- /dev/null +++ b/app/src/main/java/c/a/r/l0/f.java @@ -0,0 +1,23 @@ +package c.a.r.l0; + +import d0.z.d.o; +import kotlin.jvm.functions.Function2; +/* compiled from: VideoQuality.kt */ +public final class f extends o implements Function2 { + public static final f i = new f(); + + public f() { + super(2); + } + + public final long a(long j, long j2) { + return j2 > j ? j : j - j2; + } + + /* 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, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Long invoke(Long l, Long l2) { + return Long.valueOf(a(l.longValue(), l2.longValue())); + } +} diff --git a/app/src/main/java/c/a/r/m.java b/app/src/main/java/c/a/r/m.java index 3276a3e706..1b136b8e11 100644 --- a/app/src/main/java/c/a/r/m.java +++ b/app/src/main/java/c/a/r/m.java @@ -1,49 +1,16 @@ package c.a.r; -import a0.a.a.a; -/* compiled from: MediaSinkWantsLadder.kt */ -public final class m { - public final int a; - public final int b; +import kotlin.jvm.functions.Function0; +/* compiled from: MediaSinkWantsManager.kt */ +public final class m implements Runnable { + public final /* synthetic */ Function0 i; - /* renamed from: c reason: collision with root package name */ - public final double f222c; - public final int d; - public final int e; - - public m(int i, int i2, double d, int i3, int i4) { - this.a = i; - this.b = i2; - this.f222c = d; - this.d = i3; - this.e = i4; + public m(Function0 function0) { + this.i = function0; } - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof m)) { - return false; - } - m mVar = (m) obj; - return this.a == mVar.a && this.b == mVar.b && Double.compare(this.f222c, mVar.f222c) == 0 && this.d == mVar.d && this.e == mVar.e; - } - - public int hashCode() { - return ((((a.a(this.f222c) + (((this.a * 31) + this.b) * 31)) * 31) + this.d) * 31) + this.e; - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("ResolutionBudget(width="); - L.append(this.a); - L.append(", height="); - L.append(this.b); - L.append(", budgetPortion="); - L.append(this.f222c); - L.append(", mutedFramerate="); - L.append(this.d); - L.append(", framerate="); - return c.d.b.a.a.z(L, this.e, ")"); + @Override // java.lang.Runnable + public final /* synthetic */ void run() { + d0.z.d.m.checkNotNullExpressionValue(this.i.mo1invoke(), "invoke(...)"); } } diff --git a/app/src/main/java/c/a/r/n.java b/app/src/main/java/c/a/r/n.java index cef3e1ab0b..f771c6404b 100644 --- a/app/src/main/java/c/a/r/n.java +++ b/app/src/main/java/c/a/r/n.java @@ -1,39 +1,49 @@ package c.a.r; -import c.a.r.j0.a; -import com.discord.rtcconnection.RtcConnection; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: RtcConnection.kt */ -public final class n extends o implements Function0 { - public final /* synthetic */ Boolean $isConnected; - public final /* synthetic */ o this$0; +import a0.a.a.a; +/* compiled from: MediaSinkWantsLadder.kt */ +public final class n { + public final int a; + public final int b; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public n(o oVar, Boolean bool) { - super(0); - this.this$0 = oVar; - this.$isConnected = bool; + /* renamed from: c reason: collision with root package name */ + public final double f222c; + public final int d; + public final int e; + + public n(int i, int i2, double d, int i3, int i4) { + this.a = i; + this.b = i2; + this.f222c = d; + this.d = i3; + this.e = i4; } - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - RtcConnection rtcConnection = this.this$0.i; - Boolean bool = this.$isConnected; - m.checkNotNullExpressionValue(bool, "isConnected"); - boolean booleanValue = bool.booleanValue(); - a aVar = rtcConnection.m; - if (aVar == null) { - RtcConnection.o(rtcConnection, "handleConnectivityChange() socket was null.", null, null, 6); - } else if (booleanValue) { - aVar.h(5000, "network detected online", true); - } else { - aVar.h(15000, "network detected offline", false); + public boolean equals(Object obj) { + if (this == obj) { + return true; } - return Unit.a; + if (!(obj instanceof n)) { + return false; + } + n nVar = (n) obj; + return this.a == nVar.a && this.b == nVar.b && Double.compare(this.f222c, nVar.f222c) == 0 && this.d == nVar.d && this.e == nVar.e; + } + + public int hashCode() { + return ((((a.a(this.f222c) + (((this.a * 31) + this.b) * 31)) * 31) + this.d) * 31) + this.e; + } + + public String toString() { + StringBuilder L = c.d.b.a.a.L("ResolutionBudget(width="); + L.append(this.a); + L.append(", height="); + L.append(this.b); + L.append(", budgetPortion="); + L.append(this.f222c); + L.append(", mutedFramerate="); + L.append(this.d); + L.append(", framerate="); + return c.d.b.a.a.z(L, this.e, ")"); } } diff --git a/app/src/main/java/c/a/r/o.java b/app/src/main/java/c/a/r/o.java index b36d5dac72..b8c211e484 100644 --- a/app/src/main/java/c/a/r/o.java +++ b/app/src/main/java/c/a/r/o.java @@ -1,18 +1,38 @@ package c.a.r; +import c.a.r.k0.a; import com.discord.rtcconnection.RtcConnection; -import rx.functions.Action1; +import d0.z.d.m; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class o implements Action1 { - public final /* synthetic */ RtcConnection i; +public final class o extends d0.z.d.o implements Function0 { + public final /* synthetic */ Boolean $isConnected; + public final /* synthetic */ p this$0; - public o(RtcConnection rtcConnection) { - this.i = rtcConnection; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public o(p pVar, Boolean bool) { + super(0); + this.this$0 = pVar; + this.$isConnected = bool; } - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Boolean bool) { - this.i.s(new n(this, bool)); + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + RtcConnection rtcConnection = this.this$0.i; + Boolean bool = this.$isConnected; + m.checkNotNullExpressionValue(bool, "isConnected"); + boolean booleanValue = bool.booleanValue(); + a aVar = rtcConnection.m; + if (aVar == null) { + RtcConnection.o(rtcConnection, "handleConnectivityChange() socket was null.", null, null, 6); + } else if (booleanValue) { + aVar.i(5000, "network detected online", true); + } else { + aVar.i(15000, "network detected offline", false); + } + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/p.java b/app/src/main/java/c/a/r/p.java index 71d8203dc9..ed42ed5495 100644 --- a/app/src/main/java/c/a/r/p.java +++ b/app/src/main/java/c/a/r/p.java @@ -1,10 +1,9 @@ package c.a.r; -import c.d.b.a.a; import com.discord.rtcconnection.RtcConnection; import rx.functions.Action1; /* compiled from: RtcConnection.kt */ -public final class p implements Action1 { +public final class p implements Action1 { public final /* synthetic */ RtcConnection i; public p(RtcConnection rtcConnection) { @@ -13,10 +12,7 @@ public final class p implements Action1 { /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // rx.functions.Action1 - public void call(Throwable th) { - RtcConnection rtcConnection = this.i; - StringBuilder L = a.L("failed to handle connectivity change in "); - L.append(this.i.f2074c); - RtcConnection.o(rtcConnection, L.toString(), th, null, 4); + public void call(Boolean bool) { + this.i.s(new o(this, bool)); } } diff --git a/app/src/main/java/c/a/r/q.java b/app/src/main/java/c/a/r/q.java index 367f94cdc6..43d86f63de 100644 --- a/app/src/main/java/c/a/r/q.java +++ b/app/src/main/java/c/a/r/q.java @@ -1,18 +1,22 @@ package c.a.r; +import c.d.b.a.a; import com.discord.rtcconnection.RtcConnection; -import d0.z.d.m; +import rx.functions.Action1; /* compiled from: RtcConnection.kt */ -public final class q extends RtcConnection.b { - public final /* synthetic */ RtcConnection a; +public final class q implements Action1 { + public final /* synthetic */ RtcConnection i; public q(RtcConnection rtcConnection) { - this.a = rtcConnection; + this.i = rtcConnection; } - @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c - public void onStateChange(RtcConnection.StateChange stateChange) { - m.checkNotNullParameter(stateChange, "stateChange"); - this.a.j.onNext(stateChange); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Throwable th) { + RtcConnection rtcConnection = this.i; + StringBuilder L = a.L("failed to handle connectivity change in "); + L.append(this.i.f2074c); + RtcConnection.o(rtcConnection, L.toString(), th, null, 4); } } diff --git a/app/src/main/java/c/a/r/r.java b/app/src/main/java/c/a/r/r.java index 253778a079..6d7c9b6b3b 100644 --- a/app/src/main/java/c/a/r/r.java +++ b/app/src/main/java/c/a/r/r.java @@ -1,71 +1,18 @@ package c.a.r; -import c.a.r.j0.a; import com.discord.rtcconnection.RtcConnection; -import d0.g0.t; -import d0.t.g0; import d0.z.d.m; -import d0.z.d.o; -import java.net.URI; -import javax.net.ssl.SSLSocketFactory; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class r extends o implements Function0 { - public final /* synthetic */ s this$0; +public final class r extends RtcConnection.b { + public final /* synthetic */ RtcConnection a; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public r(s sVar) { - super(0); - this.this$0 = sVar; + public r(RtcConnection rtcConnection) { + this.a = rtcConnection; } - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - v vVar = this.this$0.i; - RtcConnection rtcConnection = vVar.this$0; - String str = vVar.$endpoint; - String str2 = vVar.$token; - SSLSocketFactory sSLSocketFactory = vVar.$sslSocketFactory; - rtcConnection.g.succeed(); - String str3 = sSLSocketFactory != null ? "wss" : "ws"; - if (str == null || str.length() == 0) { - a aVar = rtcConnection.m; - if (aVar != null) { - aVar.d(); - } - rtcConnection.u(RtcConnection.State.b.a); - } else { - String replace$default = t.replace$default(str, ".gg", ".media", false, 4, (Object) null); - String v = c.d.b.a.a.v(str3, "://", replace$default); - String replace$default2 = t.replace$default(v, ":80", ":443", false, 4, (Object) null); - a aVar2 = rtcConnection.m; - if (aVar2 != null) { - aVar2.d(); - } - if (rtcConnection.k) { - RtcConnection.j(rtcConnection, false, "Connect called on destroyed instance.", null, false, 4); - } else if (str2 == null) { - RtcConnection.j(rtcConnection, false, "Connect called with no token.", null, false, 12); - } else { - rtcConnection.r("connecting via endpoint: " + replace$default + " token: " + str2); - try { - URI uri = new URI(v); - rtcConnection.o = uri.getHost(); - rtcConnection.p = Integer.valueOf(uri.getPort()); - } catch (Exception e) { - rtcConnection.J.e(rtcConnection.f2074c, "Failed to parse RTC endpoint", e, g0.mapOf(d0.o.to("endpoint", replace$default))); - } - a aVar3 = new a(replace$default2, str2, sSLSocketFactory, rtcConnection.J, rtcConnection.I.c(), rtcConnection.K, rtcConnection.f2074c); - c0 c0Var = rtcConnection.A; - m.checkNotNullParameter(c0Var, "listener"); - aVar3.g.add(c0Var); - aVar3.e(); - rtcConnection.m = aVar3; - } - } - return Unit.a; + @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c + public void onStateChange(RtcConnection.StateChange stateChange) { + m.checkNotNullParameter(stateChange, "stateChange"); + this.a.j.onNext(stateChange); } } diff --git a/app/src/main/java/c/a/r/s.java b/app/src/main/java/c/a/r/s.java index 90bca59036..d3f5a04ffb 100644 --- a/app/src/main/java/c/a/r/s.java +++ b/app/src/main/java/c/a/r/s.java @@ -1,18 +1,71 @@ package c.a.r; +import c.a.r.k0.a; +import com.discord.rtcconnection.RtcConnection; +import d0.g0.t; +import d0.t.g0; +import d0.z.d.m; +import d0.z.d.o; +import java.net.URI; +import javax.net.ssl.SSLSocketFactory; import kotlin.Unit; -import rx.functions.Action1; +import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class s implements Action1 { - public final /* synthetic */ v i; +public final class s extends o implements Function0 { + public final /* synthetic */ t this$0; - public s(v vVar) { - this.i = vVar; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public s(t tVar) { + super(0); + this.this$0 = tVar; } - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Unit unit) { - this.i.this$0.s(new r(this)); + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + w wVar = this.this$0.i; + RtcConnection rtcConnection = wVar.this$0; + String str = wVar.$endpoint; + String str2 = wVar.$token; + SSLSocketFactory sSLSocketFactory = wVar.$sslSocketFactory; + rtcConnection.g.succeed(); + String str3 = sSLSocketFactory != null ? "wss" : "ws"; + if (str == null || str.length() == 0) { + a aVar = rtcConnection.m; + if (aVar != null) { + aVar.e(); + } + rtcConnection.u(RtcConnection.State.b.a); + } else { + String replace$default = t.replace$default(str, ".gg", ".media", false, 4, (Object) null); + String v = c.d.b.a.a.v(str3, "://", replace$default); + String replace$default2 = t.replace$default(v, ":80", ":443", false, 4, (Object) null); + a aVar2 = rtcConnection.m; + if (aVar2 != null) { + aVar2.e(); + } + if (rtcConnection.k) { + RtcConnection.j(rtcConnection, false, "Connect called on destroyed instance.", null, false, 4); + } else if (str2 == null) { + RtcConnection.j(rtcConnection, false, "Connect called with no token.", null, false, 12); + } else { + rtcConnection.r("connecting via endpoint: " + replace$default + " token: " + str2); + try { + URI uri = new URI(v); + rtcConnection.o = uri.getHost(); + rtcConnection.p = Integer.valueOf(uri.getPort()); + } catch (Exception e) { + rtcConnection.J.e(rtcConnection.f2074c, "Failed to parse RTC endpoint", e, g0.mapOf(d0.o.to("endpoint", replace$default))); + } + a aVar3 = new a(replace$default2, str2, sSLSocketFactory, rtcConnection.J, rtcConnection.I.c(), rtcConnection.K, rtcConnection.f2074c); + d0 d0Var = rtcConnection.A; + m.checkNotNullParameter(d0Var, "listener"); + aVar3.g.add(d0Var); + aVar3.f(); + rtcConnection.m = aVar3; + } + } + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/t.java b/app/src/main/java/c/a/r/t.java index 0ef36c8f43..2d1248c5ab 100644 --- a/app/src/main/java/c/a/r/t.java +++ b/app/src/main/java/c/a/r/t.java @@ -1,32 +1,18 @@ package c.a.r; -import com.discord.rtcconnection.RtcConnection; -import d0.z.d.m; -import d0.z.d.o; -import java.util.Objects; import kotlin.Unit; -import kotlin.jvm.functions.Function0; +import rx.functions.Action1; /* compiled from: RtcConnection.kt */ -public final class t extends o implements Function0 { - public final /* synthetic */ Throwable $throwable; - public final /* synthetic */ u this$0; +public final class t implements Action1 { + public final /* synthetic */ w i; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public t(u uVar, Throwable th) { - super(0); - this.this$0 = uVar; - this.$throwable = th; + public t(w wVar) { + this.i = wVar; } - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - RtcConnection rtcConnection = this.this$0.i.this$0; - Throwable th = this.$throwable; - m.checkNotNullExpressionValue(th, "throwable"); - Objects.requireNonNull(rtcConnection); - rtcConnection.s(new w(rtcConnection, th)); - return Unit.a; + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Unit unit) { + this.i.this$0.s(new s(this)); } } diff --git a/app/src/main/java/c/a/r/u.java b/app/src/main/java/c/a/r/u.java index d0e95e8a69..aae4b626d4 100644 --- a/app/src/main/java/c/a/r/u.java +++ b/app/src/main/java/c/a/r/u.java @@ -1,17 +1,32 @@ package c.a.r; -import rx.functions.Action1; +import com.discord.rtcconnection.RtcConnection; +import d0.z.d.m; +import d0.z.d.o; +import java.util.Objects; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class u implements Action1 { - public final /* synthetic */ v i; +public final class u extends o implements Function0 { + public final /* synthetic */ Throwable $throwable; + public final /* synthetic */ v this$0; - public u(v vVar) { - this.i = vVar; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public u(v vVar, Throwable th) { + super(0); + this.this$0 = vVar; + this.$throwable = th; } - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // rx.functions.Action1 - public void call(Throwable th) { - this.i.this$0.s(new t(this, th)); + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + RtcConnection rtcConnection = this.this$0.i.this$0; + Throwable th = this.$throwable; + m.checkNotNullExpressionValue(th, "throwable"); + Objects.requireNonNull(rtcConnection); + rtcConnection.s(new x(rtcConnection, th)); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/v.java b/app/src/main/java/c/a/r/v.java index 38cd6d2df5..1a26ff4edb 100644 --- a/app/src/main/java/c/a/r/v.java +++ b/app/src/main/java/c/a/r/v.java @@ -1,36 +1,17 @@ package c.a.r; -import com.discord.rtcconnection.RtcConnection; -import d0.z.d.o; -import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLSocketFactory; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; +import rx.functions.Action1; /* compiled from: RtcConnection.kt */ -public final class v extends o implements Function0 { - public final /* synthetic */ String $endpoint; - public final /* synthetic */ SSLSocketFactory $sslSocketFactory; - public final /* synthetic */ String $token; - public final /* synthetic */ RtcConnection this$0; +public final class v implements Action1 { + public final /* synthetic */ w i; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public v(RtcConnection rtcConnection, String str, String str2, SSLSocketFactory sSLSocketFactory) { - super(0); - this.this$0 = rtcConnection; - this.$endpoint = str; - this.$token = str2; - this.$sslSocketFactory = sSLSocketFactory; + public v(w wVar) { + this.i = wVar; } - /* Return type fixed from 'java.lang.Object' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public Unit mo1invoke() { - RtcConnection rtcConnection = this.this$0; - rtcConnection.r = Long.valueOf(rtcConnection.K.currentTimeMillis()); - RtcConnection rtcConnection2 = this.this$0; - rtcConnection2.t++; - rtcConnection2.u = rtcConnection2.I.a().d0(2, TimeUnit.SECONDS).X(new s(this), new u(this)); - return Unit.a; + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // rx.functions.Action1 + public void call(Throwable th) { + this.i.this$0.s(new u(this, th)); } } diff --git a/app/src/main/java/c/a/r/w.java b/app/src/main/java/c/a/r/w.java index e8097e650e..25cb5ab065 100644 --- a/app/src/main/java/c/a/r/w.java +++ b/app/src/main/java/c/a/r/w.java @@ -2,25 +2,35 @@ package c.a.r; import com.discord.rtcconnection.RtcConnection; import d0.z.d.o; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLSocketFactory; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ public final class w extends o implements Function0 { - public final /* synthetic */ Throwable $throwable; + public final /* synthetic */ String $endpoint; + public final /* synthetic */ SSLSocketFactory $sslSocketFactory; + public final /* synthetic */ String $token; public final /* synthetic */ RtcConnection this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public w(RtcConnection rtcConnection, Throwable th) { + public w(RtcConnection rtcConnection, String str, String str2, SSLSocketFactory sSLSocketFactory) { super(0); this.this$0 = rtcConnection; - this.$throwable = th; + this.$endpoint = str; + this.$token = str2; + this.$sslSocketFactory = sSLSocketFactory; } /* Return type fixed from 'java.lang.Object' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Unit mo1invoke() { - RtcConnection.j(this.this$0, false, "Unable to prepare media engine.", this.$throwable, false, 8); + RtcConnection rtcConnection = this.this$0; + rtcConnection.r = Long.valueOf(rtcConnection.K.currentTimeMillis()); + RtcConnection rtcConnection2 = this.this$0; + rtcConnection2.t++; + rtcConnection2.u = rtcConnection2.I.a().d0(2, TimeUnit.SECONDS).X(new t(this), new v(this)); return Unit.a; } } diff --git a/app/src/main/java/c/a/r/x.java b/app/src/main/java/c/a/r/x.java index 33f9ebccbc..7c27c9795e 100644 --- a/app/src/main/java/c/a/r/x.java +++ b/app/src/main/java/c/a/r/x.java @@ -1,19 +1,26 @@ package c.a.r; -import com.discord.rtcconnection.EncodeQuality; import com.discord.rtcconnection.RtcConnection; -import d0.o; -import java.util.Map; -import kotlin.Pair; -import rx.functions.Func2; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; /* compiled from: RtcConnection.kt */ -public final class x implements Func2, RtcConnection.StateChange, Pair, ? extends RtcConnection.State>> { - public static final x i = new x(); +public final class x extends o implements Function0 { + public final /* synthetic */ Throwable $throwable; + public final /* synthetic */ RtcConnection this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public x(RtcConnection rtcConnection, Throwable th) { + super(0); + this.this$0 = rtcConnection; + this.$throwable = th; + } /* 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, java.lang.Object] */ - @Override // rx.functions.Func2 - public Pair, ? extends RtcConnection.State> call(Map map, RtcConnection.StateChange stateChange) { - return o.to(map, stateChange.a); + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public Unit mo1invoke() { + RtcConnection.j(this.this$0, false, "Unable to prepare media engine.", this.$throwable, false, 8); + return Unit.a; } } diff --git a/app/src/main/java/c/a/r/y.java b/app/src/main/java/c/a/r/y.java index 4f7fef9bc3..aa4d38e75f 100644 --- a/app/src/main/java/c/a/r/y.java +++ b/app/src/main/java/c/a/r/y.java @@ -1,48 +1,19 @@ package c.a.r; -import c.a.r.j0.a; import com.discord.rtcconnection.EncodeQuality; import com.discord.rtcconnection.RtcConnection; -import d0.t.g0; -import d0.z.d.k; -import d0.z.d.m; -import java.util.LinkedHashMap; +import d0.o; import java.util.Map; import kotlin.Pair; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import rx.functions.Func2; /* compiled from: RtcConnection.kt */ -public final /* synthetic */ class y extends k implements Function1, ? extends RtcConnection.State>, Unit> { - public y(RtcConnection rtcConnection) { - super(1, rtcConnection, RtcConnection.class, "onLocalMediaSinkWants", "onLocalMediaSinkWants(Lkotlin/Pair;)V", 0); - } +public final class y implements Func2, RtcConnection.StateChange, Pair, ? extends RtcConnection.State>> { + public static final y i = new y(); /* 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 Unit invoke(Pair, ? extends RtcConnection.State> pair) { - Pair, ? extends RtcConnection.State> pair2 = pair; - m.checkNotNullParameter(pair2, "p1"); - RtcConnection rtcConnection = (RtcConnection) this.receiver; - if (rtcConnection.P) { - Map map = (Map) pair2.component1(); - if (m.areEqual((RtcConnection.State) pair2.component2(), RtcConnection.State.f.a)) { - rtcConnection.J.i(rtcConnection.f2074c, "local MediaSinkWants: " + map, null); - a aVar = rtcConnection.m; - if (aVar == null) { - RtcConnection.o(rtcConnection, "onLocalMediaSinkWants() socket was null.", null, null, 6); - } else { - LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(map.size())); - for (Map.Entry entry : map.entrySet()) { - linkedHashMap.put(entry.getKey(), Integer.valueOf(((EncodeQuality) entry.getValue()).getValue())); - } - m.checkNotNullParameter(linkedHashMap, "wants"); - if (aVar.h >= 5) { - aVar.n(15, linkedHashMap); - } - } - } - } - return Unit.a; + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // rx.functions.Func2 + public Pair, ? extends RtcConnection.State> call(Map map, RtcConnection.StateChange stateChange) { + return o.to(map, stateChange.a); } } diff --git a/app/src/main/java/c/a/r/z.java b/app/src/main/java/c/a/r/z.java index 7655ccfae1..f4df750d69 100644 --- a/app/src/main/java/c/a/r/z.java +++ b/app/src/main/java/c/a/r/z.java @@ -1,198 +1,49 @@ package c.a.r; -import c.a.r.i0.a; -import c.a.r.k0.b; -import c.a.r.k0.c; -import c.a.r.k0.d; -import c.a.r.k0.e; -import co.discord.media_engine.VoiceQuality; -import com.discord.rtcconnection.KrispOveruseDetector; -import com.discord.rtcconnection.MediaSinkWantsManager; +import c.a.r.k0.a; +import com.discord.rtcconnection.EncodeQuality; import com.discord.rtcconnection.RtcConnection; -import com.discord.rtcconnection.mediaengine.MediaEngineConnection; -import com.discord.rtcconnection.socket.io.Payloads; -import d0.t.h0; -import d0.t.n; -import d0.t.o; +import d0.t.g0; +import d0.z.d.k; import d0.z.d.m; -import java.util.ArrayList; -import java.util.List; +import java.util.LinkedHashMap; import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; -import kotlin.NoWhenBranchMatchedException; -import rx.Observable; -import rx.Subscription; +import kotlin.Pair; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; /* compiled from: RtcConnection.kt */ -public final class z implements MediaEngineConnection.c { - public final /* synthetic */ RtcConnection a; - +public final /* synthetic */ class z extends k implements Function1, ? extends RtcConnection.State>, Unit> { public z(RtcConnection rtcConnection) { - this.a = rtcConnection; + super(1, rtcConnection, RtcConnection.class, "onLocalMediaSinkWants", "onLocalMediaSinkWants(Lkotlin/Pair;)V", 0); } - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List list) { - m.checkNotNullParameter(mediaEngineConnection, "connection"); - m.checkNotNullParameter(transportInfo, "transportInfo"); - m.checkNotNullParameter(list, "supportedVideoCodecs"); - RtcConnection rtcConnection = this.a; - rtcConnection.g.succeed(); - rtcConnection.h = transportInfo; - MediaEngineConnection mediaEngineConnection2 = rtcConnection.n; - if (mediaEngineConnection2 != null) { - d dVar = new d(1000, rtcConnection.J, mediaEngineConnection2, new VoiceQuality(), new e(null, 1), new KrispOveruseDetector(mediaEngineConnection2), 0, 64); - rtcConnection.f = dVar; - dVar.a.clear(); - Subscription subscription = dVar.b; - if (subscription != null && !subscription.isUnsubscribed()) { - dVar.a(); - } - dVar.b = Observable.E(0, dVar.f217c, TimeUnit.MILLISECONDS).X(new b(dVar), new c(dVar)); - } - if (transportInfo.f2090c.ordinal() != 0) { - StringBuilder L = c.d.b.a.a.L("Unsupported protocol: "); - L.append(transportInfo.f2090c); - L.append('.'); - RtcConnection.j(rtcConnection, true, L.toString(), null, false, 12); - } else { - rtcConnection.J.recordBreadcrumb("Sending UDP info to RTC server.", rtcConnection.f2074c); - c.a.r.j0.a aVar = rtcConnection.m; - if (aVar == null) { - RtcConnection.o(rtcConnection, "onEngineConnectionConnected() socket was null.", null, null, 6); - return; - } - String str = transportInfo.a; - int i = transportInfo.b; - m.checkNotNullParameter("udp", "protocol"); - m.checkNotNullParameter(str, "address"); - m.checkNotNullParameter("xsalsa20_poly1305", "mode"); - m.checkNotNullParameter(list, "codecs"); - Payloads.Protocol.ProtocolInfo protocolInfo = new Payloads.Protocol.ProtocolInfo(str, i, "xsalsa20_poly1305"); - ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10)); - for (a aVar2 : list) { - arrayList.add(new Payloads.Protocol.CodecInfo(aVar2.a, aVar2.b, aVar2.f207c, aVar2.d, aVar2.e)); - } - aVar.n(1, new Payloads.Protocol("udp", protocolInfo, arrayList)); - } - for (RtcConnection.c cVar : rtcConnection.e) { - cVar.onMediaEngineConnectionConnected(rtcConnection); - } - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onConnectionStateChange(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.ConnectionState connectionState) { - RtcConnection.State state; - m.checkNotNullParameter(mediaEngineConnection, "connection"); - m.checkNotNullParameter(connectionState, "connectionState"); - RtcConnection rtcConnection = this.a; - RtcConnection.StateChange stateChange = rtcConnection.i; - rtcConnection.r("Connection state change: " + connectionState); - int ordinal = connectionState.ordinal(); - if (ordinal == 0) { - state = RtcConnection.State.h.a; - } else if (ordinal == 1) { - state = RtcConnection.State.g.a; - } else if (ordinal == 2) { - state = RtcConnection.State.f.a; - } else if (ordinal == 3) { - state = RtcConnection.State.e.a; - } else { - throw new NoWhenBranchMatchedException(); - } - rtcConnection.u(state); - if (stateChange.a == RtcConnection.State.g.a && rtcConnection.i.a == RtcConnection.State.h.a) { - rtcConnection.q(); - } - if (rtcConnection.i.a == RtcConnection.State.f.a) { - rtcConnection.f2075s = Long.valueOf(rtcConnection.K.currentTimeMillis()); - rtcConnection.f2076x = true; - Map mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.t))); - Long l = rtcConnection.r; - Long l2 = rtcConnection.f2075s; - Long valueOf = (l2 == null || l == null) ? null : Long.valueOf(l2.longValue() - l.longValue()); - if (valueOf != null) { - mutableMapOf.put("connect_time", Long.valueOf(valueOf.longValue())); - } - rtcConnection.b(mutableMapOf); - rtcConnection.p(RtcConnection.AnalyticsEvent.VOICE_CONNECTION_SUCCESS, mutableMapOf); - MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; - if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.b(new h(mediaSinkWantsManager, rtcConnection.n)); + /* 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 Unit invoke(Pair, ? extends RtcConnection.State> pair) { + Pair, ? extends RtcConnection.State> pair2 = pair; + m.checkNotNullParameter(pair2, "p1"); + RtcConnection rtcConnection = (RtcConnection) this.receiver; + if (rtcConnection.P) { + Map map = (Map) pair2.component1(); + if (m.areEqual((RtcConnection.State) pair2.component2(), RtcConnection.State.f.a)) { + rtcConnection.J.i(rtcConnection.f2074c, "local MediaSinkWants: " + map, null); + a aVar = rtcConnection.m; + if (aVar == null) { + RtcConnection.o(rtcConnection, "onLocalMediaSinkWants() socket was null.", null, null, 6); + } else { + LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(map.size())); + for (Map.Entry entry : map.entrySet()) { + linkedHashMap.put(entry.getKey(), Integer.valueOf(((EncodeQuality) entry.getValue()).getValue())); + } + m.checkNotNullParameter(linkedHashMap, "wants"); + aVar.b(); + if (aVar.h >= 5) { + aVar.o(15, linkedHashMap); + } + } } } - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onDestroy(MediaEngineConnection mediaEngineConnection) { - m.checkNotNullParameter(mediaEngineConnection, "connection"); - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onError(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.FailedConnectionException failedConnectionException) { - m.checkNotNullParameter(mediaEngineConnection, "connection"); - m.checkNotNullParameter(failedConnectionException, "exception"); - RtcConnection rtcConnection = this.a; - Objects.requireNonNull(rtcConnection); - String str = "connection error: " + failedConnectionException.a(); - int ordinal = failedConnectionException.a().ordinal(); - if (ordinal == 0 || ordinal == 1 || ordinal == 2) { - StringBuilder P = c.d.b.a.a.P(str, " -- "); - P.append(failedConnectionException.getMessage()); - rtcConnection.r(P.toString()); - } else { - RtcConnection.AnalyticsEvent analyticsEvent = RtcConnection.AnalyticsEvent.VOICE_CONNECTION_FAILURE; - Map mutableMapOf = h0.mutableMapOf(d0.o.to("connect_count", Integer.valueOf(rtcConnection.t))); - rtcConnection.b(mutableMapOf); - rtcConnection.p(analyticsEvent, mutableMapOf); - } - RtcConnection.j(rtcConnection, true, str, failedConnectionException, false, 8); - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onKrispStatus(MediaEngineConnection mediaEngineConnection, KrispOveruseDetector.Status status) { - m.checkNotNullParameter(mediaEngineConnection, "connection"); - m.checkNotNullParameter(status, "status"); - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onLocalMute(long j, boolean z2) { - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onLocalVideoOffScreen(long j, boolean z2) { - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onSpeaking(long j, int i, boolean z2) { - c.a.r.j0.a aVar; - RtcConnection rtcConnection = this.a; - if (j == rtcConnection.H && (aVar = rtcConnection.m) != null) { - aVar.n(5, new Payloads.Speaking(i, Integer.valueOf(z2 ? 1 : 0), 0, null, 8, null)); - } - for (RtcConnection.c cVar : rtcConnection.e) { - cVar.onSpeaking(j, z2); - } - } - - @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onVideo(long j, Integer num, int i, int i2, int i3) { - RtcConnection rtcConnection = this.a; - if (j == rtcConnection.H) { - c.a.r.j0.a aVar = rtcConnection.m; - if (aVar == null) { - RtcConnection.o(rtcConnection, "sendVideo() socket was null.", null, null, 6); - } else { - rtcConnection.f2078z = i2; - aVar.n(12, new Payloads.Video(i, i2, i3, null, n.emptyList(), 8, null)); - } - MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.v; - if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.b(new j(mediaSinkWantsManager, i2 != 0)); - } - } - for (RtcConnection.c cVar : rtcConnection.e) { - cVar.onVideoStream(j, num); - } + return Unit.a; } } diff --git a/app/src/main/java/c/a/w/b.java b/app/src/main/java/c/a/w/b.java index 05f0b01cc1..d59276329b 100644 --- a/app/src/main/java/c/a/w/b.java +++ b/app/src/main/java/c/a/w/b.java @@ -51,7 +51,7 @@ public final class b extends Animatable2Compat.AnimationCallback { if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (c.q.a.k.a.m(500, this) == coroutine_suspended) { + if (c.q.a.k.a.n(500, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -74,7 +74,7 @@ public final class b extends Animatable2Compat.AnimationCallback { m.checkNotNullParameter(drawable, "drawable"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(this.a); if (coroutineScope != null) { - c.q.a.k.a.F(coroutineScope, null, null, new a(this, null), 3, null); + c.q.a.k.a.G(coroutineScope, null, null, new a(this, null), 3, null); } } } diff --git a/app/src/main/java/c/a/w/c.java b/app/src/main/java/c/a/w/c.java index 91f688ed0d..b2d53cb293 100644 --- a/app/src/main/java/c/a/w/c.java +++ b/app/src/main/java/c/a/w/c.java @@ -19,12 +19,12 @@ public final class c extends FrameLayout { int i2 = i & 2; m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558661, this); - ImageView imageView = (ImageView) findViewById(2131364950); + ImageView imageView = (ImageView) findViewById(2131364953); if (imageView != null) { g1 g1Var = new g1(this, imageView); m.checkNotNullExpressionValue(g1Var, "SparkleViewBinding.infla…ater.from(context), this)"); this.i = g1Var; - this.j = 2131232308; + this.j = 2131232311; setLayoutParams(new FrameLayout.LayoutParams(-2, -2)); AnimatedVectorDrawableCompat create = AnimatedVectorDrawableCompat.create(getContext(), this.j); if (create != null) { @@ -36,6 +36,6 @@ public final class c extends FrameLayout { } return; } - throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131364950))); + throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131364953))); } } diff --git a/app/src/main/java/c/a/z/a0.java b/app/src/main/java/c/a/z/a0.java index 94f2b086ee..fa99232613 100644 --- a/app/src/main/java/c/a/z/a0.java +++ b/app/src/main/java/c/a/z/a0.java @@ -55,14 +55,14 @@ public final class a0 extends AppBottomSheet implements h { public c.a.i.c invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131365619; - ConstraintLayout constraintLayout = (ConstraintLayout) view2.findViewById(2131365619); + int i2 = 2131365625; + ConstraintLayout constraintLayout = (ConstraintLayout) view2.findViewById(2131365625); if (constraintLayout != null) { - i2 = 2131365620; - TextView textView = (TextView) view2.findViewById(2131365620); + i2 = 2131365626; + TextView textView = (TextView) view2.findViewById(2131365626); if (textView != null) { - i2 = 2131365621; - MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131365621); + i2 = 2131365627; + MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view2.findViewById(2131365627); if (maxHeightRecyclerView != null) { return new c.a.i.c((ConstraintLayout) view2, constraintLayout, textView, maxHeightRecyclerView); } @@ -91,14 +91,14 @@ public final class a0 extends AppBottomSheet implements h { m.checkNotNullParameter(layoutInflater2, "inflater"); m.checkNotNullParameter(viewGroup2, "parent"); View inflate = layoutInflater2.inflate(2131558435, viewGroup2, false); - int i = 2131364567; - MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364567); + int i = 2131364570; + MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364570); if (materialTextView != null) { - i = 2131364570; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364570); + i = 2131364573; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364573); if (simpleDraweeView != null) { - i = 2131364572; - MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364572); + i = 2131364575; + MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364575); if (materialTextView2 != null) { d dVar = new d((ConstraintLayout) inflate, materialTextView, simpleDraweeView, materialTextView2); m.checkNotNullExpressionValue(dVar, "BottomSheetSimpleSelecto…(inflater, parent, false)"); diff --git a/app/src/main/java/c/a/z/e0.java b/app/src/main/java/c/a/z/e0.java index b510c652f1..2487abb571 100644 --- a/app/src/main/java/c/a/z/e0.java +++ b/app/src/main/java/c/a/z/e0.java @@ -20,7 +20,7 @@ public final class e0 extends o implements Function0 { @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public Drawable mo1invoke() { - Drawable drawable = ContextCompat.getDrawable(this.this$0.getContext(), 2131232038); + Drawable drawable = ContextCompat.getDrawable(this.this$0.getContext(), 2131232041); if (drawable != null) { drawable.setTint(ColorCompat.getThemedColor(this.this$0.getContext(), 2130968949)); } diff --git a/app/src/main/java/c/a/z/k0/c/a.java b/app/src/main/java/c/a/z/k0/c/a.java index 26bf053fc6..0b25804bb7 100644 --- a/app/src/main/java/c/a/z/k0/c/a.java +++ b/app/src/main/java/c/a/z/k0/c/a.java @@ -15,14 +15,14 @@ public final class a extends MGRecyclerViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public a(c cVar) { - super(2131558989, cVar); + super(2131558990, cVar); m.checkNotNullParameter(cVar, "adapter"); View view = this.itemView; - int i = 2131362926; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362926); + int i = 2131362928; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131362928); if (simpleDraweeView != null) { - i = 2131362927; - TextView textView = (TextView) view.findViewById(2131362927); + i = 2131362929; + TextView textView = (TextView) view.findViewById(2131362929); if (textView != null) { o4 o4Var = new o4((LinearLayout) view, simpleDraweeView, textView); m.checkNotNullExpressionValue(o4Var, "WidgetDiscoveryStageCard…kerBinding.bind(itemView)"); diff --git a/app/src/main/java/c/a/z/k0/c/b.java b/app/src/main/java/c/a/z/k0/c/b.java index f9dae6f938..f01158baa8 100644 --- a/app/src/main/java/c/a/z/k0/c/b.java +++ b/app/src/main/java/c/a/z/k0/c/b.java @@ -15,17 +15,17 @@ public final class b extends MGRecyclerViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public b(c cVar) { - super(2131558987, cVar); + super(2131558988, cVar); m.checkNotNullParameter(cVar, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131364106); + TextView textView = (TextView) view.findViewById(2131364108); if (textView != null) { n4 n4Var = new n4((LinearLayout) view, textView); m.checkNotNullExpressionValue(n4Var, "WidgetDiscoveryOtherSpea…untBinding.bind(itemView)"); this.a = n4Var; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364106))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364108))); } /* JADX DEBUG: Method arguments types fixed to match base method, original types: [int, java.lang.Object] */ @@ -39,6 +39,6 @@ public final class b extends MGRecyclerViewHolder { m.checkNotNullExpressionValue(textView, "binding.otherSpeakersCountText"); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - textView.setText(c.a.l.b.i(view, 2131888147, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755060, i2, Integer.valueOf(i2))}, null, 4)); + textView.setText(c.a.l.b.i(view, 2131888157, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755061, i2, Integer.valueOf(i2))}, null, 4)); } } diff --git a/app/src/main/java/c/a/z/m0/a.java b/app/src/main/java/c/a/z/m0/a.java index 012667278c..d479d6fc5b 100644 --- a/app/src/main/java/c/a/z/m0/a.java +++ b/app/src/main/java/c/a/z/m0/a.java @@ -21,6 +21,6 @@ public final class a implements View.OnClickListener { if (!(googlePlayInAppSku == null || (function1 = giftSelectView.j) == null)) { function1.invoke(googlePlayInAppSku); } - giftSelectView.i.f1751c.setOnClickListener(null); + giftSelectView.i.f1753c.setOnClickListener(null); } } diff --git a/app/src/main/java/c/a/z/o0/b.java b/app/src/main/java/c/a/z/o0/b.java index f17e3eb3a0..b5cbab7048 100644 --- a/app/src/main/java/c/a/z/o0/b.java +++ b/app/src/main/java/c/a/z/o0/b.java @@ -22,7 +22,7 @@ public final class b extends o implements Function1 { public Unit invoke(Subscription subscription) { Subscription subscription2 = subscription; m.checkNotNullParameter(subscription2, "it"); - this.this$0.l = subscription2; + this.this$0.k = subscription2; return Unit.a; } } diff --git a/app/src/main/java/c/a/z/o0/c.java b/app/src/main/java/c/a/z/o0/c.java index 90c7b1dcbf..b7b9e8151e 100644 --- a/app/src/main/java/c/a/z/o0/c.java +++ b/app/src/main/java/c/a/z/o0/c.java @@ -1,6 +1,8 @@ package c.a.z.o0; import android.view.View; +import com.discord.api.sticker.Sticker; +import com.discord.api.sticker.StickerType; import com.discord.utilities.file.DownloadUtils; import com.discord.views.sticker.StickerView; import d0.z.d.m; @@ -24,8 +26,11 @@ public final class c extends o implements Function1 { @Override // kotlin.jvm.functions.Function1 public Unit invoke(View view) { m.checkNotNullParameter(view, "it"); - StickerView stickerView = this.this$0.this$0; - stickerView.m = StickerView.a(stickerView, ((DownloadUtils.DownloadState.Completed) this.$downloadState).getFile(), true); + Sticker sticker = this.this$0.$fullSticker; + if ((sticker != null ? sticker.j() : null) == StickerType.STANDARD) { + StickerView stickerView = this.this$0.this$0; + stickerView.l = StickerView.a(stickerView, ((DownloadUtils.DownloadState.Completed) this.$downloadState).getFile(), true); + } return Unit.a; } } diff --git a/app/src/main/java/c/a/z/o0/d.java b/app/src/main/java/c/a/z/o0/d.java index 5cd030bee2..2ea33e69e1 100644 --- a/app/src/main/java/c/a/z/o0/d.java +++ b/app/src/main/java/c/a/z/o0/d.java @@ -2,6 +2,8 @@ package c.a.z.o0; import android.widget.ImageView; import com.discord.api.sticker.BaseSticker; +import com.discord.api.sticker.Sticker; +import com.discord.api.sticker.StickerType; import com.discord.utilities.dsti.StickerUtils; import com.discord.utilities.file.DownloadUtils; import com.discord.utilities.images.MGImages; @@ -15,16 +17,18 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: StickerView.kt */ public final class d extends o implements Function1, Unit> { + public final /* synthetic */ Sticker $fullSticker; public final /* synthetic */ Integer $localAnimationSettings; public final /* synthetic */ BaseSticker $sticker; public final /* synthetic */ StickerView this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public d(StickerView stickerView, Integer num, BaseSticker baseSticker) { + public d(StickerView stickerView, Integer num, BaseSticker baseSticker, Sticker sticker) { super(1); this.this$0 = stickerView; this.$localAnimationSettings = num; this.$sticker = baseSticker; + this.$fullSticker = sticker; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -39,27 +43,38 @@ public final class d extends o implements Function1 { public Unit invoke(Subscription subscription) { Subscription subscription2 = subscription; m.checkNotNullParameter(subscription2, "it"); - this.this$0.l = subscription2; + this.this$0.k = subscription2; return Unit.a; } } diff --git a/app/src/main/java/c/a/z/o0/g.java b/app/src/main/java/c/a/z/o0/g.java index b1c7b13841..03d3e7c75c 100644 --- a/app/src/main/java/c/a/z/o0/g.java +++ b/app/src/main/java/c/a/z/o0/g.java @@ -21,8 +21,8 @@ public final class g extends o implements Function1 { @Override // kotlin.jvm.functions.Function1 public Unit invoke(View view) { m.checkNotNullParameter(view, "it"); - this.this$0.this$0.j.f99c.setPlaybackMode(RLottieDrawable.PlaybackMode.LOOP); - this.this$0.this$0.j.f99c.a(); + this.this$0.this$0.i.f99c.setPlaybackMode(RLottieDrawable.PlaybackMode.LOOP); + this.this$0.this$0.i.f99c.a(); return Unit.a; } } diff --git a/app/src/main/java/c/a/z/o0/h.java b/app/src/main/java/c/a/z/o0/h.java index c6ca35274a..bc82a6a63a 100644 --- a/app/src/main/java/c/a/z/o0/h.java +++ b/app/src/main/java/c/a/z/o0/h.java @@ -44,14 +44,14 @@ public final class h extends o implements Function1 { @Override // kotlin.jvm.functions.Function1 public Unit invoke(Error error) { m.checkNotNullParameter(error, "it"); - c.a.d.o.g(this.this$0.getContext(), 2131890334, 0, null, 12); + c.a.d.o.g(this.this$0.getContext(), 2131890364, 0, null, 12); return Unit.a; } } diff --git a/app/src/main/java/c/a/z/s.java b/app/src/main/java/c/a/z/s.java index 95d51d07c1..526ee4bfaf 100644 --- a/app/src/main/java/c/a/z/s.java +++ b/app/src/main/java/c/a/z/s.java @@ -29,7 +29,7 @@ public final class s extends o implements Function1 { m.checkNotNullExpressionValue(context, "context"); String link = modelInvite2.toLink(this.this$0.getResources(), "https://discord.gg"); m.checkNotNullExpressionValue(link, "invite.toLink(resources, BuildConfig.HOST_INVITE)"); - c.a.d.o.a(context, link, 2131890519); + c.a.d.o.a(context, link, 2131890549); this.this$0.getOnDismissRequested$app_productionGoogleRelease().mo1invoke(); return Unit.a; } diff --git a/app/src/main/java/c/a/z/z.java b/app/src/main/java/c/a/z/z.java index ead11e14b3..fc14861138 100644 --- a/app/src/main/java/c/a/z/z.java +++ b/app/src/main/java/c/a/z/z.java @@ -32,8 +32,8 @@ public final class z extends LinearLayout { i = 2131362768; TextSwitcher textSwitcher = (TextSwitcher) inflate.findViewById(2131362768); if (textSwitcher != null) { - i = 2131363022; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131363022); + i = 2131363024; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131363024); if (simpleDraweeSpanTextView != null) { c1 c1Var = new c1((LinearLayout) inflate, textView, textView2, textSwitcher, simpleDraweeSpanTextView); m.checkNotNullExpressionValue(c1Var, "ReactionViewBinding.infl…rom(context), this, true)"); diff --git a/app/src/main/java/c/b/a/a/k.java b/app/src/main/java/c/b/a/a/k.java index 316fb2f5e2..39cd0628a0 100644 --- a/app/src/main/java/c/b/a/a/k.java +++ b/app/src/main/java/c/b/a/a/k.java @@ -30,7 +30,7 @@ public final class k extends o implements Function1 { public final boolean invoke(boolean z2) { FlexInputFragment flexInputFragment = this.this$0; KProperty[] kPropertyArr = FlexInputFragment.i; - FrameLayout frameLayout = flexInputFragment.j().l; + FrameLayout frameLayout = flexInputFragment.j().k; m.checkNotNullExpressionValue(frameLayout, "binding.expressionTrayContainer"); int i = 8; frameLayout.setVisibility(8); diff --git a/app/src/main/java/c/b/a/a/l.java b/app/src/main/java/c/b/a/a/l.java index 4549cfd23a..6765af2702 100644 --- a/app/src/main/java/c/b/a/a/l.java +++ b/app/src/main/java/c/b/a/a/l.java @@ -30,8 +30,8 @@ public final class l extends o implements Function0 { public void call(Long l) { FlexInputFragment flexInputFragment = this.i.this$0; KProperty[] kPropertyArr = FlexInputFragment.i; - if (flexInputFragment.n()) { - FrameLayout frameLayout = this.i.this$0.j().l; + if (flexInputFragment.l()) { + FrameLayout frameLayout = this.i.this$0.j().k; m.checkNotNullExpressionValue(frameLayout, "binding.expressionTrayContainer"); frameLayout.setVisibility(0); FlexInputFragment.h(this.i.this$0, true); diff --git a/app/src/main/java/c/b/a/a/p.java b/app/src/main/java/c/b/a/a/p.java index e97e5add39..7a8083efe1 100644 --- a/app/src/main/java/c/b/a/a/p.java +++ b/app/src/main/java/c/b/a/a/p.java @@ -22,7 +22,7 @@ public final class p implements OnApplyWindowInsetsListener { FlexInputFragment flexInputFragment = this.a; KProperty[] kPropertyArr = FlexInputFragment.i; ViewCompat.dispatchApplyWindowInsets(flexInputFragment.j().g, windowInsetsCompat); - ViewCompat.dispatchApplyWindowInsets(this.a.j().l, windowInsetsCompat); + ViewCompat.dispatchApplyWindowInsets(this.a.j().k, windowInsetsCompat); return windowInsetsCompat.consumeSystemWindowInsets(); } } diff --git a/app/src/main/java/c/b/a/d/j.java b/app/src/main/java/c/b/a/d/j.java index c8301053bf..0f42109b52 100644 --- a/app/src/main/java/c/b/a/d/j.java +++ b/app/src/main/java/c/b/a/d/j.java @@ -28,10 +28,11 @@ import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.Job; +import s.a.a.n; import s.a.j0; -import s.a.u0; -import s.a.z; +import s.a.w0; /* compiled from: ThumbnailViewHolder.kt */ public abstract class j extends RecyclerView.ViewHolder { public static int i; @@ -70,7 +71,7 @@ public abstract class j extends RecyclerView.ViewHolder { if (a.a(j.l)) { Job job = this.a; if (job != null) { - c.q.a.k.a.j(job, null, 1, null); + c.q.a.k.a.k(job, null, 1, null); } CancellationSignal cancellationSignal = this.b; if (cancellationSignal != null) { @@ -184,9 +185,9 @@ public abstract class j extends RecyclerView.ViewHolder { m.checkNotNullParameter(uri2, "uri"); m.checkNotNullParameter(dVar, "onGenerate"); bVar.a(); - u0 u0Var = u0.i; - z zVar = j0.a; - bVar.a = c.q.a.k.a.F(u0Var, s.a.a.m.b, null, new k(bVar, uri2, dVar, null), 2, null); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher = j0.a; + bVar.a = c.q.a.k.a.G(w0Var, n.b, null, new k(bVar, uri2, dVar, null), 2, null); return; } return; diff --git a/app/src/main/java/c/b/a/d/k.java b/app/src/main/java/c/b/a/d/k.java index e15b9c48d2..d872e8b0de 100644 --- a/app/src/main/java/c/b/a/d/k.java +++ b/app/src/main/java/c/b/a/d/k.java @@ -62,12 +62,12 @@ public final class k extends d0.w.h.a.k implements Function2 supportedFlashModes; if (camera != null) { Camera.Parameters parameters = camera.getParameters(); @@ -163,7 +172,7 @@ public class a { return false; } - public static final boolean D(g0.e eVar) { + public static final boolean E(g0.e eVar) { m.checkParameterIsNotNull(eVar, "$this$isProbablyUtf8"); try { g0.e eVar2 = new g0.e(); @@ -183,22 +192,22 @@ public class a { } } - public static final Job E(CoroutineScope coroutineScope, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2, ? extends Object> function2) { - CoroutineContext a = x.a(coroutineScope, coroutineContext); + public static final Job F(CoroutineScope coroutineScope, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2, ? extends Object> function2) { + CoroutineContext a = y.a(coroutineScope, coroutineContext); Objects.requireNonNull(coroutineStart); - s.a.b h1Var = coroutineStart == CoroutineStart.LAZY ? new h1(a, function2) : new n1(a, true); - h1Var.a0(coroutineStart, h1Var, function2); - return h1Var; + s.a.b j1Var = coroutineStart == CoroutineStart.LAZY ? new j1(a, function2) : new q1(a, true); + j1Var.a0(coroutineStart, j1Var, function2); + return j1Var; } - public static /* synthetic */ Job F(CoroutineScope coroutineScope, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2 function2, int i, Object obj) { + public static /* synthetic */ Job G(CoroutineScope coroutineScope, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2 function2, int i, Object obj) { if ((i & 1) != 0) { coroutineContext = d0.w.f.i; } - return E(coroutineScope, coroutineContext, (i & 2) != 0 ? CoroutineStart.DEFAULT : null, function2); + return F(coroutineScope, coroutineContext, (i & 2) != 0 ? CoroutineStart.DEFAULT : null, function2); } - public static int G(CharSequence charSequence, int i, int i2, int i3) { + public static int H(CharSequence charSequence, int i, int i2, int i3) { int i4 = i + i2; int i5 = i; int i6 = i3; @@ -247,7 +256,7 @@ public class a { return i18 ^ (i18 >>> 16); } - public static long H(AtomicLong atomicLong, long j) { + public static long I(AtomicLong atomicLong, long j) { long j2; long j3; do { @@ -263,7 +272,7 @@ public class a { return j3; } - public static RuntimeException I(Throwable th) { + public static RuntimeException J(Throwable th) { if (th instanceof RuntimeException) { throw ((RuntimeException) th); } else if (th instanceof Error) { @@ -286,7 +295,7 @@ public class a { at jadx.core.dex.visitors.regions.RegionMaker.makeRegion(RegionMaker.java:94) at jadx.core.dex.visitors.regions.RegionMakerVisitor.visit(RegionMakerVisitor.java:50) */ - public static void J(int r2, h0.a.a.c r3) { + public static void K(int r2, h0.a.a.c r3) { /* int r0 = r2 >>> 24 if (r0 == 0) goto L_0x0025 @@ -341,19 +350,19 @@ public class a { switch-data {16->0x001b, 17->0x001b, 18->0x001b, 19->0x0013, 20->0x0013, 21->0x0013, 22->0x0025, 23->0x001b, } switch-data {66->0x001b, 67->0x001b, 68->0x001b, 69->0x001b, 70->0x001b, 71->0x0017, 72->0x0017, 73->0x0017, 74->0x0017, 75->0x0017, } */ - throw new UnsupportedOperationException("Method not decompiled: c.q.a.k.a.J(int, h0.a.a.c):void"); + throw new UnsupportedOperationException("Method not decompiled: c.q.a.k.a.K(int, h0.a.a.c):void"); } - public static final Object K(Object obj, Continuation continuation) { - if (obj instanceof u) { + public static final Object L(Object obj, Continuation continuation) { + if (obj instanceof v) { k.a aVar = k.i; - return k.m78constructorimpl(l.createFailure(((u) obj).b)); + return k.m78constructorimpl(l.createFailure(((v) obj).b)); } k.a aVar2 = k.i; return k.m78constructorimpl(obj); } - public static final void L(i0 i0Var, Continuation continuation, boolean z2) { + public static final void M(i0 i0Var, Continuation continuation, boolean z2) { Object obj; Object n = i0Var.n(); Throwable f = i0Var.f(n); @@ -367,11 +376,11 @@ public class a { Object r2 = k.m78constructorimpl(obj); if (z2) { Objects.requireNonNull(continuation, "null cannot be cast to non-null type kotlinx.coroutines.internal.DispatchedContinuation"); - s.a.a.f fVar = (s.a.a.f) continuation; - CoroutineContext context = fVar.getContext(); - Object b2 = s.a.a.a.b(context, fVar.o); + g gVar = (g) continuation; + CoroutineContext context = gVar.getContext(); + Object b2 = s.a.a.a.b(context, gVar.o); try { - fVar.q.resumeWith(r2); + gVar.q.resumeWith(r2); } finally { s.a.a.a.a(context, b2); } @@ -380,11 +389,11 @@ public class a { } } - public static int M(int i) { + public static int N(int i) { return 1 << (32 - Integer.numberOfLeadingZeros(i - 1)); } - public static final int N(g0.u uVar, int i) { + public static final int O(u uVar, int i) { int i2; m.checkParameterIsNotNull(uVar, "$this$segment"); int[] iArr = uVar.n; @@ -413,7 +422,7 @@ public class a { return i2 >= 0 ? i2 : ~i2; } - public static final v O(Socket socket) throws IOException { + public static final g0.v P(Socket socket) throws IOException { m.checkParameterIsNotNull(socket, "$this$sink"); g0.w wVar = new g0.w(socket); OutputStream outputStream = socket.getOutputStream(); @@ -423,7 +432,7 @@ public class a { return new g0.c(wVar, pVar); } - public static final g0.x P(Socket socket) throws IOException { + public static final x Q(Socket socket) throws IOException { m.checkParameterIsNotNull(socket, "$this$source"); g0.w wVar = new g0.w(socket); InputStream inputStream = socket.getInputStream(); @@ -433,56 +442,56 @@ public class a { return new g0.d(wVar, nVar); } - public static final void Q(Continuation continuation, Continuation continuation2) { + public static final void R(Continuation continuation, Continuation continuation2) { try { Continuation intercepted = d0.w.g.b.intercepted(continuation); k.a aVar = k.i; - g.b(intercepted, k.m78constructorimpl(Unit.a), null, 2); + h.b(intercepted, k.m78constructorimpl(Unit.a), null, 2); } catch (Throwable th) { k.a aVar2 = k.i; ((s.a.b) continuation2).resumeWith(k.m78constructorimpl(l.createFailure(th))); } } - public static void R(Function2 function2, Object obj, Continuation continuation, Function1 function1, int i) { + public static void S(Function2 function2, Object obj, Continuation continuation, Function1 function1, int i) { int i2 = i & 4; try { Continuation intercepted = d0.w.g.b.intercepted(d0.w.g.b.createCoroutineUnintercepted(function2, obj, continuation)); k.a aVar = k.i; - g.a(intercepted, k.m78constructorimpl(Unit.a), null); + h.a(intercepted, k.m78constructorimpl(Unit.a), null); } catch (Throwable th) { k.a aVar2 = k.i; continuation.resumeWith(k.m78constructorimpl(l.createFailure(th))); } } - public static final Object S(q qVar, R r, Function2, ? extends Object> function2) { + public static final Object T(r rVar, R r, Function2, ? extends Object> function2) { Object obj; - qVar.Y(); + rVar.Y(); if (function2 != null) { try { - obj = ((Function2) e0.beforeCheckcastToFunctionOfArity(function2, 2)).invoke(r, qVar); + obj = ((Function2) e0.beforeCheckcastToFunctionOfArity(function2, 2)).invoke(r, rVar); } catch (Throwable th) { - obj = new u(th, false, 2); + obj = new v(th, false, 2); } if (obj == d0.w.g.c.getCOROUTINE_SUSPENDED()) { return d0.w.g.c.getCOROUTINE_SUSPENDED(); } - Object L = qVar.L(obj); - if (L == f1.b) { + Object L = rVar.L(obj); + if (L == h1.b) { return d0.w.g.c.getCOROUTINE_SUSPENDED(); } - if (!(L instanceof u)) { - return f1.a(L); + if (!(L instanceof v)) { + return h1.a(L); } - throw ((u) L).b; + throw ((v) L).b; } throw new NullPointerException("null cannot be cast to non-null type (R, kotlin.coroutines.Continuation) -> kotlin.Any?"); } /* JADX WARNING: Removed duplicated region for block: B:12:0x0035 */ /* JADX WARNING: Removed duplicated region for block: B:8:0x0023 */ - public static final Object T(Exception exc, Continuation continuation) { + public static final Object U(Exception exc, Continuation continuation) { c cVar; int i; if (continuation instanceof c) { @@ -523,12 +532,12 @@ public class a { return Unit.a; } - public static final long U(String str, long j, long j2, long j3) { - String V = V(str); - if (V == null) { + public static final long V(String str, long j, long j2, long j3) { + String W = W(str); + if (W == null) { return j; } - Long longOrNull = s.toLongOrNull(V); + Long longOrNull = s.toLongOrNull(W); if (longOrNull != null) { long longValue = longOrNull.longValue(); if (j2 <= longValue && j3 >= longValue) { @@ -536,11 +545,11 @@ public class a { } throw new IllegalStateException(("System property '" + str + "' should be in range " + j2 + ".." + j3 + ", but is '" + longValue + '\'').toString()); } - throw new IllegalStateException(("System property '" + str + "' has unrecognized value '" + V + '\'').toString()); + throw new IllegalStateException(("System property '" + str + "' has unrecognized value '" + W + '\'').toString()); } - public static final String V(String str) { - int i = t.a; + public static final String W(String str) { + int i = s.a.a.u.a; try { return System.getProperty(str); } catch (SecurityException unused) { @@ -548,27 +557,27 @@ public class a { } } - public static int W(String str, int i, int i2, int i3, int i4, Object obj) { + public static int X(String str, int i, int i2, int i3, int i4, Object obj) { if ((i4 & 4) != 0) { i2 = 1; } if ((i4 & 8) != 0) { i3 = Integer.MAX_VALUE; } - return (int) U(str, (long) i, (long) i2, (long) i3); + return (int) V(str, (long) i, (long) i2, (long) i3); } - public static /* synthetic */ long X(String str, long j, long j2, long j3, int i, Object obj) { + public static /* synthetic */ long Y(String str, long j, long j2, long j3, int i, Object obj) { if ((i & 4) != 0) { j2 = 1; } if ((i & 8) != 0) { j3 = Long.MAX_VALUE; } - return U(str, j, j2, j3); + return V(str, j, j2, j3); } - public static void Y(List list) { + public static void Z(List list) { if (list != null && !list.isEmpty()) { if (list.size() == 1) { Throwable th = (Throwable) list.get(0); @@ -585,7 +594,14 @@ public class a { } } - public static void Z(Throwable th) { + public static final CoroutineScope a(CoroutineContext coroutineContext) { + if (coroutineContext.get(Job.h) == null) { + coroutineContext = coroutineContext.plus(new e1(null)); + } + return new s.a.a.f(coroutineContext); + } + + public static void a0(Throwable th) { if (th instanceof OnErrorNotImplementedException) { throw ((OnErrorNotImplementedException) th); } else if (th instanceof OnErrorFailedException) { @@ -601,36 +617,43 @@ public class a { } } - public static final CoroutineScope a(CoroutineContext coroutineContext) { - if (coroutineContext.get(Job.h) == null) { - coroutineContext = coroutineContext.plus(new c1(null)); - } - return new s.a.a.e(coroutineContext); + public static t b(Job job, int i) { + int i2 = i & 1; + return new r1(null); } - public static void a0(Throwable th, j0.g gVar, Object obj) { - Z(th); + public static void b0(Throwable th, j0.g gVar, Object obj) { + a0(th); gVar.onError(OnErrorThrowable.a(th, obj)); } - public static s.a.s b(Job job, int i) { - int i2 = i & 1; - return new o1(null); + public static final void c(f0.f0.f.a aVar, f0.f0.f.c cVar, String str) { + d.b bVar = f0.f0.f.d.f2701c; + Logger logger = f0.f0.f.d.b; + StringBuilder sb = new StringBuilder(); + sb.append(cVar.f); + sb.append(' '); + String format = String.format("%-22s", Arrays.copyOf(new Object[]{str}, 1)); + m.checkExpressionValueIsNotNull(format, "java.lang.String.format(format, *args)"); + sb.append(format); + sb.append(": "); + sb.append(aVar.f2699c); + logger.fine(sb.toString()); } /* JADX WARNING: Code restructure failed: missing block: B:66:0x010b, code lost: r1 = 1; */ - public static final String b0(String str) { + public static final String c0(String str) { m.checkParameterIsNotNull(str, "$this$toCanonicalHost"); int i = 0; int i2 = -1; if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) { - InetAddress l = (!d0.g0.t.startsWith$default(str, "[", false, 2, null) || !d0.g0.t.endsWith$default(str, "]", false, 2, null)) ? l(str, 0, str.length()) : l(str, 1, str.length() - 1); - if (l == null) { + InetAddress m = (!d0.g0.t.startsWith$default(str, "[", false, 2, null) || !d0.g0.t.endsWith$default(str, "]", false, 2, null)) ? m(str, 0, str.length()) : m(str, 1, str.length() - 1); + if (m == null) { return null; } - byte[] address = l.getAddress(); + byte[] address = m.getAddress(); if (address.length == 16) { m.checkExpressionValueIsNotNull(address, "address"); int i3 = 0; @@ -667,7 +690,7 @@ public class a { } return eVar.G(); } else if (address.length == 4) { - return l.getHostAddress(); + return m.getHostAddress(); } else { throw new AssertionError("Invalid IPv6 address: '" + str + '\''); } @@ -712,38 +735,6 @@ public class a { } } - public static final void c(f0.f0.f.a aVar, f0.f0.f.c cVar, String str) { - d.b bVar = f0.f0.f.d.f2701c; - Logger logger = f0.f0.f.d.b; - StringBuilder sb = new StringBuilder(); - sb.append(cVar.f); - sb.append(' '); - String format = String.format("%-22s", Arrays.copyOf(new Object[]{str}, 1)); - m.checkExpressionValueIsNotNull(format, "java.lang.String.format(format, *args)"); - sb.append(format); - sb.append(": "); - sb.append(aVar.f2699c); - logger.fine(sb.toString()); - } - - public static final String c0(Continuation continuation) { - Object obj; - if (continuation instanceof s.a.a.f) { - return continuation.toString(); - } - try { - k.a aVar = k.i; - obj = k.m78constructorimpl(continuation + '@' + t(continuation)); - } catch (Throwable th) { - k.a aVar2 = k.i; - obj = k.m78constructorimpl(l.createFailure(th)); - } - if (k.m80exceptionOrNullimpl(obj) != null) { - obj = continuation.getClass().getName() + '@' + t(continuation); - } - return (String) obj; - } - public static long d(long j, long j2) { long j3 = j + j2; if (j3 < 0) { @@ -752,9 +743,22 @@ public class a { return j3; } - public static final String d0(byte b2) { - char[] cArr = g0.z.b.a; - return new String(new char[]{cArr[(b2 >> 4) & 15], cArr[b2 & 15]}); + public static final String d0(Continuation continuation) { + Object obj; + if (continuation instanceof g) { + return continuation.toString(); + } + try { + k.a aVar = k.i; + obj = k.m78constructorimpl(continuation + '@' + u(continuation)); + } catch (Throwable th) { + k.a aVar2 = k.i; + obj = k.m78constructorimpl(l.createFailure(th)); + } + if (k.m80exceptionOrNullimpl(obj) != null) { + obj = continuation.getClass().getName() + '@' + u(continuation); + } + return (String) obj; } public static final boolean e(byte[] bArr, int i, byte[] bArr2, int i2, int i3) { @@ -768,9 +772,9 @@ public class a { return true; } - public static final Object e0(Object obj, Function1 function1) { - Throwable r0 = k.m80exceptionOrNullimpl(obj); - return r0 == null ? function1 != null ? new s.a.v(obj, function1) : obj : new u(r0, false, 2); + public static final String e0(byte b2) { + char[] cArr = g0.z.b.a; + return new String(new char[]{cArr[(b2 >> 4) & 15], cArr[b2 & 15]}); } public static s.a.e0 f(CoroutineScope coroutineScope, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2 function2, int i, Object obj) { @@ -779,14 +783,85 @@ public class a { if ((i & 2) != 0) { coroutineStart2 = CoroutineStart.DEFAULT; } - CoroutineContext a = x.a(coroutineScope, fVar); + CoroutineContext a = y.a(coroutineScope, fVar); Objects.requireNonNull(coroutineStart2); - f0 g1Var = coroutineStart2 == CoroutineStart.LAZY ? new g1(a, function2) : new f0(a, true); - g1Var.a0(coroutineStart2, g1Var, function2); - return g1Var; + f0 i1Var = coroutineStart2 == CoroutineStart.LAZY ? new i1(a, function2) : new f0(a, true); + i1Var.a0(coroutineStart2, i1Var, function2); + return i1Var; } - public static RectF f0(float[] fArr) { + public static final Object f0(Object obj, Function1 function1) { + Throwable r0 = k.m80exceptionOrNullimpl(obj); + return r0 == null ? function1 != null ? new s.a.w(obj, function1) : obj : new v(r0, false, 2); + } + + /* JADX WARNING: Removed duplicated region for block: B:12:0x0036 */ + /* JADX WARNING: Removed duplicated region for block: B:8:0x0023 */ + public static final Object g(s.a.e0[] e0VarArr, Continuation> continuation) { + C0171a aVar; + int i; + if (continuation instanceof C0171a) { + aVar = (C0171a) continuation; + int i2 = aVar.label; + if ((i2 & Integer.MIN_VALUE) != 0) { + aVar.label = i2 - Integer.MIN_VALUE; + Object obj = aVar.result; + Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); + i = aVar.label; + if (i != 0) { + l.throwOnFailure(obj); + if (e0VarArr.length == 0) { + return d0.t.n.emptyList(); + } + s.a.d dVar = new s.a.d(e0VarArr); + aVar.L$0 = e0VarArr; + aVar.label = 1; + s.a.k kVar = new s.a.k(d0.w.g.b.intercepted(aVar), 1); + kVar.A(); + int length = e0VarArr.length; + d.a[] aVarArr = new d.a[length]; + for (int i3 = 0; i3 < length; i3++) { + s.a.e0 e0Var = dVar.b[d0.w.h.a.b.boxInt(i3).intValue()]; + e0Var.start(); + d.a aVar2 = new d.a(kVar, e0Var); + aVar2.m = e0Var.t(aVar2); + aVarArr[i3] = aVar2; + } + d.b bVar = new d.b(dVar, aVarArr); + for (int i4 = 0; i4 < length; i4++) { + aVarArr[i4]._disposer = bVar; + } + if (kVar.v()) { + bVar.b(); + } else { + kVar.e(bVar); + } + obj = kVar.u(); + if (obj == d0.w.g.c.getCOROUTINE_SUSPENDED()) { + d0.w.h.a.g.probeCoroutineSuspended(aVar); + } + if (obj == coroutine_suspended) { + return coroutine_suspended; + } + } else if (i == 1) { + s.a.e0[] e0VarArr2 = (s.a.e0[]) aVar.L$0; + l.throwOnFailure(obj); + } else { + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); + } + return (List) obj; + } + } + aVar = new C0171a(continuation); + Object obj = aVar.result; + Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); + i = aVar.label; + if (i != 0) { + } + return (List) obj; + } + + public static RectF g0(float[] fArr) { RectF rectF = new RectF(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY); for (int i = 1; i < fArr.length; i += 2) { float round = ((float) Math.round(fArr[i - 1] * 10.0f)) / 10.0f; @@ -816,80 +891,6 @@ public class a { return rectF; } - /* JADX WARNING: Removed duplicated region for block: B:12:0x0036 */ - /* JADX WARNING: Removed duplicated region for block: B:8:0x0023 */ - public static final Object g(s.a.e0[] e0VarArr, Continuation> continuation) { - C0171a aVar; - int i; - if (continuation instanceof C0171a) { - aVar = (C0171a) continuation; - int i2 = aVar.label; - if ((i2 & Integer.MIN_VALUE) != 0) { - aVar.label = i2 - Integer.MIN_VALUE; - Object obj = aVar.result; - Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); - i = aVar.label; - if (i != 0) { - l.throwOnFailure(obj); - if (e0VarArr.length == 0) { - return d0.t.n.emptyList(); - } - s.a.d dVar = new s.a.d(e0VarArr); - aVar.L$0 = e0VarArr; - aVar.label = 1; - j jVar = new j(d0.w.g.b.intercepted(aVar), 1); - jVar.A(); - int length = e0VarArr.length; - d.a[] aVarArr = new d.a[length]; - for (int i3 = 0; i3 < length; i3++) { - s.a.e0 e0Var = dVar.b[d0.w.h.a.b.boxInt(i3).intValue()]; - e0Var.start(); - d.a aVar2 = new d.a(jVar, e0Var); - aVar2.m = e0Var.t(aVar2); - aVarArr[i3] = aVar2; - } - d.b bVar = new d.b(dVar, aVarArr); - for (int i4 = 0; i4 < length; i4++) { - aVarArr[i4]._disposer = bVar; - } - if (jVar.v()) { - bVar.b(); - } else { - jVar.e(bVar); - } - obj = jVar.u(); - if (obj == d0.w.g.c.getCOROUTINE_SUSPENDED()) { - d0.w.h.a.g.probeCoroutineSuspended(aVar); - } - if (obj == coroutine_suspended) { - return coroutine_suspended; - } - } else if (i == 1) { - s.a.e0[] e0VarArr2 = (s.a.e0[]) aVar.L$0; - l.throwOnFailure(obj); - } else { - throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); - } - return (List) obj; - } - } - aVar = new C0171a(continuation); - Object obj = aVar.result; - Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); - i = aVar.label; - if (i != 0) { - } - return (List) obj; - } - - public static boolean g0(long j) { - int i = (j > 0 ? 1 : (j == 0 ? 0 : -1)); - if (i >= 0) { - return i != 0; - } - throw new IllegalArgumentException(c.d.b.a.a.q("n >= 0 required but it was ", j)); - } - public static final UndeliveredElementException h(Function1 function1, E e, UndeliveredElementException undeliveredElementException) { try { function1.invoke(e); @@ -902,10 +903,27 @@ public class a { return undeliveredElementException; } + public static boolean h0(long j) { + int i = (j > 0 ? 1 : (j == 0 ? 0 : -1)); + if (i >= 0) { + return i != 0; + } + throw new IllegalArgumentException(c.d.b.a.a.q("n >= 0 required but it was ", j)); + } + + public static final void i(CoroutineScope coroutineScope, CancellationException cancellationException) { + Job job = (Job) coroutineScope.getCoroutineContext().get(Job.h); + if (job != null) { + job.B(cancellationException); + return; + } + throw new IllegalStateException(("Scope cannot be cancelled because it does not have a job: " + coroutineScope).toString()); + } + /* JADX INFO: finally extract failed */ /* JADX DEBUG: Multi-variable search result rejected for r3v11, resolved type: java.util.concurrent.atomic.AtomicIntegerFieldUpdater */ /* JADX WARN: Multi-variable type inference failed */ - public static final Object h0(CoroutineContext coroutineContext, Function2, ? extends Object> function2, Continuation continuation) { + public static final Object i0(CoroutineContext coroutineContext, Function2, ? extends Object> function2, Continuation continuation) { Object obj; boolean z2; CoroutineContext context = continuation.getContext(); @@ -913,18 +931,18 @@ public class a { Job job = (Job) plus.get(Job.h); if (job == null || job.a()) { if (plus == context) { - q qVar = new q(plus, continuation); - obj = S(qVar, qVar, function2); + r rVar = new r(plus, continuation); + obj = T(rVar, rVar, function2); } else { int i = d0.w.d.e; d.b bVar = d.b.a; if (m.areEqual((d0.w.d) plus.get(bVar), (d0.w.d) context.get(bVar))) { - t1 t1Var = new t1(plus, continuation); + w1 w1Var = new w1(plus, continuation); Object b2 = s.a.a.a.b(plus, null); try { - Object S = S(t1Var, t1Var, function2); + Object T = T(w1Var, w1Var, function2); s.a.a.a.a(plus, b2); - obj = S; + obj = T; } catch (Throwable th) { s.a.a.a.a(plus, b2); throw th; @@ -932,7 +950,7 @@ public class a { } else { h0 h0Var = new h0(plus, continuation); h0Var.Y(); - R(function2, h0Var, h0Var, null, 4); + S(function2, h0Var, h0Var, null, 4); while (true) { int i2 = h0Var._decision; z2 = false; @@ -948,9 +966,9 @@ public class a { if (z2) { obj = d0.w.g.c.getCOROUTINE_SUSPENDED(); } else { - obj = f1.a(h0Var.F()); - if (obj instanceof u) { - throw ((u) obj).b; + obj = h1.a(h0Var.F()); + if (obj instanceof v) { + throw ((v) obj).b; } } } @@ -963,7 +981,7 @@ public class a { throw job.p(); } - public static void i(CoroutineContext coroutineContext, CancellationException cancellationException, int i, Object obj) { + public static void j(CoroutineContext coroutineContext, CancellationException cancellationException, int i, Object obj) { int i2 = i & 1; Job job = (Job) coroutineContext.get(Job.h); if (job != null) { @@ -971,12 +989,12 @@ public class a { } } - public static /* synthetic */ void j(Job job, CancellationException cancellationException, int i, Object obj) { + public static /* synthetic */ void k(Job job, CancellationException cancellationException, int i, Object obj) { int i2 = i & 1; job.B(null); } - public static final void k(long j, long j2, long j3) { + public static final void l(long j, long j2, long j3) { if ((j2 | j3) < 0 || j2 > j || j - j2 < j3) { StringBuilder O = c.d.b.a.a.O("size=", j, " offset="); O.append(j2); @@ -992,7 +1010,7 @@ public class a { /* JADX WARNING: Code restructure failed: missing block: B:61:0x00ea, code lost: return null; */ - public static final InetAddress l(String str, int i, int i2) { + public static final InetAddress m(String str, int i, int i2) { boolean z2; int i3; int i4; @@ -1103,23 +1121,23 @@ public class a { return InetAddress.getByAddress(bArr); } - public static final Object m(long j, Continuation continuation) { + public static final Object n(long j, Continuation continuation) { if (j <= 0) { return Unit.a; } - j jVar = new j(d0.w.g.b.intercepted(continuation), 1); - jVar.A(); + s.a.k kVar = new s.a.k(d0.w.g.b.intercepted(continuation), 1); + kVar.A(); if (j < Long.MAX_VALUE) { - s(jVar.n).b(j, jVar); + t(kVar.n).b(j, kVar); } - Object u = jVar.u(); + Object u = kVar.u(); if (u == d0.w.g.c.getCOROUTINE_SUSPENDED()) { d0.w.h.a.g.probeCoroutineSuspended(continuation); } return u; } - public static final String n(long j) { + public static final String o(long j) { String str; if (j <= ((long) -999500000)) { str = ((j - ((long) 500000000)) / ((long) 1000000000)) + " s "; @@ -1139,7 +1157,7 @@ public class a { return format; } - public static long o(AtomicLong atomicLong, long j) { + public static long p(AtomicLong atomicLong, long j) { long j2; do { j2 = atomicLong.get(); @@ -1147,15 +1165,15 @@ public class a { return j2; } - public static float[] p(RectF rectF) { + public static float[] q(RectF rectF) { return new float[]{rectF.centerX(), rectF.centerY()}; } - public static final String q(Object obj) { + public static final String r(Object obj) { return obj.getClass().getSimpleName(); } - public static float[] r(RectF rectF) { + public static float[] s(RectF rectF) { float f = rectF.left; float f2 = rectF.top; float f3 = rectF.right; @@ -1163,7 +1181,7 @@ public class a { return new float[]{f, f2, f3, f2, f3, f4, f, f4}; } - public static final g0 s(CoroutineContext coroutineContext) { + public static final g0 t(CoroutineContext coroutineContext) { int i = d0.w.d.e; CoroutineContext.Element element = coroutineContext.get(d.b.a); if (!(element instanceof g0)) { @@ -1173,12 +1191,12 @@ public class a { return g0Var != null ? g0Var : d0.a; } - public static final String t(Object obj) { + public static final String u(Object obj) { return Integer.toHexString(System.identityHashCode(obj)); } @TargetApi(17) - public static int u() { + public static int v() { EGLDisplay eglGetDisplay = EGL14.eglGetDisplay(0); int[] iArr = new int[2]; EGL14.eglInitialize(eglGetDisplay, iArr, 0, iArr, 1); @@ -1202,7 +1220,7 @@ public class a { return iArr3[0]; } - public static int v(Context context) { + public static int w(Context context) { Display defaultDisplay = ((WindowManager) context.getSystemService("window")).getDefaultDisplay(); if (defaultDisplay.getWidth() == defaultDisplay.getHeight()) { return 3; @@ -1210,7 +1228,7 @@ public class a { return defaultDisplay.getWidth() < defaultDisplay.getHeight() ? 1 : 2; } - public static final void w(CoroutineContext coroutineContext, Throwable th) { + public static final void x(CoroutineContext coroutineContext, Throwable th) { try { int i = CoroutineExceptionHandler.g; CoroutineExceptionHandler coroutineExceptionHandler = (CoroutineExceptionHandler) coroutineContext.get(CoroutineExceptionHandler.a.a); @@ -1229,7 +1247,7 @@ public class a { } } - public static /* synthetic */ k0 x(Job job, boolean z2, boolean z3, Function1 function1, int i, Object obj) { + public static /* synthetic */ l0 y(Job job, boolean z2, boolean z3, Function1 function1, int i, Object obj) { if ((i & 1) != 0) { z2 = false; } @@ -1239,15 +1257,7 @@ public class a { return job.f(z2, z3, function1); } - public static k0 y(long j, Runnable runnable, CoroutineContext coroutineContext) { + public static l0 z(long j, Runnable runnable, CoroutineContext coroutineContext) { return d0.a.w(j, runnable, coroutineContext); } - - public static final boolean z(CoroutineScope coroutineScope) { - Job job = (Job) coroutineScope.getCoroutineContext().get(Job.h); - if (job != null) { - return job.a(); - } - return true; - } } diff --git a/app/src/main/java/c/q/a/l/a.java b/app/src/main/java/c/q/a/l/a.java index 8b3f56d97a..d891aa94aa 100644 --- a/app/src/main/java/c/q/a/l/a.java +++ b/app/src/main/java/c/q/a/l/a.java @@ -223,9 +223,9 @@ public class a extends c { this.f1535y.setRotate(-getCurrentAngle()); float[] copyOf = Arrays.copyOf(fArr, fArr.length); this.f1535y.mapPoints(copyOf); - float[] r = c.q.a.k.a.r(this.f1534x); - this.f1535y.mapPoints(r); - return c.q.a.k.a.f0(copyOf).contains(c.q.a.k.a.f0(r)); + float[] s2 = c.q.a.k.a.s(this.f1534x); + this.f1535y.mapPoints(s2); + return c.q.a.k.a.g0(copyOf).contains(c.q.a.k.a.g0(s2)); } public void k(float f) { @@ -276,15 +276,15 @@ public class a extends c { this.f1535y.setRotate(-getCurrentAngle()); float[] fArr3 = this.i; float[] copyOf2 = Arrays.copyOf(fArr3, fArr3.length); - float[] r = c.q.a.k.a.r(this.f1534x); + float[] s2 = c.q.a.k.a.s(this.f1534x); this.f1535y.mapPoints(copyOf2); - this.f1535y.mapPoints(r); - RectF f02 = c.q.a.k.a.f0(copyOf2); - RectF f03 = c.q.a.k.a.f0(r); - float f7 = f02.left - f03.left; - float f8 = f02.top - f03.top; - float f9 = f02.right - f03.right; - float f10 = f02.bottom - f03.bottom; + this.f1535y.mapPoints(s2); + RectF g02 = c.q.a.k.a.g0(copyOf2); + RectF g03 = c.q.a.k.a.g0(s2); + float f7 = g02.left - g03.left; + float f8 = g02.top - g03.top; + float f9 = g02.right - g03.right; + float f10 = g02.bottom - g03.bottom; float[] fArr4 = new float[4]; if (f7 <= 0.0f) { f7 = 0.0f; diff --git a/app/src/main/java/c/q/a/l/c.java b/app/src/main/java/c/q/a/l/c.java index 3a32ecd780..09a8927723 100644 --- a/app/src/main/java/c/q/a/l/c.java +++ b/app/src/main/java/c/q/a/l/c.java @@ -82,8 +82,8 @@ public class c extends AppCompatImageView { float intrinsicHeight = (float) drawable.getIntrinsicHeight(); Log.d("TransformImageView", String.format("Image size: [%d:%d]", Integer.valueOf((int) intrinsicWidth), Integer.valueOf((int) intrinsicHeight))); RectF rectF = new RectF(0.0f, 0.0f, intrinsicWidth, intrinsicHeight); - this.p = c.q.a.k.a.r(rectF); - this.q = c.q.a.k.a.p(rectF); + this.p = c.q.a.k.a.s(rectF); + this.q = c.q.a.k.a.q(rectF); this.f1537s = true; a aVar = this.o; if (aVar != null) { @@ -163,7 +163,7 @@ public class c extends AppCompatImageView { sqrt = Math.min(sqrt, min); } try { - i = c.q.a.k.a.u(); + i = c.q.a.k.a.v(); } catch (Exception e) { Log.d("EglUtils", "getMaxTextureSize: ", e); i = 0; diff --git a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java index 06a7e4bd60..2c9192ff3d 100644 --- a/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java +++ b/app/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java @@ -2662,7 +2662,7 @@ public class AnimatableValueParser { public static final boolean j1(Channel channel) { m.checkNotNullParameter(channel, "$this$isGuildTextyChannel"); - return channel.z() == 0 || channel.z() == 5 || channel.z() == 10 || channel.z() == 11 || channel.z() == 12; + return channel.z() == 0 || channel.z() == 5 || channel.z() == 10 || channel.z() == 11 || channel.z() == 12 || channel.z() == 14; } public static o.a j2(c.i.a.c.i2.w wVar) { @@ -3056,7 +3056,7 @@ public class AnimatableValueParser { function1.invoke(renderContext); if (!(objArr.length == 0)) { if (!(!renderContext.a.isEmpty())) { - renderContext.f2010c = k.toList(objArr); + renderContext.f2012c = k.toList(objArr); } else { throw new IllegalArgumentException("must provide named arguments OR formatArgs, not both."); } @@ -3486,9 +3486,9 @@ public class AnimatableValueParser { public static final Integer x0(Channel channel) { m.checkNotNullParameter(channel, "$this$getDeletedMessage"); if (f1(channel)) { - return 2131887202; + return 2131887203; } - return r1(channel) ? null : 2131887270; + return r1(channel) ? null : 2131887271; } public static final boolean x1(Channel channel) { @@ -3569,7 +3569,7 @@ public class AnimatableValueParser { z3 = false; } if (z3) { - String string = context.getString(2131890440); + String string = context.getString(2131890470); m.checkNotNullExpressionValue(string, "context.getString(R.string.invalid_text_channel)"); return string; } else if (z2) { @@ -3584,7 +3584,7 @@ public class AnimatableValueParser { z3 = false; } if (z3) { - String string2 = context.getString(2131890441); + String string2 = context.getString(2131890471); m.checkNotNullExpressionValue(string2, "context.getString(R.string.invalid_voice_channel)"); return string2; } @@ -3593,7 +3593,7 @@ public class AnimatableValueParser { z3 = false; } if (z3) { - String string3 = context.getString(2131894030); + String string3 = context.getString(2131894069); m.checkNotNullExpressionValue(string3, "context.getString(R.string.unnamed)"); return string3; } @@ -3602,7 +3602,7 @@ public class AnimatableValueParser { z3 = false; } if (z3) { - String string4 = context.getString(2131888108); + String string4 = context.getString(2131888113); m.checkNotNullExpressionValue(string4, "context.getString(R.string.direct_message)"); return string4; } else if (z2) { diff --git a/app/src/main/java/com/discord/api/botuikit/ActionRowComponent.java b/app/src/main/java/com/discord/api/botuikit/ActionRowComponent.java index 169e9eac3f..de5cbb8812 100644 --- a/app/src/main/java/com/discord/api/botuikit/ActionRowComponent.java +++ b/app/src/main/java/com/discord/api/botuikit/ActionRowComponent.java @@ -8,15 +8,6 @@ public final class ActionRowComponent extends LayoutComponent { private final List components; private final ComponentType type; - /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public ActionRowComponent(ComponentType componentType, List list) { - m.checkNotNullParameter(componentType, "type"); - m.checkNotNullParameter(list, "components"); - this.type = componentType; - this.components = list; - } - @Override // com.discord.api.botuikit.LayoutComponent public List a() { return this.components; diff --git a/app/src/main/java/com/discord/api/botuikit/ButtonComponent.java b/app/src/main/java/com/discord/api/botuikit/ButtonComponent.java index 0a36f5c98d..aec320247b 100644 --- a/app/src/main/java/com/discord/api/botuikit/ButtonComponent.java +++ b/app/src/main/java/com/discord/api/botuikit/ButtonComponent.java @@ -13,24 +13,6 @@ public final class ButtonComponent extends ActionComponent { private final ComponentType type; private final String url; - public ButtonComponent(ComponentType componentType, String str, String str2, String str3, ButtonStyle buttonStyle, boolean z2, ComponentEmoji componentEmoji, String str4) { - m.checkNotNullParameter(componentType, "type"); - m.checkNotNullParameter(buttonStyle, "style"); - this.type = componentType; - this.customId = str; - this.hash = str2; - this.label = str3; - this.style = buttonStyle; - this.disabled = z2; - this.emoji = componentEmoji; - this.url = str4; - } - - /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ ButtonComponent(ComponentType componentType, String str, String str2, String str3, ButtonStyle buttonStyle, boolean z2, ComponentEmoji componentEmoji, String str4, int i) { - this(componentType, str, str2, str3, buttonStyle, (i & 32) != 0 ? false : z2, (i & 64) != 0 ? null : componentEmoji, (i & 128) != 0 ? null : str4); - } - public final String a() { return this.customId; } diff --git a/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java b/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java index 3946203b06..cbc4c8a9af 100644 --- a/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java +++ b/app/src/main/java/com/discord/api/botuikit/ComponentEmoji.java @@ -11,18 +11,6 @@ public final class ComponentEmoji implements Serializable { private final String f1555id; private final String name; - public ComponentEmoji(String str, String str2, Boolean bool) { - m.checkNotNullParameter(str2, "name"); - this.f1555id = str; - this.name = str2; - this.animated = bool; - } - - /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ ComponentEmoji(String str, String str2, Boolean bool, int i) { - this((i & 1) != 0 ? null : str, str2, (i & 4) != 0 ? Boolean.FALSE : null); - } - public final Boolean a() { return this.animated; } diff --git a/app/src/main/java/com/discord/api/botuikit/SelectComponent.java b/app/src/main/java/com/discord/api/botuikit/SelectComponent.java index 443dec6c3d..d32210ca1f 100644 --- a/app/src/main/java/com/discord/api/botuikit/SelectComponent.java +++ b/app/src/main/java/com/discord/api/botuikit/SelectComponent.java @@ -14,21 +14,6 @@ public final class SelectComponent extends ActionComponent { private final String placeholder; private final ComponentType type; - public SelectComponent(ComponentType componentType, String str, boolean z2, String str2, String str3, int i, int i2, List list) { - m.checkNotNullParameter(componentType, "type"); - m.checkNotNullParameter(str, "customId"); - m.checkNotNullParameter(str2, "hash"); - m.checkNotNullParameter(list, "options"); - this.type = componentType; - this.customId = str; - this.disabled = z2; - this.hash = str2; - this.placeholder = str3; - this.minValues = i; - this.maxValues = i2; - this.options = list; - } - public final String a() { return this.customId; } diff --git a/app/src/main/java/com/discord/api/botuikit/SelectItem.java b/app/src/main/java/com/discord/api/botuikit/SelectItem.java index 7f17bfb52d..26a2008be3 100644 --- a/app/src/main/java/com/discord/api/botuikit/SelectItem.java +++ b/app/src/main/java/com/discord/api/botuikit/SelectItem.java @@ -13,19 +13,6 @@ public final class SelectItem implements Serializable { private final String label; private final String value; - public SelectItem(String str, String str2, ComponentEmoji componentEmoji, String str3, boolean z2, int i) { - componentEmoji = (i & 4) != 0 ? null : componentEmoji; - str3 = (i & 8) != 0 ? null : str3; - z2 = (i & 16) != 0 ? false : z2; - m.checkNotNullParameter(str, "label"); - m.checkNotNullParameter(str2, "value"); - this.label = str; - this.value = str2; - this.emoji = componentEmoji; - this.description = str3; - this.f0default = z2; - } - public final String a() { return this.description; } diff --git a/app/src/main/java/com/discord/api/channel/Channel.java b/app/src/main/java/com/discord/api/channel/Channel.java index b42cb327b4..a3f6a0ce28 100644 --- a/app/src/main/java/com/discord/api/channel/Channel.java +++ b/app/src/main/java/com/discord/api/channel/Channel.java @@ -15,6 +15,7 @@ public final class Channel { public static final int ANNOUNCEMENT_THREAD = 10; public static final int CATEGORY = 4; public static final Companion Companion = new Companion(null); + public static final int DIRECTORY = 14; public static final int DM = 1; public static final int GROUP_DM = 3; public static final int GUILD_ANNOUNCEMENT = 5; diff --git a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java index 57e75e9f6b..31c73b30d2 100644 --- a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java +++ b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByMostRecent$1.java @@ -1,6 +1,6 @@ package com.discord.api.channel; -import com.discord.models.domain.ModelMessage; +import com.discord.utilities.message.MessageUtils; import java.util.Comparator; import java.util.Map; /* compiled from: ChannelUtils.kt */ @@ -16,6 +16,6 @@ public final class ChannelUtils$getSortByMostRecent$1 implements Comparator>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.type) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31; + String str = this.description; + return i + (str != null ? str.hashCode() : 0); + } + + public String toString() { + StringBuilder L = a.L("DirectoryEntry(directoryChannelId="); + L.append(this.directoryChannelId); + L.append(", entityId="); + L.append(this.entityId); + L.append(", type="); + L.append(this.type); + L.append(", authorId="); + L.append(this.authorId); + L.append(", description="); + return a.D(L, this.description, ")"); + } +} diff --git a/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java b/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java index 1f1b8b975a..6307d538fa 100644 --- a/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java +++ b/app/src/main/java/com/discord/api/guild/preview/GuildPreview.java @@ -29,17 +29,17 @@ public final class GuildPreview { } public final String c() { - return this.banner; - } - - public final String d() { return this.description; } - public final List e() { + public final List d() { return this.emojis; } + public final List e() { + return this.features; + } + public boolean equals(Object obj) { if (this == obj) { return true; @@ -51,18 +51,18 @@ public final class GuildPreview { return this.f1564id == guildPreview.f1564id && m.areEqual(this.name, guildPreview.name) && m.areEqual(this.description, guildPreview.description) && m.areEqual(this.splash, guildPreview.splash) && m.areEqual(this.banner, guildPreview.banner) && m.areEqual(this.icon, guildPreview.icon) && m.areEqual(this.approximatePresenceCount, guildPreview.approximatePresenceCount) && m.areEqual(this.approximateMemberCount, guildPreview.approximateMemberCount) && m.areEqual(this.emojis, guildPreview.emojis) && m.areEqual(this.features, guildPreview.features); } - public final List f() { - return this.features; - } - - public final String g() { + public final String f() { return this.icon; } - public final long h() { + public final long g() { return this.f1564id; } + public final String h() { + return this.name; + } + public int hashCode() { long j = this.f1564id; int i = ((int) (j ^ (j >>> 32))) * 31; @@ -91,10 +91,6 @@ public final class GuildPreview { } public final String i() { - return this.name; - } - - public final String j() { return this.splash; } diff --git a/app/src/main/java/com/discord/models/messages/LocalAttachment.java b/app/src/main/java/com/discord/api/message/LocalAttachment.java similarity index 54% rename from app/src/main/java/com/discord/models/messages/LocalAttachment.java rename to app/src/main/java/com/discord/api/message/LocalAttachment.java index a04c3df0ce..a1de242864 100644 --- a/app/src/main/java/com/discord/models/messages/LocalAttachment.java +++ b/app/src/main/java/com/discord/api/message/LocalAttachment.java @@ -1,4 +1,4 @@ -package com.discord.models.messages; +package com.discord.api.message; import c.d.b.a.a; import d0.z.d.m; @@ -7,46 +7,27 @@ public final class LocalAttachment { private final String displayName; /* renamed from: id reason: collision with root package name */ - private final long f2052id; + private final long f1568id; private final String uriString; public LocalAttachment(long j, String str, String str2) { m.checkNotNullParameter(str, "uriString"); m.checkNotNullParameter(str2, "displayName"); - this.f2052id = j; + this.f1568id = j; this.uriString = str; this.displayName = str2; } - public static /* synthetic */ LocalAttachment copy$default(LocalAttachment localAttachment, long j, String str, String str2, int i, Object obj) { - if ((i & 1) != 0) { - j = localAttachment.f2052id; - } - if ((i & 2) != 0) { - str = localAttachment.uriString; - } - if ((i & 4) != 0) { - str2 = localAttachment.displayName; - } - return localAttachment.copy(j, str, str2); - } - - public final long component1() { - return this.f2052id; - } - - public final String component2() { - return this.uriString; - } - - public final String component3() { + public final String a() { return this.displayName; } - public final LocalAttachment copy(long j, String str, String str2) { - m.checkNotNullParameter(str, "uriString"); - m.checkNotNullParameter(str2, "displayName"); - return new LocalAttachment(j, str, str2); + public final long b() { + return this.f1568id; + } + + public final String c() { + return this.uriString; } public boolean equals(Object obj) { @@ -57,23 +38,11 @@ public final class LocalAttachment { return false; } LocalAttachment localAttachment = (LocalAttachment) obj; - return this.f2052id == localAttachment.f2052id && m.areEqual(this.uriString, localAttachment.uriString) && m.areEqual(this.displayName, localAttachment.displayName); - } - - public final String getDisplayName() { - return this.displayName; - } - - public final long getId() { - return this.f2052id; - } - - public final String getUriString() { - return this.uriString; + return this.f1568id == localAttachment.f1568id && m.areEqual(this.uriString, localAttachment.uriString) && m.areEqual(this.displayName, localAttachment.displayName); } public int hashCode() { - long j = this.f2052id; + long j = this.f1568id; int i = ((int) (j ^ (j >>> 32))) * 31; String str = this.uriString; int i2 = 0; @@ -87,7 +56,7 @@ public final class LocalAttachment { public String toString() { StringBuilder L = a.L("LocalAttachment(id="); - L.append(this.f2052id); + L.append(this.f1568id); L.append(", uriString="); L.append(this.uriString); L.append(", displayName="); diff --git a/app/src/main/java/com/discord/api/message/Message.java b/app/src/main/java/com/discord/api/message/Message.java new file mode 100644 index 0000000000..7f254779d7 --- /dev/null +++ b/app/src/main/java/com/discord/api/message/Message.java @@ -0,0 +1,546 @@ +package com.discord.api.message; + +import c.d.b.a.a; +import com.discord.api.application.Application; +import com.discord.api.botuikit.Component; +import com.discord.api.channel.Channel; +import com.discord.api.guildmember.GuildMember; +import com.discord.api.interaction.Interaction; +import com.discord.api.message.activity.MessageActivity; +import com.discord.api.message.allowedmentions.MessageAllowedMentions; +import com.discord.api.message.attachment.MessageAttachment; +import com.discord.api.message.call.MessageCall; +import com.discord.api.message.embed.MessageEmbed; +import com.discord.api.message.reaction.MessageReaction; +import com.discord.api.sticker.Sticker; +import com.discord.api.sticker.StickerPartial; +import com.discord.api.user.User; +import com.discord.api.utcdatetime.UtcDateTime; +import d0.t.h0; +import d0.z.d.m; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: Message.kt */ +public final class Message { + public static final Companion Companion = new Companion(null); + private static final Map EMPTY_REACTIONS = h0.emptyMap(); + private final MessageActivity activity; + private final MessageAllowedMentions allowedMentions; + private final Application application; + private final Long applicationId; + private final List attachments; + private final User author; + private Map cachedReactionsMap; + private final MessageCall call; + private final long channelId; + private final List components; + private final String content; + private final UtcDateTime editedTimestamp; + private final List embeds; + private final Long flags; + private final transient Long guildId; + private final transient boolean hasLocalUploads; + private final Boolean hit; + + /* renamed from: id reason: collision with root package name */ + private final long f1569id; + private final Long initialAttemptTimestamp; + private final Interaction interaction; + private final Long lastManualAttemptTimestamp; + private final List localAttachments; + private final transient GuildMember member; + private final Boolean mentionEveryone; + private final List mentionRoles; + private final List mentions; + private final MessageReference messageReference; + private final String nonce; + private final Integer numRetries; + private final Boolean pinned; + private final List reactions; + private final Message referencedMessage; + private final List stickerItems; + private final List stickers; + private final Channel thread; + private final UtcDateTime timestamp; + private final Boolean tts; + private final Integer type; + private final Long webhookId; + + /* compiled from: Message.kt */ + public static final class Companion { + public Companion() { + } + + public Companion(DefaultConstructorMarker defaultConstructorMarker) { + } + } + + /* JADX DEBUG: Multi-variable search result rejected for r33v0, resolved type: java.util.List */ + /* JADX WARN: Multi-variable type inference failed */ + public Message(long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List list6, List list7, Message message, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9) { + this.f1569id = j; + this.channelId = j2; + this.author = user; + this.content = str; + this.timestamp = utcDateTime; + this.editedTimestamp = utcDateTime2; + this.tts = bool; + this.mentionEveryone = bool2; + this.mentions = list; + this.mentionRoles = list2; + this.attachments = list3; + this.embeds = list4; + this.reactions = list5; + this.nonce = str2; + this.pinned = bool3; + this.webhookId = l; + this.type = num; + this.activity = messageActivity; + this.application = application; + this.applicationId = l2; + this.messageReference = messageReference; + this.flags = l3; + this.stickers = list6; + this.stickerItems = list7; + this.referencedMessage = message; + this.interaction = interaction; + this.thread = channel; + this.components = list8; + this.call = messageCall; + this.guildId = l4; + this.member = guildMember; + this.hit = bool4; + this.hasLocalUploads = z2; + this.allowedMentions = messageAllowedMentions; + this.numRetries = num2; + this.lastManualAttemptTimestamp = l5; + this.initialAttemptTimestamp = l6; + this.localAttachments = list9; + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ Message(long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List list6, List list7, Message message, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2) { + this(j, j2, (i & 4) != 0 ? null : user, (i & 8) != 0 ? null : str, (i & 16) != 0 ? null : utcDateTime, null, (i & 64) != 0 ? null : bool, (i & 128) != 0 ? null : bool2, (i & 256) != 0 ? null : list, (i & 512) != 0 ? null : list2, (i & 1024) != 0 ? null : list3, (i & 2048) != 0 ? null : list4, (i & 4096) != 0 ? null : list5, (i & 8192) != 0 ? null : str2, (i & 16384) != 0 ? null : bool3, null, (65536 & i) != 0 ? null : num, null, null, null, null, (2097152 & i) != 0 ? null : l3, null, null, null, (33554432 & i) != 0 ? null : interaction, null, null, null, null, null, null, (i2 & 1) != 0 ? false : z2, null, null, null, null, (i2 & 32) != 0 ? null : list9); + int i3 = i & 32; + int i4 = 32768 & i; + int i5 = 131072 & i; + int i6 = 262144 & i; + int i7 = 524288 & i; + int i8 = 1048576 & i; + int i9 = 4194304 & i; + int i10 = 8388608 & i; + int i11 = 16777216 & i; + int i12 = 67108864 & i; + int i13 = 134217728 & i; + int i14 = 268435456 & i; + int i15 = 536870912 & i; + int i16 = 1073741824 & i; + int i17 = i & Integer.MIN_VALUE; + int i18 = i2 & 2; + int i19 = i2 & 4; + int i20 = i2 & 8; + int i21 = i2 & 16; + } + + public static Message a(Message message, long j, long j2, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l, Integer num, MessageActivity messageActivity, Application application, Long l2, MessageReference messageReference, Long l3, List list6, List list7, Message message2, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Long l4, GuildMember guildMember, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2) { + long j3 = (i & 1) != 0 ? message.f1569id : j; + long j4 = (i & 2) != 0 ? message.channelId : j2; + User user2 = (i & 4) != 0 ? message.author : user; + String str3 = (i & 8) != 0 ? message.content : str; + UtcDateTime utcDateTime3 = (i & 16) != 0 ? message.timestamp : utcDateTime; + UtcDateTime utcDateTime4 = (i & 32) != 0 ? message.editedTimestamp : utcDateTime2; + Boolean bool5 = (i & 64) != 0 ? message.tts : bool; + Boolean bool6 = (i & 128) != 0 ? message.mentionEveryone : bool2; + List list10 = (i & 256) != 0 ? message.mentions : list; + List list11 = (i & 512) != 0 ? message.mentionRoles : list2; + List list12 = (i & 1024) != 0 ? message.attachments : list3; + List list13 = (i & 2048) != 0 ? message.embeds : list4; + List list14 = (i & 4096) != 0 ? message.reactions : list5; + String str4 = (i & 8192) != 0 ? message.nonce : str2; + Boolean bool7 = (i & 16384) != 0 ? message.pinned : bool3; + Long l7 = (i & 32768) != 0 ? message.webhookId : l; + Integer num3 = (i & 65536) != 0 ? message.type : num; + MessageActivity messageActivity2 = (i & 131072) != 0 ? message.activity : messageActivity; + Application application2 = (i & 262144) != 0 ? message.application : application; + Long l8 = (i & 524288) != 0 ? message.applicationId : l2; + MessageReference messageReference2 = (i & 1048576) != 0 ? message.messageReference : messageReference; + Long l9 = (i & 2097152) != 0 ? message.flags : l3; + List list15 = (i & 4194304) != 0 ? message.stickers : list6; + List list16 = (i & 8388608) != 0 ? message.stickerItems : list7; + Message message3 = (i & 16777216) != 0 ? message.referencedMessage : message2; + Interaction interaction2 = (i & 33554432) != 0 ? message.interaction : interaction; + Channel channel2 = (i & 67108864) != 0 ? message.thread : channel; + List list17 = (i & 134217728) != 0 ? message.components : list8; + MessageCall messageCall2 = (i & 268435456) != 0 ? message.call : messageCall; + Boolean bool8 = null; + Long l10 = (i & 536870912) != 0 ? message.guildId : null; + GuildMember guildMember2 = (i & 1073741824) != 0 ? message.member : null; + if ((i & Integer.MIN_VALUE) != 0) { + bool8 = message.hit; + } + boolean z3 = (i2 & 1) != 0 ? message.hasLocalUploads : z2; + MessageAllowedMentions messageAllowedMentions2 = (i2 & 2) != 0 ? message.allowedMentions : messageAllowedMentions; + Integer num4 = (i2 & 4) != 0 ? message.numRetries : num2; + Long l11 = (i2 & 8) != 0 ? message.lastManualAttemptTimestamp : l5; + Long l12 = (i2 & 16) != 0 ? message.initialAttemptTimestamp : l6; + List list18 = (i2 & 32) != 0 ? message.localAttachments : list9; + Objects.requireNonNull(message); + return new Message(j3, j4, user2, str3, utcDateTime3, utcDateTime4, bool5, bool6, list10, list11, list12, list13, list14, str4, bool7, l7, num3, messageActivity2, application2, l8, messageReference2, l9, list15, list16, message3, interaction2, channel2, list17, messageCall2, l10, guildMember2, bool8, z3, messageAllowedMentions2, num4, l11, l12, list18); + } + + public final MessageReference A() { + return this.messageReference; + } + + public final String B() { + return this.nonce; + } + + public final Integer C() { + return this.numRetries; + } + + public final Boolean D() { + return this.pinned; + } + + public final List E() { + return this.reactions; + } + + public final synchronized Map F() { + Map map; + map = this.cachedReactionsMap; + if (map != null) { + m.checkNotNull(map); + } else { + List list = this.reactions; + if (list == null || !(!list.isEmpty())) { + map = EMPTY_REACTIONS; + } else { + List list2 = this.reactions; + LinkedHashMap linkedHashMap = new LinkedHashMap(); + for (Object obj : list2) { + linkedHashMap.put(((MessageReaction) obj).b().c(), obj); + } + this.cachedReactionsMap = linkedHashMap; + m.checkNotNull(linkedHashMap); + map = linkedHashMap; + } + } + return map; + } + + public final Message G() { + return this.referencedMessage; + } + + public final List H() { + return this.stickerItems; + } + + public final List I() { + return this.stickers; + } + + public final Channel J() { + return this.thread; + } + + public final UtcDateTime K() { + return this.timestamp; + } + + public final Boolean L() { + return this.tts; + } + + public final Integer M() { + return this.type; + } + + public final Long N() { + return this.webhookId; + } + + public final MessageActivity b() { + return this.activity; + } + + public final MessageAllowedMentions c() { + return this.allowedMentions; + } + + public final Application d() { + return this.application; + } + + public final Long e() { + return this.applicationId; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof Message)) { + return false; + } + Message message = (Message) obj; + return this.f1569id == message.f1569id && this.channelId == message.channelId && m.areEqual(this.author, message.author) && m.areEqual(this.content, message.content) && m.areEqual(this.timestamp, message.timestamp) && m.areEqual(this.editedTimestamp, message.editedTimestamp) && m.areEqual(this.tts, message.tts) && m.areEqual(this.mentionEveryone, message.mentionEveryone) && m.areEqual(this.mentions, message.mentions) && m.areEqual(this.mentionRoles, message.mentionRoles) && m.areEqual(this.attachments, message.attachments) && m.areEqual(this.embeds, message.embeds) && m.areEqual(this.reactions, message.reactions) && m.areEqual(this.nonce, message.nonce) && m.areEqual(this.pinned, message.pinned) && m.areEqual(this.webhookId, message.webhookId) && m.areEqual(this.type, message.type) && m.areEqual(this.activity, message.activity) && m.areEqual(this.application, message.application) && m.areEqual(this.applicationId, message.applicationId) && m.areEqual(this.messageReference, message.messageReference) && m.areEqual(this.flags, message.flags) && m.areEqual(this.stickers, message.stickers) && m.areEqual(this.stickerItems, message.stickerItems) && m.areEqual(this.referencedMessage, message.referencedMessage) && m.areEqual(this.interaction, message.interaction) && m.areEqual(this.thread, message.thread) && m.areEqual(this.components, message.components) && m.areEqual(this.call, message.call) && m.areEqual(this.guildId, message.guildId) && m.areEqual(this.member, message.member) && m.areEqual(this.hit, message.hit) && this.hasLocalUploads == message.hasLocalUploads && m.areEqual(this.allowedMentions, message.allowedMentions) && m.areEqual(this.numRetries, message.numRetries) && m.areEqual(this.lastManualAttemptTimestamp, message.lastManualAttemptTimestamp) && m.areEqual(this.initialAttemptTimestamp, message.initialAttemptTimestamp) && m.areEqual(this.localAttachments, message.localAttachments); + } + + public final List f() { + return this.attachments; + } + + public final User g() { + return this.author; + } + + public final MessageCall h() { + return this.call; + } + + public int hashCode() { + long j = this.f1569id; + long j2 = this.channelId; + int i = ((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31; + User user = this.author; + int i2 = 0; + int hashCode = (i + (user != null ? user.hashCode() : 0)) * 31; + String str = this.content; + int hashCode2 = (hashCode + (str != null ? str.hashCode() : 0)) * 31; + UtcDateTime utcDateTime = this.timestamp; + int hashCode3 = (hashCode2 + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31; + UtcDateTime utcDateTime2 = this.editedTimestamp; + int hashCode4 = (hashCode3 + (utcDateTime2 != null ? utcDateTime2.hashCode() : 0)) * 31; + Boolean bool = this.tts; + int hashCode5 = (hashCode4 + (bool != null ? bool.hashCode() : 0)) * 31; + Boolean bool2 = this.mentionEveryone; + int hashCode6 = (hashCode5 + (bool2 != null ? bool2.hashCode() : 0)) * 31; + List list = this.mentions; + int hashCode7 = (hashCode6 + (list != null ? list.hashCode() : 0)) * 31; + List list2 = this.mentionRoles; + int hashCode8 = (hashCode7 + (list2 != null ? list2.hashCode() : 0)) * 31; + List list3 = this.attachments; + int hashCode9 = (hashCode8 + (list3 != null ? list3.hashCode() : 0)) * 31; + List list4 = this.embeds; + int hashCode10 = (hashCode9 + (list4 != null ? list4.hashCode() : 0)) * 31; + List list5 = this.reactions; + int hashCode11 = (hashCode10 + (list5 != null ? list5.hashCode() : 0)) * 31; + String str2 = this.nonce; + int hashCode12 = (hashCode11 + (str2 != null ? str2.hashCode() : 0)) * 31; + Boolean bool3 = this.pinned; + int hashCode13 = (hashCode12 + (bool3 != null ? bool3.hashCode() : 0)) * 31; + Long l = this.webhookId; + int hashCode14 = (hashCode13 + (l != null ? l.hashCode() : 0)) * 31; + Integer num = this.type; + int hashCode15 = (hashCode14 + (num != null ? num.hashCode() : 0)) * 31; + MessageActivity messageActivity = this.activity; + int hashCode16 = (hashCode15 + (messageActivity != null ? messageActivity.hashCode() : 0)) * 31; + Application application = this.application; + int hashCode17 = (hashCode16 + (application != null ? application.hashCode() : 0)) * 31; + Long l2 = this.applicationId; + int hashCode18 = (hashCode17 + (l2 != null ? l2.hashCode() : 0)) * 31; + MessageReference messageReference = this.messageReference; + int hashCode19 = (hashCode18 + (messageReference != null ? messageReference.hashCode() : 0)) * 31; + Long l3 = this.flags; + int hashCode20 = (hashCode19 + (l3 != null ? l3.hashCode() : 0)) * 31; + List list6 = this.stickers; + int hashCode21 = (hashCode20 + (list6 != null ? list6.hashCode() : 0)) * 31; + List list7 = this.stickerItems; + int hashCode22 = (hashCode21 + (list7 != null ? list7.hashCode() : 0)) * 31; + Message message = this.referencedMessage; + int hashCode23 = (hashCode22 + (message != null ? message.hashCode() : 0)) * 31; + Interaction interaction = this.interaction; + int hashCode24 = (hashCode23 + (interaction != null ? interaction.hashCode() : 0)) * 31; + Channel channel = this.thread; + int hashCode25 = (hashCode24 + (channel != null ? channel.hashCode() : 0)) * 31; + List list8 = this.components; + int hashCode26 = (hashCode25 + (list8 != null ? list8.hashCode() : 0)) * 31; + MessageCall messageCall = this.call; + int hashCode27 = (hashCode26 + (messageCall != null ? messageCall.hashCode() : 0)) * 31; + Long l4 = this.guildId; + int hashCode28 = (hashCode27 + (l4 != null ? l4.hashCode() : 0)) * 31; + GuildMember guildMember = this.member; + int hashCode29 = (hashCode28 + (guildMember != null ? guildMember.hashCode() : 0)) * 31; + Boolean bool4 = this.hit; + int hashCode30 = (hashCode29 + (bool4 != null ? bool4.hashCode() : 0)) * 31; + boolean z2 = this.hasLocalUploads; + if (z2) { + z2 = true; + } + int i3 = z2 ? 1 : 0; + int i4 = z2 ? 1 : 0; + int i5 = z2 ? 1 : 0; + int i6 = (hashCode30 + i3) * 31; + MessageAllowedMentions messageAllowedMentions = this.allowedMentions; + int hashCode31 = (i6 + (messageAllowedMentions != null ? messageAllowedMentions.hashCode() : 0)) * 31; + Integer num2 = this.numRetries; + int hashCode32 = (hashCode31 + (num2 != null ? num2.hashCode() : 0)) * 31; + Long l5 = this.lastManualAttemptTimestamp; + int hashCode33 = (hashCode32 + (l5 != null ? l5.hashCode() : 0)) * 31; + Long l6 = this.initialAttemptTimestamp; + int hashCode34 = (hashCode33 + (l6 != null ? l6.hashCode() : 0)) * 31; + List list9 = this.localAttachments; + if (list9 != null) { + i2 = list9.hashCode(); + } + return hashCode34 + i2; + } + + public final long i() { + return this.channelId; + } + + public final List j() { + return this.components; + } + + public final String k() { + return this.content; + } + + public final UtcDateTime l() { + return this.editedTimestamp; + } + + public final List m() { + return this.embeds; + } + + public final Long n() { + return this.flags; + } + + public final Long o() { + return this.guildId; + } + + public final boolean p() { + return this.hasLocalUploads; + } + + public final Boolean q() { + return this.hit; + } + + public final long r() { + return this.f1569id; + } + + public final Long s() { + return this.initialAttemptTimestamp; + } + + public final Interaction t() { + return this.interaction; + } + + public String toString() { + StringBuilder L = a.L("Message(id="); + L.append(this.f1569id); + L.append(", channelId="); + L.append(this.channelId); + L.append(", author="); + L.append(this.author); + L.append(", content="); + L.append(this.content); + L.append(", timestamp="); + L.append(this.timestamp); + L.append(", editedTimestamp="); + L.append(this.editedTimestamp); + L.append(", tts="); + L.append(this.tts); + L.append(", mentionEveryone="); + L.append(this.mentionEveryone); + L.append(", mentions="); + L.append(this.mentions); + L.append(", mentionRoles="); + L.append(this.mentionRoles); + L.append(", attachments="); + L.append(this.attachments); + L.append(", embeds="); + L.append(this.embeds); + L.append(", reactions="); + L.append(this.reactions); + L.append(", nonce="); + L.append(this.nonce); + L.append(", pinned="); + L.append(this.pinned); + L.append(", webhookId="); + L.append(this.webhookId); + L.append(", type="); + L.append(this.type); + L.append(", activity="); + L.append(this.activity); + L.append(", application="); + L.append(this.application); + L.append(", applicationId="); + L.append(this.applicationId); + L.append(", messageReference="); + L.append(this.messageReference); + L.append(", flags="); + L.append(this.flags); + L.append(", stickers="); + L.append(this.stickers); + L.append(", stickerItems="); + L.append(this.stickerItems); + L.append(", referencedMessage="); + L.append(this.referencedMessage); + L.append(", interaction="); + L.append(this.interaction); + L.append(", thread="); + L.append(this.thread); + L.append(", components="); + L.append(this.components); + L.append(", call="); + L.append(this.call); + L.append(", guildId="); + L.append(this.guildId); + L.append(", member="); + L.append(this.member); + L.append(", hit="); + L.append(this.hit); + L.append(", hasLocalUploads="); + L.append(this.hasLocalUploads); + L.append(", allowedMentions="); + L.append(this.allowedMentions); + L.append(", numRetries="); + L.append(this.numRetries); + L.append(", lastManualAttemptTimestamp="); + L.append(this.lastManualAttemptTimestamp); + L.append(", initialAttemptTimestamp="); + L.append(this.initialAttemptTimestamp); + L.append(", localAttachments="); + return a.E(L, this.localAttachments, ")"); + } + + public final Long u() { + return this.lastManualAttemptTimestamp; + } + + public final List v() { + return this.localAttachments; + } + + public final GuildMember w() { + return this.member; + } + + public final Boolean x() { + return this.mentionEveryone; + } + + public final List y() { + return this.mentionRoles; + } + + public final List z() { + return this.mentions; + } +} diff --git a/app/src/main/java/com/discord/api/message/MessageTypes.java b/app/src/main/java/com/discord/api/message/MessageTypes.java index e846dec79b..1d52bdc973 100644 --- a/app/src/main/java/com/discord/api/message/MessageTypes.java +++ b/app/src/main/java/com/discord/api/message/MessageTypes.java @@ -15,6 +15,11 @@ public final class MessageTypes { public static final int GUILD_INVITE_REMINDER = 22; public static final int GUILD_STREAM = 13; public static final MessageTypes INSTANCE = new MessageTypes(); + public static final int LOCAL = -1; + public static final int LOCAL_APPLICATION_COMMAND = -5; + public static final int LOCAL_APPLICATION_COMMAND_SEND_FAILED = -4; + public static final int LOCAL_INVALID_ATTACHMENTS = -3; + public static final int LOCAL_SEND_FAILED = -2; public static final int RECIPIENT_ADD = 1; public static final int RECIPIENT_REMOVE = 2; public static final int REPLY = 19; diff --git a/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentions.java b/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentions.java new file mode 100644 index 0000000000..bcbe1bd14b --- /dev/null +++ b/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentions.java @@ -0,0 +1,82 @@ +package com.discord.api.message.allowedmentions; + +import c.d.b.a.a; +import d0.z.d.m; +import java.util.List; +/* compiled from: MessageAllowedMentions.kt */ +public final class MessageAllowedMentions { + private final List parse; + private final Boolean repliedUser; + private final List roles; + private final List users; + + public MessageAllowedMentions() { + this(null, null, null, null, 15); + } + + public MessageAllowedMentions(List list, List list2, List list3, Boolean bool, int i) { + list = (i & 1) != 0 ? null : list; + int i2 = i & 2; + int i3 = i & 4; + bool = (i & 8) != 0 ? null : bool; + this.parse = list; + this.users = null; + this.roles = null; + this.repliedUser = bool; + } + + public final List a() { + return this.parse; + } + + public final Boolean b() { + return this.repliedUser; + } + + public final List c() { + return this.roles; + } + + public final List d() { + return this.users; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof MessageAllowedMentions)) { + return false; + } + MessageAllowedMentions messageAllowedMentions = (MessageAllowedMentions) obj; + return m.areEqual(this.parse, messageAllowedMentions.parse) && m.areEqual(this.users, messageAllowedMentions.users) && m.areEqual(this.roles, messageAllowedMentions.roles) && m.areEqual(this.repliedUser, messageAllowedMentions.repliedUser); + } + + public int hashCode() { + List list = this.parse; + int i = 0; + int hashCode = (list != null ? list.hashCode() : 0) * 31; + List list2 = this.users; + int hashCode2 = (hashCode + (list2 != null ? list2.hashCode() : 0)) * 31; + List list3 = this.roles; + int hashCode3 = (hashCode2 + (list3 != null ? list3.hashCode() : 0)) * 31; + Boolean bool = this.repliedUser; + if (bool != null) { + i = bool.hashCode(); + } + return hashCode3 + i; + } + + public String toString() { + StringBuilder L = a.L("MessageAllowedMentions(parse="); + L.append(this.parse); + L.append(", users="); + L.append(this.users); + L.append(", roles="); + L.append(this.roles); + L.append(", repliedUser="); + L.append(this.repliedUser); + L.append(")"); + return L.toString(); + } +} diff --git a/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java b/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java new file mode 100644 index 0000000000..e93f3c9982 --- /dev/null +++ b/app/src/main/java/com/discord/api/message/allowedmentions/MessageAllowedMentionsTypes.java @@ -0,0 +1,17 @@ +package com.discord.api.message.allowedmentions; +/* compiled from: MessageAllowedMentions.kt */ +public enum MessageAllowedMentionsTypes { + USERS("users"), + ROLES("roles"), + EVERYONE("everyone"); + + private final String apiStringRepresentation; + + private MessageAllowedMentionsTypes(String str) { + this.apiStringRepresentation = str; + } + + public final String serialize() { + return this.apiStringRepresentation; + } +} diff --git a/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java b/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java index a350e984f1..a5fde27220 100644 --- a/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java +++ b/app/src/main/java/com/discord/api/message/attachment/MessageAttachment.java @@ -15,7 +15,7 @@ public final class MessageAttachment { private final Integer height; /* renamed from: id reason: collision with root package name */ - private final long f1568id; + private final long f1570id; private final String proxyUrl; private final long size; private final String url; @@ -93,7 +93,7 @@ public final class MessageAttachment { return false; } MessageAttachment messageAttachment = (MessageAttachment) obj; - return m.areEqual(this.url, messageAttachment.url) && this.size == messageAttachment.size && this.f1568id == messageAttachment.f1568id && m.areEqual(this.proxyUrl, messageAttachment.proxyUrl) && m.areEqual(this.filename, messageAttachment.filename) && m.areEqual(this.width, messageAttachment.width) && m.areEqual(this.height, messageAttachment.height); + return m.areEqual(this.url, messageAttachment.url) && this.size == messageAttachment.size && this.f1570id == messageAttachment.f1570id && m.areEqual(this.proxyUrl, messageAttachment.proxyUrl) && m.areEqual(this.filename, messageAttachment.filename) && m.areEqual(this.width, messageAttachment.width) && m.areEqual(this.height, messageAttachment.height); } public final String f() { @@ -113,7 +113,7 @@ public final class MessageAttachment { int i = 0; int hashCode = str != null ? str.hashCode() : 0; long j = this.size; - long j2 = this.f1568id; + long j2 = this.f1570id; int i2 = ((((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31; String str2 = this.proxyUrl; int hashCode2 = (i2 + (str2 != null ? str2.hashCode() : 0)) * 31; @@ -134,7 +134,7 @@ public final class MessageAttachment { L.append(", size="); L.append(this.size); L.append(", id="); - L.append(this.f1568id); + L.append(this.f1570id); L.append(", proxyUrl="); L.append(this.proxyUrl); L.append(", filename="); diff --git a/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java b/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java index 9770353a6b..82dc17c606 100644 --- a/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java +++ b/app/src/main/java/com/discord/api/message/reaction/MessageReaction.java @@ -8,13 +8,13 @@ public final class MessageReaction { private final MessageReactionEmoji emoji; /* renamed from: me reason: collision with root package name */ - private final boolean f1569me; + private final boolean f1571me; public MessageReaction(int i, MessageReactionEmoji messageReactionEmoji, boolean z2) { m.checkNotNullParameter(messageReactionEmoji, "emoji"); this.count = i; this.emoji = messageReactionEmoji; - this.f1569me = z2; + this.f1571me = z2; } public final int a() { @@ -26,7 +26,7 @@ public final class MessageReaction { } public final boolean c() { - return this.f1569me; + return this.f1571me; } public boolean equals(Object obj) { @@ -37,14 +37,14 @@ public final class MessageReaction { return false; } MessageReaction messageReaction = (MessageReaction) obj; - return this.count == messageReaction.count && m.areEqual(this.emoji, messageReaction.emoji) && this.f1569me == messageReaction.f1569me; + return this.count == messageReaction.count && m.areEqual(this.emoji, messageReaction.emoji) && this.f1571me == messageReaction.f1571me; } public int hashCode() { int i = this.count * 31; MessageReactionEmoji messageReactionEmoji = this.emoji; int hashCode = (i + (messageReactionEmoji != null ? messageReactionEmoji.hashCode() : 0)) * 31; - boolean z2 = this.f1569me; + boolean z2 = this.f1571me; if (z2) { z2 = true; } @@ -60,6 +60,6 @@ public final class MessageReaction { L.append(", emoji="); L.append(this.emoji); L.append(", me="); - return a.G(L, this.f1569me, ")"); + return a.G(L, this.f1571me, ")"); } } diff --git a/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java b/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java index b8dbcc3680..63df974ba0 100644 --- a/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java +++ b/app/src/main/java/com/discord/api/message/reaction/MessageReactionEmoji.java @@ -7,7 +7,7 @@ public final class MessageReactionEmoji { private final boolean animated; /* renamed from: id reason: collision with root package name */ - private final String f1570id; + private final String f1572id; private final String name; public final boolean a() { @@ -15,11 +15,11 @@ public final class MessageReactionEmoji { } public final String b() { - return this.f1570id; + return this.f1572id; } public final String c() { - String str = this.f1570id; + String str = this.f1572id; if (str != null) { return str; } @@ -33,7 +33,7 @@ public final class MessageReactionEmoji { } public final boolean e() { - return this.f1570id != null; + return this.f1572id != null; } public boolean equals(Object obj) { @@ -44,11 +44,11 @@ public final class MessageReactionEmoji { return false; } MessageReactionEmoji messageReactionEmoji = (MessageReactionEmoji) obj; - return m.areEqual(this.f1570id, messageReactionEmoji.f1570id) && m.areEqual(this.name, messageReactionEmoji.name) && this.animated == messageReactionEmoji.animated; + return m.areEqual(this.f1572id, messageReactionEmoji.f1572id) && m.areEqual(this.name, messageReactionEmoji.name) && this.animated == messageReactionEmoji.animated; } public int hashCode() { - String str = this.f1570id; + String str = this.f1572id; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.name; @@ -68,7 +68,7 @@ public final class MessageReactionEmoji { public String toString() { StringBuilder L = a.L("MessageReactionEmoji(id="); - L.append(this.f1570id); + L.append(this.f1572id); L.append(", name="); L.append(this.name); L.append(", animated="); diff --git a/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java b/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java index 9b285c2234..830e3ce56f 100644 --- a/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java +++ b/app/src/main/java/com/discord/api/permission/PermissionOverwrite.java @@ -8,7 +8,7 @@ public final class PermissionOverwrite { private final long deny; /* renamed from: id reason: collision with root package name */ - private final long f1571id; + private final long f1573id; private final Type type; /* compiled from: PermissionOverwrite.kt */ @@ -19,14 +19,14 @@ public final class PermissionOverwrite { public PermissionOverwrite(long j, Type type, long j2, long j3) { m.checkNotNullParameter(type, "type"); - this.f1571id = j; + this.f1573id = j; this.type = type; this.allow = j2; this.deny = j3; } public static PermissionOverwrite b(PermissionOverwrite permissionOverwrite, long j, Type type, long j2, long j3, int i) { - long j4 = (i & 1) != 0 ? permissionOverwrite.f1571id : j; + long j4 = (i & 1) != 0 ? permissionOverwrite.f1573id : j; Type type2 = (i & 2) != 0 ? permissionOverwrite.type : null; long j5 = (i & 4) != 0 ? permissionOverwrite.allow : j2; long j6 = (i & 8) != 0 ? permissionOverwrite.deny : j3; @@ -35,7 +35,7 @@ public final class PermissionOverwrite { } public final long a() { - return this.f1571id; + return this.f1573id; } public final long c() { @@ -47,7 +47,7 @@ public final class PermissionOverwrite { } public final long e() { - return this.f1571id; + return this.f1573id; } public boolean equals(Object obj) { @@ -58,7 +58,7 @@ public final class PermissionOverwrite { return false; } PermissionOverwrite permissionOverwrite = (PermissionOverwrite) obj; - return this.f1571id == permissionOverwrite.f1571id && m.areEqual(this.type, permissionOverwrite.type) && this.allow == permissionOverwrite.allow && this.deny == permissionOverwrite.deny; + return this.f1573id == permissionOverwrite.f1573id && m.areEqual(this.type, permissionOverwrite.type) && this.allow == permissionOverwrite.allow && this.deny == permissionOverwrite.deny; } public final Type f() { @@ -66,7 +66,7 @@ public final class PermissionOverwrite { } public int hashCode() { - long j = this.f1571id; + long j = this.f1573id; int i = ((int) (j ^ (j >>> 32))) * 31; Type type = this.type; int hashCode = type != null ? type.hashCode() : 0; @@ -77,7 +77,7 @@ public final class PermissionOverwrite { public String toString() { StringBuilder L = a.L("PermissionOverwrite(id="); - L.append(this.f1571id); + L.append(this.f1573id); L.append(", type="); L.append(this.type); L.append(", allow="); diff --git a/app/src/main/java/com/discord/api/premium/OutboundPromotion.java b/app/src/main/java/com/discord/api/premium/OutboundPromotion.java index 49391d959a..e61517b390 100644 --- a/app/src/main/java/com/discord/api/premium/OutboundPromotion.java +++ b/app/src/main/java/com/discord/api/premium/OutboundPromotion.java @@ -8,7 +8,7 @@ public final class OutboundPromotion { private final UtcDateTime endDate; /* renamed from: id reason: collision with root package name */ - private final long f1572id; + private final long f1574id; private final String outboundRedemptionModalBody; private final String outboundRedemptionPageLink; private final String outboundRedemptionUrlFormat; @@ -21,7 +21,7 @@ public final class OutboundPromotion { m.checkNotNullParameter(str2, "outboundRedemptionModalBody"); m.checkNotNullParameter(str3, "outboundRedemptionPageLink"); m.checkNotNullParameter(str5, "outboundTermsAndConditions"); - this.f1572id = j; + this.f1574id = j; this.endDate = utcDateTime; this.outboundTitle = str; this.outboundRedemptionModalBody = str2; @@ -35,7 +35,7 @@ public final class OutboundPromotion { } public final long b() { - return this.f1572id; + return this.f1574id; } public final String c() { @@ -58,7 +58,7 @@ public final class OutboundPromotion { return false; } OutboundPromotion outboundPromotion = (OutboundPromotion) obj; - return this.f1572id == outboundPromotion.f1572id && m.areEqual(this.endDate, outboundPromotion.endDate) && m.areEqual(this.outboundTitle, outboundPromotion.outboundTitle) && m.areEqual(this.outboundRedemptionModalBody, outboundPromotion.outboundRedemptionModalBody) && m.areEqual(this.outboundRedemptionPageLink, outboundPromotion.outboundRedemptionPageLink) && m.areEqual(this.outboundRedemptionUrlFormat, outboundPromotion.outboundRedemptionUrlFormat) && m.areEqual(this.outboundTermsAndConditions, outboundPromotion.outboundTermsAndConditions); + return this.f1574id == outboundPromotion.f1574id && m.areEqual(this.endDate, outboundPromotion.endDate) && m.areEqual(this.outboundTitle, outboundPromotion.outboundTitle) && m.areEqual(this.outboundRedemptionModalBody, outboundPromotion.outboundRedemptionModalBody) && m.areEqual(this.outboundRedemptionPageLink, outboundPromotion.outboundRedemptionPageLink) && m.areEqual(this.outboundRedemptionUrlFormat, outboundPromotion.outboundRedemptionUrlFormat) && m.areEqual(this.outboundTermsAndConditions, outboundPromotion.outboundTermsAndConditions); } public final String f() { @@ -66,7 +66,7 @@ public final class OutboundPromotion { } public int hashCode() { - long j = this.f1572id; + long j = this.f1574id; int i = ((int) (j ^ (j >>> 32))) * 31; UtcDateTime utcDateTime = this.endDate; int i2 = 0; @@ -88,7 +88,7 @@ public final class OutboundPromotion { public String toString() { StringBuilder L = a.L("OutboundPromotion(id="); - L.append(this.f1572id); + L.append(this.f1574id); L.append(", endDate="); L.append(this.endDate); L.append(", outboundTitle="); diff --git a/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java b/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java index c1842a7095..dc7a340b1d 100644 --- a/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java +++ b/app/src/main/java/com/discord/api/premium/SubscriptionPlan.java @@ -6,13 +6,13 @@ import d0.z.d.m; public final class SubscriptionPlan { /* renamed from: id reason: collision with root package name */ - private final long f1573id; + private final long f1575id; private final SubscriptionInterval interval; private final int intervalCount; private final String name; public final long a() { - return this.f1573id; + return this.f1575id; } public final SubscriptionInterval b() { @@ -31,11 +31,11 @@ public final class SubscriptionPlan { return false; } SubscriptionPlan subscriptionPlan = (SubscriptionPlan) obj; - return this.f1573id == subscriptionPlan.f1573id && this.intervalCount == subscriptionPlan.intervalCount && m.areEqual(this.interval, subscriptionPlan.interval) && m.areEqual(this.name, subscriptionPlan.name); + return this.f1575id == subscriptionPlan.f1575id && this.intervalCount == subscriptionPlan.intervalCount && m.areEqual(this.interval, subscriptionPlan.interval) && m.areEqual(this.name, subscriptionPlan.name); } public int hashCode() { - long j = this.f1573id; + long j = this.f1575id; int i = ((((int) (j ^ (j >>> 32))) * 31) + this.intervalCount) * 31; SubscriptionInterval subscriptionInterval = this.interval; int i2 = 0; @@ -49,7 +49,7 @@ public final class SubscriptionPlan { public String toString() { StringBuilder L = a.L("SubscriptionPlan(id="); - L.append(this.f1573id); + L.append(this.f1575id); L.append(", intervalCount="); L.append(this.intervalCount); L.append(", interval="); diff --git a/app/src/main/java/com/discord/api/report/ReportNode.java b/app/src/main/java/com/discord/api/report/ReportNode.java index 284abce62e..ca98abd37e 100644 --- a/app/src/main/java/com/discord/api/report/ReportNode.java +++ b/app/src/main/java/com/discord/api/report/ReportNode.java @@ -12,7 +12,7 @@ public final class ReportNode { private final String header; /* renamed from: id reason: collision with root package name */ - private final int f1574id; + private final int f1576id; private final String info; private final String menu_name; private final String subheader; @@ -34,7 +34,7 @@ public final class ReportNode { } public final int e() { - return this.f1574id; + return this.f1576id; } public boolean equals(Object obj) { @@ -45,7 +45,7 @@ public final class ReportNode { return false; } ReportNode reportNode = (ReportNode) obj; - return this.f1574id == reportNode.f1574id && m.areEqual(this.menu_name, reportNode.menu_name) && m.areEqual(this.header, reportNode.header) && m.areEqual(this.subheader, reportNode.subheader) && m.areEqual(this.info, reportNode.info) && m.areEqual(this.description, reportNode.description) && m.areEqual(this.children, reportNode.children) && m.areEqual(this.elements, reportNode.elements) && m.areEqual(this.button, reportNode.button); + return this.f1576id == reportNode.f1576id && m.areEqual(this.menu_name, reportNode.menu_name) && m.areEqual(this.header, reportNode.header) && m.areEqual(this.subheader, reportNode.subheader) && m.areEqual(this.info, reportNode.info) && m.areEqual(this.description, reportNode.description) && m.areEqual(this.children, reportNode.children) && m.areEqual(this.elements, reportNode.elements) && m.areEqual(this.button, reportNode.button); } public final String f() { @@ -57,7 +57,7 @@ public final class ReportNode { } public int hashCode() { - int i = this.f1574id * 31; + int i = this.f1576id * 31; String str = this.menu_name; int i2 = 0; int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31; @@ -82,7 +82,7 @@ public final class ReportNode { public String toString() { StringBuilder L = a.L("ReportNode(id="); - L.append(this.f1574id); + L.append(this.f1576id); L.append(", menu_name="); L.append(this.menu_name); L.append(", header="); diff --git a/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java b/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java index 1f7085e5ed..67a94d28e3 100644 --- a/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java +++ b/app/src/main/java/com/discord/api/report/ReportSubmissionBody.java @@ -14,7 +14,7 @@ public final class ReportSubmissionBody { private final Long guild_id; /* renamed from: id reason: collision with root package name */ - private final long f1575id; + private final long f1577id; private final String language; private final Long message_id; private final String name; @@ -39,7 +39,7 @@ public final class ReportSubmissionBody { m.checkNotNullParameter(str4, "version"); m.checkNotNullParameter(list, "breadcrumbs"); m.checkNotNullParameter(map, "elements"); - this.f1575id = j; + this.f1577id = j; this.message_id = l; this.channel_id = j2; this.guild_id = l2; @@ -59,11 +59,11 @@ public final class ReportSubmissionBody { return false; } ReportSubmissionBody reportSubmissionBody = (ReportSubmissionBody) obj; - return this.f1575id == reportSubmissionBody.f1575id && m.areEqual(this.message_id, reportSubmissionBody.message_id) && this.channel_id == reportSubmissionBody.channel_id && m.areEqual(this.guild_id, reportSubmissionBody.guild_id) && m.areEqual(this.language, reportSubmissionBody.language) && m.areEqual(this.variant, reportSubmissionBody.variant) && m.areEqual(this.name, reportSubmissionBody.name) && m.areEqual(this.version, reportSubmissionBody.version) && m.areEqual(this.breadcrumbs, reportSubmissionBody.breadcrumbs) && m.areEqual(this.elements, reportSubmissionBody.elements); + return this.f1577id == reportSubmissionBody.f1577id && m.areEqual(this.message_id, reportSubmissionBody.message_id) && this.channel_id == reportSubmissionBody.channel_id && m.areEqual(this.guild_id, reportSubmissionBody.guild_id) && m.areEqual(this.language, reportSubmissionBody.language) && m.areEqual(this.variant, reportSubmissionBody.variant) && m.areEqual(this.name, reportSubmissionBody.name) && m.areEqual(this.version, reportSubmissionBody.version) && m.areEqual(this.breadcrumbs, reportSubmissionBody.breadcrumbs) && m.areEqual(this.elements, reportSubmissionBody.elements); } public int hashCode() { - long j = this.f1575id; + long j = this.f1577id; int i = ((int) (j ^ (j >>> 32))) * 31; Long l = this.message_id; int i2 = 0; @@ -91,7 +91,7 @@ public final class ReportSubmissionBody { public String toString() { StringBuilder L = a.L("ReportSubmissionBody(id="); - L.append(this.f1575id); + L.append(this.f1577id); L.append(", message_id="); L.append(this.message_id); L.append(", channel_id="); diff --git a/app/src/main/java/com/discord/api/role/GuildRole.java b/app/src/main/java/com/discord/api/role/GuildRole.java index 91cc4c3353..c8d6e4e996 100644 --- a/app/src/main/java/com/discord/api/role/GuildRole.java +++ b/app/src/main/java/com/discord/api/role/GuildRole.java @@ -9,7 +9,7 @@ public final class GuildRole implements Serializable { private final boolean hoist; /* renamed from: id reason: collision with root package name */ - private final long f1576id; + private final long f1578id; private final boolean managed; private final boolean mentionable; private final String name; @@ -17,7 +17,7 @@ public final class GuildRole implements Serializable { private final int position; public final long a() { - return this.f1576id; + return this.f1578id; } public final int b() { @@ -45,7 +45,7 @@ public final class GuildRole implements Serializable { return false; } GuildRole guildRole = (GuildRole) obj; - return this.position == guildRole.position && m.areEqual(this.name, guildRole.name) && this.f1576id == guildRole.f1576id && this.color == guildRole.color && this.hoist == guildRole.hoist && this.permissions == guildRole.permissions && this.mentionable == guildRole.mentionable && this.managed == guildRole.managed; + return this.position == guildRole.position && m.areEqual(this.name, guildRole.name) && this.f1578id == guildRole.f1578id && this.color == guildRole.color && this.hoist == guildRole.hoist && this.permissions == guildRole.permissions && this.mentionable == guildRole.mentionable && this.managed == guildRole.managed; } public final String f() { @@ -57,7 +57,7 @@ public final class GuildRole implements Serializable { } public final long getId() { - return this.f1576id; + return this.f1578id; } public final int h() { @@ -69,7 +69,7 @@ public final class GuildRole implements Serializable { int i = this.position * 31; String str = this.name; int hashCode = str != null ? str.hashCode() : 0; - long j = this.f1576id; + long j = this.f1578id; int i2 = (((((i + hashCode) * 31) + ((int) (j ^ (j >>> 32)))) * 31) + this.color) * 31; boolean z2 = this.hoist; int i3 = 1; @@ -103,7 +103,7 @@ public final class GuildRole implements Serializable { L.append(", name="); L.append(this.name); L.append(", id="); - L.append(this.f1576id); + L.append(this.f1578id); L.append(", color="); L.append(this.color); L.append(", hoist="); diff --git a/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java b/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java index d91373a14f..2558e57e41 100644 --- a/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java +++ b/app/src/main/java/com/discord/api/stageinstance/RecommendedStageInstanceGuild.java @@ -10,7 +10,7 @@ public final class RecommendedStageInstanceGuild { private final String icon; /* renamed from: id reason: collision with root package name */ - private final long f1577id; + private final long f1579id; private final String name; public final Set a() { @@ -22,7 +22,7 @@ public final class RecommendedStageInstanceGuild { } public final long c() { - return this.f1577id; + return this.f1579id; } public final String d() { @@ -37,11 +37,11 @@ public final class RecommendedStageInstanceGuild { return false; } RecommendedStageInstanceGuild recommendedStageInstanceGuild = (RecommendedStageInstanceGuild) obj; - return this.f1577id == recommendedStageInstanceGuild.f1577id && m.areEqual(this.name, recommendedStageInstanceGuild.name) && m.areEqual(this.icon, recommendedStageInstanceGuild.icon) && m.areEqual(this.features, recommendedStageInstanceGuild.features); + return this.f1579id == recommendedStageInstanceGuild.f1579id && m.areEqual(this.name, recommendedStageInstanceGuild.name) && m.areEqual(this.icon, recommendedStageInstanceGuild.icon) && m.areEqual(this.features, recommendedStageInstanceGuild.features); } public int hashCode() { - long j = this.f1577id; + long j = this.f1579id; int i = ((int) (j ^ (j >>> 32))) * 31; String str = this.name; int i2 = 0; @@ -57,7 +57,7 @@ public final class RecommendedStageInstanceGuild { public String toString() { StringBuilder L = a.L("RecommendedStageInstanceGuild(id="); - L.append(this.f1577id); + L.append(this.f1579id); L.append(", name="); L.append(this.name); L.append(", icon="); diff --git a/app/src/main/java/com/discord/api/stageinstance/StageInstance.java b/app/src/main/java/com/discord/api/stageinstance/StageInstance.java index 59e7cae667..b98ca7b7f0 100644 --- a/app/src/main/java/com/discord/api/stageinstance/StageInstance.java +++ b/app/src/main/java/com/discord/api/stageinstance/StageInstance.java @@ -8,7 +8,7 @@ public final class StageInstance { private final long guildId; /* renamed from: id reason: collision with root package name */ - private final long f1578id; + private final long f1580id; private final String inviteCode; private final StageInstancePrivacyLevel privacyLevel; private final String topic; @@ -22,7 +22,7 @@ public final class StageInstance { } public final long c() { - return this.f1578id; + return this.f1580id; } public final String d() { @@ -41,7 +41,7 @@ public final class StageInstance { return false; } StageInstance stageInstance = (StageInstance) obj; - return this.f1578id == stageInstance.f1578id && this.guildId == stageInstance.guildId && this.channelId == stageInstance.channelId && m.areEqual(this.topic, stageInstance.topic) && m.areEqual(this.privacyLevel, stageInstance.privacyLevel) && m.areEqual(this.inviteCode, stageInstance.inviteCode); + return this.f1580id == stageInstance.f1580id && this.guildId == stageInstance.guildId && this.channelId == stageInstance.channelId && m.areEqual(this.topic, stageInstance.topic) && m.areEqual(this.privacyLevel, stageInstance.privacyLevel) && m.areEqual(this.inviteCode, stageInstance.inviteCode); } public final String f() { @@ -49,7 +49,7 @@ public final class StageInstance { } public int hashCode() { - long j = this.f1578id; + long j = this.f1580id; long j2 = this.guildId; long j3 = this.channelId; int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31; @@ -67,7 +67,7 @@ public final class StageInstance { public String toString() { StringBuilder L = a.L("StageInstance(id="); - L.append(this.f1578id); + L.append(this.f1580id); L.append(", guildId="); L.append(this.guildId); L.append(", channelId="); diff --git a/app/src/main/java/com/discord/api/sticker/Sticker.java b/app/src/main/java/com/discord/api/sticker/Sticker.java index e9bc58b387..12e05d44dd 100644 --- a/app/src/main/java/com/discord/api/sticker/Sticker.java +++ b/app/src/main/java/com/discord/api/sticker/Sticker.java @@ -11,7 +11,7 @@ public final class Sticker implements Serializable, BaseSticker { private final Long guildId; /* renamed from: id reason: collision with root package name */ - private final long f1579id; + private final long f1581id; private final String name; private final Long packId; private final String tags; @@ -37,7 +37,7 @@ public final class Sticker implements Serializable, BaseSticker { m.checkNotNullParameter(stickerFormatType, "formatType"); m.checkNotNullParameter(str3, "tags"); m.checkNotNullParameter(stickerType, "type"); - this.f1579id = j; + this.f1581id = j; this.packId = l; this.guildId = l2; this.name = str; @@ -69,17 +69,17 @@ public final class Sticker implements Serializable, BaseSticker { @Override // com.discord.api.sticker.BaseSticker public long c() { - return this.f1579id; + return this.f1581id; } - public final String d() { + public final StickerPartial d() { + return new StickerPartial(this.f1581id, this.formatType, this.name); + } + + public final String e() { return this.description; } - public final Long e() { - return this.guildId; - } - @Override // java.lang.Object public boolean equals(Object obj) { if (this == obj) { @@ -89,28 +89,28 @@ public final class Sticker implements Serializable, BaseSticker { return false; } Sticker sticker = (Sticker) obj; - return this.f1579id == sticker.f1579id && m.areEqual(this.packId, sticker.packId) && m.areEqual(this.guildId, sticker.guildId) && m.areEqual(this.name, sticker.name) && m.areEqual(this.description, sticker.description) && m.areEqual(this.formatType, sticker.formatType) && m.areEqual(this.tags, sticker.tags) && m.areEqual(this.type, sticker.type); + return this.f1581id == sticker.f1581id && m.areEqual(this.packId, sticker.packId) && m.areEqual(this.guildId, sticker.guildId) && m.areEqual(this.name, sticker.name) && m.areEqual(this.description, sticker.description) && m.areEqual(this.formatType, sticker.formatType) && m.areEqual(this.tags, sticker.tags) && m.areEqual(this.type, sticker.type); } - public final String f() { + public final Long f() { + return this.guildId; + } + + public final String g() { return this.name; } - public final Long g() { - return this.packId; - } - public final long getId() { - return this.f1579id; + return this.f1581id; } - public final String h() { - return this.tags; + public final Long h() { + return this.packId; } @Override // java.lang.Object public int hashCode() { - long j = this.f1579id; + long j = this.f1581id; int i = ((int) (j ^ (j >>> 32))) * 31; Long l = this.packId; int i2 = 0; @@ -132,11 +132,15 @@ public final class Sticker implements Serializable, BaseSticker { return hashCode6 + i2; } - public final StickerType i() { + public final String i() { + return this.tags; + } + + public final StickerType j() { return this.type; } - public final boolean j() { + public final boolean k() { StickerFormatType stickerFormatType = this.formatType; return stickerFormatType == StickerFormatType.APNG || stickerFormatType == StickerFormatType.LOTTIE; } @@ -144,7 +148,7 @@ public final class Sticker implements Serializable, BaseSticker { @Override // java.lang.Object public String toString() { StringBuilder L = a.L("Sticker(id="); - L.append(this.f1579id); + L.append(this.f1581id); L.append(", packId="); L.append(this.packId); L.append(", guildId="); diff --git a/app/src/main/java/com/discord/api/sticker/StickerPartial.java b/app/src/main/java/com/discord/api/sticker/StickerPartial.java index 92756d6836..5b91d3a935 100644 --- a/app/src/main/java/com/discord/api/sticker/StickerPartial.java +++ b/app/src/main/java/com/discord/api/sticker/StickerPartial.java @@ -9,7 +9,7 @@ public final class StickerPartial implements Serializable, BaseSticker { private final StickerFormatType formatType; /* renamed from: id reason: collision with root package name */ - private final long f1580id; + private final long f1582id; private final String name; public final /* synthetic */ class WhenMappings { @@ -26,6 +26,14 @@ public final class StickerPartial implements Serializable, BaseSticker { } } + public StickerPartial(long j, StickerFormatType stickerFormatType, String str) { + m.checkNotNullParameter(stickerFormatType, "formatType"); + m.checkNotNullParameter(str, "name"); + this.f1582id = j; + this.formatType = stickerFormatType; + this.name = str; + } + @Override // com.discord.api.sticker.BaseSticker public StickerFormatType a() { return this.formatType; @@ -48,7 +56,7 @@ public final class StickerPartial implements Serializable, BaseSticker { @Override // com.discord.api.sticker.BaseSticker public long c() { - return this.f1580id; + return this.f1582id; } public final String d() { @@ -64,16 +72,16 @@ public final class StickerPartial implements Serializable, BaseSticker { return false; } StickerPartial stickerPartial = (StickerPartial) obj; - return this.f1580id == stickerPartial.f1580id && m.areEqual(this.formatType, stickerPartial.formatType) && m.areEqual(this.name, stickerPartial.name); + return this.f1582id == stickerPartial.f1582id && m.areEqual(this.formatType, stickerPartial.formatType) && m.areEqual(this.name, stickerPartial.name); } public final long getId() { - return this.f1580id; + return this.f1582id; } @Override // java.lang.Object public int hashCode() { - long j = this.f1580id; + long j = this.f1582id; int i = ((int) (j ^ (j >>> 32))) * 31; StickerFormatType stickerFormatType = this.formatType; int i2 = 0; @@ -88,7 +96,7 @@ public final class StickerPartial implements Serializable, BaseSticker { @Override // java.lang.Object public String toString() { StringBuilder L = a.L("StickerPartial(id="); - L.append(this.f1580id); + L.append(this.f1582id); L.append(", formatType="); L.append(this.formatType); L.append(", name="); diff --git a/app/src/main/java/com/discord/api/thread/ThreadMember.java b/app/src/main/java/com/discord/api/thread/ThreadMember.java index c647e4c726..b68a764c46 100644 --- a/app/src/main/java/com/discord/api/thread/ThreadMember.java +++ b/app/src/main/java/com/discord/api/thread/ThreadMember.java @@ -9,13 +9,13 @@ public final class ThreadMember { private final int flags; /* renamed from: id reason: collision with root package name */ - private final long f1581id; + private final long f1583id; private final UtcDateTime joinTimestamp; private final long userId; public ThreadMember(long j, long j2, int i, UtcDateTime utcDateTime) { m.checkNotNullParameter(utcDateTime, "joinTimestamp"); - this.f1581id = j; + this.f1583id = j; this.userId = j2; this.flags = i; this.joinTimestamp = utcDateTime; @@ -23,7 +23,7 @@ public final class ThreadMember { public static ThreadMember a(ThreadMember threadMember, long j, long j2, int i, UtcDateTime utcDateTime, int i2) { if ((i2 & 1) != 0) { - j = threadMember.f1581id; + j = threadMember.f1583id; } if ((i2 & 2) != 0) { j2 = threadMember.userId; @@ -42,7 +42,7 @@ public final class ThreadMember { } public final long c() { - return this.f1581id; + return this.f1583id; } public final UtcDateTime d() { @@ -61,11 +61,11 @@ public final class ThreadMember { return false; } ThreadMember threadMember = (ThreadMember) obj; - return this.f1581id == threadMember.f1581id && this.userId == threadMember.userId && this.flags == threadMember.flags && m.areEqual(this.joinTimestamp, threadMember.joinTimestamp); + return this.f1583id == threadMember.f1583id && this.userId == threadMember.userId && this.flags == threadMember.flags && m.areEqual(this.joinTimestamp, threadMember.joinTimestamp); } public int hashCode() { - long j = this.f1581id; + long j = this.f1583id; long j2 = this.userId; int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.flags) * 31; UtcDateTime utcDateTime = this.joinTimestamp; @@ -74,7 +74,7 @@ public final class ThreadMember { public String toString() { StringBuilder L = a.L("ThreadMember(id="); - L.append(this.f1581id); + L.append(this.f1583id); L.append(", userId="); L.append(this.userId); L.append(", flags="); diff --git a/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java b/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java index ef5685f9ea..d6dcfd3a92 100644 --- a/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java +++ b/app/src/main/java/com/discord/api/thread/ThreadMemberUpdate.java @@ -9,7 +9,7 @@ public final class ThreadMemberUpdate { private final long guildId; /* renamed from: id reason: collision with root package name */ - private final long f1582id; + private final long f1584id; private final UtcDateTime joinTimestamp; private final long userId; @@ -22,7 +22,7 @@ public final class ThreadMemberUpdate { } public final long c() { - return this.f1582id; + return this.f1584id; } public final UtcDateTime d() { @@ -41,11 +41,11 @@ public final class ThreadMemberUpdate { return false; } ThreadMemberUpdate threadMemberUpdate = (ThreadMemberUpdate) obj; - return this.f1582id == threadMemberUpdate.f1582id && this.guildId == threadMemberUpdate.guildId && this.userId == threadMemberUpdate.userId && this.flags == threadMemberUpdate.flags && m.areEqual(this.joinTimestamp, threadMemberUpdate.joinTimestamp); + return this.f1584id == threadMemberUpdate.f1584id && this.guildId == threadMemberUpdate.guildId && this.userId == threadMemberUpdate.userId && this.flags == threadMemberUpdate.flags && m.areEqual(this.joinTimestamp, threadMemberUpdate.joinTimestamp); } public int hashCode() { - long j = this.f1582id; + long j = this.f1584id; long j2 = this.guildId; long j3 = this.userId; int i = ((((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32)))) * 31) + this.flags) * 31; @@ -55,7 +55,7 @@ public final class ThreadMemberUpdate { public String toString() { StringBuilder L = a.L("ThreadMemberUpdate(id="); - L.append(this.f1582id); + L.append(this.f1584id); L.append(", guildId="); L.append(this.guildId); L.append(", userId="); diff --git a/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java b/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java index b4a31fcee6..4873626cb6 100644 --- a/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java +++ b/app/src/main/java/com/discord/api/thread/ThreadMembersUpdate.java @@ -9,7 +9,7 @@ public final class ThreadMembersUpdate { private final long guildId; /* renamed from: id reason: collision with root package name */ - private final long f1583id; + private final long f1585id; private final int memberCount; private final List memberIdsPreview; private final List removedMemberIds; @@ -23,7 +23,7 @@ public final class ThreadMembersUpdate { } public final long c() { - return this.f1583id; + return this.f1585id; } public final List d() { @@ -38,11 +38,11 @@ public final class ThreadMembersUpdate { return false; } ThreadMembersUpdate threadMembersUpdate = (ThreadMembersUpdate) obj; - return this.f1583id == threadMembersUpdate.f1583id && this.guildId == threadMembersUpdate.guildId && this.memberCount == threadMembersUpdate.memberCount && m.areEqual(this.removedMemberIds, threadMembersUpdate.removedMemberIds) && m.areEqual(this.memberIdsPreview, threadMembersUpdate.memberIdsPreview) && m.areEqual(this.addedMembers, threadMembersUpdate.addedMembers); + return this.f1585id == threadMembersUpdate.f1585id && this.guildId == threadMembersUpdate.guildId && this.memberCount == threadMembersUpdate.memberCount && m.areEqual(this.removedMemberIds, threadMembersUpdate.removedMemberIds) && m.areEqual(this.memberIdsPreview, threadMembersUpdate.memberIdsPreview) && m.areEqual(this.addedMembers, threadMembersUpdate.addedMembers); } public int hashCode() { - long j = this.f1583id; + long j = this.f1585id; long j2 = this.guildId; int i = ((((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.memberCount) * 31; List list = this.removedMemberIds; @@ -59,7 +59,7 @@ public final class ThreadMembersUpdate { public String toString() { StringBuilder L = a.L("ThreadMembersUpdate(id="); - L.append(this.f1583id); + L.append(this.f1585id); L.append(", guildId="); L.append(this.guildId); L.append(", memberCount="); diff --git a/app/src/main/java/com/discord/api/user/User.java b/app/src/main/java/com/discord/api/user/User.java index 3561f5f178..ab13f0269d 100644 --- a/app/src/main/java/com/discord/api/user/User.java +++ b/app/src/main/java/com/discord/api/user/User.java @@ -19,7 +19,7 @@ public final class User { private final Integer flags; /* renamed from: id reason: collision with root package name */ - private final long f1584id; + private final long f1586id; private final String locale; private final GuildMember member; private final Boolean mfaEnabled; @@ -35,7 +35,7 @@ public final class User { public User(long j, String str, NullSerializable nullSerializable, NullSerializable nullSerializable2, String str2, Integer num, Integer num2, Boolean bool, Boolean bool2, String str3, String str4, Boolean bool3, String str5, NsfwAllowance nsfwAllowance, Boolean bool4, Phone phone, String str6, PremiumTier premiumTier, Integer num3, GuildMember guildMember, String str7, String str8) { m.checkNotNullParameter(str, "username"); m.checkNotNullParameter(str2, "discriminator"); - this.f1584id = j; + this.f1586id = j; this.username = str; this.avatar = nullSerializable; this.banner = nullSerializable2; @@ -106,7 +106,7 @@ public final class User { return false; } User user = (User) obj; - return this.f1584id == user.f1584id && m.areEqual(this.username, user.username) && m.areEqual(this.avatar, user.avatar) && m.areEqual(this.banner, user.banner) && m.areEqual(this.discriminator, user.discriminator) && m.areEqual(this.publicFlags, user.publicFlags) && m.areEqual(this.flags, user.flags) && m.areEqual(this.bot, user.bot) && m.areEqual(this.system, user.system) && m.areEqual(this.token, user.token) && m.areEqual(this.email, user.email) && m.areEqual(this.verified, user.verified) && m.areEqual(this.locale, user.locale) && m.areEqual(this.nsfwAllowed, user.nsfwAllowed) && m.areEqual(this.mfaEnabled, user.mfaEnabled) && m.areEqual(this.phone, user.phone) && m.areEqual(this.analyticsToken, user.analyticsToken) && m.areEqual(this.premiumType, user.premiumType) && m.areEqual(this.approximateGuildCount, user.approximateGuildCount) && m.areEqual(this.member, user.member) && m.areEqual(this.bio, user.bio) && m.areEqual(this.bannerColor, user.bannerColor); + return this.f1586id == user.f1586id && m.areEqual(this.username, user.username) && m.areEqual(this.avatar, user.avatar) && m.areEqual(this.banner, user.banner) && m.areEqual(this.discriminator, user.discriminator) && m.areEqual(this.publicFlags, user.publicFlags) && m.areEqual(this.flags, user.flags) && m.areEqual(this.bot, user.bot) && m.areEqual(this.system, user.system) && m.areEqual(this.token, user.token) && m.areEqual(this.email, user.email) && m.areEqual(this.verified, user.verified) && m.areEqual(this.locale, user.locale) && m.areEqual(this.nsfwAllowed, user.nsfwAllowed) && m.areEqual(this.mfaEnabled, user.mfaEnabled) && m.areEqual(this.phone, user.phone) && m.areEqual(this.analyticsToken, user.analyticsToken) && m.areEqual(this.premiumType, user.premiumType) && m.areEqual(this.approximateGuildCount, user.approximateGuildCount) && m.areEqual(this.member, user.member) && m.areEqual(this.bio, user.bio) && m.areEqual(this.bannerColor, user.bannerColor); } public final String f() { @@ -122,7 +122,7 @@ public final class User { } public int hashCode() { - long j = this.f1584id; + long j = this.f1586id; int i = ((int) (j ^ (j >>> 32))) * 31; String str = this.username; int i2 = 0; @@ -173,7 +173,7 @@ public final class User { } public final long i() { - return this.f1584id; + return this.f1586id; } public final GuildMember j() { @@ -218,7 +218,7 @@ public final class User { public String toString() { StringBuilder L = a.L("User(id="); - L.append(this.f1584id); + L.append(this.f1586id); L.append(", username="); L.append(this.username); L.append(", avatar="); diff --git a/app/src/main/java/com/discord/app/App.java b/app/src/main/java/com/discord/app/App.java index 6dcb5ad81c..a2c1531ba7 100644 --- a/app/src/main/java/com/discord/app/App.java +++ b/app/src/main/java/com/discord/app/App.java @@ -166,13 +166,13 @@ public class App extends Application { m.checkNotNullParameter(this, "application"); AppLog.b = true; AppLog.a = 0; - AppLog.f1590c = PreferenceManager.getDefaultSharedPreferences(this); + AppLog.f1592c = PreferenceManager.getDefaultSharedPreferences(this); LoggingProvider loggingProvider = LoggingProvider.INSTANCE; AppLog appLog = AppLog.g; loggingProvider.init(appLog); c.i.c.c.e(this); String str = null; - if (BuildUtils.INSTANCE.isValidBuildVersionName("80.11 - Stable")) { + if (BuildUtils.INSTANCE.isValidBuildVersionName("81.14 - Stable")) { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true); } else { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false); diff --git a/app/src/main/java/com/discord/app/AppActivity.java b/app/src/main/java/com/discord/app/AppActivity.java index 3d17ba4067..372c8a8347 100644 --- a/app/src/main/java/com/discord/app/AppActivity.java +++ b/app/src/main/java/com/discord/app/AppActivity.java @@ -1,6 +1,5 @@ package com.discord.app; -import android.annotation.SuppressLint; import android.app.Application; import android.content.ContentResolver; import android.content.Context; @@ -87,7 +86,7 @@ public class AppActivity extends c.a.d.d implements AppComponent { public boolean r = true; /* renamed from: s reason: collision with root package name */ - public final Subject f1585s; + public final Subject f1587s; public Toolbar t; public final Lazy u; public Intent v; @@ -97,7 +96,7 @@ public class AppActivity extends c.a.d.d implements AppComponent { public static final class AppAction extends AppActivity { /* renamed from: x reason: collision with root package name */ - public final Lazy f1586x = d0.g.lazy(new a(this)); + public final Lazy f1588x = d0.g.lazy(new a(this)); /* compiled from: AppActivity.kt */ public static final class a extends o implements Function0> { @@ -121,7 +120,7 @@ public class AppActivity extends c.a.d.d implements AppComponent { @Override // com.discord.app.AppActivity public Class d() { - return (Class) this.f1586x.getValue(); + return (Class) this.f1588x.getValue(); } @Override // com.discord.app.AppActivity, androidx.appcompat.app.AppCompatActivity, androidx.fragment.app.FragmentActivity, androidx.activity.ComponentActivity, androidx.core.app.ComponentActivity, android.app.Activity @@ -137,11 +136,11 @@ public class AppActivity extends c.a.d.d implements AppComponent { public static final class Call extends AppActivity { /* renamed from: x reason: collision with root package name */ - public final Class f1587x = WidgetCallFullscreen.class; + public final Class f1589x = WidgetCallFullscreen.class; @Override // com.discord.app.AppActivity public Class d() { - return this.f1587x; + return this.f1589x; } } @@ -149,11 +148,11 @@ public class AppActivity extends c.a.d.d implements AppComponent { public static final class IncomingCall extends AppActivity { /* renamed from: x reason: collision with root package name */ - public final Class f1588x = WidgetVoiceCallIncoming.SystemCallIncoming.class; + public final Class f1590x = WidgetVoiceCallIncoming.SystemCallIncoming.class; @Override // com.discord.app.AppActivity public Class d() { - return this.f1588x; + return this.f1590x; } } @@ -423,7 +422,7 @@ public class AppActivity extends c.a.d.d implements AppComponent { public AppActivity() { PublishSubject l0 = PublishSubject.l0(); m.checkNotNullExpressionValue(l0, "PublishSubject.create()"); - this.f1585s = l0; + this.f1587s = l0; this.u = d0.g.lazy(new e(this)); this.v = m; int i = AppPermissionsRequests.a; @@ -436,11 +435,13 @@ public class AppActivity extends c.a.d.d implements AppComponent { z2 = true; } if (appActivity.r) { + appActivity.finish(); if (z2) { - appActivity.getIntent().putExtra("transition", AppTransitionActivity.Transition.TYPE_FADE); + AppTransitionActivity.Transition transition = AppTransitionActivity.Transition.TYPE_FADE; + appActivity.overridePendingTransition(transition.getAnimations().f1593c, transition.getAnimations().d); + appActivity.getIntent().putExtra("transition", transition); } l.d(appActivity, appActivity.d(), appActivity.getIntent()); - appActivity.finish(); } } @@ -575,7 +576,7 @@ public class AppActivity extends c.a.d.d implements AppComponent { @Override // com.discord.app.AppComponent public Subject getUnsubscribeSignal() { - return this.f1585s; + return this.f1587s; } public final boolean h(d0.e0.c cVar) { @@ -684,7 +685,6 @@ public class AppActivity extends c.a.d.d implements AppComponent { } @Override // androidx.appcompat.app.AppCompatActivity, androidx.fragment.app.FragmentActivity, androidx.activity.ComponentActivity, androidx.core.app.ComponentActivity, android.app.Activity - @SuppressLint({"MissingSuperCall"}) public void onCreate(Bundle bundle) { super.onCreate(bundle); a aVar = new a(0, this); @@ -760,7 +760,7 @@ public class AppActivity extends c.a.d.d implements AppComponent { @Override // com.discord.app.AppTransitionActivity, androidx.fragment.app.FragmentActivity, android.app.Activity public void onPause() { super.onPause(); - this.f1585s.onNext(null); + this.f1587s.onNext(null); } @Override // com.discord.app.AppTransitionActivity, androidx.fragment.app.FragmentActivity, android.app.Activity diff --git a/app/src/main/java/com/discord/app/AppBottomSheet.java b/app/src/main/java/com/discord/app/AppBottomSheet.java index b01e38d037..799eb68a5b 100644 --- a/app/src/main/java/com/discord/app/AppBottomSheet.java +++ b/app/src/main/java/com/discord/app/AppBottomSheet.java @@ -49,15 +49,15 @@ public abstract class AppBottomSheet extends BottomSheetDialogFragment implement public static final a b = new a(1); /* renamed from: c reason: collision with root package name */ - public final /* synthetic */ int f1589c; + public final /* synthetic */ int f1591c; public a(int i) { - this.f1589c = i; + this.f1591c = i; } @Override // androidx.core.view.OnApplyWindowInsetsListener public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) { - int i = this.f1589c; + int i = this.f1591c; if (i == 0) { m.checkNotNullParameter(view, "v"); m.checkNotNullParameter(windowInsetsCompat, "insets"); diff --git a/app/src/main/java/com/discord/app/AppFragment.java b/app/src/main/java/com/discord/app/AppFragment.java index cf218732f3..69edd52a5d 100644 --- a/app/src/main/java/com/discord/app/AppFragment.java +++ b/app/src/main/java/com/discord/app/AppFragment.java @@ -79,7 +79,7 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP @Override // com.discord.media_picker.MediaPicker.a public void a(Exception exc) { m.checkNotNullParameter(exc, "e"); - c.a.d.o.h(this.a.getContext(), c.a.l.b.j(this.a, 2131894100, new Object[]{exc.getMessage()}, null, 4), 0, null, 12); + c.a.d.o.h(this.a.getContext(), c.a.l.b.j(this.a, 2131894139, new Object[]{exc.getMessage()}, null, 4), 0, null, 12); } @Override // com.discord.media_picker.MediaPicker.a @@ -111,7 +111,7 @@ public abstract class AppFragment extends Fragment implements AppComponent, AppP public Unit mo1invoke() { MediaPicker mediaPicker = MediaPicker.a; AppFragment appFragment = this.this$0; - CharSequence j = c.a.l.b.j(appFragment, 2131887371, new Object[0], null, 4); + CharSequence j = c.a.l.b.j(appFragment, 2131887373, new Object[0], null, 4); e eVar = new e(this); m.checkNotNullParameter(appFragment, "provider"); m.checkNotNullParameter(j, "chooserTitle"); diff --git a/app/src/main/java/com/discord/app/AppLog.java b/app/src/main/java/com/discord/app/AppLog.java index 29e1c92ca2..a7225b767e 100644 --- a/app/src/main/java/com/discord/app/AppLog.java +++ b/app/src/main/java/com/discord/app/AppLog.java @@ -35,7 +35,7 @@ public final class AppLog extends Logger { public static boolean b; /* renamed from: c reason: collision with root package name */ - public static SharedPreferences f1590c; + public static SharedPreferences f1592c; public static final SerializedSubject d = new SerializedSubject<>(new j0.q.a(new a.d(new a.c(5000)))); public static boolean e; public static final String[] f = {"com.discord", "co.discord"}; @@ -349,7 +349,7 @@ public final class AppLog extends Logger { public static final void g(Long l, String str, String str2) { String str3; if (b) { - SharedPreferences sharedPreferences = f1590c; + SharedPreferences sharedPreferences = f1592c; if (sharedPreferences != null) { SharedPreferences.Editor edit = sharedPreferences.edit(); m.checkExpressionValueIsNotNull(edit, "editor"); diff --git a/app/src/main/java/com/discord/app/AppTransitionActivity.java b/app/src/main/java/com/discord/app/AppTransitionActivity.java index dd7783b611..71e4bf6769 100644 --- a/app/src/main/java/com/discord/app/AppTransitionActivity.java +++ b/app/src/main/java/com/discord/app/AppTransitionActivity.java @@ -49,13 +49,13 @@ public abstract class AppTransitionActivity extends AppCompatActivity { public final int b; /* renamed from: c reason: collision with root package name */ - public final int f1591c; + public final int f1593c; public final int d; public a(@AnimRes int i, @AnimRes int i2, @AnimRes int i3, @AnimRes int i4) { this.a = i; this.b = i2; - this.f1591c = i3; + this.f1593c = i3; this.d = i4; } } @@ -66,7 +66,7 @@ public abstract class AppTransitionActivity extends AppCompatActivity { return; } if ((z2 || z3) && (aVar = this.j) != null) { - overridePendingTransition(z3 ? aVar.a : aVar.f1591c, z3 ? aVar.b : aVar.d); + overridePendingTransition(z3 ? aVar.a : aVar.f1593c, z3 ? aVar.b : aVar.d); } } diff --git a/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java b/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java index 3cc437182e..8786094ad5 100644 --- a/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java +++ b/app/src/main/java/com/discord/app/AudioManagerFeatureFlag.java @@ -13,7 +13,7 @@ public final class AudioManagerFeatureFlag { public static final AudioManagerFeatureFlag b = null; /* renamed from: c reason: collision with root package name */ - public int f1592c; + public int f1594c; public final SharedPreferences d; /* compiled from: AudioManagerFeatureFlag.kt */ @@ -40,10 +40,10 @@ public final class AudioManagerFeatureFlag { SharedPreferences sharedPreferences2 = (i & 1) != 0 ? SharedPreferencesProvider.INSTANCE.get() : null; m.checkNotNullParameter(sharedPreferences2, "sharedPreferences"); this.d = sharedPreferences2; - this.f1592c = -1; + this.f1594c = -1; int i2 = sharedPreferences2.getInt("CACHE_KEY_AUDIO_MANAGER_V2_EXPERIMENT_BUCKET", -1); if (i2 != -1) { - this.f1592c = i2; + this.f1594c = i2; } } @@ -52,6 +52,7 @@ public final class AudioManagerFeatureFlag { } public final boolean b() { - return this.f1592c == 2; + int i = this.f1594c; + return i == 2 || i == 3; } } diff --git a/app/src/main/java/com/discord/app/DiscordConnectService.java b/app/src/main/java/com/discord/app/DiscordConnectService.java index b487520633..6b76e7da0e 100644 --- a/app/src/main/java/com/discord/app/DiscordConnectService.java +++ b/app/src/main/java/com/discord/app/DiscordConnectService.java @@ -154,7 +154,7 @@ public final class DiscordConnectService extends Service { m.checkNotNullExpressionValue(simpleName, "DiscordConnectService::class.java.simpleName"); Logger.i$default(appLog, simpleName, "onCreate", null, 4, null); n.f45c.a(this); - startForeground(100, new NotificationCompat.Builder(this, "Social").setAutoCancel(true).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231788).setColor(ColorCompat.getThemedColor(this, 2130969007)).setContentTitle(getString(2131887522)).setContentText(getString(2131887529)).build()); + startForeground(100, new NotificationCompat.Builder(this, "Social").setAutoCancel(true).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231791).setColor(ColorCompat.getThemedColor(this, 2130969007)).setContentTitle(getString(2131887524)).setContentText(getString(2131887531)).build()); StoreStream.Companion companion = StoreStream.Companion; Application application = getApplication(); m.checkNotNullExpressionValue(application, "application"); @@ -198,7 +198,7 @@ public final class DiscordConnectService extends Service { StoreStream.Companion companion = StoreStream.Companion; String authToken$app_productionGoogleRelease = companion.getAuthentication().getAuthToken$app_productionGoogleRelease(); if (authToken$app_productionGoogleRelease == null || t.isBlank(authToken$app_productionGoogleRelease)) { - c.a.d.o.g(this, 2131891693, 0, null, 12); + c.a.d.o.g(this, 2131891730, 0, null, 12); observable2 = Observable.x(new IllegalStateException("UNAUTHED")); m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…ateException(\"UNAUTHED\"))"); } else { @@ -215,7 +215,7 @@ public final class DiscordConnectService extends Service { } if (longOrNull != null) { if (ContextCompat.checkSelfPermission(this, "android.permission.RECORD_AUDIO") != 0) { - c.a.d.o.g(this, 2131891818, 0, null, 12); + c.a.d.o.g(this, 2131891855, 0, null, 12); observable2 = Observable.x(new IllegalStateException("Do not have microphone permissions, go to main app")); m.checkNotNullExpressionValue(observable2, "Observable.error(\n …to main app\")\n )"); } else { diff --git a/app/src/main/java/com/discord/app/RebrandFeatureFlag.java b/app/src/main/java/com/discord/app/RebrandFeatureFlag.java index 3618b26bfc..03d3e3e614 100644 --- a/app/src/main/java/com/discord/app/RebrandFeatureFlag.java +++ b/app/src/main/java/com/discord/app/RebrandFeatureFlag.java @@ -18,7 +18,7 @@ public final class RebrandFeatureFlag { public static boolean b; /* renamed from: c reason: collision with root package name */ - public static final RebrandFeatureFlag f1593c = null; + public static final RebrandFeatureFlag f1595c = null; public int d; public final SharedPreferences e; @@ -64,7 +64,7 @@ public final class RebrandFeatureFlag { Experiment experiment2 = experiment; if (experiment2 != null) { this.i.d = experiment2.getBucket(); - RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1593c; + RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c; RebrandFeatureFlag rebrandFeatureFlag2 = this.i; boolean z2 = true; if (rebrandFeatureFlag2.d < 1) { diff --git a/app/src/main/java/com/discord/chips_view/ChipsView.java b/app/src/main/java/com/discord/chips_view/ChipsView.java index f9b93600cb..2a2eac105c 100644 --- a/app/src/main/java/com/discord/chips_view/ChipsView.java +++ b/app/src/main/java/com/discord/chips_view/ChipsView.java @@ -65,20 +65,20 @@ public final class ChipsView extends ScrollView implements d.a { public int r; /* renamed from: s reason: collision with root package name */ - public int f1594s; + public int f1596s; public int t; public int u; public float v; public int w; /* renamed from: x reason: collision with root package name */ - public int f1595x; + public int f1597x; /* renamed from: y reason: collision with root package name */ - public float f1596y; + public float f1598y; /* renamed from: z reason: collision with root package name */ - public final RelativeLayout f1597z; + public final RelativeLayout f1599z; /* compiled from: ChipsView.kt */ public interface a { @@ -181,9 +181,9 @@ public final class ChipsView extends ScrollView implements d.a { m.checkNotNullParameter(attributeSet, "attrs"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - this.f1596y = resources.getDisplayMetrics().density; + this.f1598y = resources.getDisplayMetrics().density; RelativeLayout relativeLayout = new RelativeLayout(getContext()); - this.f1597z = relativeLayout; + this.f1599z = relativeLayout; addView(relativeLayout); LinearLayout linearLayout = new LinearLayout(getContext()); linearLayout.setLayoutParams(new ViewGroup.LayoutParams(0, 0)); @@ -198,26 +198,26 @@ public final class ChipsView extends ScrollView implements d.a { m.checkNotNullExpressionValue(obtainStyledAttributes, "context.theme.obtainStyl…tyleable.ChipsView, 0, 0)"); try { this.k = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_max_height, -1); - this.l = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_vertical_spacing, (int) (((float) 1) * this.f1596y)); - this.m = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_height, (int) (((float) 24) * this.f1596y)); + this.l = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_vertical_spacing, (int) (((float) 1) * this.f1598y)); + this.m = obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_height, (int) (((float) 24) * this.f1598y)); this.n = obtainStyledAttributes.getColor(R.e.ChipsView_cv_color, ContextCompat.getColor(context, 17170432)); this.o = obtainStyledAttributes.getColor(R.e.ChipsView_cv_color_clicked, ContextCompat.getColor(context, 17170443)); this.p = obtainStyledAttributes.getColor(R.e.ChipsView_cv_bg_color, ContextCompat.getColor(context, 17170443)); this.j = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_chip_bg_res, 0); this.q = obtainStyledAttributes.getColor(R.e.ChipsView_cv_bg_color_clicked, ContextCompat.getColor(context, 17170451)); this.r = obtainStyledAttributes.getColor(R.e.ChipsView_cv_text_color, -16777216); - this.f1594s = obtainStyledAttributes.getColor(R.e.ChipsView_cv_text_color_clicked, -1); + this.f1596s = obtainStyledAttributes.getColor(R.e.ChipsView_cv_text_color_clicked, -1); this.w = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_hint, 0); obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_icon_placeholder, 0); this.t = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_icon_delete, 0); this.u = obtainStyledAttributes.getColor(R.e.ChipsView_cv_search_text_color, -16777216); this.v = (float) obtainStyledAttributes.getDimensionPixelSize(R.e.ChipsView_cv_search_text_size, 49); - this.f1595x = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_chip_layout, R.d.view_chip_default); + this.f1597x = obtainStyledAttributes.getResourceId(R.e.ChipsView_cv_chip_layout, R.d.view_chip_default); obtainStyledAttributes.recycle(); int i2 = this.m + this.l; RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(-1, i2); float f = (float) 4; - layoutParams.leftMargin = (int) (this.f1596y * f); + layoutParams.leftMargin = (int) (this.f1598y * f); layoutParams.addRule(12, -1); dVar.setLayoutParams(layoutParams); dVar.setPadding(0, 0, 0, this.l); @@ -232,7 +232,7 @@ public final class ChipsView extends ScrollView implements d.a { e eVar = new e(context3, i2); eVar.setOrientation(1); eVar.setLayoutParams(new ViewGroup.LayoutParams(-1, -2)); - eVar.setPadding(0, (int) (f * this.f1596y), 0, 0); + eVar.setPadding(0, (int) (f * this.f1598y), 0, 0); this.B = eVar; relativeLayout.addView(eVar); relativeLayout.setOnClickListener(new h(this)); @@ -253,7 +253,7 @@ public final class ChipsView extends ScrollView implements d.a { public final void b(String str, Uri uri, K k, V v) { if (!this.C.containsKey(k)) { this.A.setText(""); - c.a.f.a aVar = new c.a.f.a<>(str, uri, k, v, false, new a.C0023a(this.q, this.f1596y, this.j, this.p, this.r, this.t, this.f1594s, this.o, this.n, this.m, this.f1595x), this); + c.a.f.a aVar = new c.a.f.a<>(str, uri, k, v, false, new a.C0023a(this.q, this.f1598y, this.j, this.p, this.r, this.t, this.f1596s, this.o, this.n, this.m, this.f1597x), this); this.C.put(k, aVar); Function1 function1 = this.E; if (function1 != null) { diff --git a/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java b/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java index b31a739324..d5892aea6b 100644 --- a/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java +++ b/app/src/main/java/com/discord/databinding/AnchoredVoiceControlsViewBinding.java @@ -14,7 +14,7 @@ public final class AnchoredVoiceControlsViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1598c; + public final ImageView f1600c; @NonNull public final ImageView d; @NonNull @@ -27,7 +27,7 @@ public final class AnchoredVoiceControlsViewBinding implements ViewBinding { public AnchoredVoiceControlsViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton, @NonNull ImageView imageView4, @NonNull ImageView imageView5) { this.a = linearLayout; this.b = imageView; - this.f1598c = imageView2; + this.f1600c = imageView2; this.d = imageView3; this.e = materialButton; this.f = imageView4; diff --git a/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java b/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java index ca51fafd4a..2a0f20a3a8 100644 --- a/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java +++ b/app/src/main/java/com/discord/databinding/CommandCategoryItemBinding.java @@ -14,12 +14,12 @@ public final class CommandCategoryItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final n f1599c; + public final n f1601c; public CommandCategoryItemBinding(@NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull n nVar) { this.a = frameLayout; this.b = simpleDraweeView; - this.f1599c = nVar; + this.f1601c = nVar; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java b/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java index b78d470a2d..249bab6c40 100644 --- a/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/ConfirmRemovePermissionDialogBinding.java @@ -15,14 +15,14 @@ public final class ConfirmRemovePermissionDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1600c; + public final MaterialButton f1602c; @NonNull public final LoadingButton d; public ConfirmRemovePermissionDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull LinearLayout linearLayout2) { this.a = linearLayout; this.b = textView; - this.f1600c = materialButton; + this.f1602c = materialButton; this.d = loadingButton; } diff --git a/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java b/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java index 423a277e09..98902b1d4b 100644 --- a/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/ContactSyncPermissionsSheetBinding.java @@ -15,7 +15,7 @@ public final class ContactSyncPermissionsSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1601c; + public final CheckedSetting f1603c; @NonNull public final LinkifiedTextView d; @NonNull @@ -24,7 +24,7 @@ public final class ContactSyncPermissionsSheetBinding implements ViewBinding { public ContactSyncPermissionsSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView3) { this.a = constraintLayout; this.b = checkedSetting; - this.f1601c = checkedSetting2; + this.f1603c = checkedSetting2; this.d = linkifiedTextView; this.e = checkedSetting3; } diff --git a/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java b/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java index fba1e5ff7c..669e997066 100644 --- a/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/ContactSyncUpsellSheetBinding.java @@ -16,14 +16,14 @@ public final class ContactSyncUpsellSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1602c; + public final MaterialButton f1604c; @NonNull public final g0 d; public ContactSyncUpsellSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull g0 g0Var) { this.a = constraintLayout; this.b = materialButton; - this.f1602c = materialButton2; + this.f1604c = materialButton2; this.d = g0Var; } diff --git a/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java b/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java index 695f878fc0..1728b016a5 100644 --- a/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java +++ b/app/src/main/java/com/discord/databinding/EmojiCategoryItemGuildBinding.java @@ -14,12 +14,12 @@ public final class EmojiCategoryItemGuildBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final n f1603c; + public final n f1605c; public EmojiCategoryItemGuildBinding(@NonNull FrameLayout frameLayout, @NonNull GuildIcon guildIcon, @NonNull n nVar) { this.a = frameLayout; this.b = guildIcon; - this.f1603c = nVar; + this.f1605c = nVar; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java b/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java index 6956a3b016..e4face7cbd 100644 --- a/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java +++ b/app/src/main/java/com/discord/databinding/EmojiCategoryItemStandardBinding.java @@ -14,12 +14,12 @@ public final class EmojiCategoryItemStandardBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final n f1604c; + public final n f1606c; public EmojiCategoryItemStandardBinding(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull n nVar) { this.a = frameLayout; this.b = imageView; - this.f1604c = nVar; + this.f1606c = nVar; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java b/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java index bdc7722a2b..6d0ed295f8 100644 --- a/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java +++ b/app/src/main/java/com/discord/databinding/EmptyFriendsStateContactSyncViewBinding.java @@ -16,14 +16,14 @@ public final class EmptyFriendsStateContactSyncViewBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1605c; + public final MaterialButton f1607c; @NonNull public final TextView d; public EmptyFriendsStateContactSyncViewBinding(@NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull TextView textView2) { this.a = view; this.b = textView; - this.f1605c = materialButton; + this.f1607c = materialButton; this.d = textView2; } @@ -33,14 +33,14 @@ public final class EmptyFriendsStateContactSyncViewBinding implements ViewBindin int i = 2131362824; TextView textView = (TextView) viewGroup.findViewById(2131362824); if (textView != null) { - i = 2131363026; - MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363026); + i = 2131363028; + MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363028); if (materialButton != null) { - i = 2131363027; - ImageView imageView = (ImageView) viewGroup.findViewById(2131363027); + i = 2131363029; + ImageView imageView = (ImageView) viewGroup.findViewById(2131363029); if (imageView != null) { - i = 2131363028; - TextView textView2 = (TextView) viewGroup.findViewById(2131363028); + i = 2131363030; + TextView textView2 = (TextView) viewGroup.findViewById(2131363030); if (textView2 != null) { return new EmptyFriendsStateContactSyncViewBinding(viewGroup, textView, materialButton, imageView, textView2); } diff --git a/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java b/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java index bceaffd01d..dda2e9ff0c 100644 --- a/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java +++ b/app/src/main/java/com/discord/databinding/EmptyFriendsStateViewBinding.java @@ -17,26 +17,26 @@ public final class EmptyFriendsStateViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1606c; + public final TextView f1608c; public EmptyFriendsStateViewBinding(@NonNull View view, @NonNull MaterialButton materialButton, @Nullable ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = view; this.b = materialButton; - this.f1606c = textView; + this.f1608c = textView; } @NonNull public static EmptyFriendsStateViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) { layoutInflater.inflate(2131558486, viewGroup); - int i = 2131363025; - MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363025); + int i = 2131363027; + MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363027); if (materialButton != null) { - ImageView imageView = (ImageView) viewGroup.findViewById(2131363029); - i = 2131363030; - TextView textView = (TextView) viewGroup.findViewById(2131363030); + ImageView imageView = (ImageView) viewGroup.findViewById(2131363031); + i = 2131363032; + TextView textView = (TextView) viewGroup.findViewById(2131363032); if (textView != null) { - i = 2131365129; - TextView textView2 = (TextView) viewGroup.findViewById(2131365129); + i = 2131365133; + TextView textView2 = (TextView) viewGroup.findViewById(2131365133); if (textView2 != null) { return new EmptyFriendsStateViewBinding(viewGroup, materialButton, imageView, textView, textView2); } diff --git a/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java b/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java index 3edf5b300e..8e2b57a192 100644 --- a/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java +++ b/app/src/main/java/com/discord/databinding/FeedbackViewBinding.java @@ -18,7 +18,7 @@ public final class FeedbackViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1607c; + public final TextView f1609c; @NonNull public final CardView d; @NonNull @@ -35,7 +35,7 @@ public final class FeedbackViewBinding implements ViewBinding { public FeedbackViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageButton imageButton, @NonNull TextView textView, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull ImageButton imageButton2, @NonNull ConstraintLayout constraintLayout, @NonNull TextView textView2, @NonNull ImageView imageView) { this.a = linearLayout; this.b = imageButton; - this.f1607c = textView; + this.f1609c = textView; this.d = cardView; this.e = recyclerView; this.f = imageButton2; diff --git a/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java b/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java index 5df4ad4778..7aa5dc28c0 100644 --- a/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java +++ b/app/src/main/java/com/discord/databinding/GifCategoryItemViewBinding.java @@ -15,14 +15,14 @@ public final class GifCategoryItemViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1608c; + public final SimpleDraweeView f1610c; @NonNull public final TextView d; public GifCategoryItemViewBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = cardView; this.b = imageView; - this.f1608c = simpleDraweeView; + this.f1610c = simpleDraweeView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java b/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java index 7effea971d..b215e61d26 100644 --- a/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java +++ b/app/src/main/java/com/discord/databinding/GifSuggestedTermViewBinding.java @@ -14,12 +14,12 @@ public final class GifSuggestedTermViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1609c; + public final TextView f1611c; public GifSuggestedTermViewBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull FlexboxLayout flexboxLayout, @NonNull TextView textView) { this.a = linearLayout; this.b = flexboxLayout; - this.f1609c = textView; + this.f1611c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java index cb1bbfa4ed..c56ad25fbe 100644 --- a/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/GroupInviteFriendsBottomSheetBinding.java @@ -15,7 +15,7 @@ public final class GroupInviteFriendsBottomSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1610c; + public final RecyclerView f1612c; @NonNull public final ConstraintLayout d; @NonNull @@ -24,7 +24,7 @@ public final class GroupInviteFriendsBottomSheetBinding implements ViewBinding { public GroupInviteFriendsBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ChipsView chipsView, @NonNull RecyclerView recyclerView, @NonNull ConstraintLayout constraintLayout2, @NonNull AppCompatImageView appCompatImageView) { this.a = constraintLayout; this.b = chipsView; - this.f1610c = recyclerView; + this.f1612c = recyclerView; this.d = constraintLayout2; this.e = appCompatImageView; } diff --git a/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java b/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java index 53d27c13a0..8a76babcca 100644 --- a/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java +++ b/app/src/main/java/com/discord/databinding/GroupInviteFriendsSheetItemBinding.java @@ -15,14 +15,14 @@ public final class GroupInviteFriendsSheetItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1611c; + public final TextView f1613c; @NonNull public final MaterialCheckBox d; public GroupInviteFriendsSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialCheckBox materialCheckBox) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1611c = textView; + this.f1613c = textView; this.d = materialCheckBox; } diff --git a/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java b/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java index b9b4b4ac69..b376394ace 100644 --- a/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java +++ b/app/src/main/java/com/discord/databinding/GuildTemplateChannelsItemViewBinding.java @@ -14,12 +14,12 @@ public final class GuildTemplateChannelsItemViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1612c; + public final TextView f1614c; public GuildTemplateChannelsItemViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = linearLayout; this.b = imageView; - this.f1612c = textView; + this.f1614c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java b/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java index 5d602d608b..d957c08812 100644 --- a/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java +++ b/app/src/main/java/com/discord/databinding/InlineMediaViewBinding.java @@ -17,7 +17,7 @@ public final class InlineMediaViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1613c; + public final SimpleDraweeView f1615c; @NonNull public final ProgressBar d; @NonNull @@ -30,7 +30,7 @@ public final class InlineMediaViewBinding implements ViewBinding { public InlineMediaViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ProgressBar progressBar, @NonNull ImageView imageView2, @NonNull PlayerView playerView, @NonNull ImageView imageView3) { this.a = view; this.b = imageView; - this.f1613c = simpleDraweeView; + this.f1615c = simpleDraweeView; this.d = progressBar; this.e = imageView2; this.f = playerView; @@ -40,23 +40,23 @@ public final class InlineMediaViewBinding implements ViewBinding { @NonNull public static InlineMediaViewBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) { layoutInflater.inflate(2131558526, viewGroup); - int i = 2131363576; - ImageView imageView = (ImageView) viewGroup.findViewById(2131363576); + int i = 2131363578; + ImageView imageView = (ImageView) viewGroup.findViewById(2131363578); if (imageView != null) { - i = 2131363577; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363577); + i = 2131363579; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363579); if (simpleDraweeView != null) { - i = 2131363578; - ProgressBar progressBar = (ProgressBar) viewGroup.findViewById(2131363578); + i = 2131363580; + ProgressBar progressBar = (ProgressBar) viewGroup.findViewById(2131363580); if (progressBar != null) { - i = 2131363579; - ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363579); + i = 2131363581; + ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363581); if (imageView2 != null) { - i = 2131363580; - PlayerView playerView = (PlayerView) viewGroup.findViewById(2131363580); + i = 2131363582; + PlayerView playerView = (PlayerView) viewGroup.findViewById(2131363582); if (playerView != null) { - i = 2131363581; - ImageView imageView3 = (ImageView) viewGroup.findViewById(2131363581); + i = 2131363583; + ImageView imageView3 = (ImageView) viewGroup.findViewById(2131363583); if (imageView3 != null) { return new InlineMediaViewBinding(viewGroup, imageView, simpleDraweeView, progressBar, imageView2, playerView, imageView3); } diff --git a/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java b/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java index b1fc0d9172..eec5931aa1 100644 --- a/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java +++ b/app/src/main/java/com/discord/databinding/LayoutUnhandledUriBinding.java @@ -14,12 +14,12 @@ public final class LayoutUnhandledUriBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1614c; + public final MaterialButton f1616c; public LayoutUnhandledUriBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton) { this.a = linearLayout; this.b = textView; - this.f1614c = materialButton; + this.f1616c = materialButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java b/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java index de951a9045..b9588eb603 100644 --- a/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/LeaveGuildDialogBinding.java @@ -15,7 +15,7 @@ public final class LeaveGuildDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LoadingButton f1615c; + public final LoadingButton f1617c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class LeaveGuildDialogBinding implements ViewBinding { public LeaveGuildDialogBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2) { this.a = linearLayout; this.b = materialButton; - this.f1615c = loadingButton; + this.f1617c = loadingButton; this.d = textView; this.e = textView2; } diff --git a/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java b/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java index 7077a45a8c..455d373748 100644 --- a/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java +++ b/app/src/main/java/com/discord/databinding/NotificationMuteSettingsViewBinding.java @@ -13,14 +13,14 @@ public final class NotificationMuteSettingsViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1616c; + public final TextView f1618c; @NonNull public final TextView d; public NotificationMuteSettingsViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = linearLayout; this.b = textView; - this.f1616c = textView2; + this.f1618c = textView2; this.d = textView3; } diff --git a/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java b/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java index 7c0f5a79ad..dc8c74fb7f 100644 --- a/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/OauthTokenPermissionDetailedListItemBinding.java @@ -14,12 +14,12 @@ public final class OauthTokenPermissionDetailedListItemBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1617c; + public final TextView f1619c; public OauthTokenPermissionDetailedListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = constraintLayout; this.b = imageView; - this.f1617c = textView; + this.f1619c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java b/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java index d4d8946be3..dfddc85b4d 100644 --- a/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/PaymentMethodListItemBinding.java @@ -14,12 +14,12 @@ public final class PaymentMethodListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final PaymentSourceView f1618c; + public final PaymentSourceView f1620c; public PaymentMethodListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull PaymentSourceView paymentSourceView) { this.a = relativeLayout; this.b = materialButton; - this.f1618c = paymentSourceView; + this.f1620c = paymentSourceView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java b/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java index 885b355848..91d02bed14 100644 --- a/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java +++ b/app/src/main/java/com/discord/databinding/PaymentSourceViewBinding.java @@ -14,7 +14,7 @@ public final class PaymentSourceViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1619c; + public final TextView f1621c; @NonNull public final ImageView d; @NonNull @@ -25,7 +25,7 @@ public final class PaymentSourceViewBinding implements ViewBinding { public PaymentSourceViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = view; this.b = imageView; - this.f1619c = textView; + this.f1621c = textView; this.d = imageView2; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java b/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java index 5375825d79..1667195272 100644 --- a/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/PublishMessageDialogBinding.java @@ -14,7 +14,7 @@ public final class PublishMessageDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1620c; + public final MaterialButton f1622c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class PublishMessageDialogBinding implements ViewBinding { public PublishMessageDialogBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = textView; - this.f1620c = materialButton; + this.f1622c = materialButton; this.d = textView2; this.e = linearLayout3; this.f = materialButton2; diff --git a/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java b/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java index 39699f671c..a8e4fab808 100644 --- a/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java +++ b/app/src/main/java/com/discord/databinding/RemovablePermissionOwnerViewBinding.java @@ -14,12 +14,12 @@ public final class RemovablePermissionOwnerViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1621c; + public final ImageView f1623c; public RemovablePermissionOwnerViewBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ChannelPermissionOwnerView channelPermissionOwnerView, @NonNull ImageView imageView) { this.a = constraintLayout; this.b = channelPermissionOwnerView; - this.f1621c = imageView; + this.f1623c = imageView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java b/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java index 063961d837..bb1c4f2856 100644 --- a/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java +++ b/app/src/main/java/com/discord/databinding/SettingsChannelListCategoryItemBinding.java @@ -14,12 +14,12 @@ public final class SettingsChannelListCategoryItemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1622c; + public final TextView f1624c; public SettingsChannelListCategoryItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = relativeLayout; this.b = imageView; - this.f1622c = textView; + this.f1624c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java b/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java index 70993d9715..a62aa19035 100644 --- a/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/SettingsChannelListItemBinding.java @@ -14,7 +14,7 @@ public final class SettingsChannelListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1623c; + public final ImageView f1625c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class SettingsChannelListItemBinding implements ViewBinding { public SettingsChannelListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull View view) { this.a = relativeLayout; this.b = imageView; - this.f1623c = imageView2; + this.f1625c = imageView2; this.d = textView; this.e = view; } diff --git a/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java b/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java index 7940307a0e..9b2f992175 100644 --- a/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/SimpleMemberListItemBinding.java @@ -14,12 +14,12 @@ public final class SimpleMemberListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1624c; + public final TextView f1626c; public SimpleMemberListItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1624c = textView; + this.f1626c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java index 8f210f8aa7..11b9e68633 100644 --- a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java +++ b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetHeaderItemBinding.java @@ -13,12 +13,12 @@ public final class StageAudienceBlockedBottomSheetHeaderItemBinding implements V @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialTextView f1625c; + public final MaterialTextView f1627c; public StageAudienceBlockedBottomSheetHeaderItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialTextView materialTextView, @NonNull MaterialTextView materialTextView2) { this.a = constraintLayout; this.b = materialTextView; - this.f1625c = materialTextView2; + this.f1627c = materialTextView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java index 99438c8f10..d4f89635bd 100644 --- a/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java +++ b/app/src/main/java/com/discord/databinding/StageAudienceBlockedBottomSheetItemBinding.java @@ -16,7 +16,7 @@ public final class StageAudienceBlockedBottomSheetItemBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final CutoutView f1626c; + public final CutoutView f1628c; @NonNull public final TextView d; @NonNull @@ -27,7 +27,7 @@ public final class StageAudienceBlockedBottomSheetItemBinding implements ViewBin public StageAudienceBlockedBottomSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CutoutView cutoutView, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull View view, @NonNull TextView textView3) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1626c = cutoutView; + this.f1628c = cutoutView; this.d = textView; this.e = imageView; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java b/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java index ca8656986a..25b227b169 100644 --- a/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java +++ b/app/src/main/java/com/discord/databinding/StageRaisedHandsItemUserBinding.java @@ -15,7 +15,7 @@ public final class StageRaisedHandsItemUserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1627c; + public final ImageView f1629c; @NonNull public final TextView d; @NonNull @@ -26,7 +26,7 @@ public final class StageRaisedHandsItemUserBinding implements ViewBinding { public StageRaisedHandsItemUserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2) { this.a = constraintLayout; this.b = imageView; - this.f1627c = imageView2; + this.f1629c = imageView2; this.d = textView; this.e = simpleDraweeView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java b/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java index 9ee9777f14..4418356fb1 100644 --- a/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java +++ b/app/src/main/java/com/discord/databinding/StickerCategoryItemPackBinding.java @@ -14,12 +14,12 @@ public final class StickerCategoryItemPackBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final StickerView f1628c; + public final StickerView f1630c; public StickerCategoryItemPackBinding(@NonNull FrameLayout frameLayout, @NonNull n nVar, @NonNull StickerView stickerView) { this.a = frameLayout; this.b = nVar; - this.f1628c = stickerView; + this.f1630c = stickerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java b/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java index 244f93e149..50dd558a36 100644 --- a/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/StickerPackDetailsDialogBinding.java @@ -13,7 +13,7 @@ public final class StickerPackDetailsDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1629c; + public final TextView f1631c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class StickerPackDetailsDialogBinding implements ViewBinding { public StickerPackDetailsDialogBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) { this.a = frameLayout; this.b = textView; - this.f1629c = textView2; + this.f1631c = textView2; this.d = textView3; this.e = textView4; this.f = textView5; diff --git a/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java b/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java index 6d8cf91169..cc58283036 100644 --- a/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java +++ b/app/src/main/java/com/discord/databinding/StickerStoreHeaderItemBinding.java @@ -16,7 +16,7 @@ public final class StickerStoreHeaderItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1630c; + public final RelativeLayout f1632c; @NonNull public final TextView d; @NonNull @@ -29,7 +29,7 @@ public final class StickerStoreHeaderItemBinding implements ViewBinding { public StickerStoreHeaderItemBinding(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull Chip chip, @NonNull FrameLayout frameLayout2, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = linearLayout; this.b = frameLayout; - this.f1630c = relativeLayout; + this.f1632c = relativeLayout; this.d = textView; this.e = frameLayout2; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java b/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java index 2df380350f..1249946a9d 100644 --- a/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java +++ b/app/src/main/java/com/discord/databinding/SuggestedFriendViewBinding.java @@ -14,7 +14,7 @@ public final class SuggestedFriendViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppCompatImageView f1631c; + public final AppCompatImageView f1633c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class SuggestedFriendViewBinding implements ViewBinding { public SuggestedFriendViewBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView2) { this.a = view; this.b = simpleDraweeView; - this.f1631c = appCompatImageView; + this.f1633c = appCompatImageView; this.d = textView; this.e = appCompatImageView2; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java b/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java index 860132cc25..39a04d1b34 100644 --- a/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java +++ b/app/src/main/java/com/discord/databinding/TabsHostBottomNavigationViewBinding.java @@ -20,7 +20,7 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1632c; + public final ConstraintLayout f1634c; @NonNull public final TextView d; @NonNull @@ -51,7 +51,7 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding { public TabsHostBottomNavigationViewBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView4, @NonNull FrameLayout frameLayout2, @NonNull ImageView imageView5, @NonNull FrameLayout frameLayout3, @NonNull LinearLayout linearLayout2, @NonNull UserAvatarPresenceView userAvatarPresenceView, @NonNull FrameLayout frameLayout4) { this.a = linearLayout; this.b = imageView; - this.f1632c = constraintLayout; + this.f1634c = constraintLayout; this.d = textView; this.e = imageView2; this.f = constraintLayout2; @@ -73,50 +73,50 @@ public final class TabsHostBottomNavigationViewBinding implements ViewBinding { if (z2) { viewGroup.addView(inflate); } - int i = 2131365168; - ImageView imageView = (ImageView) inflate.findViewById(2131365168); + int i = 2131365172; + ImageView imageView = (ImageView) inflate.findViewById(2131365172); if (imageView != null) { - i = 2131365169; - ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131365169); + i = 2131365173; + ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131365173); if (constraintLayout != null) { - i = 2131365170; - TextView textView = (TextView) inflate.findViewById(2131365170); + i = 2131365174; + TextView textView = (TextView) inflate.findViewById(2131365174); if (textView != null) { - i = 2131365171; - ImageView imageView2 = (ImageView) inflate.findViewById(2131365171); + i = 2131365175; + ImageView imageView2 = (ImageView) inflate.findViewById(2131365175); if (imageView2 != null) { - i = 2131365172; - ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131365172); + i = 2131365176; + ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131365176); if (constraintLayout2 != null) { - i = 2131365173; - TextView textView2 = (TextView) inflate.findViewById(2131365173); + i = 2131365177; + TextView textView2 = (TextView) inflate.findViewById(2131365177); if (textView2 != null) { - i = 2131365174; - ImageView imageView3 = (ImageView) inflate.findViewById(2131365174); + i = 2131365178; + ImageView imageView3 = (ImageView) inflate.findViewById(2131365178); if (imageView3 != null) { - i = 2131365175; - FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131365175); + i = 2131365179; + FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131365179); if (frameLayout != null) { - i = 2131365176; - ImageView imageView4 = (ImageView) inflate.findViewById(2131365176); + i = 2131365180; + ImageView imageView4 = (ImageView) inflate.findViewById(2131365180); if (imageView4 != null) { - i = 2131365177; - FrameLayout frameLayout2 = (FrameLayout) inflate.findViewById(2131365177); + i = 2131365181; + FrameLayout frameLayout2 = (FrameLayout) inflate.findViewById(2131365181); if (frameLayout2 != null) { - i = 2131365178; - ImageView imageView5 = (ImageView) inflate.findViewById(2131365178); + i = 2131365182; + ImageView imageView5 = (ImageView) inflate.findViewById(2131365182); if (imageView5 != null) { - i = 2131365179; - FrameLayout frameLayout3 = (FrameLayout) inflate.findViewById(2131365179); + i = 2131365183; + FrameLayout frameLayout3 = (FrameLayout) inflate.findViewById(2131365183); if (frameLayout3 != null) { - i = 2131365180; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365180); + i = 2131365184; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365184); if (linearLayout != null) { - i = 2131365181; - UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131365181); + i = 2131365185; + UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131365185); if (userAvatarPresenceView != null) { - i = 2131365182; - FrameLayout frameLayout4 = (FrameLayout) inflate.findViewById(2131365182); + i = 2131365186; + FrameLayout frameLayout4 = (FrameLayout) inflate.findViewById(2131365186); if (frameLayout4 != null) { return new TabsHostBottomNavigationViewBinding((LinearLayout) inflate, imageView, constraintLayout, textView, imageView2, constraintLayout2, textView2, imageView3, frameLayout, imageView4, frameLayout2, imageView5, frameLayout3, linearLayout, userAvatarPresenceView, frameLayout4); } diff --git a/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java b/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java index ef12b95246..573c2ef02f 100644 --- a/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java +++ b/app/src/main/java/com/discord/databinding/ThreadBrowserThreadViewBinding.java @@ -16,7 +16,7 @@ public final class ThreadBrowserThreadViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1633c; + public final ImageView f1635c; @NonNull public final SimpleDraweeSpanTextView d; @NonNull @@ -29,7 +29,7 @@ public final class ThreadBrowserThreadViewBinding implements ViewBinding { public ThreadBrowserThreadViewBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = view; this.b = simpleDraweeView; - this.f1633c = imageView; + this.f1635c = imageView; this.d = simpleDraweeSpanTextView; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java index dfa0bc7db9..e36ab1dd79 100644 --- a/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java +++ b/app/src/main/java/com/discord/databinding/UserProfileAdminViewBinding.java @@ -13,7 +13,7 @@ public final class UserProfileAdminViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1634c; + public final TextView f1636c; @NonNull public final TextView d; @NonNull @@ -28,7 +28,7 @@ public final class UserProfileAdminViewBinding implements ViewBinding { public UserProfileAdminViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7) { this.a = linearLayout; this.b = textView; - this.f1634c = textView2; + this.f1636c = textView2; this.d = textView3; this.e = textView4; this.f = textView5; diff --git a/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java index 4197bca07d..49e41ee95b 100644 --- a/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java +++ b/app/src/main/java/com/discord/databinding/UserProfileConnectionsViewBinding.java @@ -14,14 +14,14 @@ public final class UserProfileConnectionsViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1635c; + public final TextView f1637c; @NonNull public final RecyclerView d; public UserProfileConnectionsViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView) { this.a = linearLayout; this.b = textView; - this.f1635c = textView2; + this.f1637c = textView2; this.d = recyclerView; } diff --git a/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java index 854a15e881..5f8f575a5a 100644 --- a/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java +++ b/app/src/main/java/com/discord/databinding/UserProfileHeaderViewBinding.java @@ -20,7 +20,7 @@ public final class UserProfileHeaderViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CardView f1636c; + public final CardView f1638c; @NonNull public final UserAvatarPresenceView d; @NonNull @@ -35,7 +35,7 @@ public final class UserProfileHeaderViewBinding implements ViewBinding { public UserProfileHeaderViewBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CardView cardView, @NonNull UserAvatarPresenceView userAvatarPresenceView, @NonNull Barrier barrier, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull LinearLayout linearLayout, @NonNull UsernameView usernameView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView2, @NonNull ConstraintLayout constraintLayout2) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1636c = cardView; + this.f1638c = cardView; this.d = userAvatarPresenceView; this.e = recyclerView; this.f = simpleDraweeSpanTextView; diff --git a/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java index da70eaa466..0cb3512e02 100644 --- a/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java +++ b/app/src/main/java/com/discord/databinding/UserProfileStageActionsViewBinding.java @@ -13,12 +13,12 @@ public final class UserProfileStageActionsViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1637c; + public final TextView f1639c; public UserProfileStageActionsViewBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1637c = textView2; + this.f1639c = textView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java b/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java index e8dcfa63ef..8778f0533c 100644 --- a/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java +++ b/app/src/main/java/com/discord/databinding/UserProfileVoiceSettingsViewBinding.java @@ -15,7 +15,7 @@ public final class UserProfileVoiceSettingsViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SwitchMaterial f1638c; + public final SwitchMaterial f1640c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class UserProfileVoiceSettingsViewBinding implements ViewBinding { public UserProfileVoiceSettingsViewBinding(@NonNull LinearLayout linearLayout, @NonNull SwitchMaterial switchMaterial, @NonNull SwitchMaterial switchMaterial2, @NonNull TextView textView, @NonNull VolumeSliderView volumeSliderView) { this.a = linearLayout; this.b = switchMaterial; - this.f1638c = switchMaterial2; + this.f1640c = switchMaterial2; this.d = textView; this.e = volumeSliderView; } diff --git a/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java b/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java index f610ba8334..9d84f2fd2b 100644 --- a/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewAddPermissionOwnerBinding.java @@ -24,11 +24,11 @@ public final class ViewAddPermissionOwnerBinding implements ViewBinding { int i = 2131361917; ImageView imageView = (ImageView) viewGroup.findViewById(2131361917); if (imageView != null) { - i = 2131363727; - TextView textView = (TextView) viewGroup.findViewById(2131363727); + i = 2131363730; + TextView textView = (TextView) viewGroup.findViewById(2131363730); if (textView != null) { - i = 2131363956; - ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363956); + i = 2131363958; + ImageView imageView2 = (ImageView) viewGroup.findViewById(2131363958); if (imageView2 != null) { return new ViewAddPermissionOwnerBinding(viewGroup, imageView, textView, imageView2); } diff --git a/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java b/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java index f7ba94984c..3f28d34268 100644 --- a/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewAppcommandsOptiontitleListitemBinding.java @@ -14,12 +14,12 @@ public final class ViewAppcommandsOptiontitleListitemBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1639c; + public final SimpleDraweeView f1641c; public ViewAppcommandsOptiontitleListitemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView) { this.a = constraintLayout; this.b = textView; - this.f1639c = simpleDraweeView; + this.f1641c = simpleDraweeView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java b/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java index 526d682f28..657ade8301 100644 --- a/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewAuthInviteInfoBinding.java @@ -16,7 +16,7 @@ public final class ViewAuthInviteInfoBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1640c; + public final TextView f1642c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class ViewAuthInviteInfoBinding implements ViewBinding { public ViewAuthInviteInfoBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) { this.a = relativeLayout; this.b = simpleDraweeView; - this.f1640c = textView; + this.f1642c = textView; this.d = textView2; this.e = imageView; } diff --git a/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java b/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java index 81f77f98d5..a2eaef41f0 100644 --- a/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewCategoryOverrideItemBinding.java @@ -15,12 +15,12 @@ public final class ViewCategoryOverrideItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1641c; + public final TextView f1643c; public ViewCategoryOverrideItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull Guideline guideline, @NonNull ImageView imageView) { this.a = constraintLayout; this.b = textView; - this.f1641c = textView2; + this.f1643c = textView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java b/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java index 6056c39d8e..5b8efdfaab 100644 --- a/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewChannelOverrideItemBinding.java @@ -15,14 +15,14 @@ public final class ViewChannelOverrideItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1642c; + public final TextView f1644c; @NonNull public final TextView d; public ViewChannelOverrideItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull Guideline guideline, @NonNull ImageView imageView) { this.a = constraintLayout; this.b = textView; - this.f1642c = textView2; + this.f1644c = textView2; this.d = textView3; } diff --git a/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java b/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java index c57b492280..e8a1b0ae7d 100644 --- a/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewChatEmbedGameInviteBinding.java @@ -18,7 +18,7 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1643c; + public final TextView f1645c; @NonNull public final SimpleDraweeView d; @NonNull @@ -35,7 +35,7 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding { public ViewChatEmbedGameInviteBinding(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView3, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull TextView textView3) { this.a = view; this.b = materialButton; - this.f1643c = textView; + this.f1645c = textView; this.d = simpleDraweeView; this.e = simpleDraweeView2; this.f = simpleDraweeView3; @@ -47,32 +47,32 @@ public final class ViewChatEmbedGameInviteBinding implements ViewBinding { @NonNull public static ViewChatEmbedGameInviteBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) { layoutInflater.inflate(2131558727, viewGroup); - int i = 2131363647; - MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363647); + int i = 2131363650; + MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363650); if (materialButton != null) { - i = 2131363648; - TextView textView = (TextView) viewGroup.findViewById(2131363648); + i = 2131363651; + TextView textView = (TextView) viewGroup.findViewById(2131363651); if (textView != null) { - i = 2131363649; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363649); + i = 2131363652; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) viewGroup.findViewById(2131363652); if (simpleDraweeView != null) { - i = 2131363650; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) viewGroup.findViewById(2131363650); + i = 2131363653; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) viewGroup.findViewById(2131363653); if (simpleDraweeView2 != null) { - i = 2131363651; - Barrier barrier = (Barrier) viewGroup.findViewById(2131363651); + i = 2131363654; + Barrier barrier = (Barrier) viewGroup.findViewById(2131363654); if (barrier != null) { - i = 2131363652; - SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) viewGroup.findViewById(2131363652); + i = 2131363655; + SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) viewGroup.findViewById(2131363655); if (simpleDraweeView3 != null) { - i = 2131363653; - TextView textView2 = (TextView) viewGroup.findViewById(2131363653); + i = 2131363656; + TextView textView2 = (TextView) viewGroup.findViewById(2131363656); if (textView2 != null) { - i = 2131363654; - RecyclerView recyclerView = (RecyclerView) viewGroup.findViewById(2131363654); + i = 2131363657; + RecyclerView recyclerView = (RecyclerView) viewGroup.findViewById(2131363657); if (recyclerView != null) { - i = 2131363655; - TextView textView3 = (TextView) viewGroup.findViewById(2131363655); + i = 2131363658; + TextView textView3 = (TextView) viewGroup.findViewById(2131363658); if (textView3 != null) { return new ViewChatEmbedGameInviteBinding(viewGroup, materialButton, textView, simpleDraweeView, simpleDraweeView2, barrier, simpleDraweeView3, textView2, recyclerView, textView3); } diff --git a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java index 3caf4d32fc..1d42233cbd 100644 --- a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedHeaderBinding.java @@ -13,12 +13,12 @@ public final class ViewCommunityGetStartedHeaderBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1644c; + public final TextView f1646c; public ViewCommunityGetStartedHeaderBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = view; this.b = imageView; - this.f1644c = textView; + this.f1646c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java index 174192ef8b..5a08975f5c 100644 --- a/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewCommunityGetStartedInformationBinding.java @@ -16,14 +16,14 @@ public final class ViewCommunityGetStartedInformationBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1645c; + public final ImageView f1647c; @NonNull public final TextView d; public ViewCommunityGetStartedInformationBinding(@NonNull View view, @NonNull Guideline guideline, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2) { this.a = view; this.b = textView; - this.f1645c = imageView; + this.f1647c = imageView; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java b/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java index 201a694d86..2a90ad3f15 100644 --- a/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewConnectionGuildIntegrationBinding.java @@ -15,7 +15,7 @@ public final class ViewConnectionGuildIntegrationBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1646c; + public final SimpleDraweeView f1648c; @NonNull public final TextView d; @NonNull @@ -26,7 +26,7 @@ public final class ViewConnectionGuildIntegrationBinding implements ViewBinding public ViewConnectionGuildIntegrationBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton) { this.a = cardView; this.b = textView; - this.f1646c = simpleDraweeView; + this.f1648c = simpleDraweeView; this.d = textView2; this.e = textView3; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java b/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java index 64d8462ea2..0e1882e471 100644 --- a/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewDialogConfirmationBinding.java @@ -14,7 +14,7 @@ public final class ViewDialogConfirmationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1647c; + public final MaterialButton f1649c; @NonNull public final TextView d; @NonNull @@ -23,24 +23,24 @@ public final class ViewDialogConfirmationBinding implements ViewBinding { public ViewDialogConfirmationBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2) { this.a = linearLayout; this.b = materialButton; - this.f1647c = materialButton2; + this.f1649c = materialButton2; this.d = textView; this.e = textView2; } @NonNull public static ViewDialogConfirmationBinding a(@NonNull View view) { - int i = 2131365483; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365483); + int i = 2131365489; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365489); if (materialButton != null) { - i = 2131365484; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365484); + i = 2131365490; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365490); if (materialButton2 != null) { - i = 2131365485; - TextView textView = (TextView) view.findViewById(2131365485); + i = 2131365491; + TextView textView = (TextView) view.findViewById(2131365491); if (textView != null) { - i = 2131365486; - TextView textView2 = (TextView) view.findViewById(2131365486); + i = 2131365492; + TextView textView2 = (TextView) view.findViewById(2131365492); if (textView2 != null) { return new ViewDialogConfirmationBinding((LinearLayout) view, materialButton, materialButton2, textView, textView2); } diff --git a/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java index 743019cc40..5d4e8d88e7 100644 --- a/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewGiftEntitlementListItemBinding.java @@ -17,7 +17,7 @@ public final class ViewGiftEntitlementListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1648c; + public final RelativeLayout f1650c; @NonNull public final FrameLayout d; @NonNull @@ -34,7 +34,7 @@ public final class ViewGiftEntitlementListItemBinding implements ViewBinding { public ViewGiftEntitlementListItemBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout, @NonNull FrameLayout frameLayout2, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull AppViewFlipper appViewFlipper, @NonNull MaterialButton materialButton2, @NonNull LinkifiedTextView linkifiedTextView) { this.a = frameLayout; this.b = textView; - this.f1648c = relativeLayout; + this.f1650c = relativeLayout; this.d = frameLayout2; this.e = materialButton; this.f = view; diff --git a/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java index 9ee70f1695..7fb2b431d5 100644 --- a/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewGiftOutboundPromoListItemBinding.java @@ -15,7 +15,7 @@ public final class ViewGiftOutboundPromoListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1649c; + public final TextView f1651c; @NonNull public final SimpleDraweeView d; @NonNull @@ -26,7 +26,7 @@ public final class ViewGiftOutboundPromoListItemBinding implements ViewBinding { public ViewGiftOutboundPromoListItemBinding(@NonNull MaterialCardView materialCardView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = materialCardView; this.b = materialButton; - this.f1649c = textView; + this.f1651c = textView; this.d = simpleDraweeView; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java index 3811384d8d..c242ed8aef 100644 --- a/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewGiftSkuListItemBinding.java @@ -15,7 +15,7 @@ public final class ViewGiftSkuListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1650c; + public final TextView f1652c; @NonNull public final SimpleDraweeView d; @NonNull @@ -24,7 +24,7 @@ public final class ViewGiftSkuListItemBinding implements ViewBinding { public ViewGiftSkuListItemBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2) { this.a = cardView; this.b = imageView; - this.f1650c = textView; + this.f1652c = textView; this.d = simpleDraweeView; this.e = textView2; } diff --git a/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java b/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java index f4b573895c..83371fae2c 100644 --- a/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewGlobalSearchItemBinding.java @@ -15,7 +15,7 @@ public final class ViewGlobalSearchItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1651c; + public final TextView f1653c; @NonNull public final SimpleDraweeView d; @NonNull @@ -28,7 +28,7 @@ public final class ViewGlobalSearchItemBinding implements ViewBinding { public ViewGlobalSearchItemBinding(@NonNull View view, @NonNull Guideline guideline, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView) { this.a = view; this.b = textView; - this.f1651c = textView2; + this.f1653c = textView2; this.d = simpleDraweeView; this.e = textView3; this.f = textView4; diff --git a/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java index 020c671c8b..b21540f07a 100644 --- a/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewGuildInviteBottomSheetBinding.java @@ -17,7 +17,7 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RadioGroup f1652c; + public final RadioGroup f1654c; @NonNull public final MaterialButton d; @NonNull @@ -28,7 +28,7 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding { public ViewGuildInviteBottomSheetBinding(@NonNull View view, @NonNull Spinner spinner, @NonNull RadioGroup radioGroup, @NonNull MaterialButton materialButton, @NonNull RadioGroup radioGroup2, @NonNull CheckedSetting checkedSetting) { this.a = view; this.b = spinner; - this.f1652c = radioGroup; + this.f1654c = radioGroup; this.d = materialButton; this.e = radioGroup2; this.f = checkedSetting; @@ -37,20 +37,20 @@ public final class ViewGuildInviteBottomSheetBinding implements ViewBinding { @NonNull public static ViewGuildInviteBottomSheetBinding a(@NonNull LayoutInflater layoutInflater, @NonNull ViewGroup viewGroup) { layoutInflater.inflate(2131558754, viewGroup); - int i = 2131363366; - Spinner spinner = (Spinner) viewGroup.findViewById(2131363366); + int i = 2131363368; + Spinner spinner = (Spinner) viewGroup.findViewById(2131363368); if (spinner != null) { - i = 2131363372; - RadioGroup radioGroup = (RadioGroup) viewGroup.findViewById(2131363372); + i = 2131363374; + RadioGroup radioGroup = (RadioGroup) viewGroup.findViewById(2131363374); if (radioGroup != null) { - i = 2131363373; - MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363373); + i = 2131363375; + MaterialButton materialButton = (MaterialButton) viewGroup.findViewById(2131363375); if (materialButton != null) { - i = 2131363376; - RadioGroup radioGroup2 = (RadioGroup) viewGroup.findViewById(2131363376); + i = 2131363378; + RadioGroup radioGroup2 = (RadioGroup) viewGroup.findViewById(2131363378); if (radioGroup2 != null) { - i = 2131363385; - CheckedSetting checkedSetting = (CheckedSetting) viewGroup.findViewById(2131363385); + i = 2131363387; + CheckedSetting checkedSetting = (CheckedSetting) viewGroup.findViewById(2131363387); if (checkedSetting != null) { return new ViewGuildInviteBottomSheetBinding(viewGroup, spinner, radioGroup, materialButton, radioGroup2, checkedSetting); } diff --git a/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java b/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java index c8b03e31ff..9f82badb89 100644 --- a/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewMemberVerificationBinding.java @@ -14,7 +14,7 @@ public final class ViewMemberVerificationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1653c; + public final MaterialButton f1655c; @NonNull public final ImageView d; @NonNull @@ -23,7 +23,7 @@ public final class ViewMemberVerificationBinding implements ViewBinding { public ViewMemberVerificationBinding(@NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull TextView textView2) { this.a = view; this.b = textView; - this.f1653c = materialButton; + this.f1655c = materialButton; this.d = imageView; this.e = textView2; } diff --git a/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java b/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java index 06ea53711d..651b3f98a2 100644 --- a/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewMobileReportsBottomButtonBinding.java @@ -14,7 +14,7 @@ public final class ViewMobileReportsBottomButtonBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1654c; + public final MaterialButton f1656c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class ViewMobileReportsBottomButtonBinding implements ViewBinding { public ViewMobileReportsBottomButtonBinding(@NonNull View view, @NonNull LoadingButton loadingButton, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull TextView textView2) { this.a = view; this.b = loadingButton; - this.f1654c = materialButton; + this.f1656c = materialButton; this.d = textView; this.e = textView2; } diff --git a/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java b/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java index fa683eae8e..9a6a5bdef2 100644 --- a/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewNitroBoostPerksBinding.java @@ -20,7 +20,7 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1655c; + public final RecyclerView f1657c; @NonNull public final RelativeLayout d; @NonNull @@ -33,7 +33,7 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding { public ViewNitroBoostPerksBinding(@NonNull CardView cardView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2, @NonNull FrameLayout frameLayout, @NonNull TextView textView3, @NonNull CardView cardView2) { this.a = cardView; this.b = textView; - this.f1655c = recyclerView; + this.f1657c = recyclerView; this.d = relativeLayout; this.e = textView2; this.f = textView3; @@ -49,26 +49,26 @@ public final class ViewNitroBoostPerksBinding implements ViewBinding { int i = 2131362748; LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362748); if (linearLayout != null) { - i = 2131364192; - TextView textView = (TextView) inflate.findViewById(2131364192); + i = 2131364194; + TextView textView = (TextView) inflate.findViewById(2131364194); if (textView != null) { - i = 2131364193; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364193); + i = 2131364195; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364195); if (recyclerView != null) { - i = 2131364194; - RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131364194); + i = 2131364196; + RelativeLayout relativeLayout = (RelativeLayout) inflate.findViewById(2131364196); if (relativeLayout != null) { - i = 2131364195; - TextView textView2 = (TextView) inflate.findViewById(2131364195); + i = 2131364197; + TextView textView2 = (TextView) inflate.findViewById(2131364197); if (textView2 != null) { - i = 2131364196; - FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131364196); + i = 2131364198; + FrameLayout frameLayout = (FrameLayout) inflate.findViewById(2131364198); if (frameLayout != null) { - i = 2131364197; - TextView textView3 = (TextView) inflate.findViewById(2131364197); + i = 2131364199; + TextView textView3 = (TextView) inflate.findViewById(2131364199); if (textView3 != null) { - i = 2131364198; - CardView cardView = (CardView) inflate.findViewById(2131364198); + i = 2131364200; + CardView cardView = (CardView) inflate.findViewById(2131364200); if (cardView != null) { return new ViewNitroBoostPerksBinding((CardView) inflate, linearLayout, textView, recyclerView, relativeLayout, textView2, frameLayout, textView3, cardView); } diff --git a/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java b/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java index 1ae60c1ddf..c840a467bd 100644 --- a/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewReportsMenuNodeBinding.java @@ -28,7 +28,7 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final i4 f1656c; + public final i4 f1658c; @NonNull public final LinearLayout d; @NonNull @@ -55,7 +55,7 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding { public ViewReportsMenuNodeBinding(@NonNull ConstraintLayout constraintLayout, @NonNull d2 d2Var, @NonNull i4 i4Var, @NonNull LinearLayout linearLayout, @NonNull c2 c2Var, @NonNull MobileReportsBottomButton mobileReportsBottomButton, @NonNull MobileReportsBreadcrumbs mobileReportsBreadcrumbs, @NonNull MaterialCardView materialCardView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView2, @NonNull MaterialCardView materialCardView3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ImageView imageView) { this.a = constraintLayout; this.b = d2Var; - this.f1656c = i4Var; + this.f1658c = i4Var; this.d = linearLayout; this.e = c2Var; this.f = mobileReportsBottomButton; @@ -75,33 +75,33 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding { if (z2) { viewGroup.addView(inflate); } - int i = 2131363925; - View findViewById = inflate.findViewById(2131363925); + int i = 2131363927; + View findViewById = inflate.findViewById(2131363927); if (findViewById != null) { - int i2 = 2131363926; - Guideline guideline = (Guideline) findViewById.findViewById(2131363926); + int i2 = 2131363928; + Guideline guideline = (Guideline) findViewById.findViewById(2131363928); if (guideline != null) { - i2 = 2131363927; - TextView textView = (TextView) findViewById.findViewById(2131363927); + i2 = 2131363929; + TextView textView = (TextView) findViewById.findViewById(2131363929); if (textView != null) { - i2 = 2131363928; - Guideline guideline2 = (Guideline) findViewById.findViewById(2131363928); + i2 = 2131363930; + Guideline guideline2 = (Guideline) findViewById.findViewById(2131363930); if (guideline2 != null) { - i2 = 2131363929; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131363929); + i2 = 2131363931; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById.findViewById(2131363931); if (simpleDraweeView != null) { - i2 = 2131363930; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131363930); + i2 = 2131363932; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById.findViewById(2131363932); if (linkifiedTextView != null) { - i2 = 2131363931; - Guideline guideline3 = (Guideline) findViewById.findViewById(2131363931); + i2 = 2131363933; + Guideline guideline3 = (Guideline) findViewById.findViewById(2131363933); if (guideline3 != null) { - i2 = 2131363932; - Guideline guideline4 = (Guideline) findViewById.findViewById(2131363932); + i2 = 2131363934; + Guideline guideline4 = (Guideline) findViewById.findViewById(2131363934); if (guideline4 != null) { d2 d2Var = new d2((ConstraintLayout) findViewById, guideline, textView, guideline2, simpleDraweeView, linkifiedTextView, guideline3, guideline4); - i = 2131363935; - View findViewById2 = inflate.findViewById(2131363935); + i = 2131363937; + View findViewById2 = inflate.findViewById(2131363937); if (findViewById2 != null) { int i3 = 2131362512; ImageView imageView = (ImageView) findViewById2.findViewById(2131362512); @@ -115,67 +115,67 @@ public final class ViewReportsMenuNodeBinding implements ViewBinding { i3 = 2131362541; TextView textView2 = (TextView) findViewById2.findViewById(2131362541); if (textView2 != null) { - i3 = 2131364411; - Guideline guideline5 = (Guideline) findViewById2.findViewById(2131364411); + i3 = 2131364414; + Guideline guideline5 = (Guideline) findViewById2.findViewById(2131364414); if (guideline5 != null) { - i3 = 2131364412; - Guideline guideline6 = (Guideline) findViewById2.findViewById(2131364412); + i3 = 2131364415; + Guideline guideline6 = (Guideline) findViewById2.findViewById(2131364415); if (guideline6 != null) { - i3 = 2131364413; - Guideline guideline7 = (Guideline) findViewById2.findViewById(2131364413); + i3 = 2131364416; + Guideline guideline7 = (Guideline) findViewById2.findViewById(2131364416); if (guideline7 != null) { i4 i4Var = new i4((ConstraintLayout) findViewById2, imageView, linkifiedTextView2, simpleDraweeView2, textView2, guideline5, guideline6, guideline7); - i = 2131363936; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363936); + i = 2131363938; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363938); if (linearLayout != null) { - i = 2131363937; - View findViewById3 = inflate.findViewById(2131363937); + i = 2131363939; + View findViewById3 = inflate.findViewById(2131363939); if (findViewById3 != null) { - int i4 = 2131363920; - SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById3.findViewById(2131363920); + int i4 = 2131363922; + SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById3.findViewById(2131363922); if (simpleDraweeView3 != null) { - i4 = 2131363921; - MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131363921); + i4 = 2131363923; + MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131363923); if (materialButton != null) { - i4 = 2131363922; - TextView textView3 = (TextView) findViewById3.findViewById(2131363922); + i4 = 2131363924; + TextView textView3 = (TextView) findViewById3.findViewById(2131363924); if (textView3 != null) { - i4 = 2131363923; - TextView textView4 = (TextView) findViewById3.findViewById(2131363923); + i4 = 2131363925; + TextView textView4 = (TextView) findViewById3.findViewById(2131363925); if (textView4 != null) { - i4 = 2131363924; - TextView textView5 = (TextView) findViewById3.findViewById(2131363924); + i4 = 2131363926; + TextView textView5 = (TextView) findViewById3.findViewById(2131363926); if (textView5 != null) { c2 c2Var = new c2((LinearLayout) findViewById3, simpleDraweeView3, materialButton, textView3, textView4, textView5); - i = 2131363938; - MobileReportsBottomButton mobileReportsBottomButton = (MobileReportsBottomButton) inflate.findViewById(2131363938); + i = 2131363940; + MobileReportsBottomButton mobileReportsBottomButton = (MobileReportsBottomButton) inflate.findViewById(2131363940); if (mobileReportsBottomButton != null) { - i = 2131363939; - MobileReportsBreadcrumbs mobileReportsBreadcrumbs = (MobileReportsBreadcrumbs) inflate.findViewById(2131363939); + i = 2131363941; + MobileReportsBreadcrumbs mobileReportsBreadcrumbs = (MobileReportsBreadcrumbs) inflate.findViewById(2131363941); if (mobileReportsBreadcrumbs != null) { - i = 2131363940; - MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(2131363940); + i = 2131363942; + MaterialCardView materialCardView = (MaterialCardView) inflate.findViewById(2131363942); if (materialCardView != null) { - i = 2131363941; - LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131363941); + i = 2131363943; + LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131363943); if (linearLayout2 != null) { - i = 2131363942; - TextView textView6 = (TextView) inflate.findViewById(2131363942); + i = 2131363944; + TextView textView6 = (TextView) inflate.findViewById(2131363944); if (textView6 != null) { - i = 2131363943; - MaterialCardView materialCardView2 = (MaterialCardView) inflate.findViewById(2131363943); + i = 2131363945; + MaterialCardView materialCardView2 = (MaterialCardView) inflate.findViewById(2131363945); if (materialCardView2 != null) { - i = 2131363944; - TextView textView7 = (TextView) inflate.findViewById(2131363944); + i = 2131363946; + TextView textView7 = (TextView) inflate.findViewById(2131363946); if (textView7 != null) { - i = 2131363945; - MaterialCardView materialCardView3 = (MaterialCardView) inflate.findViewById(2131363945); + i = 2131363947; + MaterialCardView materialCardView3 = (MaterialCardView) inflate.findViewById(2131363947); if (materialCardView3 != null) { - i = 2131363946; - LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363946); + i = 2131363948; + LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363948); if (linkifiedTextView3 != null) { - i = 2131363947; - ImageView imageView2 = (ImageView) inflate.findViewById(2131363947); + i = 2131363949; + ImageView imageView2 = (ImageView) inflate.findViewById(2131363949); if (imageView2 != null) { return new ViewReportsMenuNodeBinding((ConstraintLayout) inflate, d2Var, i4Var, linearLayout, c2Var, mobileReportsBottomButton, mobileReportsBreadcrumbs, materialCardView, linearLayout2, textView6, materialCardView2, textView7, materialCardView3, linkifiedTextView3, imageView2); } diff --git a/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java b/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java index ab0a33e67b..a72ec6e7bb 100644 --- a/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewSelectableFriendSuggestionBinding.java @@ -15,7 +15,7 @@ public final class ViewSelectableFriendSuggestionBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1657c; + public final ConstraintLayout f1659c; @NonNull public final TextView d; @NonNull @@ -28,7 +28,7 @@ public final class ViewSelectableFriendSuggestionBinding implements ViewBinding public ViewSelectableFriendSuggestionBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialCheckBox materialCheckBox) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1657c = constraintLayout2; + this.f1659c = constraintLayout2; this.d = textView; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java b/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java index 4b982f8e74..2ee42be546 100644 --- a/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewServerSettingsCommunitySettingSelectorBinding.java @@ -13,7 +13,7 @@ public final class ViewServerSettingsCommunitySettingSelectorBinding implements @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1658c; + public final ImageView f1660c; @NonNull public final TextView d; @NonNull @@ -22,7 +22,7 @@ public final class ViewServerSettingsCommunitySettingSelectorBinding implements public ViewServerSettingsCommunitySettingSelectorBinding(@NonNull View view, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = view; this.b = textView; - this.f1658c = imageView; + this.f1660c = imageView; this.d = textView2; this.e = textView3; } diff --git a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java index 88ebe92c73..33c9d2969e 100644 --- a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedBoostListitemBinding.java @@ -14,7 +14,7 @@ public final class ViewSettingsBoostedBoostListitemBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1659c; + public final ImageView f1661c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class ViewSettingsBoostedBoostListitemBinding implements ViewBindin public ViewSettingsBoostedBoostListitemBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = relativeLayout; this.b = textView; - this.f1659c = imageView; + this.f1661c = imageView; this.d = textView2; this.e = textView3; } diff --git a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java index ba96101bec..d4ff031a2a 100644 --- a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedGuildListitemBinding.java @@ -15,7 +15,7 @@ public final class ViewSettingsBoostedGuildListitemBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1660c; + public final View f1662c; @NonNull public final PremiumGuildProgressView d; @NonNull @@ -28,7 +28,7 @@ public final class ViewSettingsBoostedGuildListitemBinding implements ViewBindin public ViewSettingsBoostedGuildListitemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull View view, @NonNull PremiumGuildProgressView premiumGuildProgressView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView2) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1660c = view; + this.f1662c = view; this.d = premiumGuildProgressView; this.e = textView; this.f = simpleDraweeView2; diff --git a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java index ead21b6a9d..adda72705e 100644 --- a/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewSettingsBoostedSampleGuildBinding.java @@ -15,7 +15,7 @@ public final class ViewSettingsBoostedSampleGuildBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1661c; + public final SimpleDraweeView f1663c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class ViewSettingsBoostedSampleGuildBinding implements ViewBinding public ViewSettingsBoostedSampleGuildBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull PremiumGuildProgressView premiumGuildProgressView) { this.a = cardView; this.b = textView; - this.f1661c = simpleDraweeView; + this.f1663c = simpleDraweeView; this.d = textView2; this.e = premiumGuildProgressView; } diff --git a/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java b/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java index 7ac3ad1940..a93dc7d1d1 100644 --- a/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java +++ b/app/src/main/java/com/discord/databinding/ViewUserStatusPresenceCustomBinding.java @@ -15,14 +15,14 @@ public final class ViewUserStatusPresenceCustomBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1662c; + public final SimpleDraweeView f1664c; @NonNull public final TextView d; public ViewUserStatusPresenceCustomBinding(@NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = linearLayout; this.b = appCompatImageView; - this.f1662c = simpleDraweeView; + this.f1664c = simpleDraweeView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java b/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java index 712f509082..01aef2c611 100644 --- a/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java +++ b/app/src/main/java/com/discord/databinding/VoiceControlsSheetViewBinding.java @@ -22,7 +22,7 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1663c; + public final FrameLayout f1665c; @NonNull public final ImageView d; @NonNull @@ -32,61 +32,64 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding { @NonNull public final ImageView g; @NonNull - public final TextView h; + public final ImageView h; @NonNull - public final ImageView i; + public final TextView i; @NonNull public final ImageView j; @NonNull - public final LinearLayout k; + public final ImageView k; @NonNull - public final Button l; + public final LinearLayout l; @NonNull - public final NumericBadgingView m; + public final Button m; @NonNull - public final ImageView n; + public final NumericBadgingView n; @NonNull public final ImageView o; @NonNull - public final TextView p; + public final ImageView p; @NonNull - public final CardView q; + public final TextView q; @NonNull - public final MaterialTextView r; + public final CardView r; @NonNull /* renamed from: s reason: collision with root package name */ - public final ImageView f1664s; + public final MaterialTextView f1666s; @NonNull - public final TextView t; + public final ImageView t; @NonNull - public final VolumeSliderView u; + public final TextView u; @NonNull - public final ImageView v; + public final VolumeSliderView v; + @NonNull + public final ImageView w; - public VoiceControlsSheetViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull View view2, @NonNull TextView textView3, @NonNull ImageView imageView4, @NonNull ImageView imageView5, @NonNull LinearLayout linearLayout, @NonNull Button button, @NonNull NumericBadgingView numericBadgingView, @NonNull ImageView imageView6, @NonNull ImageView imageView7, @NonNull TextView textView4, @NonNull CardView cardView, @NonNull MaterialTextView materialTextView, @NonNull ImageView imageView8, @NonNull TextView textView5, @NonNull VolumeSliderView volumeSliderView, @NonNull ImageView imageView9) { + public VoiceControlsSheetViewBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull View view2, @NonNull ImageView imageView4, @NonNull TextView textView3, @NonNull ImageView imageView5, @NonNull ImageView imageView6, @NonNull LinearLayout linearLayout, @NonNull Button button, @NonNull NumericBadgingView numericBadgingView, @NonNull ImageView imageView7, @NonNull ImageView imageView8, @NonNull TextView textView4, @NonNull CardView cardView, @NonNull MaterialTextView materialTextView, @NonNull ImageView imageView9, @NonNull TextView textView5, @NonNull VolumeSliderView volumeSliderView, @NonNull ImageView imageView10) { this.a = view; this.b = imageView; - this.f1663c = frameLayout; + this.f1665c = frameLayout; this.d = imageView2; this.e = textView; this.f = textView2; this.g = imageView3; - this.h = textView3; - this.i = imageView4; + this.h = imageView4; + this.i = textView3; this.j = imageView5; - this.k = linearLayout; - this.l = button; - this.m = numericBadgingView; - this.n = imageView6; + this.k = imageView6; + this.l = linearLayout; + this.m = button; + this.n = numericBadgingView; this.o = imageView7; - this.p = textView4; - this.q = cardView; - this.r = materialTextView; - this.f1664s = imageView8; - this.t = textView5; - this.u = volumeSliderView; - this.v = imageView9; + this.p = imageView8; + this.q = textView4; + this.r = cardView; + this.f1666s = materialTextView; + this.t = imageView9; + this.u = textView5; + this.v = volumeSliderView; + this.w = imageView10; } @NonNull @@ -107,58 +110,62 @@ public final class VoiceControlsSheetViewBinding implements ViewBinding { i = 2131362834; TextView textView2 = (TextView) viewGroup.findViewById(2131362834); if (textView2 != null) { - i = 2131362908; - ImageView imageView3 = (ImageView) viewGroup.findViewById(2131362908); + i = 2131362910; + ImageView imageView3 = (ImageView) viewGroup.findViewById(2131362910); if (imageView3 != null) { - i = 2131363500; - View findViewById = viewGroup.findViewById(2131363500); + i = 2131363502; + View findViewById = viewGroup.findViewById(2131363502); if (findViewById != null) { - i = 2131363628; - TextView textView3 = (TextView) viewGroup.findViewById(2131363628); - if (textView3 != null) { - i = 2131363958; - ImageView imageView4 = (ImageView) viewGroup.findViewById(2131363958); - if (imageView4 != null) { - i = 2131363983; - ImageView imageView5 = (ImageView) viewGroup.findViewById(2131363983); + i = 2131363614; + ImageView imageView4 = (ImageView) viewGroup.findViewById(2131363614); + if (imageView4 != null) { + i = 2131363631; + TextView textView3 = (TextView) viewGroup.findViewById(2131363631); + if (textView3 != null) { + i = 2131363960; + ImageView imageView5 = (ImageView) viewGroup.findViewById(2131363960); if (imageView5 != null) { - i = 2131364186; - LinearLayout linearLayout = (LinearLayout) viewGroup.findViewById(2131364186); - if (linearLayout != null) { - i = 2131364381; - Button button = (Button) viewGroup.findViewById(2131364381); - if (button != null) { - i = 2131364385; - NumericBadgingView numericBadgingView = (NumericBadgingView) viewGroup.findViewById(2131364385); - if (numericBadgingView != null) { - i = 2131364386; - ImageView imageView6 = (ImageView) viewGroup.findViewById(2131364386); - if (imageView6 != null) { - i = 2131364514; - ImageView imageView7 = (ImageView) viewGroup.findViewById(2131364514); + i = 2131363985; + ImageView imageView6 = (ImageView) viewGroup.findViewById(2131363985); + if (imageView6 != null) { + i = 2131364188; + LinearLayout linearLayout = (LinearLayout) viewGroup.findViewById(2131364188); + if (linearLayout != null) { + i = 2131364384; + Button button = (Button) viewGroup.findViewById(2131364384); + if (button != null) { + i = 2131364388; + NumericBadgingView numericBadgingView = (NumericBadgingView) viewGroup.findViewById(2131364388); + if (numericBadgingView != null) { + i = 2131364389; + ImageView imageView7 = (ImageView) viewGroup.findViewById(2131364389); if (imageView7 != null) { i = 2131364517; - TextView textView4 = (TextView) viewGroup.findViewById(2131364517); - if (textView4 != null) { - i = 2131364556; - CardView cardView = (CardView) viewGroup.findViewById(2131364556); - if (cardView != null) { - i = 2131364995; - MaterialTextView materialTextView = (MaterialTextView) viewGroup.findViewById(2131364995); - if (materialTextView != null) { - i = 2131365118; - ImageView imageView8 = (ImageView) viewGroup.findViewById(2131365118); - if (imageView8 != null) { - i = 2131365123; - TextView textView5 = (TextView) viewGroup.findViewById(2131365123); - if (textView5 != null) { - i = 2131365124; - VolumeSliderView volumeSliderView = (VolumeSliderView) viewGroup.findViewById(2131365124); - if (volumeSliderView != null) { - i = 2131365481; - ImageView imageView9 = (ImageView) viewGroup.findViewById(2131365481); - if (imageView9 != null) { - return new VoiceControlsSheetViewBinding(viewGroup, imageView, frameLayout, imageView2, textView, textView2, imageView3, findViewById, textView3, imageView4, imageView5, linearLayout, button, numericBadgingView, imageView6, imageView7, textView4, cardView, materialTextView, imageView8, textView5, volumeSliderView, imageView9); + ImageView imageView8 = (ImageView) viewGroup.findViewById(2131364517); + if (imageView8 != null) { + i = 2131364520; + TextView textView4 = (TextView) viewGroup.findViewById(2131364520); + if (textView4 != null) { + i = 2131364559; + CardView cardView = (CardView) viewGroup.findViewById(2131364559); + if (cardView != null) { + i = 2131364999; + MaterialTextView materialTextView = (MaterialTextView) viewGroup.findViewById(2131364999); + if (materialTextView != null) { + i = 2131365122; + ImageView imageView9 = (ImageView) viewGroup.findViewById(2131365122); + if (imageView9 != null) { + i = 2131365127; + TextView textView5 = (TextView) viewGroup.findViewById(2131365127); + if (textView5 != null) { + i = 2131365128; + VolumeSliderView volumeSliderView = (VolumeSliderView) viewGroup.findViewById(2131365128); + if (volumeSliderView != null) { + i = 2131365487; + ImageView imageView10 = (ImageView) viewGroup.findViewById(2131365487); + if (imageView10 != null) { + return new VoiceControlsSheetViewBinding(viewGroup, imageView, frameLayout, imageView2, textView, textView2, imageView3, findViewById, imageView4, textView3, imageView5, imageView6, linearLayout, button, numericBadgingView, imageView7, imageView8, textView4, cardView, materialTextView, imageView9, textView5, volumeSliderView, imageView10); + } } } } diff --git a/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java b/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java index 6ee1b0de47..8b9e6c9d52 100644 --- a/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java +++ b/app/src/main/java/com/discord/databinding/VoiceUserListItemUserBinding.java @@ -17,7 +17,7 @@ public final class VoiceUserListItemUserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1665c; + public final TextView f1667c; @NonNull public final ImageView d; @NonNull @@ -36,7 +36,7 @@ public final class VoiceUserListItemUserBinding implements ViewBinding { public VoiceUserListItemUserBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton, @NonNull VoiceUserView voiceUserView, @NonNull TextView textView2, @NonNull StreamPreviewView streamPreviewView, @NonNull ImageView imageView4) { this.a = linearLayout; this.b = imageView; - this.f1665c = textView; + this.f1667c = textView; this.d = imageView2; this.e = imageView3; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java index 8944b2ed19..73c7516da7 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAddFriendUserListItemBinding.java @@ -17,7 +17,7 @@ public final class WidgetAddFriendUserListItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppCompatImageView f1666c; + public final AppCompatImageView f1668c; @NonNull public final AppCompatImageView d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetAddFriendUserListItemBinding implements ViewBinding { public WidgetAddFriendUserListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull AppCompatImageView appCompatImageView2, @NonNull AppCompatImageView appCompatImageView3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2, @NonNull AppCompatImageView appCompatImageView4) { this.a = constraintLayout; this.b = appCompatImageView; - this.f1666c = appCompatImageView2; + this.f1668c = appCompatImageView2; this.d = appCompatImageView3; this.e = simpleDraweeView; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java index 535d22a18a..fa14df97b9 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAgeVerifyBinding.java @@ -16,7 +16,7 @@ public final class WidgetAgeVerifyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final z f1667c; + public final z f1669c; @NonNull public final a0 d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetAgeVerifyBinding implements ViewBinding { public WidgetAgeVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull z zVar, @NonNull a0 a0Var, @NonNull y yVar) { this.a = coordinatorLayout; this.b = appViewFlipper; - this.f1667c = zVar; + this.f1669c = zVar; this.d = a0Var; this.e = yVar; } diff --git a/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java index 8781806f95..4908190a20 100644 --- a/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetApplicationCommandBottomSheetBinding.java @@ -17,7 +17,7 @@ public final class WidgetApplicationCommandBottomSheetBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1668c; + public final TextView f1670c; @NonNull public final MaterialButton d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetApplicationCommandBottomSheetBinding implements ViewBin public WidgetApplicationCommandBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ProgressBar progressBar, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1668c = textView; + this.f1670c = textView; this.d = materialButton; this.e = progressBar; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java index 73f533190e..d4cf2444ad 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuditLogFilterSheetBinding.java @@ -14,12 +14,12 @@ public final class WidgetAuditLogFilterSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1669c; + public final RecyclerView f1671c; public WidgetAuditLogFilterSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView) { this.a = linearLayout; this.b = textInputLayout; - this.f1669c = recyclerView; + this.f1671c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java index 7a313979f5..c8a190543f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthBirthdayBinding.java @@ -18,7 +18,7 @@ public final class WidgetAuthBirthdayBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1670c; + public final TextInputLayout f1672c; @NonNull public final MaterialButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetAuthBirthdayBinding implements ViewBinding { public WidgetAuthBirthdayBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull MaterialCheckBox materialCheckBox, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = linkifiedTextView; - this.f1670c = textInputLayout; + this.f1672c = textInputLayout; this.d = materialButton; this.e = materialCheckBox; } diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java index 4784074693..deb224248d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthCaptchaBinding.java @@ -15,14 +15,14 @@ public final class WidgetAuthCaptchaBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1671c; + public final MaterialButton f1673c; @NonNull public final ScreenTitleView d; public WidgetAuthCaptchaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ScreenTitleView screenTitleView) { this.a = coordinatorLayout; this.b = textView; - this.f1671c = materialButton; + this.f1673c = materialButton; this.d = screenTitleView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java index 986b4f135d..896486cb9d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthLandingBinding.java @@ -18,7 +18,7 @@ public final class WidgetAuthLandingBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1672c; + public final MaterialButton f1674c; @NonNull public final MaterialButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetAuthLandingBinding implements ViewBinding { public WidgetAuthLandingBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull AuthInviteInfoView authInviteInfoView, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull MaterialButton materialButton2, @NonNull AppViewFlipper appViewFlipper, @NonNull ScreenTitleView screenTitleView) { this.a = relativeLayout; this.b = authInviteInfoView; - this.f1672c = materialButton; + this.f1674c = materialButton; this.d = materialButton2; this.e = appViewFlipper; } diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java index 1e07641a13..550b146fdb 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthLoginBinding.java @@ -18,7 +18,7 @@ public final class WidgetAuthLoginBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1673c; + public final LinearLayout f1675c; @NonNull public final TextView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetAuthLoginBinding implements ViewBinding { public WidgetAuthLoginBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1673c = linearLayout; + this.f1675c = linearLayout; this.d = textView; this.e = phoneOrEmailInputView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java index b7d645c242..e36e0d6a28 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBackupCodesBinding.java @@ -15,14 +15,14 @@ public final class WidgetAuthMfaBackupCodesBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1674c; + public final TextInputLayout f1676c; @NonNull public final MaterialButton d; public WidgetAuthMfaBackupCodesBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1674c = textInputLayout; + this.f1676c = textInputLayout; this.d = materialButton2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java index 06ab5cda2b..bbe84e90d6 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthMfaBinding.java @@ -15,12 +15,12 @@ public final class WidgetAuthMfaBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final DimmerView f1675c; + public final DimmerView f1677c; public WidgetAuthMfaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull CodeVerificationView codeVerificationView, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = codeVerificationView; - this.f1675c = dimmerView; + this.f1677c = dimmerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java index 6bd1f6ac3f..79ef247b11 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthPhoneVerifyBinding.java @@ -15,7 +15,7 @@ public final class WidgetAuthPhoneVerifyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1676c; + public final TextView f1678c; @NonNull public final CodeVerificationView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetAuthPhoneVerifyBinding implements ViewBinding { public WidgetAuthPhoneVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CodeVerificationView codeVerificationView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = textView; - this.f1676c = textView2; + this.f1678c = textView2; this.d = codeVerificationView; this.e = textView3; this.f = textView4; diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java index fae1d1d020..16d5bd1b13 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterAccountInformationBinding.java @@ -16,7 +16,7 @@ public final class WidgetAuthRegisterAccountInformationBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final LoadingButton f1677c; + public final LoadingButton f1679c; @NonNull public final TextInputLayout d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetAuthRegisterAccountInformationBinding implements ViewBi public WidgetAuthRegisterAccountInformationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull MaterialCheckBox materialCheckBox) { this.a = coordinatorLayout; this.b = linkifiedTextView; - this.f1677c = loadingButton; + this.f1679c = loadingButton; this.d = textInputLayout; this.e = textInputLayout2; this.f = materialCheckBox; diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java index 6eed39d84f..4a7971a83b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthRegisterIdentityBinding.java @@ -18,7 +18,7 @@ public final class WidgetAuthRegisterIdentityBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CardSegment f1678c; + public final CardSegment f1680c; @NonNull public final PhoneOrEmailInputView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetAuthRegisterIdentityBinding implements ViewBinding { public WidgetAuthRegisterIdentityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull CardSegment cardSegment, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CardSegment cardSegment2, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1678c = cardSegment; + this.f1680c = cardSegment; this.d = phoneOrEmailInputView; this.e = linkifiedTextView; this.f = cardSegment2; diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java index 77b9f0e80f..963159d4d8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthResetPasswordBinding.java @@ -13,12 +13,12 @@ public final class WidgetAuthResetPasswordBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1679c; + public final MaterialButton f1681c; public WidgetAuthResetPasswordBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = coordinatorLayout; this.b = materialButton; - this.f1679c = materialButton2; + this.f1681c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java index 162e1a8084..719ef06994 100644 --- a/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetAuthUndeleteAccountBinding.java @@ -14,14 +14,14 @@ public final class WidgetAuthUndeleteAccountBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1680c; + public final MaterialButton f1682c; @NonNull public final ScreenTitleView d; public WidgetAuthUndeleteAccountBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull ScreenTitleView screenTitleView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1680c = materialButton2; + this.f1682c = materialButton2; this.d = screenTitleView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java index 9c0ea605e1..ce8bc9be7c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetBanUserBinding.java @@ -16,7 +16,7 @@ public final class WidgetBanUserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1681c; + public final MaterialButton f1683c; @NonNull public final MaterialButton d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetBanUserBinding implements ViewBinding { public WidgetBanUserBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout3) { this.a = linearLayout; this.b = textView; - this.f1681c = materialButton; + this.f1683c = materialButton; this.d = materialButton2; this.e = checkedSetting; this.f = checkedSetting2; diff --git a/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java b/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java index efd1059cba..8fe220f481 100644 --- a/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetBugReportBinding.java @@ -21,7 +21,7 @@ public final class WidgetBugReportBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1682c; + public final TextInputLayout f1684c; @NonNull public final TextInputLayout d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetBugReportBinding implements ViewBinding { public WidgetBugReportBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull MaterialTextView materialTextView, @NonNull TextInputLayout textInputLayout3, @NonNull MaterialCardView materialCardView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppCompatImageView appCompatImageView2, @NonNull ImageView imageView, @NonNull StickerView stickerView, @NonNull MaterialTextView materialTextView2, @NonNull MaterialButton materialButton, @NonNull AppViewFlipper appViewFlipper, @NonNull MaterialButton materialButton2, @NonNull MaterialTextView materialTextView3, @NonNull View view) { this.a = coordinatorLayout; this.b = appCompatImageView; - this.f1682c = textInputLayout; + this.f1684c = textInputLayout; this.d = textInputLayout2; this.e = materialTextView; this.f = textInputLayout3; diff --git a/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java b/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java index 0347cf3036..fb3a0c8c9f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetCallFullscreenBinding.java @@ -31,7 +31,7 @@ public final class WidgetCallFullscreenBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppBarLayout f1683c; + public final AppBarLayout f1685c; @NonNull public final RelativeLayout d; @NonNull @@ -65,7 +65,7 @@ public final class WidgetCallFullscreenBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final ConstraintLayout f1684s; + public final ConstraintLayout f1686s; @NonNull public final UserSummaryView t; @NonNull @@ -78,7 +78,7 @@ public final class WidgetCallFullscreenBinding implements ViewBinding { public WidgetCallFullscreenBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Toolbar toolbar, @NonNull AppBarLayout appBarLayout, @NonNull RelativeLayout relativeLayout, @NonNull z3 z3Var, @NonNull Barrier barrier, @NonNull ConstraintLayout constraintLayout2, @NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout3, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton2, @NonNull VideoCallParticipantView videoCallParticipantView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton3, @NonNull ConstraintLayout constraintLayout4, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView2, @NonNull StageCallVisitCommunityView stageCallVisitCommunityView, @NonNull a4 a4Var, @NonNull ConstraintLayout constraintLayout5, @NonNull UserSummaryView userSummaryView, @NonNull MaterialTextView materialTextView, @NonNull ViewStub viewStub, @NonNull Barrier barrier2, @NonNull VoiceControlsSheetView voiceControlsSheetView, @NonNull FragmentContainerView fragmentContainerView) { this.a = constraintLayout; this.b = toolbar; - this.f1683c = appBarLayout; + this.f1685c = appBarLayout; this.d = relativeLayout; this.e = z3Var; this.f = coordinatorLayout; @@ -94,7 +94,7 @@ public final class WidgetCallFullscreenBinding implements ViewBinding { this.p = recyclerView2; this.q = stageCallVisitCommunityView; this.r = a4Var; - this.f1684s = constraintLayout5; + this.f1686s = constraintLayout5; this.t = userSummaryView; this.u = materialTextView; this.v = viewStub; diff --git a/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java b/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java index a3eef647b6..136098068c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChangeLogBinding.java @@ -17,7 +17,7 @@ public final class WidgetChangeLogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppCompatImageButton f1685c; + public final AppCompatImageButton f1687c; @NonNull public final AppCompatImageButton d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetChangeLogBinding implements ViewBinding { public WidgetChangeLogBinding(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout2, @NonNull AppCompatImageButton appCompatImageButton, @NonNull AppCompatImageButton appCompatImageButton2, @NonNull NestedScrollView nestedScrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppCompatImageButton appCompatImageButton3, @NonNull VideoView videoView, @NonNull SimpleDraweeView simpleDraweeView2) { this.a = linearLayout; this.b = linkifiedTextView; - this.f1685c = appCompatImageButton; + this.f1687c = appCompatImageButton; this.d = appCompatImageButton2; this.e = nestedScrollView; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java b/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java index fcf6428056..b1abc79335 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChangeLogSpecialBinding.java @@ -20,7 +20,7 @@ public final class WidgetChangeLogSpecialBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageButton f1686c; + public final ImageButton f1688c; @NonNull public final MaterialButton d; @NonNull @@ -41,7 +41,7 @@ public final class WidgetChangeLogSpecialBinding implements ViewBinding { public WidgetChangeLogSpecialBinding(@NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ImageButton imageButton, @NonNull MaterialButton materialButton, @NonNull ImageButton imageButton2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull NestedScrollView nestedScrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull VideoView videoView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView, @NonNull CardView cardView2) { this.a = linearLayout; this.b = linkifiedTextView; - this.f1686c = imageButton; + this.f1688c = imageButton; this.d = materialButton; this.e = imageButton2; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java index 30aa3234f1..f47109875e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSheetBinding.java @@ -18,7 +18,7 @@ public final class WidgetChannelFollowSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1687c; + public final TextView f1689c; @NonNull public final SimpleDraweeView d; @NonNull @@ -37,7 +37,7 @@ public final class WidgetChannelFollowSheetBinding implements ViewBinding { public WidgetChannelFollowSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCardView materialCardView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull AppViewFlipper appViewFlipper) { this.a = nestedScrollView; this.b = textView; - this.f1687c = textView2; + this.f1689c = textView2; this.d = simpleDraweeView; this.e = materialCardView; this.f = materialCardView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java index 99fedcf8fc..ad16123476 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelFollowSuccessDialogBinding.java @@ -15,14 +15,14 @@ public final class WidgetChannelFollowSuccessDialogBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1688c; + public final SimpleDraweeView f1690c; @NonNull public final TextView d; public WidgetChannelFollowSuccessDialogBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = nestedScrollView; this.b = materialButton; - this.f1688c = simpleDraweeView; + this.f1690c = simpleDraweeView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java index cdd4235bcf..794c1a2019 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelGroupDmSettingsBinding.java @@ -18,7 +18,7 @@ public final class WidgetChannelGroupDmSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1689c; + public final FloatingActionButton f1691c; @NonNull public final NotificationMuteSettingsView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetChannelGroupDmSettingsBinding implements ViewBinding { public WidgetChannelGroupDmSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull NestedScrollView nestedScrollView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1689c = floatingActionButton; + this.f1691c = floatingActionButton; this.d = notificationMuteSettingsView; this.e = nestedScrollView; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java index 3d2d70bf06..b3ba891bc3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelMembersListItemUserBinding.java @@ -17,7 +17,7 @@ public final class WidgetChannelMembersListItemUserBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1690c; + public final ImageView f1692c; @NonNull public final SimpleDraweeSpanTextView d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetChannelMembersListItemUserBinding implements ViewBindin public WidgetChannelMembersListItemUserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ImageView imageView2, @NonNull UsernameView usernameView, @NonNull StatusView statusView, @NonNull ImageView imageView3) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1690c = imageView; + this.f1692c = imageView; this.d = simpleDraweeSpanTextView; this.e = imageView2; this.f = usernameView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java index b569694443..fe74da804a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelNotificationSettingsBinding.java @@ -16,7 +16,7 @@ public final class WidgetChannelNotificationSettingsBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final NotificationMuteSettingsView f1691c; + public final NotificationMuteSettingsView f1693c; @NonNull public final CheckedSetting d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetChannelNotificationSettingsBinding implements ViewBindi public WidgetChannelNotificationSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout2, @NonNull NestedScrollView nestedScrollView) { this.a = coordinatorLayout; this.b = linearLayout; - this.f1691c = notificationMuteSettingsView; + this.f1693c = notificationMuteSettingsView; this.d = checkedSetting; this.e = checkedSetting2; this.f = checkedSetting3; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java index 2bb21f06da..10465bfbae 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberBinding.java @@ -14,12 +14,12 @@ public final class WidgetChannelSettingsAddMemberBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SearchInputView f1692c; + public final SearchInputView f1694c; public WidgetChannelSettingsAddMemberBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull SearchInputView searchInputView) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1692c = searchInputView; + this.f1694c = searchInputView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java index 983f313393..0bef6f0e73 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberItemBinding.java @@ -15,14 +15,14 @@ public final class WidgetChannelSettingsAddMemberItemBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialCheckBox f1693c; + public final MaterialCheckBox f1695c; @NonNull public final ConstraintLayout d; public WidgetChannelSettingsAddMemberItemBinding(@NonNull FrameLayout frameLayout, @NonNull ChannelPermissionOwnerView channelPermissionOwnerView, @NonNull MaterialCheckBox materialCheckBox, @NonNull ConstraintLayout constraintLayout) { this.a = frameLayout; this.b = channelPermissionOwnerView; - this.f1693c = materialCheckBox; + this.f1695c = materialCheckBox; this.d = constraintLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java index 495afb0613..826dbc7451 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsAddMemberSheetBinding.java @@ -14,14 +14,14 @@ public final class WidgetChannelSettingsAddMemberSheetBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final FragmentContainerView f1694c; + public final FragmentContainerView f1696c; @NonNull public final TextView d; public WidgetChannelSettingsAddMemberSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull FragmentContainerView fragmentContainerView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = linearLayout; this.b = textView; - this.f1694c = fragmentContainerView; + this.f1696c = fragmentContainerView; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java index abcf8e9bc8..03d50f7f31 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsEditPermissionsBinding.java @@ -31,7 +31,7 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final TernaryCheckBox f1695c; + public final TernaryCheckBox f1697c; @NonNull public final TernaryCheckBox d; @NonNull @@ -65,7 +65,7 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi @NonNull /* renamed from: s reason: collision with root package name */ - public final TernaryCheckBox f1696s; + public final TernaryCheckBox f1698s; @NonNull public final TernaryCheckBox t; @NonNull @@ -77,20 +77,20 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi @NonNull /* renamed from: x reason: collision with root package name */ - public final TernaryCheckBox f1697x; + public final TernaryCheckBox f1699x; @NonNull /* renamed from: y reason: collision with root package name */ - public final TernaryCheckBox f1698y; + public final TernaryCheckBox f1700y; @NonNull /* renamed from: z reason: collision with root package name */ - public final SimpleDraweeView f1699z; + public final SimpleDraweeView f1701z; public WidgetChannelSettingsEditPermissionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TernaryCheckBox ternaryCheckBox, @NonNull TernaryCheckBox ternaryCheckBox2, @NonNull TernaryCheckBox ternaryCheckBox3, @NonNull TernaryCheckBox ternaryCheckBox4, @NonNull TernaryCheckBox ternaryCheckBox5, @NonNull TernaryCheckBox ternaryCheckBox6, @NonNull TernaryCheckBox ternaryCheckBox7, @NonNull TernaryCheckBox ternaryCheckBox8, @NonNull TernaryCheckBox ternaryCheckBox9, @NonNull TernaryCheckBox ternaryCheckBox10, @NonNull TernaryCheckBox ternaryCheckBox11, @NonNull TernaryCheckBox ternaryCheckBox12, @NonNull TernaryCheckBox ternaryCheckBox13, @NonNull TernaryCheckBox ternaryCheckBox14, @NonNull TernaryCheckBox ternaryCheckBox15, @NonNull TernaryCheckBox ternaryCheckBox16, @NonNull TernaryCheckBox ternaryCheckBox17, @NonNull TernaryCheckBox ternaryCheckBox18, @NonNull TernaryCheckBox ternaryCheckBox19, @NonNull TernaryCheckBox ternaryCheckBox20, @NonNull TernaryCheckBox ternaryCheckBox21, @NonNull TernaryCheckBox ternaryCheckBox22, @NonNull TernaryCheckBox ternaryCheckBox23, @NonNull TernaryCheckBox ternaryCheckBox24, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView3) { this.a = coordinatorLayout; this.b = ternaryCheckBox; - this.f1695c = ternaryCheckBox2; + this.f1697c = ternaryCheckBox2; this.d = ternaryCheckBox3; this.e = ternaryCheckBox4; this.f = ternaryCheckBox5; @@ -106,14 +106,14 @@ public final class WidgetChannelSettingsEditPermissionsBinding implements ViewBi this.p = ternaryCheckBox15; this.q = ternaryCheckBox16; this.r = ternaryCheckBox17; - this.f1696s = ternaryCheckBox18; + this.f1698s = ternaryCheckBox18; this.t = ternaryCheckBox19; this.u = ternaryCheckBox20; this.v = ternaryCheckBox21; this.w = ternaryCheckBox22; - this.f1697x = ternaryCheckBox23; - this.f1698y = ternaryCheckBox24; - this.f1699z = simpleDraweeView; + this.f1699x = ternaryCheckBox23; + this.f1700y = ternaryCheckBox24; + this.f1701z = simpleDraweeView; this.A = textView; this.B = floatingActionButton; this.C = linearLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java index 9926872d7a..e6c236cef1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsAdvancedBinding.java @@ -15,7 +15,7 @@ public final class WidgetChannelSettingsPermissionsAdvancedBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1700c; + public final TextView f1702c; @NonNull public final LinearLayout d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetChannelSettingsPermissionsAdvancedBinding implements Vi public WidgetChannelSettingsPermissionsAdvancedBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout2, @NonNull RecyclerView recyclerView2) { this.a = coordinatorLayout; this.b = textView; - this.f1700c = textView2; + this.f1702c = textView2; this.d = linearLayout; this.e = recyclerView; this.f = linearLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java index c176d543cd..a27874e857 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSettingsPermissionsOverviewBinding.java @@ -15,12 +15,12 @@ public final class WidgetChannelSettingsPermissionsOverviewBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final SegmentedControlContainer f1701c; + public final SegmentedControlContainer f1703c; public WidgetChannelSettingsPermissionsOverviewBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull AppViewFlipper appViewFlipper, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull FragmentContainerView fragmentContainerView2) { this.a = coordinatorLayout; this.b = appViewFlipper; - this.f1701c = segmentedControlContainer; + this.f1703c = segmentedControlContainer; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java index 99a97cef37..dbbbb174dd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelSidebarActionsBinding.java @@ -14,12 +14,12 @@ public final class WidgetChannelSidebarActionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final PrivateChannelSideBarActionsView f1702c; + public final PrivateChannelSideBarActionsView f1704c; public WidgetChannelSidebarActionsBinding(@NonNull FrameLayout frameLayout, @NonNull GuildChannelSideBarActionsView guildChannelSideBarActionsView, @NonNull PrivateChannelSideBarActionsView privateChannelSideBarActionsView) { this.a = frameLayout; this.b = guildChannelSideBarActionsView; - this.f1702c = privateChannelSideBarActionsView; + this.f1704c = privateChannelSideBarActionsView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java index 42807cf804..4bc076b4cc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelTopicBinding.java @@ -16,7 +16,7 @@ public final class WidgetChannelTopicBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1703c; + public final ImageView f1705c; @NonNull public final ImageView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetChannelTopicBinding implements ViewBinding { public WidgetChannelTopicBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1703c = imageView; + this.f1705c = imageView; this.d = imageView2; this.e = textView; this.f = linkifiedTextView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java index 6781545d8a..0c78c664bd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListActionsChangeNicknameBinding.java @@ -15,7 +15,7 @@ public final class WidgetChannelsListActionsChangeNicknameBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1704c; + public final TextInputLayout f1706c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetChannelsListActionsChangeNicknameBinding implements Vie public WidgetChannelsListActionsChangeNicknameBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1704c = textInputLayout; + this.f1706c = textInputLayout; this.d = textView; this.e = materialButton2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java index 802618bc38..4f93beb78a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListBinding.java @@ -25,7 +25,7 @@ public final class WidgetChannelsListBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1705c; + public final RecyclerView f1707c; @NonNull public final SimpleDraweeView d; @NonNull @@ -58,7 +58,7 @@ public final class WidgetChannelsListBinding implements ViewBinding { public WidgetChannelsListBinding(@NonNull RoundedCoordinatorLayout roundedCoordinatorLayout, @NonNull CustomAppBarLayout customAppBarLayout, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull Toolbar toolbar, @NonNull TextView textView5, @NonNull AppCompatImageView appCompatImageView, @NonNull View view, @NonNull View view2, @NonNull ViewStub viewStub, @NonNull Toolbar toolbar2, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull RoundedCoordinatorLayout roundedCoordinatorLayout2, @NonNull EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView, @NonNull EmptyFriendsStateView emptyFriendsStateView) { this.a = roundedCoordinatorLayout; this.b = customAppBarLayout; - this.f1705c = recyclerView; + this.f1707c = recyclerView; this.d = simpleDraweeView; this.e = frameLayout; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java index f52252a0f3..792a5011fa 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemActiveStageEventBinding.java @@ -17,7 +17,7 @@ public final class WidgetChannelsListItemActiveStageEventBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1706c; + public final MaterialButton f1708c; @NonNull public final TextView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetChannelsListItemActiveStageEventBinding implements View public WidgetChannelsListItemActiveStageEventBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull UserSummaryView userSummaryView, @NonNull MaterialTextView materialTextView) { this.a = constraintLayout; this.b = textView2; - this.f1706c = materialButton; + this.f1708c = materialButton; this.d = textView3; this.e = textView4; this.f = userSummaryView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java index 4cb3ac9df0..c618c4872e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemCategoryBinding.java @@ -14,14 +14,14 @@ public final class WidgetChannelsListItemCategoryBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1707c; + public final ImageView f1709c; @NonNull public final TextView d; public WidgetChannelsListItemCategoryBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView) { this.a = linearLayout; this.b = imageView; - this.f1707c = imageView2; + this.f1709c = imageView2; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java index 16814f4180..53d4a88160 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelBinding.java @@ -14,7 +14,7 @@ public final class WidgetChannelsListItemChannelBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1708c; + public final TextView f1710c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetChannelsListItemChannelBinding implements ViewBinding { public WidgetChannelsListItemChannelBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = imageView; - this.f1708c = textView; + this.f1710c = textView; this.d = textView2; this.e = imageView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java index 4bdd4793a0..314d552b82 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelPrivateBinding.java @@ -16,7 +16,7 @@ public final class WidgetChannelsListItemChannelPrivateBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1709c; + public final SimpleDraweeView f1711c; @NonNull public final SimpleDraweeSpanTextView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetChannelsListItemChannelPrivateBinding implements ViewBi public WidgetChannelsListItemChannelPrivateBinding(@NonNull RelativeLayout relativeLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = relativeLayout; this.b = statusView; - this.f1709c = simpleDraweeView; + this.f1711c = simpleDraweeView; this.d = simpleDraweeSpanTextView; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java index bbac509304..770e940198 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelStageVoiceBinding.java @@ -14,14 +14,14 @@ public final class WidgetChannelsListItemChannelStageVoiceBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1710c; + public final TextView f1712c; @NonNull public final TextView d; public WidgetChannelsListItemChannelStageVoiceBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = relativeLayout; this.b = imageView; - this.f1710c = textView; + this.f1712c = textView; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java index f4983a6bba..f7c54f8dae 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemChannelVoiceBinding.java @@ -15,14 +15,14 @@ public final class WidgetChannelsListItemChannelVoiceBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1711c; + public final ImageView f1713c; @NonNull public final VoiceUserLimitView d; public WidgetChannelsListItemChannelVoiceBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull VoiceUserLimitView voiceUserLimitView) { this.a = relativeLayout; this.b = textView; - this.f1711c = imageView; + this.f1713c = imageView; this.d = voiceUserLimitView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java new file mode 100644 index 0000000000..b2d27e8dd6 --- /dev/null +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemDirectoryBinding.java @@ -0,0 +1,25 @@ +package com.discord.databinding; + +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.viewbinding.ViewBinding; +public final class WidgetChannelsListItemDirectoryBinding implements ViewBinding { + @NonNull + public final LinearLayout a; + @NonNull + public final TextView b; + + public WidgetChannelsListItemDirectoryBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) { + this.a = linearLayout; + this.b = textView; + } + + @Override // androidx.viewbinding.ViewBinding + @NonNull + public View getRoot() { + return this.a; + } +} diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java index 2b1c1b887c..78486cabd0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemHeaderBinding.java @@ -14,12 +14,12 @@ public final class WidgetChannelsListItemHeaderBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1712c; + public final ImageView f1714c; public WidgetChannelsListItemHeaderBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull ImageView imageView) { this.a = relativeLayout; this.b = textView; - this.f1712c = imageView; + this.f1714c = imageView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java index 4a8f19702a..1b49007269 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemTextActionsBinding.java @@ -14,7 +14,7 @@ public final class WidgetChannelsListItemTextActionsBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1713c; + public final TextView f1715c; @NonNull public final TextView d; @NonNull @@ -37,7 +37,7 @@ public final class WidgetChannelsListItemTextActionsBinding implements ViewBindi public WidgetChannelsListItemTextActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9) { this.a = nestedScrollView; this.b = textView; - this.f1713c = textView2; + this.f1715c = textView2; this.d = textView3; this.e = view; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java index 321c043dc7..23a9409ca8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadActionsBinding.java @@ -15,7 +15,7 @@ public final class WidgetChannelsListItemThreadActionsBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1714c; + public final TextView f1716c; @NonNull public final TextView d; @NonNull @@ -40,7 +40,7 @@ public final class WidgetChannelsListItemThreadActionsBinding implements ViewBin public WidgetChannelsListItemThreadActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull View view, @NonNull View view2, @NonNull TextView textView5, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9) { this.a = nestedScrollView; this.b = linearLayout; - this.f1714c = textView2; + this.f1716c = textView2; this.d = textView3; this.e = textView4; this.f = view; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java index a25888307f..7c780f4a3a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemThreadBinding.java @@ -14,7 +14,7 @@ public final class WidgetChannelsListItemThreadBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1715c; + public final TextView f1717c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetChannelsListItemThreadBinding implements ViewBinding { public WidgetChannelsListItemThreadBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = constraintLayout; this.b = constraintLayout2; - this.f1715c = textView; + this.f1717c = textView; this.d = textView2; this.e = imageView; this.f = imageView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java index 28aef8404d..17d29d4546 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListItemVoiceUserBinding.java @@ -16,7 +16,7 @@ public final class WidgetChannelsListItemVoiceUserBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1716c; + public final ImageView f1718c; @NonNull public final ImageView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetChannelsListItemVoiceUserBinding implements ViewBinding public WidgetChannelsListItemVoiceUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull ImageView imageView3, @NonNull TextView textView2, @NonNull LinearLayout linearLayout) { this.a = relativeLayout; this.b = simpleDraweeView; - this.f1716c = imageView; + this.f1718c = imageView; this.d = imageView2; this.e = textView; this.f = imageView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java index 43a7be531f..c7e1d38c9d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChannelsListUnreadsBinding.java @@ -14,12 +14,12 @@ public final class WidgetChannelsListUnreadsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1717c; + public final RelativeLayout f1719c; public WidgetChannelsListUnreadsBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout) { this.a = frameLayout; this.b = textView; - this.f1717c = relativeLayout; + this.f1719c = relativeLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java index 4d3c21301d..01564d448a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatInputApplicationCommandsBinding.java @@ -14,12 +14,12 @@ public final class WidgetChatInputApplicationCommandsBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1718c; + public final RecyclerView f1720c; public WidgetChatInputApplicationCommandsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull View view) { this.a = constraintLayout; this.b = textView; - this.f1718c = recyclerView; + this.f1720c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java index 971e5e134d..03d19fb8b2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatInputBinding.java @@ -20,7 +20,7 @@ public final class WidgetChatInputBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1719c; + public final RecyclerView f1721c; @NonNull public final LinearLayout d; @NonNull @@ -54,12 +54,12 @@ public final class WidgetChatInputBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final e4 f1720s; + public final e4 f1722s; public WidgetChatInputBinding(@NonNull LinearLayout linearLayout, @NonNull WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageButton appCompatImageButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView2, @NonNull LinearLayout linearLayout4, @NonNull TextView textView4, @NonNull RecyclerView recyclerView3, @NonNull FragmentContainerView fragmentContainerView, @NonNull LinearLayout linearLayout5, @NonNull d4 d4Var, @NonNull e4 e4Var) { this.a = linearLayout; this.b = widgetChatInputApplicationCommandsBinding; - this.f1719c = recyclerView; + this.f1721c = recyclerView; this.d = linearLayout2; this.e = relativeLayout; this.f = appCompatImageButton; @@ -75,7 +75,7 @@ public final class WidgetChatInputBinding implements ViewBinding { this.p = fragmentContainerView; this.q = linearLayout5; this.r = d4Var; - this.f1720s = e4Var; + this.f1722s = e4Var; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java index 2a168121a1..0683891d64 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListActionsBinding.java @@ -15,7 +15,7 @@ public final class WidgetChatListActionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1721c; + public final TextView f1723c; @NonNull public final TextView d; @NonNull @@ -48,7 +48,7 @@ public final class WidgetChatListActionsBinding implements ViewBinding { public WidgetChatListActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15) { this.a = nestedScrollView; this.b = recyclerView; - this.f1721c = textView; + this.f1723c = textView; this.d = textView2; this.e = textView3; this.f = textView4; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java index 5e250e384b..e70485f108 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemApplicationCommandBinding.java @@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemApplicationCommandBinding implements @NonNull /* renamed from: c reason: collision with root package name */ - public final CardView f1722c; + public final CardView f1724c; @NonNull public final FrameLayout d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetChatListAdapterItemApplicationCommandBinding implements public WidgetChatListAdapterItemApplicationCommandBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull CardView cardView, @NonNull FrameLayout frameLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull Guideline guideline) { this.a = constraintLayout; this.b = textView; - this.f1722c = cardView; + this.f1724c = cardView; this.d = frameLayout; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java index a26517e6ba..baa8fc893a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemAttachmentBinding.java @@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemAttachmentBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1723c; + public final View f1725c; @NonNull public final MaterialCardView d; @NonNull @@ -38,7 +38,7 @@ public final class WidgetChatListAdapterItemAttachmentBinding implements ViewBin public WidgetChatListAdapterItemAttachmentBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull Barrier barrier, @NonNull MaterialCardView materialCardView, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull InlineMediaView inlineMediaView, @NonNull TextView textView2, @NonNull FrameLayout frameLayout, @NonNull Guideline guideline) { this.a = constraintLayout; this.b = view; - this.f1723c = view2; + this.f1725c = view2; this.d = materialCardView; this.e = textView; this.f = imageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java index dd44f48ec8..2df60d015c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemBotComponentRowBinding.java @@ -13,14 +13,14 @@ public final class WidgetChatListAdapterItemBotComponentRowBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1724c; + public final View f1726c; @NonNull public final View d; public WidgetChatListAdapterItemBotComponentRowBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull View view2) { this.a = constraintLayout; this.b = linearLayout; - this.f1724c = view; + this.f1726c = view; this.d = view2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java index 4c191b579c..140fcbc769 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemCallBinding.java @@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemCallBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1725c; + public final RecyclerView f1727c; @NonNull public final TextView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetChatListAdapterItemCallBinding implements ViewBinding { public WidgetChatListAdapterItemCallBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3) { this.a = cardView; this.b = imageView; - this.f1725c = recyclerView; + this.f1727c = recyclerView; this.d = textView; this.e = textView2; this.f = linearLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java index d9fc06dd16..fc210d2de0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEmbedBinding.java @@ -22,7 +22,7 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1726c; + public final View f1728c; @NonNull public final SimpleDraweeView d; @NonNull @@ -56,14 +56,14 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding @NonNull /* renamed from: s reason: collision with root package name */ - public final CardView f1727s; + public final CardView f1729s; @NonNull public final InlineMediaView t; public WidgetChatListAdapterItemEmbedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull Barrier barrier, @NonNull Barrier barrier2, @NonNull MaterialCardView materialCardView, @NonNull ConstraintLayout constraintLayout2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull View view3, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView3, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView4, @NonNull TextView textView3, @NonNull FrameLayout frameLayout, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull CardView cardView, @NonNull InlineMediaView inlineMediaView) { this.a = constraintLayout; this.b = view; - this.f1726c = view2; + this.f1728c = view2; this.d = simpleDraweeView; this.e = textView; this.f = materialCardView; @@ -79,7 +79,7 @@ public final class WidgetChatListAdapterItemEmbedBinding implements ViewBinding this.p = textView3; this.q = frameLayout; this.r = linkifiedTextView2; - this.f1727s = cardView; + this.f1729s = cardView; this.t = inlineMediaView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java index 863bc889f0..4fe09429c7 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemEphemeralMessageBinding.java @@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemEphemeralMessageBinding implements V @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1728c; + public final View f1730c; @NonNull public final ImageView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetChatListAdapterItemEphemeralMessageBinding implements V public WidgetChatListAdapterItemEphemeralMessageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull Guideline guideline) { this.a = constraintLayout; this.b = view; - this.f1728c = view2; + this.f1730c = view2; this.d = imageView; this.e = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java index 8a401af869..5e3575e9e9 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGiftBinding.java @@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemGiftBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1729c; + public final MaterialButton f1731c; @NonNull public final TextView d; @NonNull @@ -38,7 +38,7 @@ public final class WidgetChatListAdapterItemGiftBinding implements ViewBinding { public WidgetChatListAdapterItemGiftBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull View view, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton3, @NonNull ConstraintLayout constraintLayout2) { this.a = constraintLayout; this.b = materialButton; - this.f1729c = materialButton2; + this.f1731c = materialButton2; this.d = textView; this.e = textView2; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java index 989c171992..6aa082d247 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildInviteReminderBinding.java @@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemGuildInviteReminderBinding implement @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1730c; + public final TextView f1732c; @NonNull public final TextView d; public WidgetChatListAdapterItemGuildInviteReminderBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = constraintLayout; this.b = materialButton; - this.f1730c = textView; + this.f1732c = textView; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java index df530d7ed6..cc36f8725c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildTemplateBinding.java @@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemGuildTemplateBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1731c; + public final TextView f1733c; @NonNull public final TextView d; public WidgetChatListAdapterItemGuildTemplateBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ConstraintLayout constraintLayout2) { this.a = constraintLayout; this.b = materialButton; - this.f1731c = textView2; + this.f1733c = textView2; this.d = textView3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java index ee3bb5bd5e..5a729120e5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemGuildWelcomeBinding.java @@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemGuildWelcomeBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1732c; + public final LinkifiedTextView f1734c; @NonNull public final LinkifiedTextView d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetChatListAdapterItemGuildWelcomeBinding implements ViewB public WidgetChatListAdapterItemGuildWelcomeBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull ChatActionItem chatActionItem, @NonNull ChatActionItem chatActionItem2) { this.a = linearLayout; this.b = textView; - this.f1732c = linkifiedTextView; + this.f1734c = linkifiedTextView; this.d = linkifiedTextView2; this.e = chatActionItem; this.f = chatActionItem2; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java index f68fd088ae..72cc83145e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemInviteBinding.java @@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1733c; + public final TextView f1735c; @NonNull public final SimpleDraweeView d; @NonNull @@ -46,7 +46,7 @@ public final class WidgetChatListAdapterItemInviteBinding implements ViewBinding public WidgetChatListAdapterItemInviteBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull View view, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton3, @NonNull TextView textView4, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull ImageView imageView2, @NonNull TextView textView6, @NonNull ConstraintLayout constraintLayout2) { this.a = constraintLayout; this.b = textView; - this.f1733c = textView2; + this.f1735c = textView2; this.d = simpleDraweeView; this.e = textView3; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java index 26a09c829b..bd65ca6eff 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMentionFooterBinding.java @@ -14,12 +14,12 @@ public final class WidgetChatListAdapterItemMentionFooterBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1734c; + public final View f1736c; public WidgetChatListAdapterItemMentionFooterBinding(@NonNull LinearLayout linearLayout, @NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull View view2) { this.a = linearLayout; this.b = view; - this.f1734c = view2; + this.f1736c = view2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java index 37b37eb9da..6e45d281f3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemMessageHeaderBinding.java @@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemMessageHeaderBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1735c; + public final View f1737c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetChatListAdapterItemMessageHeaderBinding implements View public WidgetChatListAdapterItemMessageHeaderBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull Space space) { this.a = relativeLayout; this.b = textView; - this.f1735c = view; + this.f1737c = view; this.d = textView2; this.e = space; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java index 67d5ad08cb..7bbaf6e97d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemPrivateChannelStartBinding.java @@ -14,14 +14,14 @@ public final class WidgetChatListAdapterItemPrivateChannelStartBinding implement @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1736c; + public final SimpleDraweeView f1738c; @NonNull public final TextView d; public WidgetChatListAdapterItemPrivateChannelStartBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1736c = simpleDraweeView; + this.f1738c = simpleDraweeView; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java index 8ea839be04..51428dd130 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemReactionsBinding.java @@ -13,14 +13,14 @@ public final class WidgetChatListAdapterItemReactionsBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1737c; + public final View f1739c; @NonNull public final FlexboxLayout d; public WidgetChatListAdapterItemReactionsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull FlexboxLayout flexboxLayout) { this.a = constraintLayout; this.b = view; - this.f1737c = view2; + this.f1739c = view2; this.d = flexboxLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java index 33949e00be..5e5e774ed1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSpotifyListenTogetherBinding.java @@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogetherBinding impleme @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1738c; + public final TextView f1740c; @NonNull public final ConstraintLayout d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogetherBinding impleme public WidgetChatListAdapterItemSpotifyListenTogetherBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView, @NonNull TextView textView4, @NonNull TextView textView5) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1738c = textView; + this.f1740c = textView; this.d = constraintLayout2; this.e = textView2; this.f = recyclerView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java index 96a6e8b846..04bbf77f53 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStageInviteBinding.java @@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemStageInviteBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1739c; + public final TextView f1741c; @NonNull public final SimpleDraweeView d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetChatListAdapterItemStageInviteBinding implements ViewBi public WidgetChatListAdapterItemStageInviteBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView5, @NonNull DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView) { this.a = constraintLayout; this.b = textView; - this.f1739c = textView2; + this.f1741c = textView2; this.d = simpleDraweeView; this.e = textView4; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java index 225fb0cf08..cae409ac23 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStartBinding.java @@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemStartBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1740c; + public final TextView f1742c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetChatListAdapterItemStartBinding implements ViewBinding public WidgetChatListAdapterItemStartBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull ImageView imageView) { this.a = linearLayout; this.b = textView; - this.f1740c = textView2; + this.f1742c = textView2; this.d = textView3; this.e = textView4; this.f = imageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java index 02e9de877b..a660206999 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetBinding.java @@ -14,12 +14,12 @@ public final class WidgetChatListAdapterItemStickerGreetBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1741c; + public final MaterialButton f1743c; public WidgetChatListAdapterItemStickerGreetBinding(@NonNull LinearLayout linearLayout, @NonNull StickerView stickerView, @NonNull MaterialButton materialButton) { this.a = linearLayout; this.b = stickerView; - this.f1741c = materialButton; + this.f1743c = materialButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java index 47da1af475..fab30a5446 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemStickerGreetCompactBinding.java @@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemStickerGreetCompactBinding implement @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1742c; + public final TextView f1744c; @NonNull public final LinearLayout d; public WidgetChatListAdapterItemStickerGreetCompactBinding(@NonNull ConstraintLayout constraintLayout, @NonNull StickerView stickerView, @NonNull TextView textView, @NonNull LinearLayout linearLayout) { this.a = constraintLayout; this.b = stickerView; - this.f1742c = textView; + this.f1744c = textView; this.d = linearLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java index 1b314b9e09..a3418de7a3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemSystemBinding.java @@ -15,14 +15,14 @@ public final class WidgetChatListAdapterItemSystemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1743c; + public final LinkifiedTextView f1745c; @NonNull public final TextView d; public WidgetChatListAdapterItemSystemBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) { this.a = relativeLayout; this.b = imageView; - this.f1743c = linkifiedTextView; + this.f1745c = linkifiedTextView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java index 0756e5ed39..b57024c2b8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemTextDividerBinding.java @@ -13,27 +13,27 @@ public final class WidgetChatListAdapterItemTextDividerBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1744c; + public final View f1746c; @NonNull public final TextView d; public WidgetChatListAdapterItemTextDividerBinding(@NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull View view2, @NonNull TextView textView) { this.a = relativeLayout; this.b = view; - this.f1744c = view2; + this.f1746c = view2; this.d = textView; } @NonNull public static WidgetChatListAdapterItemTextDividerBinding a(@NonNull View view) { - int i = 2131362939; - View findViewById = view.findViewById(2131362939); + int i = 2131362941; + View findViewById = view.findViewById(2131362941); if (findViewById != null) { - i = 2131362940; - View findViewById2 = view.findViewById(2131362940); + i = 2131362942; + View findViewById2 = view.findViewById(2131362942); if (findViewById2 != null) { - i = 2131362941; - TextView textView = (TextView) view.findViewById(2131362941); + i = 2131362943; + TextView textView = (TextView) view.findViewById(2131362943); if (textView != null) { return new WidgetChatListAdapterItemTextDividerBinding((RelativeLayout) view, findViewById, findViewById2, textView); } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java index 0ef12486ca..7f42801aa5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadDraftFormBinding.java @@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemThreadDraftFormBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1745c; + public final CheckedSetting f1747c; @NonNull public final ImageView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetChatListAdapterItemThreadDraftFormBinding implements Vi public WidgetChatListAdapterItemThreadDraftFormBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull View view, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull TextInputLayout textInputLayout) { this.a = linearLayout; this.b = textView; - this.f1745c = checkedSetting; + this.f1747c = checkedSetting; this.d = imageView; this.e = textInputLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java index 6b177f2d1e..e0dcbc1765 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemThreadEmbedBinding.java @@ -18,7 +18,7 @@ public final class WidgetChatListAdapterItemThreadEmbedBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1746c; + public final View f1748c; @NonNull public final ConstraintLayout d; @NonNull @@ -41,7 +41,7 @@ public final class WidgetChatListAdapterItemThreadEmbedBinding implements ViewBi public WidgetChatListAdapterItemThreadEmbedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull View view2, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull View view3, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ConstraintLayout constraintLayout4, @NonNull ViewReplySpline viewReplySpline, @NonNull Guideline guideline) { this.a = constraintLayout; this.b = view; - this.f1746c = view2; + this.f1748c = view2; this.d = constraintLayout2; this.e = imageView; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java index 9ab1f378fd..6f27304727 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListAdapterItemUploadProgressBinding.java @@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemUploadProgressBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1747c; + public final ImageView f1749c; @NonNull public final UploadProgressView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetChatListAdapterItemUploadProgressBinding implements Vie public WidgetChatListAdapterItemUploadProgressBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull UploadProgressView uploadProgressView, @NonNull UploadProgressView uploadProgressView2, @NonNull UploadProgressView uploadProgressView3) { this.a = linearLayout; this.b = imageView; - this.f1747c = imageView2; + this.f1749c = imageView2; this.d = uploadProgressView; this.e = uploadProgressView2; this.f = uploadProgressView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java index 7bba6cf6fa..7f47a63ae4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatListBotUiButtonComponentBinding.java @@ -17,7 +17,7 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1748c; + public final SimpleDraweeView f1750c; @NonNull public final MaterialTextView d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind public WidgetChatListBotUiButtonComponentBinding(@NonNull ButtonComponentView buttonComponentView, @NonNull MaterialButton materialButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialTextView materialTextView, @NonNull AppCompatImageView appCompatImageView, @NonNull TypingDots typingDots) { this.a = buttonComponentView; this.b = materialButton; - this.f1748c = simpleDraweeView; + this.f1750c = simpleDraweeView; this.d = materialTextView; this.e = appCompatImageView; this.f = typingDots; @@ -39,17 +39,17 @@ public final class WidgetChatListBotUiButtonComponentBinding implements ViewBind int i = 2131362183; MaterialButton materialButton = (MaterialButton) view.findViewById(2131362183); if (materialButton != null) { - i = 2131363001; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363001); + i = 2131363003; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363003); if (simpleDraweeView != null) { - i = 2131363727; - MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131363727); + i = 2131363730; + MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131363730); if (materialTextView != null) { - i = 2131363753; - AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363753); + i = 2131363756; + AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131363756); if (appCompatImageView != null) { - i = 2131363766; - TypingDots typingDots = (TypingDots) view.findViewById(2131363766); + i = 2131363769; + TypingDots typingDots = (TypingDots) view.findViewById(2131363769); if (typingDots != null) { return new WidgetChatListBotUiButtonComponentBinding((ButtonComponentView) view, materialButton, simpleDraweeView, materialTextView, appCompatImageView, typingDots); } diff --git a/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java index a15fd94abd..933035a45f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatOverlayBinding.java @@ -18,7 +18,7 @@ public final class WidgetChatOverlayBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1749c; + public final RelativeLayout f1751c; @NonNull public final TypingDots d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetChatOverlayBinding implements ViewBinding { public WidgetChatOverlayBinding(@NonNull ConstraintLayout constraintLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull RelativeLayout relativeLayout, @NonNull TypingDots typingDots, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull g4 g4Var) { this.a = constraintLayout; this.b = floatingActionButton; - this.f1749c = relativeLayout; + this.f1751c = relativeLayout; this.d = typingDots; this.e = textView; this.f = imageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java index aeb4a0adbb..ddc533980e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChatStatusBinding.java @@ -14,14 +14,14 @@ public final class WidgetChatStatusBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1750c; + public final ImageView f1752c; @NonNull public final TextView d; public WidgetChatStatusBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = linearLayout; this.b = linearLayout2; - this.f1750c = imageView; + this.f1752c = imageView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java index 9c602915cd..edd64b1384 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChoosePlanAdapterPlanItemBinding.java @@ -14,7 +14,7 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialCardView f1751c; + public final MaterialCardView f1753c; @NonNull public final TextView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding public WidgetChoosePlanAdapterPlanItemBinding(@NonNull MaterialCardView materialCardView, @NonNull ImageView imageView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = materialCardView; this.b = imageView; - this.f1751c = materialCardView2; + this.f1753c = materialCardView2; this.d = textView; this.e = imageView2; this.f = textView2; @@ -36,21 +36,21 @@ public final class WidgetChoosePlanAdapterPlanItemBinding implements ViewBinding @NonNull public static WidgetChoosePlanAdapterPlanItemBinding a(@NonNull View view) { - int i = 2131364221; - ImageView imageView = (ImageView) view.findViewById(2131364221); + int i = 2131364223; + ImageView imageView = (ImageView) view.findViewById(2131364223); if (imageView != null) { MaterialCardView materialCardView = (MaterialCardView) view; - i = 2131364223; - TextView textView = (TextView) view.findViewById(2131364223); + i = 2131364225; + TextView textView = (TextView) view.findViewById(2131364225); if (textView != null) { - i = 2131364224; - ImageView imageView2 = (ImageView) view.findViewById(2131364224); + i = 2131364226; + ImageView imageView2 = (ImageView) view.findViewById(2131364226); if (imageView2 != null) { - i = 2131364225; - TextView textView2 = (TextView) view.findViewById(2131364225); + i = 2131364227; + TextView textView2 = (TextView) view.findViewById(2131364227); if (textView2 != null) { - i = 2131364226; - TextView textView3 = (TextView) view.findViewById(2131364226); + i = 2131364228; + TextView textView3 = (TextView) view.findViewById(2131364228); if (textView3 != null) { return new WidgetChoosePlanAdapterPlanItemBinding(materialCardView, imageView, materialCardView, textView, imageView2, textView2, textView3); } diff --git a/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java b/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java index 38bc9cd82f..d88be66634 100644 --- a/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetChoosePlanBinding.java @@ -16,7 +16,7 @@ public final class WidgetChoosePlanBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1752c; + public final LinkifiedTextView f1754c; @NonNull public final RecyclerView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetChoosePlanBinding implements ViewBinding { public WidgetChoosePlanBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull RecyclerView recyclerView, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = linearLayout; - this.f1752c = linkifiedTextView; + this.f1754c = linkifiedTextView; this.d = recyclerView; this.e = dimmerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java index 1f998fb856..4d66100971 100644 --- a/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetCollapsedVoiceUserListItemBinding.java @@ -14,12 +14,12 @@ public final class WidgetCollapsedVoiceUserListItemBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1753c; + public final SimpleDraweeView f1755c; public WidgetCollapsedVoiceUserListItemBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView) { this.a = frameLayout; this.b = textView; - this.f1753c = simpleDraweeView; + this.f1755c = simpleDraweeView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java index 731061bd42..abc74375e5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetConfirmRemoveCommunityDialogBinding.java @@ -14,12 +14,12 @@ public final class WidgetConfirmRemoveCommunityDialogBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1754c; + public final MaterialButton f1756c; public WidgetConfirmRemoveCommunityDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1754c = materialButton2; + this.f1756c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java b/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java index 6ea6a1a3b3..40299e1c06 100644 --- a/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetConnectionsAddXboxBinding.java @@ -15,14 +15,14 @@ public final class WidgetConnectionsAddXboxBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1755c; + public final LinearLayout f1757c; @NonNull public final DimmerView d; public WidgetConnectionsAddXboxBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CodeVerificationView codeVerificationView, @NonNull LinearLayout linearLayout, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = codeVerificationView; - this.f1755c = linearLayout; + this.f1757c = linearLayout; this.d = dimmerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java b/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java index b28a270098..8627447215 100644 --- a/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetContactSyncBinding.java @@ -19,7 +19,7 @@ public final class WidgetContactSyncBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final e0 f1756c; + public final e0 f1758c; @NonNull public final f0 d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetContactSyncBinding implements ViewBinding { public WidgetContactSyncBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull b0 b0Var, @NonNull e0 e0Var, @NonNull f0 f0Var, @NonNull c0 c0Var, @NonNull d0 d0Var, @NonNull h0 h0Var, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = b0Var; - this.f1756c = e0Var; + this.f1758c = e0Var; this.d = f0Var; this.e = c0Var; this.f = d0Var; diff --git a/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java index 05949a0f3d..7d0135fc6b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetCreateChannelBinding.java @@ -21,7 +21,7 @@ public final class WidgetCreateChannelBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RadioButton f1757c; + public final RadioButton f1759c; @NonNull public final TextInputLayout d; @NonNull @@ -56,7 +56,7 @@ public final class WidgetCreateChannelBinding implements ViewBinding { public WidgetCreateChannelBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull RadioButton radioButton, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView2, @NonNull SwitchCompat switchCompat, @NonNull TextView textView3, @NonNull RecyclerView recyclerView, @NonNull View view, @NonNull TextView textView4, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView2, @NonNull RadioButton radioButton2, @NonNull TextView textView5, @NonNull ConstraintLayout constraintLayout3, @NonNull ImageView imageView3, @NonNull RadioButton radioButton3, @NonNull TextView textView6, @NonNull LinearLayout linearLayout, @NonNull ConstraintLayout constraintLayout4, @NonNull ImageView imageView4, @NonNull RadioButton radioButton4, @NonNull TextView textView7) { this.a = coordinatorLayout; this.b = constraintLayout; - this.f1757c = radioButton; + this.f1759c = radioButton; this.d = textInputLayout; this.e = relativeLayout; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java b/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java index d002d09a22..22d070ddf3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetCreationIntentBinding.java @@ -15,7 +15,7 @@ public final class WidgetCreationIntentBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1758c; + public final TextView f1760c; @NonNull public final MaterialCardView d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetCreationIntentBinding implements ViewBinding { public WidgetCreationIntentBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialCardView materialCardView, @NonNull TextView textView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView2, @NonNull LinkifiedTextView linkifiedTextView) { this.a = coordinatorLayout; this.b = materialCardView; - this.f1758c = textView; + this.f1760c = textView; this.d = materialCardView2; this.e = textView2; this.f = linkifiedTextView; diff --git a/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java index ce0fa5690b..82126da52a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetDisableDeleteAccountDialogBinding.java @@ -16,7 +16,7 @@ public final class WidgetDisableDeleteAccountDialogBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1759c; + public final MaterialButton f1761c; @NonNull public final TextInputLayout d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetDisableDeleteAccountDialogBinding implements ViewBindin public WidgetDisableDeleteAccountDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout2) { this.a = linearLayout; this.b = textView; - this.f1759c = materialButton; + this.f1761c = materialButton; this.d = textInputLayout; this.e = loadingButton; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java b/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java index 410998d04d..adad30c09d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetDiscoveryBinding.java @@ -16,7 +16,7 @@ public final class WidgetDiscoveryBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1760c; + public final RecyclerView f1762c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetDiscoveryBinding implements ViewBinding { public WidgetDiscoveryBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull SwipeRefreshLayout swipeRefreshLayout) { this.a = constraintLayout; this.b = constraintLayout2; - this.f1760c = recyclerView; + this.f1762c = recyclerView; this.d = textView3; this.e = swipeRefreshLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java b/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java index 4063590b84..8122562cd3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetDiscoveryStageCardBinding.java @@ -16,7 +16,7 @@ public final class WidgetDiscoveryStageCardBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final DiscoveryStageCardBodyView f1761c; + public final DiscoveryStageCardBodyView f1763c; @NonNull public final DiscoveryStageCardControlsView d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetDiscoveryStageCardBinding implements ViewBinding { public WidgetDiscoveryStageCardBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull DiscoveryStageCardBodyView discoveryStageCardBodyView, @NonNull DiscoveryStageCardControlsView discoveryStageCardControlsView, @NonNull TextView textView, @NonNull DiscoveryStageCardTopHatView discoveryStageCardTopHatView, @NonNull View view, @NonNull View view2) { this.a = linearLayout; this.b = linearLayout2; - this.f1761c = discoveryStageCardBodyView; + this.f1763c = discoveryStageCardBodyView; this.d = discoveryStageCardControlsView; this.e = textView; this.f = discoveryStageCardTopHatView; diff --git a/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java b/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java index 9b5d8d29ca..83884ceedd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetEditRoleBinding.java @@ -50,7 +50,7 @@ public final class WidgetEditRoleBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1762c; + public final FloatingActionButton f1764c; @NonNull public final CheckedSetting d; @NonNull @@ -84,7 +84,7 @@ public final class WidgetEditRoleBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final CheckedSetting f1763s; + public final CheckedSetting f1765s; @NonNull public final CheckedSetting t; @NonNull @@ -96,20 +96,20 @@ public final class WidgetEditRoleBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final CheckedSetting f1764x; + public final CheckedSetting f1766x; @NonNull /* renamed from: y reason: collision with root package name */ - public final CheckedSetting f1765y; + public final CheckedSetting f1767y; @NonNull /* renamed from: z reason: collision with root package name */ - public final CheckedSetting f1766z; + public final CheckedSetting f1768z; public WidgetEditRoleBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull View view, @NonNull RelativeLayout relativeLayout, @NonNull CheckedSetting checkedSetting6, @NonNull View view2, @NonNull View view3, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull CheckedSetting checkedSetting11, @NonNull CheckedSetting checkedSetting12, @NonNull CheckedSetting checkedSetting13, @NonNull CheckedSetting checkedSetting14, @NonNull CheckedSetting checkedSetting15, @NonNull CheckedSetting checkedSetting16, @NonNull CheckedSetting checkedSetting17, @NonNull CheckedSetting checkedSetting18, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting19, @NonNull CheckedSetting checkedSetting20, @NonNull CheckedSetting checkedSetting21, @NonNull CheckedSetting checkedSetting22, @NonNull CheckedSetting checkedSetting23, @NonNull CheckedSetting checkedSetting24, @NonNull CheckedSetting checkedSetting25, @NonNull CheckedSetting checkedSetting26, @NonNull CheckedSetting checkedSetting27, @NonNull CheckedSetting checkedSetting28, @NonNull CheckedSetting checkedSetting29, @NonNull CheckedSetting checkedSetting30, @NonNull CheckedSetting checkedSetting31, @NonNull CheckedSetting checkedSetting32, @NonNull CheckedSetting checkedSetting33, @NonNull CheckedSetting checkedSetting34, @NonNull CheckedSetting checkedSetting35, @NonNull View view4, @NonNull TextView textView) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1762c = floatingActionButton; + this.f1764c = floatingActionButton; this.d = checkedSetting; this.e = checkedSetting2; this.f = checkedSetting3; @@ -125,14 +125,14 @@ public final class WidgetEditRoleBinding implements ViewBinding { this.p = checkedSetting9; this.q = checkedSetting10; this.r = checkedSetting11; - this.f1763s = checkedSetting12; + this.f1765s = checkedSetting12; this.t = checkedSetting13; this.u = checkedSetting14; this.v = checkedSetting15; this.w = checkedSetting16; - this.f1764x = checkedSetting17; - this.f1765y = checkedSetting18; - this.f1766z = checkedSetting19; + this.f1766x = checkedSetting17; + this.f1767y = checkedSetting18; + this.f1768z = checkedSetting19; this.A = checkedSetting20; this.B = checkedSetting21; this.C = checkedSetting22; diff --git a/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java index e5a3a175c6..4444b1e673 100644 --- a/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetEmojiPickerBinding.java @@ -22,7 +22,7 @@ public final class WidgetEmojiPickerBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppViewFlipper f1767c; + public final AppViewFlipper f1769c; @NonNull public final AppBarLayout d; @NonNull @@ -49,7 +49,7 @@ public final class WidgetEmojiPickerBinding implements ViewBinding { public WidgetEmojiPickerBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull AppBarLayout appBarLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull Barrier barrier, @NonNull RecyclerView recyclerView2, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull ImageView imageView2, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView3, @NonNull TextInputEditText textInputEditText, @NonNull Toolbar toolbar) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1767c = appViewFlipper; + this.f1769c = appViewFlipper; this.d = appBarLayout; this.e = textView; this.f = imageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java index 5276365713..bfa56d6447 100644 --- a/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetEmojiSheetBinding.java @@ -17,7 +17,7 @@ public final class WidgetEmojiSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1768c; + public final TextView f1770c; @NonNull public final SimpleDraweeView d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetEmojiSheetBinding implements ViewBinding { public WidgetEmojiSheetBinding(@NonNull AppViewFlipper appViewFlipper, @NonNull TextView textView, @NonNull FrameLayout frameLayout, @NonNull View view, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull AppViewFlipper appViewFlipper2, @NonNull MaterialButton materialButton, @NonNull FrameLayout frameLayout2, @NonNull MaterialButton materialButton2, @NonNull TextView textView3, @NonNull FrameLayout frameLayout3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull TextView textView5, @NonNull MaterialButton materialButton3, @NonNull TextView textView6, @NonNull MaterialButton materialButton4) { this.a = appViewFlipper; this.b = frameLayout; - this.f1768c = textView2; + this.f1770c = textView2; this.d = simpleDraweeView; this.e = appViewFlipper2; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java b/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java index ecb02bcaf6..f78a1e552a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetEnableMfaStepsBinding.java @@ -14,12 +14,12 @@ public final class WidgetEnableMfaStepsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final StepsView f1769c; + public final StepsView f1771c; public WidgetEnableMfaStepsBinding(@NonNull FrameLayout frameLayout, @NonNull DimmerView dimmerView, @NonNull StepsView stepsView) { this.a = frameLayout; this.b = dimmerView; - this.f1769c = stepsView; + this.f1771c = stepsView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java index 53ccf25c4d..fe55021aec 100644 --- a/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetEnableSmsBackupDialogBinding.java @@ -16,7 +16,7 @@ public final class WidgetEnableSmsBackupDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1770c; + public final MaterialButton f1772c; @NonNull public final LoadingButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetEnableSmsBackupDialogBinding implements ViewBinding { public WidgetEnableSmsBackupDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2) { this.a = linearLayout; this.b = textView; - this.f1770c = materialButton; + this.f1772c = materialButton; this.d = loadingButton; this.e = textView2; this.f = textInputLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java index d7b5906ec8..17fe8834fe 100644 --- a/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetEndStageBottomSheetBinding.java @@ -13,12 +13,12 @@ public final class WidgetEndStageBottomSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1771c; + public final MaterialButton f1773c; public WidgetEndStageBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = nestedScrollView; this.b = materialButton; - this.f1771c = materialButton2; + this.f1773c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java b/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java index 9f2de96764..8c4b24491b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetExpressionTrayBinding.java @@ -21,7 +21,7 @@ public final class WidgetExpressionTrayBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1772c; + public final FrameLayout f1774c; @NonNull public final FragmentContainerView d; @NonNull @@ -46,7 +46,7 @@ public final class WidgetExpressionTrayBinding implements ViewBinding { public WidgetExpressionTrayBinding(@NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull FrameLayout frameLayout3, @NonNull FragmentContainerView fragmentContainerView, @NonNull CardSegment cardSegment, @NonNull FragmentContainerView fragmentContainerView2, @NonNull CardSegment cardSegment2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout, @NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull CardSegment cardSegment3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull AppBarLayout appBarLayout) { this.a = frameLayout; this.b = frameLayout2; - this.f1772c = frameLayout3; + this.f1774c = frameLayout3; this.d = fragmentContainerView; this.e = fragmentContainerView2; this.f = fragmentContainerView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java b/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java index 5eda2339c8..6246ceae3b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFatalCrashBinding.java @@ -15,7 +15,7 @@ public final class WidgetFatalCrashBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1773c; + public final TextView f1775c; @NonNull public final TextView d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetFatalCrashBinding implements ViewBinding { public WidgetFatalCrashBinding(@NonNull ScrollView scrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView5) { this.a = scrollView; this.b = textView; - this.f1773c = textView2; + this.f1775c = textView2; this.d = textView3; this.e = textView4; this.f = linkifiedTextView; diff --git a/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java index 263cb54e7d..33134c30f3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFeedbackSheetBinding.java @@ -15,7 +15,7 @@ public final class WidgetFeedbackSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final NestedScrollView f1774c; + public final NestedScrollView f1776c; @NonNull public final FeedbackView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetFeedbackSheetBinding implements ViewBinding { public WidgetFeedbackSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull ImageView imageView, @NonNull NestedScrollView nestedScrollView2, @NonNull FeedbackView feedbackView, @NonNull TextView textView) { this.a = nestedScrollView; this.b = imageView; - this.f1774c = nestedScrollView2; + this.f1776c = nestedScrollView2; this.d = feedbackView; this.e = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java index d3e113a080..a17258b6f8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFolderContextMenuBinding.java @@ -13,7 +13,7 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1775c; + public final TextView f1777c; @NonNull public final TextView d; @NonNull @@ -22,7 +22,7 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding { public WidgetFolderContextMenuBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = cardView; this.b = cardView2; - this.f1775c = textView; + this.f1777c = textView; this.d = textView2; this.e = textView3; } @@ -30,17 +30,17 @@ public final class WidgetFolderContextMenuBinding implements ViewBinding { @NonNull public static WidgetFolderContextMenuBinding a(@NonNull View view) { CardView cardView = (CardView) view; - int i = 2131363216; - TextView textView = (TextView) view.findViewById(2131363216); + int i = 2131363218; + TextView textView = (TextView) view.findViewById(2131363218); if (textView != null) { - i = 2131363217; - View findViewById = view.findViewById(2131363217); + i = 2131363219; + View findViewById = view.findViewById(2131363219); if (findViewById != null) { - i = 2131363218; - TextView textView2 = (TextView) view.findViewById(2131363218); + i = 2131363220; + TextView textView2 = (TextView) view.findViewById(2131363220); if (textView2 != null) { - i = 2131363219; - TextView textView3 = (TextView) view.findViewById(2131363219); + i = 2131363221; + TextView textView3 = (TextView) view.findViewById(2131363221); if (textView3 != null) { return new WidgetFolderContextMenuBinding((CardView) view, cardView, textView, findViewById, textView2, textView3); } diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java index edceeb2585..8ea58409cc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFriendsAddByIdBinding.java @@ -16,7 +16,7 @@ public final class WidgetFriendsAddByIdBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1776c; + public final LinearLayout f1778c; @NonNull public final MaterialButton d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetFriendsAddByIdBinding implements ViewBinding { public WidgetFriendsAddByIdBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) { this.a = nestedScrollView; this.b = textView; - this.f1776c = linearLayout; + this.f1778c = linearLayout; this.d = materialButton; this.e = textInputLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java index 178706dc6b..0b2c62fb76 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemFriendBinding.java @@ -18,7 +18,7 @@ public final class WidgetFriendsListAdapterItemFriendBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1777c; + public final SimpleDraweeView f1779c; @NonNull public final AppCompatImageView d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetFriendsListAdapterItemFriendBinding implements ViewBind public WidgetFriendsListAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2) { this.a = relativeLayout; this.b = simpleDraweeSpanTextView; - this.f1777c = simpleDraweeView; + this.f1779c = simpleDraweeView; this.d = appCompatImageView; this.e = appCompatImageView2; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java index 4fef592d99..fc63e3f05f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListAdapterItemPendingBinding.java @@ -18,7 +18,7 @@ public final class WidgetFriendsListAdapterItemPendingBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeSpanTextView f1778c; + public final SimpleDraweeSpanTextView f1780c; @NonNull public final SimpleDraweeView d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetFriendsListAdapterItemPendingBinding implements ViewBin public WidgetFriendsListAdapterItemPendingBinding(@NonNull RelativeLayout relativeLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull AppCompatImageView appCompatImageView2, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull LinearLayout linearLayout2) { this.a = relativeLayout; this.b = appCompatImageView; - this.f1778c = simpleDraweeSpanTextView; + this.f1780c = simpleDraweeSpanTextView; this.d = simpleDraweeView; this.e = appCompatImageView2; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java index b3d93e0545..6aaee6d420 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListBinding.java @@ -16,7 +16,7 @@ public final class WidgetFriendsListBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final EmptyFriendsStateView f1779c; + public final EmptyFriendsStateView f1781c; @NonNull public final AppViewFlipper d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetFriendsListBinding implements ViewBinding { public WidgetFriendsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView, @NonNull EmptyFriendsStateView emptyFriendsStateView, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) { this.a = relativeLayout; this.b = emptyFriendsStateContactSyncView; - this.f1779c = emptyFriendsStateView; + this.f1781c = emptyFriendsStateView; this.d = appViewFlipper; this.e = recyclerView; this.f = recyclerView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java index 20b8816e44..5c5c0a78bc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFriendsListExpandableHeaderBinding.java @@ -13,21 +13,21 @@ public final class WidgetFriendsListExpandableHeaderBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1780c; + public final TextView f1782c; public WidgetFriendsListExpandableHeaderBinding(@NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull TextView textView2) { this.a = frameLayout; this.b = textView; - this.f1780c = textView2; + this.f1782c = textView2; } @NonNull public static WidgetFriendsListExpandableHeaderBinding a(@NonNull View view) { - int i = 2131363242; - TextView textView = (TextView) view.findViewById(2131363242); + int i = 2131363244; + TextView textView = (TextView) view.findViewById(2131363244); if (textView != null) { - i = 2131363259; - TextView textView2 = (TextView) view.findViewById(2131363259); + i = 2131363261; + TextView textView2 = (TextView) view.findViewById(2131363261); if (textView2 != null) { return new WidgetFriendsListExpandableHeaderBinding((FrameLayout) view, textView, textView2); } diff --git a/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java b/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java index 768e2a7a5f..c877eb1e25 100644 --- a/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetFriendsNearbyBinding.java @@ -16,7 +16,7 @@ public final class WidgetFriendsNearbyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1781c; + public final TextView f1783c; @NonNull public final RecyclerView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetFriendsNearbyBinding implements ViewBinding { public WidgetFriendsNearbyBinding(@NonNull NestedScrollView nestedScrollView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull TextView textView2, @NonNull RLottieImageView rLottieImageView, @NonNull TextView textView3) { this.a = nestedScrollView; this.b = materialButton; - this.f1781c = textView; + this.f1783c = textView; this.d = recyclerView; this.e = textView2; this.f = rLottieImageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java index 18e9cec8c2..ad75512d57 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGifCategoryBinding.java @@ -15,7 +15,7 @@ public final class WidgetGifCategoryBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1782c; + public final RecyclerView f1784c; @NonNull public final GifLoadingView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetGifCategoryBinding implements ViewBinding { public WidgetGifCategoryBinding(@NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout, @NonNull ContentResizingCoordinatorLayout contentResizingCoordinatorLayout2, @NonNull RecyclerView recyclerView, @NonNull GifLoadingView gifLoadingView, @NonNull TextView textView) { this.a = contentResizingCoordinatorLayout; this.b = contentResizingCoordinatorLayout2; - this.f1782c = recyclerView; + this.f1784c = recyclerView; this.d = gifLoadingView; this.e = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java index a2e8ca0f21..945e51d81e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGifPickerBinding.java @@ -14,14 +14,14 @@ public final class WidgetGifPickerBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1783c; + public final FrameLayout f1785c; @NonNull public final GifLoadingView d; public WidgetGifPickerBinding(@NonNull FrameLayout frameLayout, @NonNull RecyclerView recyclerView, @NonNull FrameLayout frameLayout2, @NonNull GifLoadingView gifLoadingView) { this.a = frameLayout; this.b = recyclerView; - this.f1783c = frameLayout2; + this.f1785c = frameLayout2; this.d = gifLoadingView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java index 6dcb004a72..64417cd345 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGifPickerSearchBinding.java @@ -18,7 +18,7 @@ public final class WidgetGifPickerSearchBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final GifLoadingView f1784c; + public final GifLoadingView f1786c; @NonNull public final AppViewFlipper d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetGifPickerSearchBinding implements ViewBinding { public WidgetGifPickerSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout appBarLayout, @NonNull RecyclerView recyclerView, @NonNull GifLoadingView gifLoadingView, @NonNull Toolbar toolbar, @NonNull AppViewFlipper appViewFlipper, @NonNull SearchInputView searchInputView) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1784c = gifLoadingView; + this.f1786c = gifLoadingView; this.d = appViewFlipper; this.e = searchInputView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java index ef87f7eda9..cdcc9cd341 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchBinding.java @@ -17,7 +17,7 @@ public final class WidgetGlobalSearchBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1785c; + public final TextInputLayout f1787c; @NonNull public final TextInputEditText d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetGlobalSearchBinding implements ViewBinding { public WidgetGlobalSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputEditText textInputEditText, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton2, @NonNull RecyclerView recyclerView2, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = materialButton; - this.f1785c = textInputLayout; + this.f1787c = textInputLayout; this.d = textInputEditText; this.e = recyclerView; this.f = materialButton2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java index 056b11a4bd..f0397a570d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGlobalSearchItemGuildBinding.java @@ -13,12 +13,12 @@ public final class WidgetGlobalSearchItemGuildBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1786c; + public final ImageView f1788c; public WidgetGlobalSearchItemGuildBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = imageView; - this.f1786c = imageView2; + this.f1788c = imageView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java b/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java index bb3aea4172..9b819135eb 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGlobalStatusIndicatorBinding.java @@ -15,7 +15,7 @@ public final class WidgetGlobalStatusIndicatorBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1787c; + public final LinearLayout f1789c; @NonNull public final MaterialButton d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetGlobalStatusIndicatorBinding implements ViewBinding { public WidgetGlobalStatusIndicatorBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull MaterialButton materialButton2, @NonNull ImageView imageView, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1787c = linearLayout2; + this.f1789c = linearLayout2; this.d = materialButton; this.e = linearLayout3; this.f = linearLayout4; diff --git a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java index d3ef105189..3240354e93 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsBinding.java @@ -18,7 +18,7 @@ public final class WidgetGroupInviteFriendsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1788c; + public final RelativeLayout f1790c; @NonNull public final RecyclerView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetGroupInviteFriendsBinding implements ViewBinding { public WidgetGroupInviteFriendsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull ChipsView chipsView, @NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = chipsView; - this.f1788c = relativeLayout; + this.f1790c = relativeLayout; this.d = recyclerView; this.e = floatingActionButton; this.f = appViewFlipper; diff --git a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java index a091baeeec..6d51df87f8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGroupInviteFriendsItemBinding.java @@ -18,7 +18,7 @@ public final class WidgetGroupInviteFriendsItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1789c; + public final SimpleDraweeView f1791c; @NonNull public final SimpleDraweeSpanTextView d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetGroupInviteFriendsItemBinding implements ViewBinding { public WidgetGroupInviteFriendsItemBinding(@NonNull LinearLayout linearLayout, @NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView, @NonNull StatusView statusView, @NonNull CheckBox checkBox) { this.a = linearLayout; this.b = relativeLayout; - this.f1789c = simpleDraweeView; + this.f1791c = simpleDraweeView; this.d = simpleDraweeSpanTextView; this.e = textView; this.f = statusView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java index b86dd02db0..2279e73698 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildCloneBinding.java @@ -22,7 +22,7 @@ public final class WidgetGuildCloneBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppViewFlipper f1790c; + public final AppViewFlipper f1792c; @NonNull public final LinkifiedTextView d; @NonNull @@ -41,7 +41,7 @@ public final class WidgetGuildCloneBinding implements ViewBinding { public WidgetGuildCloneBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull i0 i0Var, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull GuildTemplateChannelsView guildTemplateChannelsView, @NonNull RolesListView rolesListView, @NonNull LinearLayout linearLayout, @NonNull ProgressBar progressBar) { this.a = coordinatorLayout; this.b = loadingButton; - this.f1790c = appViewFlipper; + this.f1792c = appViewFlipper; this.d = linkifiedTextView; this.e = i0Var; this.f = textInputLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java index 53d2258fe5..2cee684bc0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildContextMenuBinding.java @@ -13,7 +13,7 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1791c; + public final TextView f1793c; @NonNull public final TextView d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding { public WidgetGuildContextMenuBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull View view, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5) { this.a = cardView; this.b = cardView2; - this.f1791c = textView; + this.f1793c = textView; this.d = textView2; this.e = textView3; this.f = textView4; @@ -36,23 +36,23 @@ public final class WidgetGuildContextMenuBinding implements ViewBinding { @NonNull public static WidgetGuildContextMenuBinding a(@NonNull View view) { CardView cardView = (CardView) view; - int i = 2131363345; - TextView textView = (TextView) view.findViewById(2131363345); + int i = 2131363347; + TextView textView = (TextView) view.findViewById(2131363347); if (textView != null) { - i = 2131363346; - View findViewById = view.findViewById(2131363346); + i = 2131363348; + View findViewById = view.findViewById(2131363348); if (findViewById != null) { - i = 2131363347; - TextView textView2 = (TextView) view.findViewById(2131363347); + i = 2131363349; + TextView textView2 = (TextView) view.findViewById(2131363349); if (textView2 != null) { - i = 2131363348; - TextView textView3 = (TextView) view.findViewById(2131363348); + i = 2131363350; + TextView textView3 = (TextView) view.findViewById(2131363350); if (textView3 != null) { - i = 2131363349; - TextView textView4 = (TextView) view.findViewById(2131363349); + i = 2131363351; + TextView textView4 = (TextView) view.findViewById(2131363351); if (textView4 != null) { - i = 2131363350; - TextView textView5 = (TextView) view.findViewById(2131363350); + i = 2131363352; + TextView textView5 = (TextView) view.findViewById(2131363352); if (textView5 != null) { return new WidgetGuildContextMenuBinding((CardView) view, cardView, textView, findViewById, textView2, textView3, textView4, textView5); } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java index 58f0ef96e8..aabfd964b8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildCreateBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildCreateBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1792c; + public final LinkifiedTextView f1794c; @NonNull public final i0 d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetGuildCreateBinding implements ViewBinding { public WidgetGuildCreateBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull LinkifiedTextView linkifiedTextView, @NonNull i0 i0Var, @NonNull TextInputLayout textInputLayout, @NonNull ScreenTitleView screenTitleView) { this.a = coordinatorLayout; this.b = loadingButton; - this.f1792c = linkifiedTextView; + this.f1794c = linkifiedTextView; this.d = i0Var; this.e = textInputLayout; this.f = screenTitleView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java index 16ca8811dd..22bbdeec86 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildFolderSettingsBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildFolderSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1793c; + public final TextView f1795c; @NonNull public final RelativeLayout d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetGuildFolderSettingsBinding implements ViewBinding { public WidgetGuildFolderSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1793c = textView; + this.f1795c = textView; this.d = relativeLayout; this.e = view; this.f = floatingActionButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java index 3c9a1a46b1..7f29986680 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildInviteBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1794c; + public final MaterialButton f1796c; @NonNull public final WidgetInviteInfo d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetGuildInviteBinding implements ViewBinding { public WidgetGuildInviteBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull MaterialButton materialButton2, @NonNull WidgetInviteInfo widgetInviteInfo, @NonNull SimpleDraweeView simpleDraweeView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1794c = materialButton2; + this.f1796c = materialButton2; this.d = widgetInviteInfo; this.e = simpleDraweeView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java index 2cb6230bb2..b4f770bf67 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildInviteInfoBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1795c; + public final SimpleDraweeView f1797c; @NonNull public final CardView d; @NonNull @@ -44,7 +44,7 @@ public final class WidgetGuildInviteInfoBinding implements ViewBinding { public WidgetGuildInviteInfoBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView, @NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull CardView cardView2, @NonNull TextView textView2, @NonNull CardView cardView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = view; this.b = simpleDraweeView; - this.f1795c = simpleDraweeView2; + this.f1797c = simpleDraweeView2; this.d = cardView; this.e = relativeLayout; this.f = relativeLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java index 4058ace24e..4e6297bf0d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildInviteSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RadioGroup f1796c; + public final RadioGroup f1798c; @NonNull public final MaterialButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetGuildInviteSettingsBinding implements ViewBinding { public WidgetGuildInviteSettingsBinding(@NonNull LinearLayout linearLayout, @NonNull Spinner spinner, @NonNull RadioGroup radioGroup, @NonNull MaterialButton materialButton, @NonNull RadioGroup radioGroup2, @NonNull CheckedSetting checkedSetting) { this.a = linearLayout; this.b = spinner; - this.f1796c = radioGroup; + this.f1798c = radioGroup; this.d = materialButton; this.e = radioGroup2; this.f = checkedSetting; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java index f4f13d0906..de4d31e4ff 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java @@ -20,7 +20,7 @@ public final class WidgetGuildInviteShareBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1797c; + public final TextView f1799c; @NonNull public final TextView d; @NonNull @@ -41,7 +41,7 @@ public final class WidgetGuildInviteShareBinding implements ViewBinding { public WidgetGuildInviteShareBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) { this.a = coordinatorLayout; this.b = view; - this.f1797c = textView; + this.f1799c = textView; this.d = textView2; this.e = checkedSetting; this.f = imageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java index 2c75daee42..6a29360a88 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java @@ -19,7 +19,7 @@ public final class WidgetGuildInviteShareCompactBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1798c; + public final TextView f1800c; @NonNull public final TextView d; @NonNull @@ -38,7 +38,7 @@ public final class WidgetGuildInviteShareCompactBinding implements ViewBinding { public WidgetGuildInviteShareCompactBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) { this.a = coordinatorLayout; this.b = view; - this.f1798c = textView; + this.f1800c = textView; this.d = textView2; this.e = imageView; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java index f413f65ff3..223885f0cc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildInviteShareEmptySuggestionsBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1799c; + public final TextView f1801c; @NonNull public final MaterialButton d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetGuildInviteShareEmptySuggestionsBinding implements View public WidgetGuildInviteShareEmptySuggestionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageButton imageButton, @NonNull TextView textView2, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) { this.a = coordinatorLayout; this.b = view; - this.f1799c = textView; + this.f1801c = textView; this.d = materialButton; this.e = imageButton; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java index b1fdade557..0ed3acdba5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1800c; + public final MaterialButton f1802c; @NonNull public final TextView d; @NonNull @@ -24,24 +24,24 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding { public WidgetGuildInviteShareItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1800c = materialButton; + this.f1802c = materialButton; this.d = textView; this.e = materialButton2; } @NonNull public static WidgetGuildInviteShareItemBinding a(@NonNull View view) { - int i = 2131363679; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363679); + int i = 2131363682; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363682); if (simpleDraweeView != null) { - i = 2131363680; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363680); + i = 2131363683; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363683); if (materialButton != null) { - i = 2131363708; - TextView textView = (TextView) view.findViewById(2131363708); + i = 2131363711; + TextView textView = (TextView) view.findViewById(2131363711); if (textView != null) { - i = 2131363709; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363709); + i = 2131363712; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363712); if (materialButton2 != null) { return new WidgetGuildInviteShareItemBinding((LinearLayout) view, simpleDraweeView, materialButton, textView, materialButton2); } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java index 696b62a72c..27493f004c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java @@ -23,7 +23,7 @@ public final class WidgetGuildInviteShareSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1801c; + public final TextView f1803c; @NonNull public final TextView d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetGuildInviteShareSheetBinding implements ViewBinding { public WidgetGuildInviteShareSheetBinding(@NonNull FrameLayout frameLayout, @NonNull ConstraintLayout constraintLayout, @NonNull FrameLayout frameLayout2, @NonNull Barrier barrier, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull TextView textView4, @NonNull ImageButton imageButton, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView5, @NonNull MaterialButton materialButton, @NonNull TextView textView6, @NonNull FrameLayout frameLayout3, @NonNull TextView textView7, @NonNull Barrier barrier2, @NonNull FrameLayout frameLayout4, @NonNull Barrier barrier3, @NonNull SearchInputView searchInputView, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) { this.a = frameLayout; this.b = constraintLayout; - this.f1801c = textView; + this.f1803c = textView; this.d = textView4; this.e = imageButton; this.f = nestedScrollView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java index a32dca444a..51cbf6fc84 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java @@ -14,12 +14,12 @@ public final class WidgetGuildJoinBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1802c; + public final TextInputLayout f1804c; public WidgetGuildJoinBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) { this.a = coordinatorLayout; this.b = materialButton; - this.f1802c = textInputLayout; + this.f1804c = textInputLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java index 4877e706b7..5373cf48a1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java @@ -57,7 +57,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1803c; + public final CheckedSetting f1805c; @NonNull public final SimpleDraweeView d; @NonNull @@ -91,7 +91,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final AppViewFlipper f1804s; + public final AppViewFlipper f1806s; @NonNull public final ImageView t; @NonNull @@ -103,20 +103,20 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final TextView f1805x; + public final TextView f1807x; @NonNull /* renamed from: y reason: collision with root package name */ - public final MaterialButton f1806y; + public final MaterialButton f1808y; @NonNull /* renamed from: z reason: collision with root package name */ - public final MaterialButton f1807z; + public final MaterialButton f1809z; public WidgetGuildProfileSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull Barrier barrier, @NonNull CheckedSetting checkedSetting, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout5, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull CardView cardView2, @NonNull TextView textView5, @NonNull AppViewFlipper appViewFlipper, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting2, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView3, @NonNull TextView textView6, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull CardView cardView4, @NonNull LinearLayout linearLayout6, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull MaterialButton materialButton4, @NonNull LinearLayout linearLayout7, @NonNull TextView textView12, @NonNull ImageView imageView2, @NonNull TextView textView13, @NonNull CardView cardView5, @NonNull CardView cardView6, @NonNull MaterialButton materialButton5, @NonNull LinearLayout linearLayout8, @NonNull MaterialButton materialButton6, @NonNull MaterialButton materialButton7) { this.a = nestedScrollView; this.b = linearLayout; - this.f1803c = checkedSetting; + this.f1805c = checkedSetting; this.d = simpleDraweeView; this.e = materialButton; this.f = linearLayout2; @@ -132,14 +132,14 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { this.p = recyclerView; this.q = cardView2; this.r = textView5; - this.f1804s = appViewFlipper; + this.f1806s = appViewFlipper; this.t = imageView; this.u = checkedSetting2; this.v = simpleDraweeView2; this.w = cardView3; - this.f1805x = textView6; - this.f1806y = materialButton2; - this.f1807z = materialButton3; + this.f1807x = textView6; + this.f1808y = materialButton2; + this.f1809z = materialButton3; this.A = textView7; this.B = textView8; this.C = cardView4; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java index 42851b200e..a1e4b63c21 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildSelectorItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1808c; + public final SimpleDraweeView f1810c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetGuildSelectorItemBinding implements ViewBinding { public WidgetGuildSelectorItemBinding(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = linearLayout; this.b = frameLayout; - this.f1808c = simpleDraweeView; + this.f1810c = simpleDraweeView; this.d = textView; this.e = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java index 81ff2064dc..dc9e75244c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildTransferOwnershipBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1809c; + public final MaterialButton f1811c; @NonNull public final MaterialButton d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetGuildTransferOwnershipBinding implements ViewBinding { public WidgetGuildTransferOwnershipBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2) { this.a = linearLayout; this.b = checkedSetting; - this.f1809c = materialButton; + this.f1811c = materialButton; this.d = materialButton2; this.e = textInputLayout; this.f = linearLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java index 4712f75f2f..5e84869fbc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildWelcomeChannelBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1810c; + public final TextView f1812c; @NonNull public final SimpleDraweeView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetGuildWelcomeChannelBinding implements ViewBinding { public WidgetGuildWelcomeChannelBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView3) { this.a = cardView; this.b = cardView2; - this.f1810c = textView; + this.f1812c = textView; this.d = simpleDraweeView; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java index 52147ff10a..cf7e08a1b4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildWelcomeSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1811c; + public final TextView f1813c; @NonNull public final AppViewFlipper d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetGuildWelcomeSheetBinding implements ViewBinding { public WidgetGuildWelcomeSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CardView cardView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = nestedScrollView; this.b = recyclerView; - this.f1811c = textView; + this.f1813c = textView; this.d = appViewFlipper; this.e = simpleDraweeView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java index 985edd8b2e..440e29845f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java @@ -14,12 +14,12 @@ public final class WidgetGuildsListBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ViewStub f1812c; + public final ViewStub f1814c; public WidgetGuildsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull ViewStub viewStub) { this.a = relativeLayout; this.b = recyclerView; - this.f1812c = viewStub; + this.f1814c = viewStub; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java index 27290701cf..4be23685d2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java @@ -13,21 +13,21 @@ public final class WidgetGuildsListItemDmBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1813c; + public final TextView f1815c; public WidgetGuildsListItemDmBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = view; this.b = simpleDraweeView; - this.f1813c = textView; + this.f1815c = textView; } @NonNull public static WidgetGuildsListItemDmBinding a(@NonNull View view) { - int i = 2131363486; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363486); + int i = 2131363488; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363488); if (simpleDraweeView != null) { - i = 2131363487; - TextView textView = (TextView) view.findViewById(2131363487); + i = 2131363489; + TextView textView = (TextView) view.findViewById(2131363489); if (textView != null) { return new WidgetGuildsListItemDmBinding(view, simpleDraweeView, textView); } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java index 46d937f285..60e73f6caa 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildsListItemFolderBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1814c; + public final FrameLayout f1816c; @NonNull public final View d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetGuildsListItemFolderBinding implements ViewBinding { public WidgetGuildsListItemFolderBinding(@NonNull RelativeLayout relativeLayout, @NonNull ServerFolderView serverFolderView, @NonNull FrameLayout frameLayout, @NonNull View view, @NonNull TextView textView, @NonNull View view2, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = serverFolderView; - this.f1814c = frameLayout; + this.f1816c = frameLayout; this.d = view; this.e = textView; this.f = view2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java index 0e9f97361d..0ed7c21d62 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1815c; + public final ImageView f1817c; @NonNull public final SimpleDraweeView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding { public WidgetGuildsListItemGuildBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull FrameLayout frameLayout, @NonNull TextView textView2, @NonNull ImageView imageView3) { this.a = view; this.b = imageView; - this.f1815c = imageView2; + this.f1817c = imageView2; this.d = simpleDraweeView; this.e = textView; this.f = frameLayout; @@ -40,26 +40,26 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding { @NonNull public static WidgetGuildsListItemGuildBinding a(@NonNull View view) { - int i = 2131363481; - ImageView imageView = (ImageView) view.findViewById(2131363481); + int i = 2131363483; + ImageView imageView = (ImageView) view.findViewById(2131363483); if (imageView != null) { - i = 2131363482; - ImageView imageView2 = (ImageView) view.findViewById(2131363482); + i = 2131363484; + ImageView imageView2 = (ImageView) view.findViewById(2131363484); if (imageView2 != null) { - i = 2131363483; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363483); + i = 2131363485; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363485); if (simpleDraweeView != null) { - i = 2131363484; - TextView textView = (TextView) view.findViewById(2131363484); + i = 2131363486; + TextView textView = (TextView) view.findViewById(2131363486); if (textView != null) { - i = 2131363485; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363485); + i = 2131363487; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363487); if (frameLayout != null) { - i = 2131363491; - TextView textView2 = (TextView) view.findViewById(2131363491); + i = 2131363493; + TextView textView2 = (TextView) view.findViewById(2131363493); if (textView2 != null) { - i = 2131363497; - ImageView imageView3 = (ImageView) view.findViewById(2131363497); + i = 2131363499; + ImageView imageView3 = (ImageView) view.findViewById(2131363499); if (imageView3 != null) { return new WidgetGuildsListItemGuildBinding(view, imageView, imageView2, simpleDraweeView, textView, frameLayout, textView2, imageView3); } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java index 56c6534394..dd414b28cb 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java @@ -13,12 +13,12 @@ public final class WidgetGuildsListItemGuildVerticalBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1816c; + public final ImageView f1818c; public WidgetGuildsListItemGuildVerticalBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = imageView; - this.f1816c = imageView2; + this.f1818c = imageView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java index 9b218d5c75..5f3a93a897 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java @@ -14,14 +14,14 @@ public final class WidgetGuildsListItemProfileBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1817c; + public final FrameLayout f1819c; @NonNull public final ImageView d; public WidgetGuildsListItemProfileBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = imageView; - this.f1817c = frameLayout; + this.f1819c = frameLayout; this.d = imageView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java index 3423676fd6..a2b50f11bd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java @@ -17,7 +17,7 @@ public final class WidgetHomeBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final HomePanelsLayout f1818c; + public final HomePanelsLayout f1820c; @NonNull public final q4 d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetHomeBinding implements ViewBinding { public WidgetHomeBinding(@NonNull FrameLayout frameLayout, @NonNull t4 t4Var, @NonNull HomePanelsLayout homePanelsLayout, @NonNull q4 q4Var, @NonNull s4 s4Var, @NonNull u4 u4Var, @NonNull FrameLayout frameLayout2) { this.a = frameLayout; this.b = t4Var; - this.f1818c = homePanelsLayout; + this.f1820c = homePanelsLayout; this.d = q4Var; this.e = s4Var; this.f = u4Var; diff --git a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java index 718afcbf76..666927c4ed 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java @@ -16,7 +16,7 @@ public final class WidgetHomePanelCenterNsfwBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1819c; + public final MaterialButton f1821c; @NonNull public final MaterialButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetHomePanelCenterNsfwBinding implements ViewBinding { public WidgetHomePanelCenterNsfwBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) { this.a = linearLayout; this.b = imageView; - this.f1819c = materialButton; + this.f1821c = materialButton; this.d = materialButton2; this.e = linkifiedTextView; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java b/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java index e4f4779efc..7b8b16ae74 100644 --- a/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java @@ -21,7 +21,7 @@ public final class WidgetIncomingShareBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ViewEmbedGameInvite f1820c; + public final ViewEmbedGameInvite f1822c; @NonNull public final TextInputLayout d; @NonNull @@ -46,7 +46,7 @@ public final class WidgetIncomingShareBinding implements ViewBinding { public WidgetIncomingShareBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull ViewEmbedGameInvite viewEmbedGameInvite, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull CardView cardView, @NonNull TextInputLayout textInputLayout2, @NonNull RecyclerView recyclerView2, @NonNull ImageView imageView, @NonNull AppViewFlipper appViewFlipper, @NonNull NestedScrollView nestedScrollView, @NonNull AppViewFlipper appViewFlipper2, @NonNull ViewGlobalSearchItem viewGlobalSearchItem, @NonNull ImageView imageView2) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1820c = viewEmbedGameInvite; + this.f1822c = viewEmbedGameInvite; this.d = textInputLayout; this.e = recyclerView; this.f = cardView; diff --git a/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java b/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java index ab4bafd791..47dec221ab 100644 --- a/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java @@ -15,14 +15,14 @@ public final class WidgetIssueDetailsFormBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1821c; + public final TextInputLayout f1823c; @NonNull public final MaterialButton d; public WidgetIssueDetailsFormBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton) { this.a = nestedScrollView; this.b = linkifiedTextView; - this.f1821c = textInputLayout; + this.f1823c = textInputLayout; this.d = materialButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java index 510540eece..2836e5e4ba 100644 --- a/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java @@ -15,7 +15,7 @@ public final class WidgetKickUserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1822c; + public final MaterialButton f1824c; @NonNull public final MaterialButton d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetKickUserBinding implements ViewBinding { public WidgetKickUserBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1822c = materialButton; + this.f1824c = materialButton; this.d = materialButton2; this.e = textInputLayout; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java index 020a0d454f..200f6ecd7c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java @@ -13,12 +13,12 @@ public final class WidgetManageReactionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1823c; + public final RecyclerView f1825c; public WidgetManageReactionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1823c = recyclerView2; + this.f1825c = recyclerView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java index 49376e2062..46124425cc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java @@ -15,14 +15,14 @@ public final class WidgetManageReactionsEmojiBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeSpanTextView f1824c; + public final SimpleDraweeSpanTextView f1826c; @NonNull public final View d; public WidgetManageReactionsEmojiBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull View view) { this.a = relativeLayout; this.b = textView; - this.f1824c = simpleDraweeSpanTextView; + this.f1826c = simpleDraweeSpanTextView; this.d = view; } diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java index 35036a70f1..e94dafc171 100644 --- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java @@ -15,14 +15,14 @@ public final class WidgetManageReactionsResultUserBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1825c; + public final SimpleDraweeView f1827c; @NonNull public final TextView d; public WidgetManageReactionsResultUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = relativeLayout; this.b = imageView; - this.f1825c = simpleDraweeView; + this.f1827c = simpleDraweeView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java b/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java index 7c26a5dcbf..f819654554 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java @@ -17,7 +17,7 @@ public final class WidgetMediaBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1826c; + public final FrameLayout f1828c; @NonNull public final ZoomableDraweeView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetMediaBinding implements ViewBinding { public WidgetMediaBinding(@NonNull FrameLayout frameLayout, @NonNull AppBarLayout appBarLayout, @NonNull FrameLayout frameLayout2, @NonNull ZoomableDraweeView zoomableDraweeView, @NonNull ProgressBar progressBar, @NonNull PlayerControlView playerControlView, @NonNull PlayerView playerView) { this.a = frameLayout; this.b = appBarLayout; - this.f1826c = frameLayout2; + this.f1828c = frameLayout2; this.d = zoomableDraweeView; this.e = progressBar; this.f = playerControlView; diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java index 2b719839f1..ce53443c6e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java @@ -21,7 +21,7 @@ public final class WidgetMemberVerificationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1827c; + public final SimpleDraweeView f1829c; @NonNull public final MemberVerificationView d; @NonNull @@ -36,7 +36,7 @@ public final class WidgetMemberVerificationBinding implements ViewBinding { public WidgetMemberVerificationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CustomAppBarLayout customAppBarLayout, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull DimmerView dimmerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MemberVerificationView memberVerificationView, @NonNull MemberVerificationAvatarView memberVerificationAvatarView, @NonNull LoadingButton loadingButton, @NonNull RecyclerView recyclerView, @NonNull NestedScrollView nestedScrollView) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1827c = simpleDraweeView; + this.f1829c = simpleDraweeView; this.d = memberVerificationView; this.e = memberVerificationAvatarView; this.f = loadingButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java index b4f93df95a..280d9d718a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java @@ -15,7 +15,7 @@ public final class WidgetMemberVerificationPendingDialogBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1828c; + public final MaterialButton f1830c; @NonNull public final MaterialButton d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetMemberVerificationPendingDialogBinding implements ViewB public WidgetMemberVerificationPendingDialogBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = relativeLayout; this.b = imageView; - this.f1828c = materialButton; + this.f1830c = materialButton; this.d = materialButton2; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java index 98bc3b3f34..2fae1e3482 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetMemberVerificationRuleItemBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1829c; + public final View f1831c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetMemberVerificationRuleItemBinding implements ViewBindin public WidgetMemberVerificationRuleItemBinding(@NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull View view, @NonNull TextView textView, @NonNull RoundedRelativeLayout roundedRelativeLayout2) { this.a = roundedRelativeLayout; this.b = simpleDraweeSpanTextView; - this.f1829c = view; + this.f1831c = view; this.d = textView; this.e = roundedRelativeLayout2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java index a3c5f8dabf..cded189915 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java @@ -15,12 +15,12 @@ public final class WidgetMemberVerificationSuccessBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1830c; + public final TextView f1832c; public WidgetMemberVerificationSuccessBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull CardView cardView) { this.a = relativeLayout; this.b = materialButton; - this.f1830c = textView; + this.f1832c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java b/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java index 488178af48..7a27b5c55b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java @@ -14,12 +14,12 @@ public final class WidgetMobileReportsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ProgressBar f1831c; + public final ProgressBar f1833c; public WidgetMobileReportsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FrameLayout frameLayout, @NonNull ProgressBar progressBar) { this.a = coordinatorLayout; this.b = frameLayout; - this.f1831c = progressBar; + this.f1833c = progressBar; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java index 17bedc2f59..5c4839cb27 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java @@ -15,7 +15,7 @@ public final class WidgetMuteSettingsSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1832c; + public final LinearLayout f1834c; @NonNull public final LinearLayout d; @NonNull @@ -48,7 +48,7 @@ public final class WidgetMuteSettingsSheetBinding implements ViewBinding { public WidgetMuteSettingsSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull FrameLayout frameLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout3, @NonNull TextView textView11, @NonNull TextView textView12) { this.a = nestedScrollView; this.b = textView; - this.f1832c = linearLayout; + this.f1834c = linearLayout; this.d = linearLayout2; this.e = frameLayout; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java b/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java index 93f49dd926..df2f65e7b5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java @@ -15,14 +15,14 @@ public final class WidgetNavigationHelpBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TabLayout f1833c; + public final TabLayout f1835c; @NonNull public final ViewPager2 d; public WidgetNavigationHelpBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TabLayout tabLayout, @NonNull ViewPager2 viewPager2) { this.a = linearLayout; this.b = imageView; - this.f1833c = tabLayout; + this.f1835c = tabLayout; this.d = viewPager2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java index d0556356b9..8a0e098796 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java @@ -15,7 +15,7 @@ public final class WidgetNoticeDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1834c; + public final LinkifiedTextView f1836c; @NonNull public final MaterialButton d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetNoticeDialogBinding implements ViewBinding { public WidgetNoticeDialogBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = linearLayout2; - this.f1834c = linkifiedTextView; + this.f1836c = linkifiedTextView; this.d = materialButton; this.e = textView; this.f = linearLayout3; diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java index c65f5f75ff..5b0b3ad7f0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java @@ -13,12 +13,12 @@ public final class WidgetNoticeNuxOverlayBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1835c; + public final MaterialButton f1837c; public WidgetNoticeNuxOverlayBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1835c = materialButton2; + this.f1837c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java index 975a274b36..c55d5529bf 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java @@ -13,12 +13,12 @@ public final class WidgetNoticeNuxSamsungLinkBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1836c; + public final MaterialButton f1838c; public WidgetNoticeNuxSamsungLinkBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1836c = materialButton2; + this.f1838c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java index f548d25db2..29d02f6cc9 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java @@ -17,7 +17,7 @@ public final class WidgetNoticePopupBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeSpanTextView f1837c; + public final SimpleDraweeSpanTextView f1839c; @NonNull public final ImageView d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetNoticePopupBinding implements ViewBinding { public WidgetNoticePopupBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull StickerView stickerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RelativeLayout relativeLayout2) { this.a = relativeLayout; this.b = simpleDraweeView; - this.f1837c = simpleDraweeSpanTextView; + this.f1839c = simpleDraweeSpanTextView; this.d = imageView; this.e = simpleDraweeView2; this.f = stickerView; diff --git a/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java b/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java index 521ad3b7a0..b0c90340c5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java @@ -17,7 +17,7 @@ public final class WidgetNuxChannelPromptBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1838c; + public final SimpleDraweeView f1840c; @NonNull public final TextView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetNuxChannelPromptBinding implements ViewBinding { public WidgetNuxChannelPromptBinding(@NonNull RelativeLayout relativeLayout, @NonNull LoadingButton loadingButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextInputLayout textInputLayout, @NonNull Toolbar toolbar) { this.a = relativeLayout; this.b = loadingButton; - this.f1838c = simpleDraweeView; + this.f1840c = simpleDraweeView; this.d = textView; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java b/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java index 662a2ac5a3..48712f4f3f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java @@ -16,7 +16,7 @@ public final class WidgetNuxGuildTemplateBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialCardView f1839c; + public final MaterialCardView f1841c; @NonNull public final MaterialCardView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetNuxGuildTemplateBinding implements ViewBinding { public WidgetNuxGuildTemplateBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialCardView materialCardView, @NonNull MaterialCardView materialCardView2, @NonNull MaterialCardView materialCardView3, @NonNull MaterialCardView materialCardView4, @NonNull MaterialCardView materialCardView5, @NonNull MaterialCardView materialCardView6, @NonNull MaterialButton materialButton, @NonNull MaterialCardView materialCardView7, @NonNull LinearLayout linearLayout2, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout3) { this.a = linearLayout; this.b = materialCardView; - this.f1839c = materialCardView2; + this.f1841c = materialCardView2; this.d = materialCardView3; this.e = materialCardView4; this.f = materialCardView5; diff --git a/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java b/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java index 5868916687..9294874441 100644 --- a/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java @@ -19,7 +19,7 @@ public final class WidgetOauthAuthorizeBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1840c; + public final SimpleDraweeView f1842c; @NonNull public final TextView d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetOauthAuthorizeBinding implements ViewBinding { public WidgetOauthAuthorizeBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull MaterialCardView materialCardView, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton3, @NonNull ImageView imageView2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView, @NonNull TextView textView5, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton4, @NonNull MaterialButton materialButton5, @NonNull SimpleDraweeView simpleDraweeView2) { this.a = coordinatorLayout; this.b = textView; - this.f1840c = simpleDraweeView; + this.f1842c = simpleDraweeView; this.d = textView2; this.e = linearLayout; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java index b634970a2f..1d6fa8f206 100644 --- a/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsSheetBinding.java @@ -13,12 +13,12 @@ public final class WidgetOutboundPromoTermsSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1841c; + public final TextView f1843c; public WidgetOutboundPromoTermsSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1841c = textView2; + this.f1843c = textView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java index 4dd9c1cac6..35dc757a95 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java @@ -19,7 +19,7 @@ public final class WidgetPaymentSourceEditDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1842c; + public final MaterialButton f1844c; @NonNull public final LoadingButton d; @NonNull @@ -48,7 +48,7 @@ public final class WidgetPaymentSourceEditDialogBinding implements ViewBinding { public WidgetPaymentSourceEditDialogBinding(@NonNull LinearLayout linearLayout, @NonNull Toolbar toolbar, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull TextInputLayout textInputLayout3, @NonNull TextInputLayout textInputLayout4, @NonNull CheckBox checkBox, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout5, @NonNull TextInputLayout textInputLayout6, @NonNull TextInputLayout textInputLayout7, @NonNull PaymentSourceView paymentSourceView) { this.a = linearLayout; this.b = toolbar; - this.f1842c = materialButton; + this.f1844c = materialButton; this.d = loadingButton; this.e = textInputLayout; this.f = textInputLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java index 51a4380b94..8b0c009679 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java @@ -14,12 +14,12 @@ public final class WidgetPhoneCountryCodeBottomSheetBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1843c; + public final TextInputLayout f1845c; public WidgetPhoneCountryCodeBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) { this.a = linearLayout; this.b = recyclerView; - this.f1843c = textInputLayout; + this.f1845c = textInputLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java index 0a6c429417..7d71a89941 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java @@ -13,14 +13,14 @@ public final class WidgetPhoneCountryCodeListItemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1844c; + public final ConstraintLayout f1846c; @NonNull public final TextView d; public WidgetPhoneCountryCodeListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2) { this.a = constraintLayout; this.b = textView; - this.f1844c = constraintLayout2; + this.f1846c = constraintLayout2; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java b/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java index 3202a32f70..b89f6e4655 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java @@ -16,7 +16,7 @@ public final class WidgetPremiumGuildTransferBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1845c; + public final TextView f1847c; @NonNull public final TextView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetPremiumGuildTransferBinding implements ViewBinding { public WidgetPremiumGuildTransferBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView2, @NonNull TextView textView4) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1845c = textView; + this.f1847c = textView; this.d = textView2; this.e = premiumGuildConfirmationView; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java b/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java index 307995a046..a275c96f67 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPruneUsersBinding.java @@ -16,7 +16,7 @@ public final class WidgetPruneUsersBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1846c; + public final TextView f1848c; @NonNull public final MaterialButton d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetPruneUsersBinding implements ViewBinding { public WidgetPruneUsersBinding(@NonNull ScrollView scrollView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull ProgressBar progressBar) { this.a = scrollView; this.b = materialButton; - this.f1846c = textView; + this.f1848c = textView; this.d = materialButton2; this.e = textView2; this.f = checkedSetting; diff --git a/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java b/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java index 0ead12f208..96871adec8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetQrScannerBinding.java @@ -14,12 +14,12 @@ public final class WidgetQrScannerBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final Chip f1847c; + public final Chip f1849c; public WidgetQrScannerBinding(@NonNull FrameLayout frameLayout, @NonNull ZXingScannerView zXingScannerView, @NonNull Chip chip) { this.a = frameLayout; this.b = zXingScannerView; - this.f1847c = chip; + this.f1849c = chip; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java index e2bfada3cd..833b8a6797 100644 --- a/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetQuickMentionsDialogBinding.java @@ -14,12 +14,12 @@ public final class WidgetQuickMentionsDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TabLayout f1848c; + public final TabLayout f1850c; public WidgetQuickMentionsDialogBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ViewPager2 viewPager2, @NonNull TabLayout tabLayout) { this.a = constraintLayout; this.b = viewPager2; - this.f1848c = tabLayout; + this.f1850c = tabLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java b/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java index 9e7540728a..fa30bcfa5c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetRemoteAuthBinding.java @@ -16,7 +16,7 @@ public final class WidgetRemoteAuthBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final a5 f1849c; + public final a5 f1851c; @NonNull public final b5 d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetRemoteAuthBinding implements ViewBinding { public WidgetRemoteAuthBinding(@NonNull RelativeLayout relativeLayout, @NonNull c5 c5Var, @NonNull a5 a5Var, @NonNull b5 b5Var, @NonNull AppViewFlipper appViewFlipper) { this.a = relativeLayout; this.b = c5Var; - this.f1849c = a5Var; + this.f1851c = a5Var; this.d = b5Var; this.e = appViewFlipper; } diff --git a/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java index 3838394297..6fe94eb7e9 100644 --- a/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetScreenShareNfxSheetBinding.java @@ -14,12 +14,12 @@ public final class WidgetScreenShareNfxSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1850c; + public final MaterialButton f1852c; public WidgetScreenShareNfxSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull MaterialButton materialButton) { this.a = nestedScrollView; this.b = textView; - this.f1850c = materialButton; + this.f1852c = materialButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java index 6e47419681..d107882e94 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSearchBinding.java @@ -15,7 +15,7 @@ public final class WidgetSearchBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1851c; + public final TextInputLayout f1853c; @NonNull public final FragmentContainerView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetSearchBinding implements ViewBinding { public WidgetSearchBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2) { this.a = coordinatorLayout; this.b = floatingActionButton; - this.f1851c = textInputLayout; + this.f1853c = textInputLayout; this.d = fragmentContainerView; this.e = fragmentContainerView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java index c567a04156..aad15102ab 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemChannelBinding.java @@ -14,12 +14,12 @@ public final class WidgetSearchSuggestionsItemChannelBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1852c; + public final TextView f1854c; public WidgetSearchSuggestionsItemChannelBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = relativeLayout; this.b = relativeLayout2; - this.f1852c = textView; + this.f1854c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java index 9d9a632f37..80d03498b1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemHasBinding.java @@ -14,14 +14,14 @@ public final class WidgetSearchSuggestionsItemHasBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1853c; + public final ImageView f1855c; @NonNull public final TextView d; public WidgetSearchSuggestionsItemHasBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = relativeLayout; this.b = relativeLayout2; - this.f1853c = imageView; + this.f1855c = imageView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java index 69cfef81a1..f85b9ab838 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemRecentQueryBinding.java @@ -14,12 +14,12 @@ public final class WidgetSearchSuggestionsItemRecentQueryBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1854c; + public final TextView f1856c; public WidgetSearchSuggestionsItemRecentQueryBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = relativeLayout; this.b = relativeLayout2; - this.f1854c = textView; + this.f1856c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java index b80fc9c998..398bbb6a21 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSearchSuggestionsItemSuggestionBinding.java @@ -14,7 +14,7 @@ public final class WidgetSearchSuggestionsItemSuggestionBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1855c; + public final RelativeLayout f1857c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetSearchSuggestionsItemSuggestionBinding implements ViewB public WidgetSearchSuggestionsItemSuggestionBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull RelativeLayout relativeLayout2, @NonNull TextView textView2, @NonNull ImageView imageView) { this.a = relativeLayout; this.b = textView; - this.f1855c = relativeLayout2; + this.f1857c = relativeLayout2; this.d = textView2; this.e = imageView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java index d600491411..59618d86e3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetBinding.java @@ -14,7 +14,7 @@ public final class WidgetSelectComponentBottomSheetBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final MaxHeightRecyclerView f1856c; + public final MaxHeightRecyclerView f1858c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetSelectComponentBottomSheetBinding implements ViewBindin public WidgetSelectComponentBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = constraintLayout; this.b = textView; - this.f1856c = maxHeightRecyclerView; + this.f1858c = maxHeightRecyclerView; this.d = textView2; this.e = textView3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java index 2f8500569c..5da429af08 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSelectComponentBottomSheetItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetSelectComponentBottomSheetItemBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1857c; + public final View f1859c; @NonNull public final View d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetSelectComponentBottomSheetItemBinding implements ViewBi public WidgetSelectComponentBottomSheetItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialTextView materialTextView, @NonNull View view, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCheckBox materialCheckBox, @NonNull MaterialTextView materialTextView2) { this.a = constraintLayout; this.b = materialTextView; - this.f1857c = view; + this.f1859c = view; this.d = view2; this.e = simpleDraweeView; this.f = materialCheckBox; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java index 14f113fe86..a55d4351ce 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerBoostConfirmationBinding.java @@ -17,7 +17,7 @@ public final class WidgetServerBoostConfirmationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1858c; + public final TextView f1860c; @NonNull public final TextView d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetServerBoostConfirmationBinding implements ViewBinding { public WidgetServerBoostConfirmationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = premiumGuildConfirmationView; - this.f1858c = textView; + this.f1860c = textView; this.d = textView2; this.e = materialButton; this.f = dimmerView; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java index f3ddad8da0..4df05b9eb6 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerBoostStatusBinding.java @@ -20,7 +20,7 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1859c; + public final LinkifiedTextView f1861c; @NonNull public final TextView d; @NonNull @@ -43,7 +43,7 @@ public final class WidgetServerBoostStatusBinding implements ViewBinding { public WidgetServerBoostStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull SimplePager simplePager, @NonNull l2 l2Var) { this.a = coordinatorLayout; this.b = appViewFlipper; - this.f1859c = linkifiedTextView; + this.f1861c = linkifiedTextView; this.d = textView; this.e = premiumSubscriptionMarketingView; this.f = premiumGuildSubscriptionUpsellView; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java index 73a2302188..a7c0c0c12b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerDeleteDialogBinding.java @@ -15,7 +15,7 @@ public final class WidgetServerDeleteDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1860c; + public final MaterialButton f1862c; @NonNull public final TextView d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetServerDeleteDialogBinding implements ViewBinding { public WidgetServerDeleteDialogBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2) { this.a = linearLayout; this.b = materialButton; - this.f1860c = materialButton2; + this.f1862c = materialButton2; this.d = textView; this.e = textInputLayout; this.f = linearLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java index 32ae923e06..91fbb69778 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerNotificationOverrideSelectorBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerNotificationOverrideSelectorBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1861c; + public final TextInputLayout f1863c; public WidgetServerNotificationOverrideSelectorBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1861c = textInputLayout; + this.f1863c = textInputLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java index 41b15802fd..3b6684b07f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerNotificationsBinding.java @@ -17,7 +17,7 @@ public final class WidgetServerNotificationsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1862c; + public final RecyclerView f1864c; @NonNull public final CheckedSetting d; @NonNull @@ -40,7 +40,7 @@ public final class WidgetServerNotificationsBinding implements ViewBinding { public WidgetServerNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull p1 p1Var, @NonNull RecyclerView recyclerView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull View view, @NonNull LinearLayout linearLayout, @NonNull NotificationMuteSettingsView notificationMuteSettingsView, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) { this.a = coordinatorLayout; this.b = p1Var; - this.f1862c = recyclerView; + this.f1864c = recyclerView; this.d = checkedSetting; this.e = checkedSetting2; this.f = checkedSetting3; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java index a685e3b9fd..36a08c4bbd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogBinding.java @@ -16,7 +16,7 @@ public final class WidgetServerSettingsAuditLogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1863c; + public final RecyclerView f1865c; @NonNull public final TextView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetServerSettingsAuditLogBinding implements ViewBinding { public WidgetServerSettingsAuditLogBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull AppViewFlipper appViewFlipper, @NonNull AppViewFlipper appViewFlipper2) { this.a = coordinatorLayout; this.b = textView3; - this.f1863c = recyclerView; + this.f1865c = recyclerView; this.d = textView4; this.e = appViewFlipper; this.f = appViewFlipper2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java index 947c2bd0a1..bc059c98cb 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterActionListitemBinding.java @@ -15,14 +15,14 @@ public final class WidgetServerSettingsAuditLogFilterActionListitemBinding imple @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1864c; + public final ImageView f1866c; @NonNull public final ImageView d; public WidgetServerSettingsAuditLogFilterActionListitemBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2) { this.a = linearLayout; this.b = checkedSetting; - this.f1864c = imageView; + this.f1866c = imageView; this.d = imageView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java index 50b40c856f..92b1615d71 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogFilterUserListitemBinding.java @@ -16,14 +16,14 @@ public final class WidgetServerSettingsAuditLogFilterUserListitemBinding impleme @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1865c; + public final CheckedSetting f1867c; @NonNull public final ImageView d; public WidgetServerSettingsAuditLogFilterUserListitemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1865c = checkedSetting; + this.f1867c = checkedSetting; this.d = imageView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java index fa1c23bb02..ac77c71165 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsAuditLogListitemBinding.java @@ -17,7 +17,7 @@ public final class WidgetServerSettingsAuditLogListitemBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1866c; + public final ImageView f1868c; @NonNull public final SimpleDraweeView d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetServerSettingsAuditLogListitemBinding implements ViewBi public WidgetServerSettingsAuditLogListitemBinding(@NonNull CardView cardView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView3, @NonNull RelativeLayout relativeLayout) { this.a = cardView; this.b = imageView; - this.f1866c = imageView2; + this.f1868c = imageView2; this.d = simpleDraweeView; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java index fde63e431f..7480cdc7e9 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBanListItemBinding.java @@ -14,14 +14,14 @@ public final class WidgetServerSettingsBanListItemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1867c; + public final SimpleDraweeView f1869c; @NonNull public final TextView d; public WidgetServerSettingsBanListItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = relativeLayout; this.b = relativeLayout2; - this.f1867c = simpleDraweeView; + this.f1869c = simpleDraweeView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java index ee2de57c45..744976c979 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBansBinding.java @@ -16,14 +16,14 @@ public final class WidgetServerSettingsBansBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1868c; + public final TextInputLayout f1870c; @NonNull public final AppViewFlipper d; public WidgetServerSettingsBansBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1868c = textInputLayout; + this.f1870c = textInputLayout; this.d = appViewFlipper; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java index e51fc94ce4..a8f089795a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsBinding.java @@ -15,7 +15,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1869c; + public final TextView f1871c; @NonNull public final TextView d; @NonNull @@ -49,7 +49,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final View f1870s; + public final View f1872s; @NonNull public final SimpleDraweeView t; @NonNull @@ -60,7 +60,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding { public WidgetServerSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull View view2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView15, @NonNull TextView textView16) { this.a = coordinatorLayout; this.b = textView; - this.f1869c = textView2; + this.f1871c = textView2; this.d = textView3; this.e = textView4; this.f = textView5; @@ -76,7 +76,7 @@ public final class WidgetServerSettingsBinding implements ViewBinding { this.p = linearLayout; this.q = linearLayout2; this.r = linearLayout3; - this.f1870s = view2; + this.f1872s = view2; this.t = simpleDraweeView; this.u = textView15; this.v = textView16; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java index 039ed21613..8c6466025d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsBinding.java @@ -16,14 +16,14 @@ public final class WidgetServerSettingsChannelsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1871c; + public final FloatingActionButton f1873c; @NonNull public final RecyclerView d; public WidgetServerSettingsChannelsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull FloatingActionButton floatingActionButton, @NonNull RecyclerView recyclerView, @NonNull FrameLayout frameLayout) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1871c = floatingActionButton; + this.f1873c = floatingActionButton; this.d = recyclerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java index 80f477d827..cd9b1b3c2d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortActionsBinding.java @@ -13,14 +13,14 @@ public final class WidgetServerSettingsChannelsSortActionsBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1872c; + public final TextView f1874c; @NonNull public final TextView d; public WidgetServerSettingsChannelsSortActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = nestedScrollView; this.b = textView2; - this.f1872c = textView3; + this.f1874c = textView3; this.d = textView4; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java index c131e93315..32ed6da931 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsChannelsSortFabMenuBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerSettingsChannelsSortFabMenuBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TableLayout f1873c; + public final TableLayout f1875c; public WidgetServerSettingsChannelsSortFabMenuBinding(@NonNull TableLayout tableLayout, @NonNull TableRow tableRow, @NonNull TableRow tableRow2, @NonNull TableRow tableRow3, @NonNull TableRow tableRow4, @NonNull FloatingActionButton floatingActionButton, @NonNull TableLayout tableLayout2) { this.a = tableLayout; this.b = floatingActionButton; - this.f1873c = tableLayout2; + this.f1875c = tableLayout2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java index b46758de47..0b98a0ce10 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunityOverviewBinding.java @@ -15,7 +15,7 @@ public final class WidgetServerSettingsCommunityOverviewBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final CommunitySelectorView f1874c; + public final CommunitySelectorView f1876c; @NonNull public final CommunitySelectorView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetServerSettingsCommunityOverviewBinding implements ViewB public WidgetServerSettingsCommunityOverviewBinding(@NonNull LinearLayout linearLayout, @NonNull CommunitySelectorView communitySelectorView, @NonNull CommunitySelectorView communitySelectorView2, @NonNull CommunitySelectorView communitySelectorView3, @NonNull ScrollView scrollView, @NonNull LoadingButton loadingButton, @NonNull CommunitySelectorView communitySelectorView4) { this.a = linearLayout; this.b = communitySelectorView; - this.f1874c = communitySelectorView2; + this.f1876c = communitySelectorView2; this.d = communitySelectorView3; this.e = loadingButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java index 8bdf179423..ecb7d1a05c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupFirstStepBinding.java @@ -15,12 +15,12 @@ public final class WidgetServerSettingsCommunitySetupFirstStepBinding implements @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1875c; + public final CheckedSetting f1877c; public WidgetServerSettingsCommunitySetupFirstStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull ScreenTitleView screenTitleView) { this.a = scrollView; this.b = checkedSetting; - this.f1875c = checkedSetting2; + this.f1877c = checkedSetting2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java index df5ee7ca34..aa61fe5d9f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupSecondStepBinding.java @@ -15,12 +15,12 @@ public final class WidgetServerSettingsCommunitySetupSecondStepBinding implement @NonNull /* renamed from: c reason: collision with root package name */ - public final CommunitySelectorView f1876c; + public final CommunitySelectorView f1878c; public WidgetServerSettingsCommunitySetupSecondStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CommunitySelectorView communitySelectorView, @NonNull ScreenTitleView screenTitleView, @NonNull CommunitySelectorView communitySelectorView2) { this.a = scrollView; this.b = communitySelectorView; - this.f1876c = communitySelectorView2; + this.f1878c = communitySelectorView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java index 8aa49cba0f..ee54eccafc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsCommunitySetupThirdStepBinding.java @@ -16,7 +16,7 @@ public final class WidgetServerSettingsCommunitySetupThirdStepBinding implements @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1877c; + public final LinkifiedTextView f1879c; @NonNull public final CheckedSetting d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetServerSettingsCommunitySetupThirdStepBinding implements public WidgetServerSettingsCommunitySetupThirdStepBinding(@NonNull ScrollView scrollView, @NonNull ScrollView scrollView2, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull ScreenTitleView screenTitleView) { this.a = scrollView; this.b = checkedSetting; - this.f1877c = linkifiedTextView; + this.f1879c = linkifiedTextView; this.d = checkedSetting2; this.e = checkedSetting3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java index 7462b31a1e..ac70450905 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditIntegrationBinding.java @@ -20,7 +20,7 @@ public final class WidgetServerSettingsEditIntegrationBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1878c; + public final LinearLayout f1880c; @NonNull public final CheckedSetting d; @NonNull @@ -51,7 +51,7 @@ public final class WidgetServerSettingsEditIntegrationBinding implements ViewBin public WidgetServerSettingsEditIntegrationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout4, @NonNull TextView textView2, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout5, @NonNull LinearLayout linearLayout6, @NonNull v vVar) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1878c = linearLayout; + this.f1880c = linearLayout; this.d = checkedSetting; this.e = checkedSetting2; this.f = checkedSetting3; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java index cd62b98760..2971ae4125 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEditMemberBinding.java @@ -17,7 +17,7 @@ public final class WidgetServerSettingsEditMemberBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1879c; + public final TextView f1881c; @NonNull public final TextView d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetServerSettingsEditMemberBinding implements ViewBinding public WidgetServerSettingsEditMemberBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextView textView3) { this.a = coordinatorLayout; this.b = linearLayout; - this.f1879c = textView; + this.f1881c = textView; this.d = textView2; this.e = textInputLayout; this.f = linearLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java index 4a3efb8c62..1e0af3748b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppViewFlipper f1880c; + public final AppViewFlipper f1882c; public WidgetServerSettingsEmojisBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1880c = appViewFlipper; + this.f1882c = appViewFlipper; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java index 5c1ab19cff..0fc12eaff3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisEditBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisEditBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1881c; + public final FloatingActionButton f1883c; public WidgetServerSettingsEmojisEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1881c = floatingActionButton; + this.f1883c = floatingActionButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java index c9b1c08f36..bef8784e78 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisHeaderBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerSettingsEmojisHeaderBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1882c; + public final TextView f1884c; public WidgetServerSettingsEmojisHeaderBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) { this.a = linearLayout; this.b = materialButton; - this.f1882c = textView; + this.f1884c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java index abf34fb08d..47abd5bea1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsEmojisItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetServerSettingsEmojisItemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1883c; + public final LinearLayout f1885c; @NonNull public final TextView d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetServerSettingsEmojisItemBinding implements ViewBinding public WidgetServerSettingsEmojisItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView2) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1883c = linearLayout2; + this.f1885c = linearLayout2; this.d = textView; this.e = textView2; this.f = simpleDraweeView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java index 6bb0c8f57b..3f76ef9063 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java @@ -13,7 +13,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1884c; + public final TextView f1886c; @NonNull public final TextView d; @NonNull @@ -22,7 +22,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi public WidgetServerSettingsInstantInviteActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = nestedScrollView; this.b = textView; - this.f1884c = textView2; + this.f1886c = textView2; this.d = textView3; this.e = textView4; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java index 95d90a3d5c..95f14f0ab2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java @@ -16,7 +16,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1885c; + public final TextView f1887c; @NonNull public final LinearLayout d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V public WidgetServerSettingsInstantInviteListItemBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7) { this.a = cardView; this.b = textView; - this.f1885c = textView2; + this.f1887c = textView2; this.d = linearLayout; this.e = textView3; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java index 7389f4970f..cd54a5d93f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java @@ -15,12 +15,12 @@ public final class WidgetServerSettingsInstantInvitesBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final AppViewFlipper f1886c; + public final AppViewFlipper f1888c; public WidgetServerSettingsInstantInvitesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1886c = appViewFlipper; + this.f1888c = appViewFlipper; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java index 23c806e669..b17e1682ec 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java @@ -18,7 +18,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1887c; + public final View f1889c; @NonNull public final ImageView d; @NonNull @@ -35,7 +35,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie public WidgetServerSettingsIntegrationListItemBinding(@NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull CheckedSetting checkedSetting, @NonNull ProgressBar progressBar) { this.a = frameLayout; this.b = relativeLayout; - this.f1887c = view; + this.f1889c = view; this.d = imageView; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java index a9ee7bf28a..3b91ff8889 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java @@ -15,12 +15,12 @@ public final class WidgetServerSettingsIntegrationsBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final AppViewFlipper f1888c; + public final AppViewFlipper f1890c; public WidgetServerSettingsIntegrationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1888c = appViewFlipper; + this.f1890c = appViewFlipper; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java index 2ab9923de4..af56cf4687 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java @@ -16,7 +16,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1889c; + public final ConstraintLayout f1891c; @NonNull public final ImageView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind public WidgetServerSettingsMemberListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull UsernameView usernameView, @NonNull ImageView imageView2, @NonNull RolesListView rolesListView) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1889c = constraintLayout2; + this.f1891c = constraintLayout2; this.d = imageView; this.e = usernameView; this.f = imageView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java index 88af216bd3..1c4f195cb4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java @@ -18,7 +18,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1890c; + public final RecyclerView f1892c; @NonNull public final Spinner d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding { public WidgetServerSettingsMembersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull Spinner spinner, @NonNull AppViewFlipper appViewFlipper) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1890c = recyclerView; + this.f1892c = recyclerView; this.d = spinner; this.e = appViewFlipper; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java index 2e99f6ffc0..3280d4c803 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsModerationBinding.java @@ -14,7 +14,7 @@ public final class WidgetServerSettingsModerationBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1891c; + public final CheckedSetting f1893c; @NonNull public final CheckedSetting d; @NonNull @@ -35,7 +35,7 @@ public final class WidgetServerSettingsModerationBinding implements ViewBinding public WidgetServerSettingsModerationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull TextView textView2) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1891c = checkedSetting2; + this.f1893c = checkedSetting2; this.d = checkedSetting3; this.e = textView; this.f = checkedSetting4; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java index 0f599b3461..6e9993a722 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewAfkTimeoutBinding.java @@ -13,7 +13,7 @@ public final class WidgetServerSettingsOverviewAfkTimeoutBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1892c; + public final TextView f1894c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetServerSettingsOverviewAfkTimeoutBinding implements View public WidgetServerSettingsOverviewAfkTimeoutBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6) { this.a = nestedScrollView; this.b = textView2; - this.f1892c = textView3; + this.f1894c = textView3; this.d = textView4; this.e = textView5; this.f = textView6; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java index 866ff3256f..c71a86cf99 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewBinding.java @@ -22,7 +22,7 @@ public final class WidgetServerSettingsOverviewBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final v2 f1893c; + public final v2 f1895c; @NonNull public final w2 d; @NonNull @@ -43,7 +43,7 @@ public final class WidgetServerSettingsOverviewBinding implements ViewBinding { public WidgetServerSettingsOverviewBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull e5 e5Var, @NonNull v2 v2Var, @NonNull w2 w2Var, @NonNull x2 x2Var, @NonNull y2 y2Var, @NonNull FloatingActionButton floatingActionButton, @NonNull ScrollView scrollView, @NonNull z2 z2Var, @NonNull a3 a3Var, @NonNull b3 b3Var) { this.a = coordinatorLayout; this.b = e5Var; - this.f1893c = v2Var; + this.f1895c = v2Var; this.d = w2Var; this.e = x2Var; this.f = y2Var; diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java index 65167ff3bc..0c1ddcf64e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsOverviewRegionBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerSettingsOverviewRegionBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final MaxHeightRecyclerView f1894c; + public final MaxHeightRecyclerView f1896c; public WidgetServerSettingsOverviewRegionBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaxHeightRecyclerView maxHeightRecyclerView) { this.a = linearLayout; this.b = materialButton; - this.f1894c = maxHeightRecyclerView; + this.f1896c = maxHeightRecyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java index afcb15db4a..8361d68b99 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRoleItemBinding.java @@ -14,14 +14,14 @@ public final class WidgetServerSettingsRoleItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1895c; + public final ImageView f1897c; @NonNull public final TextView d; public WidgetServerSettingsRoleItemBinding(@NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull View view2, @NonNull View view3, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = relativeLayout; this.b = view3; - this.f1895c = imageView; + this.f1897c = imageView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java index a8c951a51a..73263a55a3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsRolesListBinding.java @@ -15,14 +15,14 @@ public final class WidgetServerSettingsRolesListBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1896c; + public final FloatingActionButton f1898c; @NonNull public final RecyclerView d; public WidgetServerSettingsRolesListBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull FloatingActionButton floatingActionButton, @NonNull RecyclerView recyclerView) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1896c = floatingActionButton; + this.f1898c = floatingActionButton; this.d = recyclerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java index bf5d3a9673..bb05f45145 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityBinding.java @@ -14,12 +14,12 @@ public final class WidgetServerSettingsSecurityBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1897c; + public final MaterialButton f1899c; public WidgetServerSettingsSecurityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton) { this.a = coordinatorLayout; this.b = textView; - this.f1897c = materialButton; + this.f1899c = materialButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java index a9316f23d8..101ae0a408 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsSecurityDialogBinding.java @@ -15,14 +15,14 @@ public final class WidgetServerSettingsSecurityDialogBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1898c; + public final MaterialButton f1900c; @NonNull public final TextInputLayout d; public WidgetServerSettingsSecurityDialogBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout) { this.a = linearLayout; this.b = materialButton; - this.f1898c = materialButton2; + this.f1900c = materialButton2; this.d = textInputLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java index 5a00a3cb51..9950326ce5 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsVanityUrlBinding.java @@ -17,7 +17,7 @@ public final class WidgetServerSettingsVanityUrlBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1899c; + public final TextView f1901c; @NonNull public final TextView d; @NonNull @@ -36,7 +36,7 @@ public final class WidgetServerSettingsVanityUrlBinding implements ViewBinding { public WidgetServerSettingsVanityUrlBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RelativeLayout relativeLayout, @NonNull ProgressBar progressBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1899c = textView; + this.f1901c = textView; this.d = textView2; this.e = textView3; this.f = relativeLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java index f407075784..2e6652ec6a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccessibilityBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsAccessibilityBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1900c; + public final CheckedSetting f1902c; @NonNull public final TextView d; @NonNull @@ -26,29 +26,26 @@ public final class WidgetSettingsAccessibilityBinding implements ViewBinding { @NonNull public final CheckedSetting g; @NonNull - public final LinearLayout h; + public final TextView h; @NonNull - public final TextView i; + public final CheckedSetting i; @NonNull public final CheckedSetting j; @NonNull public final CheckedSetting k; - @NonNull - public final CheckedSetting l; public WidgetSettingsAccessibilityBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull View view, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1900c = checkedSetting2; + this.f1902c = checkedSetting2; this.d = textView; this.e = linkifiedTextView; this.f = textView2; this.g = checkedSetting3; - this.h = linearLayout; - this.i = textView3; - this.j = checkedSetting4; - this.k = checkedSetting5; - this.l = checkedSetting6; + this.h = textView3; + this.i = checkedSetting4; + this.j = checkedSetting5; + this.k = checkedSetting6; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java index 74ee01385a..a1da3abd8e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBackupCodesBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsAccountBackupCodesBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1901c; + public final MaterialButton f1903c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetSettingsAccountBackupCodesBinding implements ViewBindin public WidgetSettingsAccountBackupCodesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull RecyclerView recyclerView) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1901c = materialButton; + this.f1903c = materialButton; this.d = textView; this.e = recyclerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java index 205b93a960..1421e17859 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountBinding.java @@ -49,7 +49,7 @@ public final class WidgetSettingsAccountBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1902c; + public final TextView f1904c; @NonNull public final SimpleDraweeView d; @NonNull @@ -83,7 +83,7 @@ public final class WidgetSettingsAccountBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f1903s; + public final TextView f1905s; @NonNull public final LinearLayout t; @NonNull @@ -95,20 +95,20 @@ public final class WidgetSettingsAccountBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final LinearLayout f1904x; + public final LinearLayout f1906x; @NonNull /* renamed from: y reason: collision with root package name */ - public final TextView f1905y; + public final TextView f1907y; @NonNull /* renamed from: z reason: collision with root package name */ - public final TextView f1906z; + public final TextView f1908z; public WidgetSettingsAccountBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout6, @NonNull TextView textView7, @NonNull AppViewFlipper appViewFlipper, @NonNull LottieAnimationView lottieAnimationView, @NonNull TextView textView8, @NonNull LinearLayout linearLayout7, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout8, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull LinearLayout linearLayout9, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull FloatingActionButton floatingActionButton, @NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView17, @NonNull TextView textView18, @NonNull LinearLayout linearLayout10, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton2, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull TextView textView23) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1902c = textView; + this.f1904c = textView; this.d = simpleDraweeView; this.e = frameLayout; this.f = textView2; @@ -124,14 +124,14 @@ public final class WidgetSettingsAccountBinding implements ViewBinding { this.p = lottieAnimationView; this.q = textView8; this.r = linearLayout7; - this.f1903s = textView10; + this.f1905s = textView10; this.t = linearLayout8; this.u = textView12; this.v = textView13; this.w = textView14; - this.f1904x = linearLayout9; - this.f1905y = textView15; - this.f1906z = textView16; + this.f1906x = linearLayout9; + this.f1907y = textView15; + this.f1908z = textView16; this.A = floatingActionButton; this.B = nestedScrollView; this.C = checkedSetting; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java index 45ca861a1c..ae339792a2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountChangePasswordBinding.java @@ -15,7 +15,7 @@ public final class WidgetSettingsAccountChangePasswordBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1907c; + public final TextInputLayout f1909c; @NonNull public final FloatingActionButton d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetSettingsAccountChangePasswordBinding implements ViewBin public WidgetSettingsAccountChangePasswordBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout3, @NonNull DimmerView dimmerView) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1907c = textInputLayout2; + this.f1909c = textInputLayout2; this.d = floatingActionButton; this.e = textInputLayout3; this.f = dimmerView; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java index 7364600351..3974312a4f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountContactsNameEditBinding.java @@ -15,14 +15,14 @@ public final class WidgetSettingsAccountContactsNameEditBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1908c; + public final MaterialButton f1910c; @NonNull public final FloatingActionButton d; public WidgetSettingsAccountContactsNameEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1908c = materialButton; + this.f1910c = materialButton; this.d = floatingActionButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java index 5599cbc1da..a5007f5b1e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEditBinding.java @@ -16,14 +16,14 @@ public final class WidgetSettingsAccountEditBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1909c; + public final TextInputLayout f1911c; @NonNull public final FloatingActionButton d; public WidgetSettingsAccountEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull RelativeLayout relativeLayout, @NonNull TextInputLayout textInputLayout2, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1909c = textInputLayout2; + this.f1911c = textInputLayout2; this.d = floatingActionButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java index bb0c61ef5a..72e85e43dd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAccountEmailEditBinding.java @@ -14,12 +14,12 @@ public final class WidgetSettingsAccountEmailEditBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1910c; + public final FloatingActionButton f1912c; public WidgetSettingsAccountEmailEditBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1910c = floatingActionButton; + this.f1912c = floatingActionButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java index e6f3c6c6e4..58d84f86b3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAppearanceBinding.java @@ -17,7 +17,7 @@ public final class WidgetSettingsAppearanceBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1911c; + public final TextView f1913c; @NonNull public final TextView d; @NonNull @@ -42,7 +42,7 @@ public final class WidgetSettingsAppearanceBinding implements ViewBinding { public WidgetSettingsAppearanceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull j4 j4Var, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull View view, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4) { this.a = coordinatorLayout; this.b = j4Var; - this.f1911c = textView; + this.f1913c = textView; this.d = textView2; this.e = textView3; this.f = seekBar; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java index e9a3bc6bd1..5f7ab9581a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsAuthorizedAppsListItemBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsAuthorizedAppsListItemBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1912c; + public final TextView f1914c; @NonNull public final TextView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetSettingsAuthorizedAppsListItemBinding implements ViewBi public WidgetSettingsAuthorizedAppsListItemBinding(@NonNull MaterialCardView materialCardView, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialCardView materialCardView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView) { this.a = materialCardView; this.b = appCompatImageView; - this.f1912c = textView; + this.f1914c = textView; this.d = textView2; this.e = simpleDraweeView; this.f = materialCardView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java index 739dd55a24..017654237d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBehaviorBinding.java @@ -14,7 +14,7 @@ public final class WidgetSettingsBehaviorBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1913c; + public final TextView f1915c; @NonNull public final CheckedSetting d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetSettingsBehaviorBinding implements ViewBinding { public WidgetSettingsBehaviorBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1913c = textView; + this.f1915c = textView; this.d = checkedSetting2; this.e = textView2; this.f = checkedSetting3; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java index ef89f18c0f..77a1e49e10 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBinding.java @@ -30,7 +30,7 @@ public final class WidgetSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1914c; + public final TextView f1916c; @NonNull public final TextView d; @NonNull @@ -64,7 +64,7 @@ public final class WidgetSettingsBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f1915s; + public final TextView f1917s; @NonNull public final LinearLayout t; @NonNull @@ -76,20 +76,20 @@ public final class WidgetSettingsBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final LinearLayout f1916x; + public final LinearLayout f1918x; @NonNull /* renamed from: y reason: collision with root package name */ - public final TextView f1917y; + public final TextView f1919y; @NonNull /* renamed from: z reason: collision with root package name */ - public final TextView f1918z; + public final TextView f1920z; public WidgetSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull TextView textView12, @NonNull View view, @NonNull TextView textView13, @NonNull TextView textView14, @NonNull TextView textView15, @NonNull TextView textView16, @NonNull TextView textView17, @NonNull LinearLayout linearLayout, @NonNull TextView textView18, @NonNull TextView textView19, @NonNull TextView textView20, @NonNull LinearLayout linearLayout2, @NonNull TextView textView21, @NonNull TextView textView22, @NonNull TextView textView23, @NonNull StatusView statusView, @NonNull TextView textView24, @NonNull TextView textView25, @NonNull TextView textView26, @NonNull TextView textView27, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull TextView textView28) { this.a = coordinatorLayout; this.b = textView; - this.f1914c = textView2; + this.f1916c = textView2; this.d = textView3; this.e = textView4; this.f = textView5; @@ -105,14 +105,14 @@ public final class WidgetSettingsBinding implements ViewBinding { this.p = textView14; this.q = textView15; this.r = textView16; - this.f1915s = textView17; + this.f1917s = textView17; this.t = linearLayout; this.u = textView18; this.v = textView19; this.w = textView20; - this.f1916x = linearLayout2; - this.f1917y = textView22; - this.f1918z = textView23; + this.f1918x = linearLayout2; + this.f1919y = textView22; + this.f1920z = textView23; this.A = statusView; this.B = textView24; this.C = textView25; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java index 908b4adcba..b378bad155 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBlockedUsersBinding.java @@ -15,12 +15,12 @@ public final class WidgetSettingsBlockedUsersBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1919c; + public final RecyclerView f1921c; public WidgetSettingsBlockedUsersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull ImageView imageView) { this.a = coordinatorLayout; this.b = appViewFlipper; - this.f1919c = recyclerView; + this.f1921c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java index 1c5ed10614..c84a933067 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsBoostBinding.java @@ -20,7 +20,7 @@ public final class WidgetSettingsBoostBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final AppViewFlipper f1920c; + public final AppViewFlipper f1922c; @NonNull public final PremiumSubscriptionMarketingView d; @NonNull @@ -39,7 +39,7 @@ public final class WidgetSettingsBoostBinding implements ViewBinding { public WidgetSettingsBoostBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull g3 g3Var, @NonNull AppViewFlipper appViewFlipper, @NonNull PremiumSubscriptionMarketingView premiumSubscriptionMarketingView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton, @NonNull RecyclerView recyclerView2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout, @NonNull PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView) { this.a = coordinatorLayout; this.b = g3Var; - this.f1920c = appViewFlipper; + this.f1922c = appViewFlipper; this.d = premiumSubscriptionMarketingView; this.e = recyclerView; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java index 74d2340487..0a559dd521 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsConnectionsBinding.java @@ -14,12 +14,12 @@ public final class WidgetSettingsConnectionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1921c; + public final RecyclerView f1923c; public WidgetSettingsConnectionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView) { this.a = coordinatorLayout; this.b = textView; - this.f1921c = recyclerView; + this.f1923c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java index 22b783edd4..4619917b80 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsDeveloperBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsDeveloperBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1922c; + public final MaterialButton f1924c; @NonNull public final MaterialButton d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetSettingsDeveloperBinding implements ViewBinding { public WidgetSettingsDeveloperBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2, @NonNull MaterialButton materialButton4, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1922c = materialButton2; + this.f1924c = materialButton2; this.d = materialButton3; this.e = recyclerView; this.f = recyclerView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java index ac8a0eb92a..a02175ebe8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsEnableMfaKeyBinding.java @@ -13,14 +13,14 @@ public final class WidgetSettingsEnableMfaKeyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1923c; + public final TextView f1925c; @NonNull public final TextView d; public WidgetSettingsEnableMfaKeyBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = linearLayout; this.b = textView; - this.f1923c = textView2; + this.f1925c = textView2; this.d = textView3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java index 535da0e3e0..31d7b897c0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsGiftingBinding.java @@ -22,7 +22,7 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final GiftSelectView f1924c; + public final GiftSelectView f1926c; @NonNull public final GiftSelectView d; @NonNull @@ -56,12 +56,12 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final RecyclerView f1925s; + public final RecyclerView f1927s; public WidgetSettingsGiftingBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull GiftSelectView giftSelectView, @NonNull GiftSelectView giftSelectView2, @NonNull GiftSelectView giftSelectView3, @NonNull GiftSelectView giftSelectView4, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull AppViewFlipper appViewFlipper, @NonNull ProgressBar progressBar, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull RecyclerView recyclerView2) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1924c = giftSelectView; + this.f1926c = giftSelectView; this.d = giftSelectView2; this.e = giftSelectView3; this.f = giftSelectView4; @@ -77,7 +77,7 @@ public final class WidgetSettingsGiftingBinding implements ViewBinding { this.p = textView3; this.q = textView4; this.r = textView5; - this.f1925s = recyclerView2; + this.f1927s = recyclerView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java index 67e0208d8d..2e4f1ba9ba 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemAddConnectedAccountBinding.java @@ -14,12 +14,12 @@ public final class WidgetSettingsItemAddConnectedAccountBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1926c; + public final TextView f1928c; public WidgetSettingsItemAddConnectedAccountBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = linearLayout; this.b = imageView; - this.f1926c = textView; + this.f1928c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java index 9b5403e268..3e7f0fc133 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemBlockedUserBinding.java @@ -15,14 +15,14 @@ public final class WidgetSettingsItemBlockedUserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1927c; + public final TextView f1929c; @NonNull public final MaterialButton d; public WidgetSettingsItemBlockedUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull MaterialButton materialButton) { this.a = relativeLayout; this.b = simpleDraweeView; - this.f1927c = textView; + this.f1929c = textView; this.d = materialButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java index 0361dd8c03..918c981cd0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsItemConnectedAccountBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsItemConnectedAccountBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1928c; + public final ImageView f1930c; @NonNull public final TextView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetSettingsItemConnectedAccountBinding implements ViewBind public WidgetSettingsItemConnectedAccountBinding(@NonNull CardView cardView, @NonNull ImageView imageView, @NonNull View view, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull SwitchMaterial switchMaterial, @NonNull SwitchMaterial switchMaterial2, @NonNull View view2, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull SwitchMaterial switchMaterial3) { this.a = cardView; this.b = imageView; - this.f1928c = imageView2; + this.f1930c = imageView2; this.d = textView; this.e = switchMaterial; this.f = switchMaterial2; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java index cfed70539a..d5dfc1254c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsLanguageBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1929c; + public final ImageView f1931c; @NonNull public final TextView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetSettingsLanguageBinding implements ViewBinding { public WidgetSettingsLanguageBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull TextView textView3) { this.a = coordinatorLayout; this.b = relativeLayout; - this.f1929c = imageView; + this.f1931c = imageView; this.d = textView; this.e = textView2; this.f = checkedSetting; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java index 6aa9abb266..c04d62b144 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsLanguageSelectItemBinding.java @@ -15,14 +15,14 @@ public final class WidgetSettingsLanguageSelectItemBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1930c; + public final TextView f1932c; @NonNull public final TextView d; public WidgetSettingsLanguageSelectItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull Barrier barrier, @NonNull TextView textView, @NonNull TextView textView2) { this.a = constraintLayout; this.b = imageView; - this.f1930c = textView; + this.f1932c = textView; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java index c944b5fdd2..8a3b6317a6 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsMediaBinding.java @@ -16,7 +16,7 @@ public final class WidgetSettingsMediaBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1931c; + public final CheckedSetting f1933c; @NonNull public final LinkifiedTextView d; @NonNull @@ -43,7 +43,7 @@ public final class WidgetSettingsMediaBinding implements ViewBinding { public WidgetSettingsMediaBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting5, @NonNull CheckedSetting checkedSetting6) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1931c = checkedSetting2; + this.f1933c = checkedSetting2; this.d = linkifiedTextView; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java index e179b47eb6..3925d55ee4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationOsBinding.java @@ -15,14 +15,14 @@ public final class WidgetSettingsNotificationOsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1932c; + public final RelativeLayout f1934c; @NonNull public final CheckedSetting d; public WidgetSettingsNotificationOsBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting2) { this.a = linearLayout; this.b = checkedSetting; - this.f1932c = relativeLayout; + this.f1934c = relativeLayout; this.d = checkedSetting2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java index b69ea8dd56..7d14df2662 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsNotificationsBinding.java @@ -14,7 +14,7 @@ public final class WidgetSettingsNotificationsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1933c; + public final CheckedSetting f1935c; @NonNull public final CheckedSetting d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetSettingsNotificationsBinding implements ViewBinding { public WidgetSettingsNotificationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull CheckedSetting checkedSetting5, @NonNull LinearLayout linearLayout) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1933c = checkedSetting2; + this.f1935c = checkedSetting2; this.d = checkedSetting3; this.e = checkedSetting4; this.f = checkedSetting5; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java index 337aec5ca5..eae70721b8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsPremiumBinding.java @@ -25,7 +25,7 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final j0 f1934c; + public final j0 f1936c; @NonNull public final o2 d; @NonNull @@ -59,14 +59,14 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final p2 f1935s; + public final p2 f1937s; @NonNull public final q2 t; public WidgetSettingsPremiumBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull x xVar, @NonNull j0 j0Var, @NonNull o2 o2Var, @NonNull ActiveSubscriptionView activeSubscriptionView, @NonNull ActiveSubscriptionView activeSubscriptionView2, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull ScrollView scrollView, @NonNull Button button, @NonNull CardView cardView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull AppViewFlipper appViewFlipper, @NonNull p2 p2Var, @NonNull q2 q2Var) { this.a = coordinatorLayout; this.b = xVar; - this.f1934c = j0Var; + this.f1936c = j0Var; this.d = o2Var; this.e = activeSubscriptionView; this.f = activeSubscriptionView2; @@ -82,7 +82,7 @@ public final class WidgetSettingsPremiumBinding implements ViewBinding { this.p = linearLayout2; this.q = textView5; this.r = appViewFlipper; - this.f1935s = p2Var; + this.f1937s = p2Var; this.t = q2Var; } diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java index 348fcfb2df..6543c88f46 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsPrivacyBinding.java @@ -17,7 +17,7 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1936c; + public final CheckedSetting f1938c; @NonNull public final TextView d; @NonNull @@ -51,7 +51,7 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final CheckedSetting f1937s; + public final CheckedSetting f1939s; @NonNull public final CheckedSetting t; @NonNull @@ -63,20 +63,20 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final TextView f1938x; + public final TextView f1940x; @NonNull /* renamed from: y reason: collision with root package name */ - public final CheckedSetting f1939y; + public final CheckedSetting f1941y; @NonNull /* renamed from: z reason: collision with root package name */ - public final CheckedSetting f1940z; + public final CheckedSetting f1942z; public WidgetSettingsPrivacyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull DimmerView dimmerView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting5, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull LinearLayout linearLayout2, @NonNull TextView textView4, @NonNull CheckedSetting checkedSetting6, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting7, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull CheckedSetting checkedSetting11, @NonNull CheckedSetting checkedSetting12, @NonNull TextView textView6, @NonNull CheckedSetting checkedSetting13, @NonNull MaterialButton materialButton, @NonNull TextView textView7, @NonNull CheckedSetting checkedSetting14, @NonNull CheckedSetting checkedSetting15) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1936c = checkedSetting2; + this.f1938c = checkedSetting2; this.d = textView; this.e = checkedSetting3; this.f = checkedSetting4; @@ -92,14 +92,14 @@ public final class WidgetSettingsPrivacyBinding implements ViewBinding { this.p = checkedSetting8; this.q = checkedSetting9; this.r = checkedSetting10; - this.f1937s = checkedSetting11; + this.f1939s = checkedSetting11; this.t = checkedSetting12; this.u = textView6; this.v = checkedSetting13; this.w = materialButton; - this.f1938x = textView7; - this.f1939y = checkedSetting14; - this.f1940z = checkedSetting15; + this.f1940x = textView7; + this.f1941y = checkedSetting14; + this.f1942z = checkedSetting15; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java index b0533c6647..394d992fe7 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceBinding.java @@ -27,7 +27,7 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1941c; + public final CheckedSetting f1943c; @NonNull public final CheckedSetting d; @NonNull @@ -61,7 +61,7 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final SeekBar f1942s; + public final SeekBar f1944s; @NonNull public final TextView t; @NonNull @@ -73,20 +73,20 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final TextView f1943x; + public final TextView f1945x; @NonNull /* renamed from: y reason: collision with root package name */ - public final SeekBar f1944y; + public final SeekBar f1946y; @NonNull /* renamed from: z reason: collision with root package name */ - public final MaterialButton f1945z; + public final MaterialButton f1947z; public WidgetSettingsVoiceBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull CheckedSetting checkedSetting4, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting5, @NonNull RelativeLayout relativeLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull CheckedSetting checkedSetting6, @NonNull CheckedSetting checkedSetting7, @NonNull TextView textView5, @NonNull CheckedSetting checkedSetting8, @NonNull CheckedSetting checkedSetting9, @NonNull CheckedSetting checkedSetting10, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull SeekBar seekBar, @NonNull LinearLayout linearLayout, @NonNull TextView textView8, @NonNull CheckedSetting checkedSetting11, @NonNull TextView textView9, @NonNull View view, @NonNull TextView textView10, @NonNull TextView textView11, @NonNull SeekBar seekBar2, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2, @NonNull RelativeLayout relativeLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView12, @NonNull LinkifiedTextView linkifiedTextView) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1941c = checkedSetting2; + this.f1943c = checkedSetting2; this.d = checkedSetting3; this.e = checkedSetting4; this.f = textView; @@ -102,14 +102,14 @@ public final class WidgetSettingsVoiceBinding implements ViewBinding { this.p = checkedSetting10; this.q = textView6; this.r = textView7; - this.f1942s = seekBar; + this.f1944s = seekBar; this.t = textView8; this.u = checkedSetting11; this.v = textView9; this.w = view; - this.f1943x = textView11; - this.f1944y = seekBar2; - this.f1945z = materialButton; + this.f1945x = textView11; + this.f1946y = seekBar2; + this.f1947z = materialButton; this.A = linearLayout2; this.B = relativeLayout2; this.C = textView12; diff --git a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java index a6aabfd579..215f54c688 100644 --- a/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetSettingsVoiceInputModeBinding.java @@ -14,12 +14,12 @@ public final class WidgetSettingsVoiceInputModeBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1946c; + public final LinearLayout f1948c; public WidgetSettingsVoiceInputModeBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2) { this.a = nestedScrollView; this.b = linearLayout; - this.f1946c = linearLayout2; + this.f1948c = linearLayout2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java index 0cad995283..9aaf729670 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageAudienceBlockedBottomSheetBinding.java @@ -14,14 +14,14 @@ public final class WidgetStageAudienceBlockedBottomSheetBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final MaxHeightRecyclerView f1947c; + public final MaxHeightRecyclerView f1949c; @NonNull public final MaterialButton d; public WidgetStageAudienceBlockedBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull MaterialButton materialButton2) { this.a = constraintLayout; this.b = materialButton; - this.f1947c = maxHeightRecyclerView; + this.f1949c = maxHeightRecyclerView; this.d = materialButton2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java index 1f7aa49694..a07e3c254c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageAudienceNoticeBottomSheetBinding.java @@ -16,14 +16,14 @@ public final class WidgetStageAudienceNoticeBottomSheetBinding implements ViewBi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1948c; + public final TextView f1950c; @NonNull public final MaterialButton d; public WidgetStageAudienceNoticeBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Barrier barrier, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull ImageView imageView2, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull TextView textView3, @NonNull ImageView imageView4, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull ImageView imageView5, @NonNull TextView textView5) { this.a = coordinatorLayout; this.b = imageView4; - this.f1948c = textView4; + this.f1950c = textView4; this.d = materialButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java index 12b9c436ea..3195c5f95b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelAudienceBinding.java @@ -16,7 +16,7 @@ public final class WidgetStageChannelAudienceBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CutoutView f1949c; + public final CutoutView f1951c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetStageChannelAudienceBinding implements ViewBinding { public WidgetStageChannelAudienceBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CutoutView cutoutView, @NonNull TextView textView, @NonNull ImageView imageView) { this.a = constraintLayout; this.b = simpleDraweeView; - this.f1949c = cutoutView; + this.f1951c = cutoutView; this.d = textView; this.e = imageView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java index 2d2ab3e111..d836024894 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelDetailsBinding.java @@ -14,7 +14,7 @@ public final class WidgetStageChannelDetailsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1950c; + public final ImageView f1952c; @NonNull public final TextView d; @NonNull @@ -37,7 +37,7 @@ public final class WidgetStageChannelDetailsBinding implements ViewBinding { public WidgetStageChannelDetailsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView3, @NonNull ImageView imageView4, @NonNull TextView textView3, @NonNull ImageView imageView5, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull ImageView imageView6, @NonNull TextView textView6) { this.a = constraintLayout; this.b = imageView; - this.f1950c = imageView2; + this.f1952c = imageView2; this.d = textView; this.e = textView2; this.f = imageView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java index ec5e1415ec..fde8209fc1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageChannelModeratorPermissionsBinding.java @@ -14,14 +14,14 @@ public final class WidgetStageChannelModeratorPermissionsBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final PermissionOwnerListView f1951c; + public final PermissionOwnerListView f1953c; @NonNull public final PermissionOwnerListView d; public WidgetStageChannelModeratorPermissionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AddPermissionOwnerView addPermissionOwnerView, @NonNull PermissionOwnerListView permissionOwnerListView, @NonNull PermissionOwnerListView permissionOwnerListView2) { this.a = coordinatorLayout; this.b = addPermissionOwnerView; - this.f1951c = permissionOwnerListView; + this.f1953c = permissionOwnerListView; this.d = permissionOwnerListView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java index 4280ba25aa..4c4811ac38 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageModeratorJoinBottomSheetBinding.java @@ -15,12 +15,12 @@ public final class WidgetStageModeratorJoinBottomSheetBinding implements ViewBin @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1952c; + public final MaterialButton f1954c; public WidgetStageModeratorJoinBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = coordinatorLayout; this.b = materialButton; - this.f1952c = materialButton2; + this.f1954c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java index 680ba40d4b..4b0c9feae0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStagePublicNoticeBottomSheetBinding.java @@ -17,14 +17,14 @@ public final class WidgetStagePublicNoticeBottomSheetBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1953c; + public final MaterialButton f1955c; @NonNull public final LinkifiedTextView d; public WidgetStagePublicNoticeBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull AppCompatImageView appCompatImageView, @NonNull LinearLayout linearLayout, @NonNull ScreenTitleView screenTitleView, @NonNull LinkifiedTextView linkifiedTextView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1953c = materialButton2; + this.f1955c = materialButton2; this.d = linkifiedTextView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java index 5ab9041e56..61d6c6374f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageRaisedHandsBottomSheetBinding.java @@ -17,7 +17,7 @@ public final class WidgetStageRaisedHandsBottomSheetBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final Group f1954c; + public final Group f1956c; @NonNull public final SwitchMaterial d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetStageRaisedHandsBottomSheetBinding implements ViewBindi public WidgetStageRaisedHandsBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull MaterialTextView materialTextView, @NonNull Group group, @NonNull ImageView imageView, @NonNull MaterialTextView materialTextView2, @NonNull MaterialTextView materialTextView3, @NonNull SwitchMaterial switchMaterial, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull MaterialTextView materialTextView4, @NonNull MaterialTextView materialTextView5, @NonNull MaterialTextView materialTextView6, @NonNull Group group2, @NonNull ImageView imageView2) { this.a = coordinatorLayout; this.b = materialTextView; - this.f1954c = group; + this.f1956c = group; this.d = switchMaterial; this.e = maxHeightRecyclerView; this.f = materialTextView4; diff --git a/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java index 27d0418f61..774983a06f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageSettingsBinding.java @@ -21,7 +21,7 @@ public final class WidgetStageSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1955c; + public final LinkifiedTextView f1957c; @NonNull public final CheckedSetting d; @NonNull @@ -40,7 +40,7 @@ public final class WidgetStageSettingsBinding implements ViewBinding { public WidgetStageSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinkifiedTextView linkifiedTextView, @NonNull CheckedSetting checkedSetting, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull CheckedSetting checkedSetting2, @NonNull ScreenTitleView screenTitleView, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull Space space, @NonNull TextInputEditText textInputEditText) { this.a = coordinatorLayout; this.b = textView; - this.f1955c = linkifiedTextView; + this.f1957c = linkifiedTextView; this.d = checkedSetting; this.e = linkifiedTextView2; this.f = checkedSetting2; diff --git a/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java index b8cbf97095..ac5b343f44 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStageStartEventBottomSheetBinding.java @@ -17,7 +17,7 @@ public final class WidgetStageStartEventBottomSheetBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1956c; + public final MaterialButton f1958c; @NonNull public final TextView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetStageStartEventBottomSheetBinding implements ViewBindin public WidgetStageStartEventBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppCompatImageView appCompatImageView, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextInputEditText textInputEditText, @NonNull TextView textView4, @NonNull TextInputLayout textInputLayout) { this.a = coordinatorLayout; this.b = textView; - this.f1956c = materialButton; + this.f1958c = materialButton; this.d = textView2; this.e = textView3; this.f = textInputEditText; diff --git a/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java index cdf29d483a..8bedbb4661 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStartCallSheetBinding.java @@ -13,12 +13,12 @@ public final class WidgetStartCallSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1957c; + public final TextView f1959c; public WidgetStartCallSheetBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1957c = textView2; + this.f1959c = textView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java index 84a70517b2..75c036e11e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBinding.java @@ -16,7 +16,7 @@ public final class WidgetStartStageServerSelectionBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1958c; + public final RecyclerView f1960c; @NonNull public final ImageView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetStartStageServerSelectionBinding implements ViewBinding public WidgetStartStageServerSelectionBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull RecyclerView recyclerView, @NonNull ImageView imageView2, @NonNull Button button, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = constraintLayout; this.b = imageView; - this.f1958c = recyclerView; + this.f1960c = recyclerView; this.d = imageView2; this.e = button; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java index bb9780151d..deb41cb507 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionBulletItemBinding.java @@ -14,7 +14,7 @@ public final class WidgetStartStageServerSelectionBulletItemBinding implements V @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1959c; + public final ImageView f1961c; @NonNull public final ImageView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetStartStageServerSelectionBulletItemBinding implements V public WidgetStartStageServerSelectionBulletItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull LinkifiedTextView linkifiedTextView) { this.a = constraintLayout; this.b = constraintLayout2; - this.f1959c = imageView; + this.f1961c = imageView; this.d = imageView2; this.e = linkifiedTextView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java index e88967c187..b61c4cbd40 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStartStageServerSelectionGuildItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetStartStageServerSelectionGuildItemBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1960c; + public final ImageView f1962c; @NonNull public final SimpleDraweeView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetStartStageServerSelectionGuildItemBinding implements Vi public WidgetStartStageServerSelectionGuildItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = constraintLayout; this.b = constraintLayout2; - this.f1960c = imageView2; + this.f1962c = imageView2; this.d = simpleDraweeView; this.e = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java index 9dc62369f6..0bd577496b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStickerPackStoreSheetBinding.java @@ -16,7 +16,7 @@ public final class WidgetStickerPackStoreSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1961c; + public final RecyclerView f1963c; @NonNull public final SimpleDraweeView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetStickerPackStoreSheetBinding implements ViewBinding { public WidgetStickerPackStoreSheetBinding(@NonNull RelativeLayout relativeLayout, @NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout2, @NonNull RecyclerView recyclerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LoadingButton loadingButton) { this.a = relativeLayout; this.b = relativeLayout2; - this.f1961c = recyclerView; + this.f1963c = recyclerView; this.d = simpleDraweeView; this.e = loadingButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java index 108d9a257e..0ead31df63 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStickerPickerBinding.java @@ -24,7 +24,7 @@ public final class WidgetStickerPickerBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1962c; + public final LinkifiedTextView f1964c; @NonNull public final StickerView d; @NonNull @@ -58,12 +58,12 @@ public final class WidgetStickerPickerBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final Toolbar f1963s; + public final Toolbar f1965s; public WidgetStickerPickerBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull AppBarLayout appBarLayout, @NonNull ConstraintLayout constraintLayout, @NonNull View view, @NonNull RecyclerView recyclerView2, @NonNull CoordinatorLayout coordinatorLayout2, @NonNull SearchInputView searchInputView, @NonNull Toolbar toolbar) { this.a = coordinatorLayout; this.b = imageView; - this.f1962c = linkifiedTextView; + this.f1964c = linkifiedTextView; this.d = stickerView; this.e = stickerView2; this.f = stickerView3; @@ -79,7 +79,7 @@ public final class WidgetStickerPickerBinding implements ViewBinding { this.p = recyclerView2; this.q = coordinatorLayout2; this.r = searchInputView; - this.f1963s = toolbar; + this.f1965s = toolbar; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java index bd690b87af..9c4687786b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetStickerSheetBinding.java @@ -18,7 +18,7 @@ public final class WidgetStickerSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1964c; + public final TextView f1966c; @NonNull public final TextView d; @NonNull @@ -39,7 +39,7 @@ public final class WidgetStickerSheetBinding implements ViewBinding { public WidgetStickerSheetBinding(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton, @NonNull Chip chip, @NonNull RelativeLayout relativeLayout, @NonNull StickerView stickerView, @NonNull StickerView stickerView2, @NonNull StickerView stickerView3, @NonNull StickerView stickerView4) { this.a = linearLayout; this.b = loadingButton; - this.f1964c = textView; + this.f1966c = textView; this.d = textView2; this.e = materialButton; this.f = chip; diff --git a/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java b/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java index 8f5d219283..158ca71e63 100644 --- a/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetTabsHostBinding.java @@ -15,7 +15,7 @@ public final class WidgetTabsHostBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1965c; + public final ConstraintLayout f1967c; @NonNull public final FragmentContainerView d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetTabsHostBinding implements ViewBinding { public WidgetTabsHostBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TabsHostBottomNavigationView tabsHostBottomNavigationView, @NonNull ConstraintLayout constraintLayout2, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull FragmentContainerView fragmentContainerView3, @NonNull FragmentContainerView fragmentContainerView4, @NonNull FragmentContainerView fragmentContainerView5, @NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull FragmentContainerView fragmentContainerView6) { this.a = constraintLayout; this.b = tabsHostBottomNavigationView; - this.f1965c = constraintLayout2; + this.f1967c = constraintLayout2; this.d = fragmentContainerView; this.e = fragmentContainerView2; this.f = fragmentContainerView4; diff --git a/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java index bcfd1634ba..8b2415fa4a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetTextChannelSettingsBinding.java @@ -19,7 +19,7 @@ public final class WidgetTextChannelSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1966c; + public final TextInputLayout f1968c; @NonNull public final TextInputLayout d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetTextChannelSettingsBinding implements ViewBinding { public WidgetTextChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CheckedSetting checkedSetting, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull View view, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout3, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull TextView textView3, @NonNull SeekBar seekBar, @NonNull TextView textView4, @NonNull NestedScrollView nestedScrollView) { this.a = coordinatorLayout; this.b = checkedSetting; - this.f1966c = textInputLayout; + this.f1968c = textInputLayout; this.d = textInputLayout2; this.e = linearLayout; this.f = checkedSetting2; diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java index 6d454e1658..428d0f6e01 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadArchiveActionsSheetBinding.java @@ -14,7 +14,7 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1967c; + public final LinearLayout f1969c; @NonNull public final TextView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding public WidgetThreadArchiveActionsSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7) { this.a = nestedScrollView; this.b = textView; - this.f1967c = linearLayout; + this.f1969c = linearLayout; this.d = textView2; this.e = textView3; this.f = textView4; @@ -48,23 +48,23 @@ public final class WidgetThreadArchiveActionsSheetBinding implements ViewBinding i = 2131362072; LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362072); if (linearLayout2 != null) { - i = 2131364102; - TextView textView2 = (TextView) view.findViewById(2131364102); + i = 2131364104; + TextView textView2 = (TextView) view.findViewById(2131364104); if (textView2 != null) { - i = 2131364103; - TextView textView3 = (TextView) view.findViewById(2131364103); + i = 2131364105; + TextView textView3 = (TextView) view.findViewById(2131364105); if (textView3 != null) { - i = 2131364104; - TextView textView4 = (TextView) view.findViewById(2131364104); + i = 2131364106; + TextView textView4 = (TextView) view.findViewById(2131364106); if (textView4 != null) { - i = 2131364105; - TextView textView5 = (TextView) view.findViewById(2131364105); + i = 2131364107; + TextView textView5 = (TextView) view.findViewById(2131364107); if (textView5 != null) { - i = 2131365129; - TextView textView6 = (TextView) view.findViewById(2131365129); + i = 2131365133; + TextView textView6 = (TextView) view.findViewById(2131365133); if (textView6 != null) { - i = 2131365281; - TextView textView7 = (TextView) view.findViewById(2131365281); + i = 2131365286; + TextView textView7 = (TextView) view.findViewById(2131365286); if (textView7 != null) { return new WidgetThreadArchiveActionsSheetBinding((NestedScrollView) view, textView, linearLayout, linearLayout2, textView2, textView3, textView4, textView5, textView6, textView7); } diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java index 720882fd00..e7a93158bd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserActiveBinding.java @@ -14,12 +14,12 @@ public final class WidgetThreadBrowserActiveBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1968c; + public final RecyclerView f1970c; public WidgetThreadBrowserActiveBinding(@NonNull ConstraintLayout constraintLayout, @NonNull i1 i1Var, @NonNull RecyclerView recyclerView) { this.a = constraintLayout; this.b = i1Var; - this.f1968c = recyclerView; + this.f1970c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java index 94e793cce4..dc23600313 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserArchivedBinding.java @@ -16,7 +16,7 @@ public final class WidgetThreadBrowserArchivedBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1969c; + public final RecyclerView f1971c; @NonNull public final ConstraintLayout d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetThreadBrowserArchivedBinding implements ViewBinding { public WidgetThreadBrowserArchivedBinding(@NonNull ConstraintLayout constraintLayout, @NonNull i1 i1Var, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton) { this.a = constraintLayout; this.b = i1Var; - this.f1969c = recyclerView; + this.f1971c = recyclerView; this.d = constraintLayout2; this.e = materialButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java index e80409bc6b..9a7ff2f6c4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserBinding.java @@ -15,12 +15,12 @@ public final class WidgetThreadBrowserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimplePager f1970c; + public final SimplePager f1972c; public WidgetThreadBrowserBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TabLayout tabLayout, @NonNull AppBarLayout appBarLayout, @NonNull SimplePager simplePager) { this.a = constraintLayout; this.b = tabLayout; - this.f1970c = simplePager; + this.f1972c = simplePager; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java index 479a6bcbb3..9bf12d2678 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadBrowserFilterSheetBinding.java @@ -15,7 +15,7 @@ public final class WidgetThreadBrowserFilterSheetBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final CardView f1971c; + public final CardView f1973c; @NonNull public final CheckedSetting d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetThreadBrowserFilterSheetBinding implements ViewBinding public WidgetThreadBrowserFilterSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull CheckedSetting checkedSetting, @NonNull CardView cardView, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3, @NonNull TextView textView2) { this.a = nestedScrollView; this.b = checkedSetting; - this.f1971c = cardView; + this.f1973c = cardView; this.d = checkedSetting2; this.e = checkedSetting3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java index e98b6060f0..9458a253b1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadNotificationSettingsBinding.java @@ -15,7 +15,7 @@ public final class WidgetThreadNotificationSettingsBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1972c; + public final CheckedSetting f1974c; @NonNull public final CheckedSetting d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetThreadNotificationSettingsBinding implements ViewBindin public WidgetThreadNotificationSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull NestedScrollView nestedScrollView, @NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3) { this.a = coordinatorLayout; this.b = linearLayout; - this.f1972c = checkedSetting; + this.f1974c = checkedSetting; this.d = checkedSetting2; this.e = checkedSetting3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java index 9c4679d37f..28aeb69f81 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadSettingsBinding.java @@ -16,12 +16,12 @@ public final class WidgetThreadSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1973c; + public final FloatingActionButton f1975c; public WidgetThreadSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull NestedScrollView nestedScrollView, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = textInputLayout; - this.f1973c = floatingActionButton; + this.f1975c = floatingActionButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java index 824ed98349..7acef18aef 100644 --- a/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetThreadStatusBinding.java @@ -14,14 +14,14 @@ public final class WidgetThreadStatusBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LoadingButton f1974c; + public final LoadingButton f1976c; @NonNull public final TextView d; public WidgetThreadStatusBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ConstraintLayout constraintLayout2, @NonNull LoadingButton loadingButton, @NonNull TextView textView) { this.a = constraintLayout; this.b = constraintLayout2; - this.f1974c = loadingButton; + this.f1976c = loadingButton; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java index ebd97cc0c1..2a533346c0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetTosAcceptBinding.java @@ -17,7 +17,7 @@ public final class WidgetTosAcceptBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1975c; + public final MaterialButton f1977c; @NonNull public final LinkifiedTextView d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetTosAcceptBinding implements ViewBinding { public WidgetTosAcceptBinding(@NonNull RelativeLayout relativeLayout, @NonNull CheckBox checkBox, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull TextView textView, @NonNull TextView textView2) { this.a = relativeLayout; this.b = checkBox; - this.f1975c = materialButton; + this.f1977c = materialButton; this.d = linkifiedTextView; this.e = linkifiedTextView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java index c937c86578..151b7f78f4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationBinding.java @@ -17,7 +17,7 @@ public final class WidgetTosReportViolationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1976c; + public final TextView f1978c; @NonNull public final LinearLayout d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetTosReportViolationBinding implements ViewBinding { public WidgetTosReportViolationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ProgressBar progressBar, @NonNull LinkifiedTextView linkifiedTextView) { this.a = coordinatorLayout; this.b = loadingButton; - this.f1976c = textView; + this.f1978c = textView; this.d = linearLayout; this.e = textView2; this.f = progressBar; diff --git a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java index 093fe033c9..82e370f868 100644 --- a/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetTosReportViolationReasonBinding.java @@ -14,14 +14,14 @@ public final class WidgetTosReportViolationReasonBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1977c; + public final TextView f1979c; @NonNull public final MaterialRadioButton d; public WidgetTosReportViolationReasonBinding(@NonNull RelativeLayout relativeLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialRadioButton materialRadioButton) { this.a = relativeLayout; this.b = textView; - this.f1977c = textView2; + this.f1979c = textView2; this.d = materialRadioButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java index 4ecaad010d..2dd6ade4ff 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUrlActionsBinding.java @@ -13,7 +13,7 @@ public final class WidgetUrlActionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1978c; + public final TextView f1980c; @NonNull public final TextView d; @NonNull @@ -22,7 +22,7 @@ public final class WidgetUrlActionsBinding implements ViewBinding { public WidgetUrlActionsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = linearLayout; this.b = textView; - this.f1978c = textView2; + this.f1980c = textView2; this.d = textView3; this.e = textView4; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java index 8e3a768593..3cd80dd504 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserAccountVerifyBinding.java @@ -14,7 +14,7 @@ public final class WidgetUserAccountVerifyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RelativeLayout f1979c; + public final RelativeLayout f1981c; @NonNull public final LinkifiedTextView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetUserAccountVerifyBinding implements ViewBinding { public WidgetUserAccountVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull RelativeLayout relativeLayout3, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) { this.a = relativeLayout; this.b = relativeLayout2; - this.f1979c = relativeLayout3; + this.f1981c = relativeLayout3; this.d = linkifiedTextView; this.e = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java index a083c81235..c87ea97b85 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserEmailUpdateBinding.java @@ -16,7 +16,7 @@ public final class WidgetUserEmailUpdateBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1980c; + public final TextInputLayout f1982c; @NonNull public final TextInputLayout d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetUserEmailUpdateBinding implements ViewBinding { public WidgetUserEmailUpdateBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull DimmerView dimmerView) { this.a = relativeLayout; this.b = materialButton; - this.f1980c = textInputLayout; + this.f1982c = textInputLayout; this.d = textInputLayout2; this.e = dimmerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java index 28127a7c54..58587da436 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserEmailVerifyBinding.java @@ -14,12 +14,12 @@ public final class WidgetUserEmailVerifyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1981c; + public final MaterialButton f1983c; public WidgetUserEmailVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = relativeLayout; this.b = materialButton; - this.f1981c = materialButton2; + this.f1983c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java index ddb6b7db00..7b03cb6a7a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserMentionsBinding.java @@ -14,12 +14,12 @@ public final class WidgetUserMentionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1982c; + public final RecyclerView f1984c; public WidgetUserMentionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Toolbar toolbar, @NonNull RecyclerView recyclerView) { this.a = coordinatorLayout; this.b = toolbar; - this.f1982c = recyclerView; + this.f1984c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java index b808a68d3f..51e839a76a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserMentionsFilterBinding.java @@ -13,14 +13,14 @@ public final class WidgetUserMentionsFilterBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1983c; + public final CheckedSetting f1985c; @NonNull public final CheckedSetting d; public WidgetUserMentionsFilterBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CheckedSetting checkedSetting, @NonNull CheckedSetting checkedSetting2, @NonNull CheckedSetting checkedSetting3) { this.a = nestedScrollView; this.b = checkedSetting; - this.f1983c = checkedSetting2; + this.f1985c = checkedSetting2; this.d = checkedSetting3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java index 26b4857402..2a50e0dfaa 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserPasswordVerifyBinding.java @@ -15,14 +15,14 @@ public final class WidgetUserPasswordVerifyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1984c; + public final TextInputLayout f1986c; @NonNull public final FloatingActionButton d; public WidgetUserPasswordVerifyBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextInputLayout textInputLayout, @NonNull FloatingActionButton floatingActionButton) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1984c = textInputLayout; + this.f1986c = textInputLayout; this.d = floatingActionButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java index 8612fea647..8da6dbef65 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserPhoneManageBinding.java @@ -16,7 +16,7 @@ public final class WidgetUserPhoneManageBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1985c; + public final TextView f1987c; @NonNull public final TextView d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetUserPhoneManageBinding implements ViewBinding { public WidgetUserPhoneManageBinding(@NonNull FrameLayout frameLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull MaterialButton materialButton, @NonNull PhoneOrEmailInputView phoneOrEmailInputView, @NonNull TextView textView3) { this.a = frameLayout; this.b = dimmerView; - this.f1985c = textView; + this.f1987c = textView; this.d = textView2; this.e = materialButton; this.f = phoneOrEmailInputView; diff --git a/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java index 9d6eaaa9fc..aadf960d3b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserPhoneVerifyBinding.java @@ -15,14 +15,14 @@ public final class WidgetUserPhoneVerifyBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final DimmerView f1986c; + public final DimmerView f1988c; @NonNull public final CodeVerificationView d; public WidgetUserPhoneVerifyBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull DimmerView dimmerView, @NonNull CodeVerificationView codeVerificationView) { this.a = relativeLayout; this.b = imageView; - this.f1986c = dimmerView; + this.f1988c = dimmerView; this.d = codeVerificationView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java index 29ccce5431..87aecdb174 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemEmptyBinding.java @@ -14,12 +14,12 @@ public final class WidgetUserProfileAdapterItemEmptyBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1987c; + public final TextView f1989c; public WidgetUserProfileAdapterItemEmptyBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TextView textView) { this.a = linearLayout; this.b = imageView; - this.f1987c = textView; + this.f1989c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java index 4a94572e3c..6cbf4a1683 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemFriendBinding.java @@ -18,7 +18,7 @@ public final class WidgetUserProfileAdapterItemFriendBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final j5 f1988c; + public final j5 f1990c; @NonNull public final j5 d; @NonNull @@ -35,7 +35,7 @@ public final class WidgetUserProfileAdapterItemFriendBinding implements ViewBind public WidgetUserProfileAdapterItemFriendBinding(@NonNull RelativeLayout relativeLayout, @NonNull j5 j5Var, @NonNull j5 j5Var2, @NonNull j5 j5Var3, @NonNull j5 j5Var4, @NonNull SimpleDraweeView simpleDraweeView, @NonNull LinearLayout linearLayout, @NonNull StatusView statusView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull TextView textView) { this.a = relativeLayout; this.b = j5Var; - this.f1988c = j5Var2; + this.f1990c = j5Var2; this.d = j5Var3; this.e = j5Var4; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java index 1bfadda833..22bbc3e1b3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserProfileAdapterItemServerBinding.java @@ -14,7 +14,7 @@ public final class WidgetUserProfileAdapterItemServerBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1989c; + public final TextView f1991c; @NonNull public final TextView d; @NonNull @@ -23,7 +23,7 @@ public final class WidgetUserProfileAdapterItemServerBinding implements ViewBind public WidgetUserProfileAdapterItemServerBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RelativeLayout relativeLayout2) { this.a = relativeLayout; this.b = simpleDraweeView; - this.f1989c = textView; + this.f1991c = textView; this.d = textView2; this.e = textView3; } diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java index 1c398c1573..321c6733fc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserSetCustomStatusBinding.java @@ -18,7 +18,7 @@ public final class WidgetUserSetCustomStatusBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1990c; + public final FrameLayout f1992c; @NonNull public final MaterialRadioButton d; @NonNull @@ -37,7 +37,7 @@ public final class WidgetUserSetCustomStatusBinding implements ViewBinding { public WidgetUserSetCustomStatusBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull FrameLayout frameLayout, @NonNull RadioGroup radioGroup, @NonNull MaterialRadioButton materialRadioButton, @NonNull MaterialRadioButton materialRadioButton2, @NonNull MaterialRadioButton materialRadioButton3, @NonNull MaterialRadioButton materialRadioButton4, @NonNull MaterialRadioButton materialRadioButton5, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout) { this.a = coordinatorLayout; this.b = simpleDraweeView; - this.f1990c = frameLayout; + this.f1992c = frameLayout; this.d = materialRadioButton; this.e = materialRadioButton2; this.f = materialRadioButton3; diff --git a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java index 778c99f686..ce30909be2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserSheetBinding.java @@ -19,28 +19,31 @@ import com.discord.widgets.user.profile.UserProfileConnectionsView; import com.discord.widgets.user.profile.UserProfileHeaderView; import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView; import com.google.android.material.button.MaterialButton; +import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; public final class WidgetUserSheetBinding implements ViewBinding { @NonNull - public final LinearLayout A; + public final Button A; @NonNull - public final View B; + public final LinearLayout B; @NonNull - public final UserProfileHeaderView C; + public final View C; @NonNull - public final CardView D; + public final UserProfileHeaderView D; @NonNull - public final UserProfileStageActionsView E; + public final CardView E; @NonNull - public final TextView F; + public final UserProfileStageActionsView F; @NonNull - public final UserProfileVoiceSettingsView G; + public final TextView G; @NonNull - public final RolesListView H; + public final UserProfileVoiceSettingsView H; @NonNull - public final Button I; + public final RolesListView I; @NonNull - public final CardView J; + public final Button J; + @NonNull + public final CardView K; @NonNull public final NestedScrollView a; @NonNull @@ -48,7 +51,7 @@ public final class WidgetUserSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1991c; + public final TextView f1993c; @NonNull public final LinkifiedTextView d; @NonNull @@ -82,7 +85,7 @@ public final class WidgetUserSheetBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f1992s; + public final TextView f1994s; @NonNull public final TextView t; @NonNull @@ -94,20 +97,20 @@ public final class WidgetUserSheetBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final TextView f1993x; + public final TextView f1995x; @NonNull /* renamed from: y reason: collision with root package name */ - public final TextInputLayout f1994y; + public final TextInputEditText f1996y; @NonNull /* renamed from: z reason: collision with root package name */ - public final Button f1995z; + public final TextInputLayout f1997z; - public WidgetUserSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ContentLoadingProgressBar contentLoadingProgressBar, @NonNull FrameLayout frameLayout, @NonNull Button button, @NonNull CardView cardView2, @NonNull UserProfileAdminView userProfileAdminView, @NonNull Button button2, @NonNull TextView textView2, @NonNull UserProfileConnectionsView userProfileConnectionsView, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull FrameLayout frameLayout2, @NonNull Button button3, @NonNull ImageView imageView, @NonNull TextView textView7, @NonNull TextInputLayout textInputLayout, @NonNull Button button4, @NonNull LinearLayout linearLayout4, @NonNull View view, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull CardView cardView3, @NonNull UserProfileStageActionsView userProfileStageActionsView, @NonNull TextView textView8, @NonNull UserProfileVoiceSettingsView userProfileVoiceSettingsView, @NonNull RolesListView rolesListView, @NonNull Button button5, @NonNull CardView cardView4) { + public WidgetUserSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull CardView cardView, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull ContentLoadingProgressBar contentLoadingProgressBar, @NonNull FrameLayout frameLayout, @NonNull Button button, @NonNull CardView cardView2, @NonNull UserProfileAdminView userProfileAdminView, @NonNull Button button2, @NonNull TextView textView2, @NonNull UserProfileConnectionsView userProfileConnectionsView, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull FrameLayout frameLayout2, @NonNull Button button3, @NonNull ImageView imageView, @NonNull TextView textView7, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull Button button4, @NonNull LinearLayout linearLayout4, @NonNull View view, @NonNull UserProfileHeaderView userProfileHeaderView, @NonNull CardView cardView3, @NonNull UserProfileStageActionsView userProfileStageActionsView, @NonNull TextView textView8, @NonNull UserProfileVoiceSettingsView userProfileVoiceSettingsView, @NonNull RolesListView rolesListView, @NonNull Button button5, @NonNull CardView cardView4) { this.a = nestedScrollView; this.b = cardView; - this.f1991c = textView; + this.f1993c = textView; this.d = linkifiedTextView; this.e = contentLoadingProgressBar; this.f = frameLayout; @@ -123,24 +126,25 @@ public final class WidgetUserSheetBinding implements ViewBinding { this.p = materialButton2; this.q = linearLayout2; this.r = linearLayout3; - this.f1992s = textView5; + this.f1994s = textView5; this.t = textView6; this.u = frameLayout2; this.v = button3; this.w = imageView; - this.f1993x = textView7; - this.f1994y = textInputLayout; - this.f1995z = button4; - this.A = linearLayout4; - this.B = view; - this.C = userProfileHeaderView; - this.D = cardView3; - this.E = userProfileStageActionsView; - this.F = textView8; - this.G = userProfileVoiceSettingsView; - this.H = rolesListView; - this.I = button5; - this.J = cardView4; + this.f1995x = textView7; + this.f1996y = textInputEditText; + this.f1997z = textInputLayout; + this.A = button4; + this.B = linearLayout4; + this.C = view; + this.D = userProfileHeaderView; + this.E = cardView3; + this.F = userProfileStageActionsView; + this.G = textView8; + this.H = userProfileVoiceSettingsView; + this.I = rolesListView; + this.J = button5; + this.K = cardView4; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java b/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java index b243adb620..ad6a7001d6 100644 --- a/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetUserStatusUpdateBinding.java @@ -15,7 +15,7 @@ public final class WidgetUserStatusUpdateBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final q3 f1996c; + public final q3 f1998c; @NonNull public final q3 d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetUserStatusUpdateBinding implements ViewBinding { public WidgetUserStatusUpdateBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull UserStatusPresenceCustomView userStatusPresenceCustomView, @NonNull q3 q3Var, @NonNull q3 q3Var2, @NonNull q3 q3Var3, @NonNull q3 q3Var4) { this.a = nestedScrollView; this.b = userStatusPresenceCustomView; - this.f1996c = q3Var; + this.f1998c = q3Var; this.d = q3Var2; this.e = q3Var3; this.f = q3Var4; diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java index c098ed80c9..7e90d02f5f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetVoiceBottomSheetBinding.java @@ -19,7 +19,7 @@ public final class WidgetVoiceBottomSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final l0 f1997c; + public final l0 f1999c; @NonNull public final MaterialButton d; @NonNull @@ -36,7 +36,7 @@ public final class WidgetVoiceBottomSheetBinding implements ViewBinding { public WidgetVoiceBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull k0 k0Var, @NonNull l0 l0Var, @NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull RelativeLayout relativeLayout, @NonNull AnchoredVoiceControlsView anchoredVoiceControlsView, @NonNull MaterialButton materialButton2, @NonNull MaxHeightRecyclerView maxHeightRecyclerView, @NonNull CoordinatorLayout coordinatorLayout2) { this.a = coordinatorLayout; this.b = k0Var; - this.f1997c = l0Var; + this.f1999c = l0Var; this.d = materialButton; this.e = relativeLayout; this.f = anchoredVoiceControlsView; diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java index 52bf5e642a..0b416683b1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetVoiceCallIncomingBinding.java @@ -18,7 +18,7 @@ public final class WidgetVoiceCallIncomingBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FloatingActionButton f1998c; + public final FloatingActionButton f2000c; @NonNull public final FloatingActionButton d; @NonNull @@ -35,7 +35,7 @@ public final class WidgetVoiceCallIncomingBinding implements ViewBinding { public WidgetVoiceCallIncomingBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull FloatingActionButton floatingActionButton2, @NonNull PrivateCallBlurredGridView privateCallBlurredGridView, @NonNull FloatingActionButton floatingActionButton3, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull Guideline guideline, @NonNull PrivateCallGridView privateCallGridView) { this.a = constraintLayout; this.b = linearLayout; - this.f1998c = floatingActionButton; + this.f2000c = floatingActionButton; this.d = floatingActionButton2; this.e = privateCallBlurredGridView; this.f = floatingActionButton3; diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java index d7e79b1508..1c84766173 100644 --- a/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetVoiceCallInlineBinding.java @@ -13,12 +13,12 @@ public final class WidgetVoiceCallInlineBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1999c; + public final MaterialButton f2001c; public WidgetVoiceCallInlineBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton) { this.a = linearLayout; this.b = linearLayout2; - this.f1999c = materialButton; + this.f2001c = materialButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java index b119ff54dc..5523303cbe 100644 --- a/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetVoiceChannelSettingsBinding.java @@ -17,7 +17,7 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f2000c; + public final TextInputLayout f2002c; @NonNull public final TextInputLayout d; @NonNull @@ -51,12 +51,12 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f2001s; + public final TextView f2003s; public WidgetVoiceChannelSettingsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull SeekBar seekBar, @NonNull TextView textView, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView4, @NonNull FloatingActionButton floatingActionButton, @NonNull LinearLayout linearLayout2, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull View view2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView7, @NonNull LinearLayout linearLayout4, @NonNull TextView textView8, @NonNull View view3, @NonNull SeekBar seekBar2, @NonNull TextView textView9) { this.a = coordinatorLayout; this.b = seekBar; - this.f2000c = textInputLayout; + this.f2002c = textInputLayout; this.d = textInputLayout2; this.e = textView2; this.f = textView3; @@ -72,7 +72,7 @@ public final class WidgetVoiceChannelSettingsBinding implements ViewBinding { this.p = textView8; this.q = view3; this.r = seekBar2; - this.f2001s = textView9; + this.f2003s = textView9; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java index c617b2f2f6..abf4bee29f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetVoiceNoiseCancellationBottomSheetBinding.java @@ -14,12 +14,12 @@ public final class WidgetVoiceNoiseCancellationBottomSheetBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f2002c; + public final TextView f2004c; public WidgetVoiceNoiseCancellationBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView) { this.a = linearLayout; this.b = materialButton; - this.f2002c = textView; + this.f2004c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java index 27e116d4c8..d99dfc2e5d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetVoiceSettingsBottomSheetBinding.java @@ -14,7 +14,7 @@ public final class WidgetVoiceSettingsBottomSheetBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SwitchMaterial f2003c; + public final SwitchMaterial f2005c; @NonNull public final TextView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetVoiceSettingsBottomSheetBinding implements ViewBinding public WidgetVoiceSettingsBottomSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull SwitchMaterial switchMaterial, @NonNull TextView textView2, @NonNull NestedScrollView nestedScrollView2, @NonNull TextView textView3, @NonNull SwitchMaterial switchMaterial2, @NonNull TextView textView4) { this.a = nestedScrollView; this.b = textView; - this.f2003c = switchMaterial; + this.f2005c = switchMaterial; this.d = textView2; this.e = textView3; this.f = switchMaterial2; diff --git a/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java b/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java index 611b5ef755..dbb514660e 100644 --- a/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java +++ b/app/src/main/java/com/discord/dialogs/ImageUploadDialog.java @@ -104,17 +104,17 @@ public final class ImageUploadDialog extends AppDialog { public t invoke(View view) { View view2 = view; m.checkNotNullParameter(view2, "p1"); - int i2 = 2131364025; - MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364025); + int i2 = 2131364027; + MaterialButton materialButton = (MaterialButton) view2.findViewById(2131364027); if (materialButton != null) { - i2 = 2131364026; - TextView textView = (TextView) view2.findViewById(2131364026); + i2 = 2131364028; + TextView textView = (TextView) view2.findViewById(2131364028); if (textView != null) { - i2 = 2131364029; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131364029); + i2 = 2131364031; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view2.findViewById(2131364031); if (simpleDraweeView != null) { - i2 = 2131364031; - MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364031); + i2 = 2131364033; + MaterialButton materialButton2 = (MaterialButton) view2.findViewById(2131364033); if (materialButton2 != null) { return new t((LinearLayout) view2, materialButton, textView, simpleDraweeView, materialButton2); } diff --git a/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java b/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java index 6d702fe7ce..95370138d2 100644 --- a/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java +++ b/app/src/main/java/com/discord/embed/RenderableEmbedMedia.java @@ -8,12 +8,12 @@ public final class RenderableEmbedMedia { public final Integer b; /* renamed from: c reason: collision with root package name */ - public final Integer f2004c; + public final Integer f2006c; public RenderableEmbedMedia(String str, Integer num, Integer num2) { this.a = str; this.b = num; - this.f2004c = num2; + this.f2006c = num2; } public boolean equals(Object obj) { @@ -24,7 +24,7 @@ public final class RenderableEmbedMedia { return false; } RenderableEmbedMedia renderableEmbedMedia = (RenderableEmbedMedia) obj; - return m.areEqual(this.a, renderableEmbedMedia.a) && m.areEqual(this.b, renderableEmbedMedia.b) && m.areEqual(this.f2004c, renderableEmbedMedia.f2004c); + return m.areEqual(this.a, renderableEmbedMedia.a) && m.areEqual(this.b, renderableEmbedMedia.b) && m.areEqual(this.f2006c, renderableEmbedMedia.f2006c); } public int hashCode() { @@ -33,7 +33,7 @@ public final class RenderableEmbedMedia { int hashCode = (str != null ? str.hashCode() : 0) * 31; Integer num = this.b; int hashCode2 = (hashCode + (num != null ? num.hashCode() : 0)) * 31; - Integer num2 = this.f2004c; + Integer num2 = this.f2006c; if (num2 != null) { i = num2.hashCode(); } @@ -46,6 +46,6 @@ public final class RenderableEmbedMedia { L.append(", width="); L.append(this.b); L.append(", height="); - return a.B(L, this.f2004c, ")"); + return a.B(L, this.f2006c, ")"); } } diff --git a/app/src/main/java/com/discord/gateway/io/IncomingParser.java b/app/src/main/java/com/discord/gateway/io/IncomingParser.java index e34149afb6..a0a1cfa94d 100644 --- a/app/src/main/java/com/discord/gateway/io/IncomingParser.java +++ b/app/src/main/java/com/discord/gateway/io/IncomingParser.java @@ -66,125 +66,125 @@ public final class IncomingParser implements Model { this.log = function1; } - /* JADX WARNING: Code restructure failed: missing block: B:101:0x0225, code lost: - if (r1.equals("INTERACTION_SUCCESS") != false) goto L_0x03f6; + /* JADX WARNING: Code restructure failed: missing block: B:101:0x0222, code lost: + if (r1.equals("INTERACTION_SUCCESS") != false) goto L_0x03f3; */ - /* JADX WARNING: Code restructure failed: missing block: B:106:0x0241, code lost: - if (r1.equals("CALL_UPDATE") != false) goto L_0x0339; + /* JADX WARNING: Code restructure failed: missing block: B:106:0x023e, code lost: + if (r1.equals("CALL_UPDATE") != false) goto L_0x0336; */ - /* JADX WARNING: Code restructure failed: missing block: B:108:0x024b, code lost: - if (r1.equals("GUILD_UPDATE") != false) goto L_0x0357; + /* JADX WARNING: Code restructure failed: missing block: B:108:0x0248, code lost: + if (r1.equals("GUILD_UPDATE") != false) goto L_0x0354; */ - /* JADX WARNING: Code restructure failed: missing block: B:122:0x02cf, code lost: - if (r1.equals("GUILD_MEMBER_UPDATE") != false) goto L_0x0451; + /* JADX WARNING: Code restructure failed: missing block: B:122:0x02cc, code lost: + if (r1.equals("GUILD_MEMBER_UPDATE") != false) goto L_0x044e; */ - /* JADX WARNING: Code restructure failed: missing block: B:127:0x02eb, code lost: - if (r1.equals("MESSAGE_DELETE_BULK") != false) goto L_0x02ed; + /* JADX WARNING: Code restructure failed: missing block: B:127:0x02e8, code lost: + if (r1.equals("MESSAGE_DELETE_BULK") != false) goto L_0x02ea; */ - /* JADX WARNING: Code restructure failed: missing block: B:128:0x02ed, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:128:0x02ea, code lost: r5.data = r6.parse(new com.discord.models.domain.ModelMessageDelete()); */ - /* JADX WARNING: Code restructure failed: missing block: B:133:0x0312, code lost: - if (r1.equals("CHANNEL_UPDATE") != false) goto L_0x0396; + /* JADX WARNING: Code restructure failed: missing block: B:133:0x030f, code lost: + if (r1.equals("CHANNEL_UPDATE") != false) goto L_0x0393; */ - /* JADX WARNING: Code restructure failed: missing block: B:138:0x032e, code lost: - if (r1.equals("CALL_DELETE") != false) goto L_0x0339; + /* JADX WARNING: Code restructure failed: missing block: B:138:0x032b, code lost: + if (r1.equals("CALL_DELETE") != false) goto L_0x0336; */ - /* JADX WARNING: Code restructure failed: missing block: B:140:0x0337, code lost: - if (r1.equals("CALL_CREATE") != false) goto L_0x0339; + /* JADX WARNING: Code restructure failed: missing block: B:140:0x0334, code lost: + if (r1.equals("CALL_CREATE") != false) goto L_0x0336; */ - /* JADX WARNING: Code restructure failed: missing block: B:141:0x0339, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:141:0x0336, code lost: r5.data = r6.parse(new com.discord.models.domain.ModelCall()); */ - /* JADX WARNING: Code restructure failed: missing block: B:143:0x034c, code lost: - if (r1.equals("GUILD_DELETE") != false) goto L_0x0357; + /* JADX WARNING: Code restructure failed: missing block: B:143:0x0349, code lost: + if (r1.equals("GUILD_DELETE") != false) goto L_0x0354; */ - /* JADX WARNING: Code restructure failed: missing block: B:145:0x0355, code lost: - if (r1.equals("GUILD_CREATE") != false) goto L_0x0357; + /* JADX WARNING: Code restructure failed: missing block: B:145:0x0352, code lost: + if (r1.equals("GUILD_CREATE") != false) goto L_0x0354; */ - /* JADX WARNING: Code restructure failed: missing block: B:146:0x0357, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:146:0x0354, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.guild.Guild.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:151:0x0379, code lost: - if (r1.equals("CHANNEL_RECIPIENT_REMOVE") != false) goto L_0x037b; + /* JADX WARNING: Code restructure failed: missing block: B:151:0x0376, code lost: + if (r1.equals("CHANNEL_RECIPIENT_REMOVE") != false) goto L_0x0378; */ - /* JADX WARNING: Code restructure failed: missing block: B:152:0x037b, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:152:0x0378, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.channel.ChannelRecipient.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:154:0x038b, code lost: - if (r1.equals("CHANNEL_DELETE") != false) goto L_0x0396; + /* JADX WARNING: Code restructure failed: missing block: B:154:0x0388, code lost: + if (r1.equals("CHANNEL_DELETE") != false) goto L_0x0393; */ - /* JADX WARNING: Code restructure failed: missing block: B:156:0x0394, code lost: - if (r1.equals("CHANNEL_CREATE") != false) goto L_0x0396; + /* JADX WARNING: Code restructure failed: missing block: B:156:0x0391, code lost: + if (r1.equals("CHANNEL_CREATE") != false) goto L_0x0393; */ - /* JADX WARNING: Code restructure failed: missing block: B:157:0x0396, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:157:0x0393, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.channel.Channel.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:159:0x03a4, code lost: - if (r1.equals("RELATIONSHIP_REMOVE") != false) goto L_0x048a; + /* JADX WARNING: Code restructure failed: missing block: B:159:0x03a1, code lost: + if (r1.equals("RELATIONSHIP_REMOVE") != false) goto L_0x0487; */ - /* JADX WARNING: Code restructure failed: missing block: B:161:0x03ae, code lost: - if (r1.equals("STAGE_INSTANCE_UPDATE") != false) goto L_0x0478; + /* JADX WARNING: Code restructure failed: missing block: B:161:0x03ab, code lost: + if (r1.equals("STAGE_INSTANCE_UPDATE") != false) goto L_0x0475; */ - /* JADX WARNING: Code restructure failed: missing block: B:172:0x03f4, code lost: - if (r1.equals("INTERACTION_CREATE") != false) goto L_0x03f6; + /* JADX WARNING: Code restructure failed: missing block: B:172:0x03f1, code lost: + if (r1.equals("INTERACTION_CREATE") != false) goto L_0x03f3; */ - /* JADX WARNING: Code restructure failed: missing block: B:173:0x03f6, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:173:0x03f3, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.interaction.InteractionStateUpdate.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:184:0x043c, code lost: - if (r1.equals("MESSAGE_REACTION_ADD") != false) goto L_0x051a; + /* JADX WARNING: Code restructure failed: missing block: B:184:0x0439, code lost: + if (r1.equals("MESSAGE_REACTION_ADD") != false) goto L_0x0517; */ - /* JADX WARNING: Code restructure failed: missing block: B:186:0x0446, code lost: - if (r1.equals("STAGE_INSTANCE_DELETE") != false) goto L_0x0478; + /* JADX WARNING: Code restructure failed: missing block: B:186:0x0443, code lost: + if (r1.equals("STAGE_INSTANCE_DELETE") != false) goto L_0x0475; */ - /* JADX WARNING: Code restructure failed: missing block: B:188:0x044f, code lost: - if (r1.equals("GUILD_MEMBER_ADD") != false) goto L_0x0451; + /* JADX WARNING: Code restructure failed: missing block: B:188:0x044c, code lost: + if (r1.equals("GUILD_MEMBER_ADD") != false) goto L_0x044e; */ - /* JADX WARNING: Code restructure failed: missing block: B:189:0x0451, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:189:0x044e, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.guildmember.GuildMember.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:191:0x0461, code lost: - if (r1.equals("GUILD_BAN_ADD") != false) goto L_0x0463; + /* JADX WARNING: Code restructure failed: missing block: B:191:0x045e, code lost: + if (r1.equals("GUILD_BAN_ADD") != false) goto L_0x0460; */ - /* JADX WARNING: Code restructure failed: missing block: B:192:0x0463, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:192:0x0460, code lost: r5.data = r6.parse(new com.discord.models.domain.ModelBan()); */ - /* JADX WARNING: Code restructure failed: missing block: B:194:0x0476, code lost: - if (r1.equals("STAGE_INSTANCE_CREATE") != false) goto L_0x0478; + /* JADX WARNING: Code restructure failed: missing block: B:194:0x0473, code lost: + if (r1.equals("STAGE_INSTANCE_CREATE") != false) goto L_0x0475; */ - /* JADX WARNING: Code restructure failed: missing block: B:195:0x0478, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:195:0x0475, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.stageinstance.StageInstance.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:197:0x0488, code lost: - if (r1.equals("RELATIONSHIP_ADD") != false) goto L_0x048a; + /* JADX WARNING: Code restructure failed: missing block: B:197:0x0485, code lost: + if (r1.equals("RELATIONSHIP_ADD") != false) goto L_0x0487; */ - /* JADX WARNING: Code restructure failed: missing block: B:198:0x048a, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:198:0x0487, code lost: r5.data = r6.parse(new com.discord.models.domain.ModelUserRelationship()); */ - /* JADX WARNING: Code restructure failed: missing block: B:203:0x04af, code lost: - if (r1.equals("MESSAGE_REACTION_REMOVE_ALL") != false) goto L_0x051a; + /* JADX WARNING: Code restructure failed: missing block: B:203:0x04ac, code lost: + if (r1.equals("MESSAGE_REACTION_REMOVE_ALL") != false) goto L_0x0517; */ - /* JADX WARNING: Code restructure failed: missing block: B:205:0x04b8, code lost: - if (r1.equals("GUILD_JOIN_REQUEST_UPDATE") != false) goto L_0x0509; + /* JADX WARNING: Code restructure failed: missing block: B:205:0x04b5, code lost: + if (r1.equals("GUILD_JOIN_REQUEST_UPDATE") != false) goto L_0x0506; */ - /* JADX WARNING: Code restructure failed: missing block: B:210:0x04d2, code lost: - if (r1.equals("USER_CONNECTIONS_INTEGRATION_JOINING") != false) goto L_0x04d4; + /* JADX WARNING: Code restructure failed: missing block: B:210:0x04cf, code lost: + if (r1.equals("USER_CONNECTIONS_INTEGRATION_JOINING") != false) goto L_0x04d1; */ - /* JADX WARNING: Code restructure failed: missing block: B:211:0x04d4, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:211:0x04d1, code lost: r6.skipValue(); r5.data = kotlin.Unit.a; */ - /* JADX WARNING: Code restructure failed: missing block: B:219:0x0507, code lost: - if (r1.equals("GUILD_JOIN_REQUEST_CREATE") != false) goto L_0x0509; + /* JADX WARNING: Code restructure failed: missing block: B:219:0x0504, code lost: + if (r1.equals("GUILD_JOIN_REQUEST_CREATE") != false) goto L_0x0506; */ - /* JADX WARNING: Code restructure failed: missing block: B:220:0x0509, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:220:0x0506, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.guildjoinrequest.GuildJoinRequestCreateOrUpdate.class); */ - /* JADX WARNING: Code restructure failed: missing block: B:222:0x0518, code lost: - if (r1.equals("MESSAGE_REACTION_REMOVE_EMOJI") != false) goto L_0x051a; + /* JADX WARNING: Code restructure failed: missing block: B:222:0x0515, code lost: + if (r1.equals("MESSAGE_REACTION_REMOVE_EMOJI") != false) goto L_0x0517; */ - /* JADX WARNING: Code restructure failed: missing block: B:223:0x051a, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:223:0x0517, code lost: r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.message.reaction.MessageReactionUpdate.class); */ /* JADX WARNING: Code restructure failed: missing block: B:246:?, code lost: @@ -236,16 +236,16 @@ public final class IncomingParser implements Model { if (r1.equals("THREAD_UPDATE") != false) goto L_0x01e4; */ /* JADX WARNING: Code restructure failed: missing block: B:61:0x0142, code lost: - if (r1.equals("GUILD_BAN_REMOVE") != false) goto L_0x0463; + if (r1.equals("GUILD_BAN_REMOVE") != false) goto L_0x0460; */ /* JADX WARNING: Code restructure failed: missing block: B:66:0x015e, code lost: - if (r1.equals("INTERACTION_FAILURE") != false) goto L_0x03f6; + if (r1.equals("INTERACTION_FAILURE") != false) goto L_0x03f3; */ /* JADX WARNING: Code restructure failed: missing block: B:68:0x0168, code lost: if (r1.equals("MESSAGE_UPDATE") != false) goto L_0x0212; */ /* JADX WARNING: Code restructure failed: missing block: B:73:0x0184, code lost: - if (r1.equals("USER_CONNECTIONS_UPDATE") != false) goto L_0x04d4; + if (r1.equals("USER_CONNECTIONS_UPDATE") != false) goto L_0x04d1; */ /* JADX WARNING: Code restructure failed: missing block: B:81:0x01b5, code lost: if (r1.equals("THREAD_DELETE") != false) goto L_0x01e4; @@ -257,19 +257,19 @@ public final class IncomingParser implements Model { r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.channel.Channel.class); */ /* JADX WARNING: Code restructure failed: missing block: B:92:0x01f2, code lost: - if (r1.equals("MESSAGE_REACTION_REMOVE") != false) goto L_0x051a; + if (r1.equals("MESSAGE_REACTION_REMOVE") != false) goto L_0x0517; */ /* JADX WARNING: Code restructure failed: missing block: B:94:0x01fc, code lost: - if (r1.equals("CHANNEL_RECIPIENT_ADD") != false) goto L_0x037b; + if (r1.equals("CHANNEL_RECIPIENT_ADD") != false) goto L_0x0378; */ /* JADX WARNING: Code restructure failed: missing block: B:96:0x0206, code lost: - if (r1.equals("MESSAGE_DELETE") != false) goto L_0x02ed; + if (r1.equals("MESSAGE_DELETE") != false) goto L_0x02ea; */ /* JADX WARNING: Code restructure failed: missing block: B:98:0x0210, code lost: if (r1.equals("MESSAGE_CREATE") != false) goto L_0x0212; */ /* JADX WARNING: Code restructure failed: missing block: B:99:0x0212, code lost: - r5.data = r6.parse(new com.discord.models.domain.ModelMessage()); + r5.data = com.discord.models.deserialization.gson.InboundGatewayGsonParser.fromJson(r6, com.discord.api.message.Message.class); */ @Override // com.discord.models.domain.Model public void assignField(Model.JsonReader jsonReader) throws IOException { diff --git a/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java b/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java index 23b12c5fe4..b25442cf77 100644 --- a/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java +++ b/app/src/main/java/com/discord/hardware_analytics/BuildInfo.java @@ -10,7 +10,7 @@ public final class BuildInfo { public final String b; /* renamed from: c reason: collision with root package name */ - public final String f2006c; + public final String f2008c; public final String d; public final String e; public final String f; @@ -74,7 +74,7 @@ public final class BuildInfo { m.checkNotNullParameter(str12, "device_supported_abis"); this.a = str7; this.b = str8; - this.f2006c = str9; + this.f2008c = str9; this.d = str10; this.e = str11; this.f = str12; @@ -89,7 +89,7 @@ public final class BuildInfo { return false; } BuildInfo buildInfo = (BuildInfo) obj; - return m.areEqual(this.a, buildInfo.a) && m.areEqual(this.b, buildInfo.b) && m.areEqual(this.f2006c, buildInfo.f2006c) && m.areEqual(this.d, buildInfo.d) && m.areEqual(this.e, buildInfo.e) && m.areEqual(this.f, buildInfo.f) && this.g == buildInfo.g; + return m.areEqual(this.a, buildInfo.a) && m.areEqual(this.b, buildInfo.b) && m.areEqual(this.f2008c, buildInfo.f2008c) && m.areEqual(this.d, buildInfo.d) && m.areEqual(this.e, buildInfo.e) && m.areEqual(this.f, buildInfo.f) && this.g == buildInfo.g; } public int hashCode() { @@ -98,7 +98,7 @@ public final class BuildInfo { int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.b; int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31; - String str3 = this.f2006c; + String str3 = this.f2008c; int hashCode3 = (hashCode2 + (str3 != null ? str3.hashCode() : 0)) * 31; String str4 = this.d; int hashCode4 = (hashCode3 + (str4 != null ? str4.hashCode() : 0)) * 31; @@ -125,7 +125,7 @@ public final class BuildInfo { L.append(", device_brand="); L.append(this.b); L.append(", device_manufacturer="); - L.append(this.f2006c); + L.append(this.f2008c); L.append(", device_model="); L.append(this.d); L.append(", device_product="); diff --git a/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java b/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java index beeed2d637..ef55a0b801 100644 --- a/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java +++ b/app/src/main/java/com/discord/hardware_analytics/DecoderCountInfo.java @@ -7,7 +7,7 @@ public final class DecoderCountInfo { public int b; /* renamed from: c reason: collision with root package name */ - public int f2007c; + public int f2009c; public int d; public int e; public int f; @@ -20,7 +20,7 @@ public final class DecoderCountInfo { public DecoderCountInfo(int i, int i2, int i3, int i4, int i5, int i6, int i7) { this.a = i; this.b = i2; - this.f2007c = i3; + this.f2009c = i3; this.d = i4; this.e = i5; this.f = i6; @@ -37,7 +37,7 @@ public final class DecoderCountInfo { i7 = (i8 & 64) != 0 ? -1 : i7; this.a = i; this.b = i2; - this.f2007c = i3; + this.f2009c = i3; this.d = i4; this.e = i5; this.f = i6; @@ -52,11 +52,11 @@ public final class DecoderCountInfo { return false; } DecoderCountInfo decoderCountInfo = (DecoderCountInfo) obj; - return this.a == decoderCountInfo.a && this.b == decoderCountInfo.b && this.f2007c == decoderCountInfo.f2007c && this.d == decoderCountInfo.d && this.e == decoderCountInfo.e && this.f == decoderCountInfo.f && this.g == decoderCountInfo.g; + return this.a == decoderCountInfo.a && this.b == decoderCountInfo.b && this.f2009c == decoderCountInfo.f2009c && this.d == decoderCountInfo.d && this.e == decoderCountInfo.e && this.f == decoderCountInfo.f && this.g == decoderCountInfo.g; } public int hashCode() { - return (((((((((((this.a * 31) + this.b) * 31) + this.f2007c) * 31) + this.d) * 31) + this.e) * 31) + this.f) * 31) + this.g; + return (((((((((((this.a * 31) + this.b) * 31) + this.f2009c) * 31) + this.d) * 31) + this.e) * 31) + this.f) * 31) + this.g; } public String toString() { @@ -65,7 +65,7 @@ public final class DecoderCountInfo { L.append(", nHardwareDecoders720="); L.append(this.b); L.append(", nHardwareDecoders480="); - L.append(this.f2007c); + L.append(this.f2009c); L.append(", nDecoders1080="); L.append(this.d); L.append(", nDecoders720="); diff --git a/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java b/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java index 9a854397fb..ec1de6acba 100644 --- a/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java +++ b/app/src/main/java/com/discord/hardware_analytics/HardwareSurveyService.java @@ -117,7 +117,7 @@ public final class HardwareSurveyService extends RemoteIntentService { if (aVar5.d) { int ordinal = aVar5.a.ordinal(); if (ordinal == 0) { - decoderCountInfo.f2007c = intValue; + decoderCountInfo.f2009c = intValue; } else if (ordinal == 1) { decoderCountInfo.b = intValue; } else if (ordinal == 2) { @@ -141,7 +141,7 @@ public final class HardwareSurveyService extends RemoteIntentService { decoderCountInfo.g = (int) (System.currentTimeMillis() - currentTimeMillis); Bundle bundle = new Bundle(); m.checkNotNullParameter(bundle, "bundle"); - bundle.putIntegerArrayList("com.discord.hardware_analytics.DecoderCountInfo", n.arrayListOf(Integer.valueOf(decoderCountInfo.a), Integer.valueOf(decoderCountInfo.b), Integer.valueOf(decoderCountInfo.f2007c), Integer.valueOf(decoderCountInfo.d), Integer.valueOf(decoderCountInfo.e), Integer.valueOf(decoderCountInfo.f), Integer.valueOf(decoderCountInfo.g))); + bundle.putIntegerArrayList("com.discord.hardware_analytics.DecoderCountInfo", n.arrayListOf(Integer.valueOf(decoderCountInfo.a), Integer.valueOf(decoderCountInfo.b), Integer.valueOf(decoderCountInfo.f2009c), Integer.valueOf(decoderCountInfo.d), Integer.valueOf(decoderCountInfo.e), Integer.valueOf(decoderCountInfo.f), Integer.valueOf(decoderCountInfo.g))); return bundle; } throw new IllegalStateException("Check failed.".toString()); diff --git a/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java b/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java index e1c37dd3db..9a19336726 100644 --- a/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java +++ b/app/src/main/java/com/discord/hardware_analytics/MemoryInfo.java @@ -11,7 +11,7 @@ public final class MemoryInfo { public final boolean b; /* renamed from: c reason: collision with root package name */ - public final int f2008c; + public final int f2010c; public final int d; public final ActivityManager.MemoryInfo e; @@ -29,7 +29,7 @@ public final class MemoryInfo { Objects.requireNonNull(systemService, "null cannot be cast to non-null type android.app.ActivityManager"); ActivityManager activityManager = (ActivityManager) systemService; this.b = activityManager.isLowRamDevice(); - this.f2008c = activityManager.getMemoryClass(); + this.f2010c = activityManager.getMemoryClass(); this.d = activityManager.getLargeMemoryClass(); m.checkNotNullParameter(context, "context"); Object systemService2 = context.getSystemService("activity"); @@ -41,7 +41,7 @@ public final class MemoryInfo { StringBuilder L = c.d.b.a.a.L("MemoryObserver(isLowRamDevice="); L.append(this.b); L.append(", memoryClass="); - L.append(this.f2008c); + L.append(this.f2010c); L.append(", "); L.append("largeMemoryClass="); L.append(this.d); diff --git a/app/src/main/java/com/discord/i18n/Hook.java b/app/src/main/java/com/discord/i18n/Hook.java index 9692c36299..6c4ca1b444 100644 --- a/app/src/main/java/com/discord/i18n/Hook.java +++ b/app/src/main/java/com/discord/i18n/Hook.java @@ -14,7 +14,7 @@ public final class Hook { public String b; /* renamed from: c reason: collision with root package name */ - public a f2009c; + public a f2011c; /* compiled from: Hook.kt */ public static final class a { diff --git a/app/src/main/java/com/discord/i18n/RenderContext.java b/app/src/main/java/com/discord/i18n/RenderContext.java index 8d7ada28a9..ee28cf5b3c 100644 --- a/app/src/main/java/com/discord/i18n/RenderContext.java +++ b/app/src/main/java/com/discord/i18n/RenderContext.java @@ -18,7 +18,7 @@ public final class RenderContext { public final Map b = new HashMap(); /* renamed from: c reason: collision with root package name */ - public List f2010c; + public List f2012c; @ColorInt public Integer d; @ColorInt @@ -45,7 +45,7 @@ public final class RenderContext { d dVar = new d(this); Objects.requireNonNull(hook2); m.checkNotNullParameter(dVar, "onClick"); - hook2.f2009c = new Hook.a(null, dVar); + hook2.f2011c = new Hook.a(null, dVar); return Unit.a; } } diff --git a/app/src/main/java/com/discord/models/application/Unread.java b/app/src/main/java/com/discord/models/application/Unread.java index cc21ed667f..7c77b0f3ea 100644 --- a/app/src/main/java/com/discord/models/application/Unread.java +++ b/app/src/main/java/com/discord/models/application/Unread.java @@ -2,7 +2,7 @@ package com.discord.models.application; import a0.a.a.b; import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.t.s; import d0.z.d.m; import java.util.List; @@ -26,13 +26,13 @@ public final class Unread { return companion.getTotalMessages(marker, list); } - private final int getTotalMessages(Marker marker, List list) { + private final int getTotalMessages(Marker marker, List list) { int i = 0; if (!list.isEmpty() && marker.getMessageId() != null) { - for (ModelMessage modelMessage : s.asReversed(list)) { - long id2 = modelMessage.getId(); + for (Message message : s.asReversed(list)) { + long r = message.r(); Long messageId = marker.getMessageId(); - if (messageId != null && id2 == messageId.longValue()) { + if (messageId != null && r == messageId.longValue()) { return i; } i++; @@ -136,7 +136,7 @@ public final class Unread { } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public Unread(Marker marker, List list) { + public Unread(Marker marker, List list) { this(marker, Companion.access$getTotalMessages(Companion, marker, list)); m.checkNotNullParameter(marker, "marker"); m.checkNotNullParameter(list, "messages"); diff --git a/app/src/main/java/com/discord/models/commands/Application.java b/app/src/main/java/com/discord/models/commands/Application.java index 352f4578fb..e0b8b44414 100644 --- a/app/src/main/java/com/discord/models/commands/Application.java +++ b/app/src/main/java/com/discord/models/commands/Application.java @@ -14,12 +14,12 @@ public final class Application { private final Integer iconRes; /* renamed from: id reason: collision with root package name */ - private final long f2011id; + private final long f2013id; private final String name; public Application(long j, String str, String str2, Integer num, int i, User user, boolean z2) { m.checkNotNullParameter(str, "name"); - this.f2011id = j; + this.f2013id = j; this.name = str; this.icon = str2; this.iconRes = num; @@ -34,11 +34,11 @@ public final class Application { } public static /* synthetic */ Application copy$default(Application application, long j, String str, String str2, Integer num, int i, User user, boolean z2, int i2, Object obj) { - return application.copy((i2 & 1) != 0 ? application.f2011id : j, (i2 & 2) != 0 ? application.name : str, (i2 & 4) != 0 ? application.icon : str2, (i2 & 8) != 0 ? application.iconRes : num, (i2 & 16) != 0 ? application.commandCount : i, (i2 & 32) != 0 ? application.bot : user, (i2 & 64) != 0 ? application.builtIn : z2); + return application.copy((i2 & 1) != 0 ? application.f2013id : j, (i2 & 2) != 0 ? application.name : str, (i2 & 4) != 0 ? application.icon : str2, (i2 & 8) != 0 ? application.iconRes : num, (i2 & 16) != 0 ? application.commandCount : i, (i2 & 32) != 0 ? application.bot : user, (i2 & 64) != 0 ? application.builtIn : z2); } public final long component1() { - return this.f2011id; + return this.f2013id; } public final String component2() { @@ -78,7 +78,7 @@ public final class Application { return false; } Application application = (Application) obj; - return this.f2011id == application.f2011id && m.areEqual(this.name, application.name) && m.areEqual(this.icon, application.icon) && m.areEqual(this.iconRes, application.iconRes) && this.commandCount == application.commandCount && m.areEqual(this.bot, application.bot) && this.builtIn == application.builtIn; + return this.f2013id == application.f2013id && m.areEqual(this.name, application.name) && m.areEqual(this.icon, application.icon) && m.areEqual(this.iconRes, application.iconRes) && this.commandCount == application.commandCount && m.areEqual(this.bot, application.bot) && this.builtIn == application.builtIn; } public final User getBot() { @@ -102,7 +102,7 @@ public final class Application { } public final long getId() { - return this.f2011id; + return this.f2013id; } public final String getName() { @@ -110,7 +110,7 @@ public final class Application { } public int hashCode() { - int a = b.a(this.f2011id) * 31; + int a = b.a(this.f2013id) * 31; String str = this.name; int i = 0; int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31; @@ -135,7 +135,7 @@ public final class Application { public String toString() { StringBuilder L = a.L("Application(id="); - L.append(this.f2011id); + L.append(this.f2013id); L.append(", name="); L.append(this.name); L.append(", icon="); diff --git a/app/src/main/java/com/discord/models/commands/ApplicationCommand.java b/app/src/main/java/com/discord/models/commands/ApplicationCommand.java index 5d665ba3de..083ed9bed4 100644 --- a/app/src/main/java/com/discord/models/commands/ApplicationCommand.java +++ b/app/src/main/java/com/discord/models/commands/ApplicationCommand.java @@ -15,7 +15,7 @@ public abstract class ApplicationCommand { private final Long guildId; /* renamed from: id reason: collision with root package name */ - private final String f2012id; + private final String f2014id; private final String name; private final List options; private final Map permissions; @@ -24,7 +24,7 @@ public abstract class ApplicationCommand { /* JADX DEBUG: Multi-variable search result rejected for r13v0, resolved type: kotlin.jvm.functions.Function1, java.lang.String> */ /* JADX WARN: Multi-variable type inference failed */ private ApplicationCommand(String str, long j, String str2, String str3, Integer num, List list, boolean z2, Long l, String str4, Boolean bool, Map map, Function1, String> function1) { - this.f2012id = str; + this.f2014id = str; this.applicationId = j; this.name = str2; this.description = str3; @@ -72,7 +72,7 @@ public abstract class ApplicationCommand { } public final String getId() { - return this.f2012id; + return this.f2014id; } public final String getName() { diff --git a/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java b/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java index a6ce5e4b28..cd2a21951c 100644 --- a/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java +++ b/app/src/main/java/com/discord/models/deserialization/gson/InboundGatewayGsonParser.java @@ -43,4 +43,8 @@ public final class InboundGatewayGsonParser { m.checkNotNullExpressionValue(m, "gatewayGsonInstance.toJson(source)"); return m; } + + public final Gson getGatewayGsonInstance() { + return gatewayGsonInstance; + } } diff --git a/app/src/main/java/com/discord/models/domain/Harvest.java b/app/src/main/java/com/discord/models/domain/Harvest.java index 46ff8ab538..55a758bb8e 100644 --- a/app/src/main/java/com/discord/models/domain/Harvest.java +++ b/app/src/main/java/com/discord/models/domain/Harvest.java @@ -10,13 +10,13 @@ public final class Harvest { private final String createdAt; /* renamed from: id reason: collision with root package name */ - private final String f2013id; + private final String f2015id; private final long userId; public Harvest(String str, long j, String str2, String str3) { m.checkNotNullParameter(str, "id"); m.checkNotNullParameter(str2, "createdAt"); - this.f2013id = str; + this.f2015id = str; this.userId = j; this.createdAt = str2; this.completedAt = str3; @@ -31,7 +31,7 @@ public final class Harvest { public static /* synthetic */ Harvest copy$default(Harvest harvest, String str, long j, String str2, String str3, int i, Object obj) { if ((i & 1) != 0) { - str = harvest.f2013id; + str = harvest.f2015id; } if ((i & 2) != 0) { j = harvest.userId; @@ -54,7 +54,7 @@ public final class Harvest { } public final String component1() { - return this.f2013id; + return this.f2015id; } public final long component2() { @@ -83,7 +83,7 @@ public final class Harvest { return false; } Harvest harvest = (Harvest) obj; - return m.areEqual(this.f2013id, harvest.f2013id) && this.userId == harvest.userId && m.areEqual(this.createdAt, harvest.createdAt) && m.areEqual(this.completedAt, harvest.completedAt); + return m.areEqual(this.f2015id, harvest.f2015id) && this.userId == harvest.userId && m.areEqual(this.createdAt, harvest.createdAt) && m.areEqual(this.completedAt, harvest.completedAt); } public final String getCompletedAt() { @@ -95,7 +95,7 @@ public final class Harvest { } public final String getId() { - return this.f2013id; + return this.f2015id; } public final long getUserId() { @@ -103,7 +103,7 @@ public final class Harvest { } public int hashCode() { - String str = this.f2013id; + String str = this.f2015id; int i = 0; int hashCode = str != null ? str.hashCode() : 0; long j = this.userId; @@ -123,7 +123,7 @@ public final class Harvest { public String toString() { StringBuilder L = a.L("Harvest(id="); - L.append(this.f2013id); + L.append(this.f2015id); L.append(", userId="); L.append(this.userId); L.append(", createdAt="); diff --git a/app/src/main/java/com/discord/models/domain/Model.java b/app/src/main/java/com/discord/models/domain/Model.java index 7895187518..4c953b71ab 100644 --- a/app/src/main/java/com/discord/models/domain/Model.java +++ b/app/src/main/java/com/discord/models/domain/Model.java @@ -1,6 +1,6 @@ package com.discord.models.domain; -import c.a.n.a.o0; +import c.a.n.a.h0; import c.d.b.a.a; import c.i.d.o; import com.google.gson.Gson; @@ -128,7 +128,7 @@ public interface Model { } public HashMap nextListAsMap(ItemFactory itemFactory, KeySelector keySelector) throws IOException { - return (HashMap) nextListAsMap(itemFactory, keySelector, o0.i); + return (HashMap) nextListAsMap(itemFactory, keySelector, h0.i); } public > M nextListAsMap(ItemFactory itemFactory, KeySelector keySelector, Func0 func0) throws IOException { diff --git a/app/src/main/java/com/discord/models/domain/ModelAllowedMentions.java b/app/src/main/java/com/discord/models/domain/ModelAllowedMentions.java deleted file mode 100644 index 4b3616fdda..0000000000 --- a/app/src/main/java/com/discord/models/domain/ModelAllowedMentions.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.discord.models.domain; - -import c.d.b.a.a; -import d0.z.d.m; -import java.util.List; -import kotlin.jvm.internal.DefaultConstructorMarker; -/* compiled from: ModelAllowedMentions.kt */ -public final class ModelAllowedMentions { - private final List parse; - private final Boolean repliedUser; - private final List roles; - private final List users; - - /* compiled from: ModelAllowedMentions.kt */ - public enum Types { - USERS("users"), - ROLES("roles"), - EVERYONE("everyone"); - - private final String apiStringRepresentation; - - private Types(String str) { - this.apiStringRepresentation = str; - } - - public final String serialize() { - return this.apiStringRepresentation; - } - } - - public ModelAllowedMentions() { - this(null, null, null, null, 15, null); - } - - /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public ModelAllowedMentions(List list, List list2, List list3, Boolean bool) { - this.parse = list; - this.users = list2; - this.roles = list3; - this.repliedUser = bool; - } - - /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ ModelAllowedMentions(List list, List list2, List list3, Boolean bool, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? null : list, (i & 2) != 0 ? null : list2, (i & 4) != 0 ? null : list3, (i & 8) != 0 ? null : bool); - } - - /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.models.domain.ModelAllowedMentions */ - /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ ModelAllowedMentions copy$default(ModelAllowedMentions modelAllowedMentions, List list, List list2, List list3, Boolean bool, int i, Object obj) { - if ((i & 1) != 0) { - list = modelAllowedMentions.parse; - } - if ((i & 2) != 0) { - list2 = modelAllowedMentions.users; - } - if ((i & 4) != 0) { - list3 = modelAllowedMentions.roles; - } - if ((i & 8) != 0) { - bool = modelAllowedMentions.repliedUser; - } - return modelAllowedMentions.copy(list, list2, list3, bool); - } - - public final List component1() { - return this.parse; - } - - public final List component2() { - return this.users; - } - - public final List component3() { - return this.roles; - } - - public final Boolean component4() { - return this.repliedUser; - } - - public final ModelAllowedMentions copy(List list, List list2, List list3, Boolean bool) { - return new ModelAllowedMentions(list, list2, list3, bool); - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof ModelAllowedMentions)) { - return false; - } - ModelAllowedMentions modelAllowedMentions = (ModelAllowedMentions) obj; - return m.areEqual(this.parse, modelAllowedMentions.parse) && m.areEqual(this.users, modelAllowedMentions.users) && m.areEqual(this.roles, modelAllowedMentions.roles) && m.areEqual(this.repliedUser, modelAllowedMentions.repliedUser); - } - - public final List getParse() { - return this.parse; - } - - public final Boolean getRepliedUser() { - return this.repliedUser; - } - - public final List getRoles() { - return this.roles; - } - - public final List getUsers() { - return this.users; - } - - public int hashCode() { - List list = this.parse; - int i = 0; - int hashCode = (list != null ? list.hashCode() : 0) * 31; - List list2 = this.users; - int hashCode2 = (hashCode + (list2 != null ? list2.hashCode() : 0)) * 31; - List list3 = this.roles; - int hashCode3 = (hashCode2 + (list3 != null ? list3.hashCode() : 0)) * 31; - Boolean bool = this.repliedUser; - if (bool != null) { - i = bool.hashCode(); - } - return hashCode3 + i; - } - - public String toString() { - StringBuilder L = a.L("ModelAllowedMentions(parse="); - L.append(this.parse); - L.append(", users="); - L.append(this.users); - L.append(", roles="); - L.append(this.roles); - L.append(", repliedUser="); - L.append(this.repliedUser); - L.append(")"); - return L.toString(); - } -} diff --git a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java index 57516661cc..43f8d29bab 100644 --- a/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java +++ b/app/src/main/java/com/discord/models/domain/ModelAuditLogEntry.java @@ -118,7 +118,7 @@ public class ModelAuditLogEntry implements Model { private Long guildId; /* renamed from: id reason: collision with root package name */ - private long f2014id; + private long f2016id; private Options options; private String reason; private long targetId; @@ -287,7 +287,7 @@ public class ModelAuditLogEntry implements Model { public static class ChangeNameId implements Model { /* renamed from: id reason: collision with root package name */ - private long f2015id; + private long f2017id; private String name; @Override // com.discord.models.domain.Model @@ -295,7 +295,7 @@ public class ModelAuditLogEntry implements Model { String nextName = jsonReader.nextName(); nextName.hashCode(); if (nextName.equals("id")) { - this.f2015id = jsonReader.nextLong(this.f2015id); + this.f2017id = jsonReader.nextLong(this.f2017id); } else if (!nextName.equals("name")) { jsonReader.skipValue(); } else { @@ -324,7 +324,7 @@ public class ModelAuditLogEntry implements Model { } public long getId() { - return this.f2015id; + return this.f2017id; } public String getName() { @@ -353,7 +353,7 @@ public class ModelAuditLogEntry implements Model { private int deleteMemberDays; /* renamed from: id reason: collision with root package name */ - private long f2016id; + private long f2018id; private int membersRemoved; private String roleName; private int type; @@ -421,7 +421,7 @@ public class ModelAuditLogEntry implements Model { this.deleteMemberDays = jsonReader.nextInt(this.deleteMemberDays); return; case 3: - this.f2016id = jsonReader.nextLong(this.f2016id); + this.f2018id = jsonReader.nextLong(this.f2018id); return; case 4: this.type = jsonReader.nextInt(this.type); @@ -471,7 +471,7 @@ public class ModelAuditLogEntry implements Model { } public long getId() { - return this.f2016id; + return this.f2018id; } public int getMembersRemoved() { @@ -560,7 +560,7 @@ public class ModelAuditLogEntry implements Model { } public ModelAuditLogEntry(long j, int i, long j2, long j3, List list, Options options, long j4, Long l) { - this.f2014id = j; + this.f2016id = j; this.actionTypeId = i; this.targetId = j2; this.userId = j3; @@ -739,7 +739,7 @@ public class ModelAuditLogEntry implements Model { this.userId = jsonReader.nextLong(this.userId); return; case 4: - this.f2014id = jsonReader.nextLong(this.f2014id); + this.f2016id = jsonReader.nextLong(this.f2016id); return; case 5: this.changes = jsonReader.nextList(new g(jsonReader)); @@ -810,7 +810,7 @@ public class ModelAuditLogEntry implements Model { } public long getId() { - return this.f2014id; + return this.f2016id; } public Options getOptions() { diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java index 8ea5df5b04..302e950f4e 100644 --- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java +++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccount.java @@ -14,7 +14,7 @@ public final class ModelConnectedAccount implements Model { @NonNull /* renamed from: id reason: collision with root package name */ - private String f2017id; + private String f2019id; private List integrations; private boolean revoked; private boolean showActivity; @@ -97,7 +97,7 @@ public final class ModelConnectedAccount implements Model { this.verified = jsonReader.nextBoolean(this.verified); return; case 1: - this.f2017id = jsonReader.nextString(this.f2017id); + this.f2019id = jsonReader.nextString(this.f2019id); return; case 2: this.username = jsonReader.nextString(this.username); @@ -159,7 +159,7 @@ public final class ModelConnectedAccount implements Model { @NonNull public String getId() { - return this.f2017id; + return this.f2019id; } public List getIntegrations() { diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java index 869d84ae3c..93fba2a974 100644 --- a/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java +++ b/app/src/main/java/com/discord/models/domain/ModelConnectedAccountIntegration.java @@ -20,7 +20,7 @@ public final class ModelConnectedAccountIntegration { private final ModelConnectedIntegrationGuild guild; /* renamed from: id reason: collision with root package name */ - private final String f2018id; + private final String f2020id; private final String type; /* compiled from: ModelConnectedAccountIntegration.kt */ @@ -59,7 +59,7 @@ public final class ModelConnectedAccountIntegration { public ModelConnectedAccountIntegration(String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild) { m.checkNotNullParameter(str, "id"); - this.f2018id = str; + this.f2020id = str; this.type = str2; this.account = modelConnectedIntegrationAccount; this.guild = modelConnectedIntegrationGuild; @@ -67,7 +67,7 @@ public final class ModelConnectedAccountIntegration { public static /* synthetic */ ModelConnectedAccountIntegration copy$default(ModelConnectedAccountIntegration modelConnectedAccountIntegration, String str, String str2, ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, ModelConnectedIntegrationGuild modelConnectedIntegrationGuild, int i, Object obj) { if ((i & 1) != 0) { - str = modelConnectedAccountIntegration.f2018id; + str = modelConnectedAccountIntegration.f2020id; } if ((i & 2) != 0) { str2 = modelConnectedAccountIntegration.type; @@ -82,7 +82,7 @@ public final class ModelConnectedAccountIntegration { } public final String component1() { - return this.f2018id; + return this.f2020id; } public final String component2() { @@ -110,7 +110,7 @@ public final class ModelConnectedAccountIntegration { return false; } ModelConnectedAccountIntegration modelConnectedAccountIntegration = (ModelConnectedAccountIntegration) obj; - return m.areEqual(this.f2018id, modelConnectedAccountIntegration.f2018id) && m.areEqual(this.type, modelConnectedAccountIntegration.type) && m.areEqual(this.account, modelConnectedAccountIntegration.account) && m.areEqual(this.guild, modelConnectedAccountIntegration.guild); + return m.areEqual(this.f2020id, modelConnectedAccountIntegration.f2020id) && m.areEqual(this.type, modelConnectedAccountIntegration.type) && m.areEqual(this.account, modelConnectedAccountIntegration.account) && m.areEqual(this.guild, modelConnectedAccountIntegration.guild); } public final ModelConnectedIntegrationAccount getAccount() { @@ -149,7 +149,7 @@ public final class ModelConnectedAccountIntegration { } public final String getId() { - return this.f2018id; + return this.f2020id; } public final String getType() { @@ -157,7 +157,7 @@ public final class ModelConnectedAccountIntegration { } public int hashCode() { - String str = this.f2018id; + String str = this.f2020id; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.type; @@ -173,7 +173,7 @@ public final class ModelConnectedAccountIntegration { public String toString() { StringBuilder L = c.d.b.a.a.L("ModelConnectedAccountIntegration(id="); - L.append(this.f2018id); + L.append(this.f2020id); L.append(", type="); L.append(this.type); L.append(", account="); diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java index b4a86ed1b8..8512c55b33 100644 --- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java +++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationAccount.java @@ -11,7 +11,7 @@ import kotlin.reflect.KProperty; public final class ModelConnectedIntegrationAccount { /* renamed from: id reason: collision with root package name */ - private final String f2019id; + private final String f2021id; private final String name; /* compiled from: ModelConnectedIntegrationAccount.kt */ @@ -39,13 +39,13 @@ public final class ModelConnectedIntegrationAccount { public ModelConnectedIntegrationAccount(String str, String str2) { m.checkNotNullParameter(str, "id"); m.checkNotNullParameter(str2, "name"); - this.f2019id = str; + this.f2021id = str; this.name = str2; } public static /* synthetic */ ModelConnectedIntegrationAccount copy$default(ModelConnectedIntegrationAccount modelConnectedIntegrationAccount, String str, String str2, int i, Object obj) { if ((i & 1) != 0) { - str = modelConnectedIntegrationAccount.f2019id; + str = modelConnectedIntegrationAccount.f2021id; } if ((i & 2) != 0) { str2 = modelConnectedIntegrationAccount.name; @@ -54,7 +54,7 @@ public final class ModelConnectedIntegrationAccount { } public final String component1() { - return this.f2019id; + return this.f2021id; } public final String component2() { @@ -75,11 +75,11 @@ public final class ModelConnectedIntegrationAccount { return false; } ModelConnectedIntegrationAccount modelConnectedIntegrationAccount = (ModelConnectedIntegrationAccount) obj; - return m.areEqual(this.f2019id, modelConnectedIntegrationAccount.f2019id) && m.areEqual(this.name, modelConnectedIntegrationAccount.name); + return m.areEqual(this.f2021id, modelConnectedIntegrationAccount.f2021id) && m.areEqual(this.name, modelConnectedIntegrationAccount.name); } public final String getId() { - return this.f2019id; + return this.f2021id; } public final String getName() { @@ -87,7 +87,7 @@ public final class ModelConnectedIntegrationAccount { } public int hashCode() { - String str = this.f2019id; + String str = this.f2021id; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.name; @@ -99,7 +99,7 @@ public final class ModelConnectedIntegrationAccount { public String toString() { StringBuilder L = c.d.b.a.a.L("ModelConnectedIntegrationAccount(id="); - L.append(this.f2019id); + L.append(this.f2021id); L.append(", name="); return c.d.b.a.a.D(L, this.name, ")"); } diff --git a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java index 0797e63497..a093a587e2 100644 --- a/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java +++ b/app/src/main/java/com/discord/models/domain/ModelConnectedIntegrationGuild.java @@ -14,7 +14,7 @@ public final class ModelConnectedIntegrationGuild { private final String icon; /* renamed from: id reason: collision with root package name */ - private final long f2020id; + private final long f2022id; private final String name; /* compiled from: ModelConnectedIntegrationGuild.kt */ @@ -40,7 +40,7 @@ public final class ModelConnectedIntegrationGuild { } public ModelConnectedIntegrationGuild(long j, String str, String str2) { - this.f2020id = j; + this.f2022id = j; this.icon = str; this.name = str2; } @@ -52,7 +52,7 @@ public final class ModelConnectedIntegrationGuild { public static /* synthetic */ ModelConnectedIntegrationGuild copy$default(ModelConnectedIntegrationGuild modelConnectedIntegrationGuild, long j, String str, String str2, int i, Object obj) { if ((i & 1) != 0) { - j = modelConnectedIntegrationGuild.f2020id; + j = modelConnectedIntegrationGuild.f2022id; } if ((i & 2) != 0) { str = modelConnectedIntegrationGuild.icon; @@ -64,7 +64,7 @@ public final class ModelConnectedIntegrationGuild { } public final long component1() { - return this.f2020id; + return this.f2022id; } public final String component2() { @@ -87,7 +87,7 @@ public final class ModelConnectedIntegrationGuild { return false; } ModelConnectedIntegrationGuild modelConnectedIntegrationGuild = (ModelConnectedIntegrationGuild) obj; - return this.f2020id == modelConnectedIntegrationGuild.f2020id && m.areEqual(this.icon, modelConnectedIntegrationGuild.icon) && m.areEqual(this.name, modelConnectedIntegrationGuild.name); + return this.f2022id == modelConnectedIntegrationGuild.f2022id && m.areEqual(this.icon, modelConnectedIntegrationGuild.icon) && m.areEqual(this.name, modelConnectedIntegrationGuild.name); } public final String getIcon() { @@ -95,7 +95,7 @@ public final class ModelConnectedIntegrationGuild { } public final long getId() { - return this.f2020id; + return this.f2022id; } public final String getName() { @@ -103,7 +103,7 @@ public final class ModelConnectedIntegrationGuild { } public int hashCode() { - long j = this.f2020id; + long j = this.f2022id; int i = ((int) (j ^ (j >>> 32))) * 31; String str = this.icon; int i2 = 0; @@ -117,7 +117,7 @@ public final class ModelConnectedIntegrationGuild { public String toString() { StringBuilder L = c.d.b.a.a.L("ModelConnectedIntegrationGuild(id="); - L.append(this.f2020id); + L.append(this.f2022id); L.append(", icon="); L.append(this.icon); L.append(", name="); diff --git a/app/src/main/java/com/discord/models/domain/ModelEntitlement.java b/app/src/main/java/com/discord/models/domain/ModelEntitlement.java index 5d9133bc42..9cf69167d3 100644 --- a/app/src/main/java/com/discord/models/domain/ModelEntitlement.java +++ b/app/src/main/java/com/discord/models/domain/ModelEntitlement.java @@ -9,7 +9,7 @@ public final class ModelEntitlement { private final Boolean consumed; /* renamed from: id reason: collision with root package name */ - private final long f2021id; + private final long f2023id; private final Long parentId; private final Long promotionId; private final ModelSku sku; @@ -20,7 +20,7 @@ public final class ModelEntitlement { public ModelEntitlement(long j, long j2, int i, long j3, long j4, ModelSku modelSku, SubscriptionPlan subscriptionPlan, Long l, Boolean bool, Long l2) { m.checkNotNullParameter(modelSku, "sku"); - this.f2021id = j; + this.f2023id = j; this.applicationId = j2; this.type = i; this.userId = j3; @@ -33,11 +33,11 @@ public final class ModelEntitlement { } public static /* synthetic */ ModelEntitlement copy$default(ModelEntitlement modelEntitlement, long j, long j2, int i, long j3, long j4, ModelSku modelSku, SubscriptionPlan subscriptionPlan, Long l, Boolean bool, Long l2, int i2, Object obj) { - return modelEntitlement.copy((i2 & 1) != 0 ? modelEntitlement.f2021id : j, (i2 & 2) != 0 ? modelEntitlement.applicationId : j2, (i2 & 4) != 0 ? modelEntitlement.type : i, (i2 & 8) != 0 ? modelEntitlement.userId : j3, (i2 & 16) != 0 ? modelEntitlement.skuId : j4, (i2 & 32) != 0 ? modelEntitlement.sku : modelSku, (i2 & 64) != 0 ? modelEntitlement.subscriptionPlan : subscriptionPlan, (i2 & 128) != 0 ? modelEntitlement.parentId : l, (i2 & 256) != 0 ? modelEntitlement.consumed : bool, (i2 & 512) != 0 ? modelEntitlement.promotionId : l2); + return modelEntitlement.copy((i2 & 1) != 0 ? modelEntitlement.f2023id : j, (i2 & 2) != 0 ? modelEntitlement.applicationId : j2, (i2 & 4) != 0 ? modelEntitlement.type : i, (i2 & 8) != 0 ? modelEntitlement.userId : j3, (i2 & 16) != 0 ? modelEntitlement.skuId : j4, (i2 & 32) != 0 ? modelEntitlement.sku : modelSku, (i2 & 64) != 0 ? modelEntitlement.subscriptionPlan : subscriptionPlan, (i2 & 128) != 0 ? modelEntitlement.parentId : l, (i2 & 256) != 0 ? modelEntitlement.consumed : bool, (i2 & 512) != 0 ? modelEntitlement.promotionId : l2); } public final long component1() { - return this.f2021id; + return this.f2023id; } public final Long component10() { @@ -89,7 +89,7 @@ public final class ModelEntitlement { return false; } ModelEntitlement modelEntitlement = (ModelEntitlement) obj; - return this.f2021id == modelEntitlement.f2021id && this.applicationId == modelEntitlement.applicationId && this.type == modelEntitlement.type && this.userId == modelEntitlement.userId && this.skuId == modelEntitlement.skuId && m.areEqual(this.sku, modelEntitlement.sku) && m.areEqual(this.subscriptionPlan, modelEntitlement.subscriptionPlan) && m.areEqual(this.parentId, modelEntitlement.parentId) && m.areEqual(this.consumed, modelEntitlement.consumed) && m.areEqual(this.promotionId, modelEntitlement.promotionId); + return this.f2023id == modelEntitlement.f2023id && this.applicationId == modelEntitlement.applicationId && this.type == modelEntitlement.type && this.userId == modelEntitlement.userId && this.skuId == modelEntitlement.skuId && m.areEqual(this.sku, modelEntitlement.sku) && m.areEqual(this.subscriptionPlan, modelEntitlement.subscriptionPlan) && m.areEqual(this.parentId, modelEntitlement.parentId) && m.areEqual(this.consumed, modelEntitlement.consumed) && m.areEqual(this.promotionId, modelEntitlement.promotionId); } public final long getApplicationId() { @@ -101,7 +101,7 @@ public final class ModelEntitlement { } public final long getId() { - return this.f2021id; + return this.f2023id; } public final Long getParentId() { @@ -133,7 +133,7 @@ public final class ModelEntitlement { } public int hashCode() { - long j = this.f2021id; + long j = this.f2023id; long j2 = this.applicationId; long j3 = this.userId; long j4 = this.skuId; @@ -156,7 +156,7 @@ public final class ModelEntitlement { public String toString() { StringBuilder L = a.L("ModelEntitlement(id="); - L.append(this.f2021id); + L.append(this.f2023id); L.append(", applicationId="); L.append(this.applicationId); L.append(", type="); diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java b/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java index a92d88aecf..f0de6e138f 100644 --- a/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java +++ b/app/src/main/java/com/discord/models/domain/ModelGuildFolder.java @@ -12,7 +12,7 @@ public final class ModelGuildFolder { private final List guildIds; /* renamed from: id reason: collision with root package name */ - private final Long f2022id; + private final Long f2024id; private final String name; /* compiled from: ModelGuildFolder.kt */ @@ -41,7 +41,7 @@ public final class ModelGuildFolder { public ModelGuildFolder(Long l, List list, Integer num, String str) { m.checkNotNullParameter(list, "guildIds"); - this.f2022id = l; + this.f2024id = l; this.guildIds = list; this.color = num; this.name = str; @@ -56,7 +56,7 @@ public final class ModelGuildFolder { /* JADX WARN: Multi-variable type inference failed */ public static /* synthetic */ ModelGuildFolder copy$default(ModelGuildFolder modelGuildFolder, Long l, List list, Integer num, String str, int i, Object obj) { if ((i & 1) != 0) { - l = modelGuildFolder.f2022id; + l = modelGuildFolder.f2024id; } if ((i & 2) != 0) { list = modelGuildFolder.guildIds; @@ -71,7 +71,7 @@ public final class ModelGuildFolder { } public final Long component1() { - return this.f2022id; + return this.f2024id; } public final List component2() { @@ -99,7 +99,7 @@ public final class ModelGuildFolder { return false; } ModelGuildFolder modelGuildFolder = (ModelGuildFolder) obj; - return m.areEqual(this.f2022id, modelGuildFolder.f2022id) && m.areEqual(this.guildIds, modelGuildFolder.guildIds) && m.areEqual(this.color, modelGuildFolder.color) && m.areEqual(this.name, modelGuildFolder.name); + return m.areEqual(this.f2024id, modelGuildFolder.f2024id) && m.areEqual(this.guildIds, modelGuildFolder.guildIds) && m.areEqual(this.color, modelGuildFolder.color) && m.areEqual(this.name, modelGuildFolder.name); } public final Integer getColor() { @@ -111,7 +111,7 @@ public final class ModelGuildFolder { } public final Long getId() { - return this.f2022id; + return this.f2024id; } public final String getName() { @@ -119,7 +119,7 @@ public final class ModelGuildFolder { } public int hashCode() { - Long l = this.f2022id; + Long l = this.f2024id; int i = 0; int hashCode = (l != null ? l.hashCode() : 0) * 31; List list = this.guildIds; @@ -135,7 +135,7 @@ public final class ModelGuildFolder { public String toString() { StringBuilder L = a.L("ModelGuildFolder(id="); - L.append(this.f2022id); + L.append(this.f2024id); L.append(", guildIds="); L.append(this.guildIds); L.append(", color="); diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java index 25131c3051..a1520278a1 100644 --- a/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java +++ b/app/src/main/java/com/discord/models/domain/ModelGuildIntegration.java @@ -17,7 +17,7 @@ public class ModelGuildIntegration implements Model { private int expireGracePeriod; /* renamed from: id reason: collision with root package name */ - private long f2023id; + private long f2025id; private String name; private long roleId; private int subscriberCount; @@ -29,7 +29,7 @@ public class ModelGuildIntegration implements Model { public static class IntegrationAccount implements Model { /* renamed from: id reason: collision with root package name */ - private String f2024id; + private String f2026id; private String name; @Override // com.discord.models.domain.Model @@ -37,7 +37,7 @@ public class ModelGuildIntegration implements Model { String nextName = jsonReader.nextName(); nextName.hashCode(); if (nextName.equals("id")) { - this.f2024id = jsonReader.nextString(this.f2024id); + this.f2026id = jsonReader.nextString(this.f2026id); } else if (!nextName.equals("name")) { jsonReader.skipValue(); } else { @@ -71,7 +71,7 @@ public class ModelGuildIntegration implements Model { } public String getId() { - return this.f2024id; + return this.f2026id; } public String getName() { @@ -248,7 +248,7 @@ public class ModelGuildIntegration implements Model { this.expireBehavior = jsonReader.nextInt(this.expireBehavior); return; case 5: - this.f2023id = jsonReader.nextLong(this.f2023id); + this.f2025id = jsonReader.nextLong(this.f2025id); return; case 6: this.name = jsonReader.nextString(this.name); @@ -339,7 +339,7 @@ public class ModelGuildIntegration implements Model { } public long getId() { - return this.f2023id; + return this.f2025id; } public String getName() { diff --git a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java index c5007bf81a..2002d7f1c6 100644 --- a/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java +++ b/app/src/main/java/com/discord/models/domain/ModelGuildMemberListUpdate.java @@ -17,7 +17,7 @@ public final class ModelGuildMemberListUpdate { private final long guildId; /* renamed from: id reason: collision with root package name */ - private final String f2025id; + private final String f2027id; private final List operations; /* compiled from: ModelGuildMemberListUpdate.kt */ @@ -35,7 +35,7 @@ public final class ModelGuildMemberListUpdate { private final int count; /* renamed from: id reason: collision with root package name */ - private final String f2026id; + private final String f2028id; private final Type type; /* compiled from: ModelGuildMemberListUpdate.kt */ @@ -67,7 +67,7 @@ public final class ModelGuildMemberListUpdate { public Group(String str, int i) { Type type; m.checkNotNullParameter(str, "id"); - this.f2026id = str; + this.f2028id = str; this.count = i; int hashCode = str.hashCode(); if (hashCode != -1548612125) { @@ -85,7 +85,7 @@ public final class ModelGuildMemberListUpdate { public static /* synthetic */ Group copy$default(Group group, String str, int i, int i2, Object obj) { if ((i2 & 1) != 0) { - str = group.f2026id; + str = group.f2028id; } if ((i2 & 2) != 0) { i = group.count; @@ -94,7 +94,7 @@ public final class ModelGuildMemberListUpdate { } public final String component1() { - return this.f2026id; + return this.f2028id; } public final int component2() { @@ -114,7 +114,7 @@ public final class ModelGuildMemberListUpdate { return false; } Group group = (Group) obj; - return m.areEqual(this.f2026id, group.f2026id) && this.count == group.count; + return m.areEqual(this.f2028id, group.f2028id) && this.count == group.count; } public final int getCount() { @@ -122,7 +122,7 @@ public final class ModelGuildMemberListUpdate { } public final String getId() { - return this.f2026id; + return this.f2028id; } public final Type getType() { @@ -130,13 +130,13 @@ public final class ModelGuildMemberListUpdate { } public int hashCode() { - String str = this.f2026id; + String str = this.f2028id; return ((str != null ? str.hashCode() : 0) * 31) + this.count; } public String toString() { StringBuilder L = a.L("Group(id="); - L.append(this.f2026id); + L.append(this.f2028id); L.append(", count="); return a.z(L, this.count, ")"); } @@ -756,7 +756,7 @@ public final class ModelGuildMemberListUpdate { m.checkNotNullParameter(list, "operations"); m.checkNotNullParameter(list2, "groups"); this.guildId = j; - this.f2025id = str; + this.f2027id = str; this.operations = list; this.groups = list2; } @@ -768,7 +768,7 @@ public final class ModelGuildMemberListUpdate { j = modelGuildMemberListUpdate.guildId; } if ((i & 2) != 0) { - str = modelGuildMemberListUpdate.f2025id; + str = modelGuildMemberListUpdate.f2027id; } if ((i & 4) != 0) { list = modelGuildMemberListUpdate.operations; @@ -784,7 +784,7 @@ public final class ModelGuildMemberListUpdate { } public final String component2() { - return this.f2025id; + return this.f2027id; } public final List component3() { @@ -810,7 +810,7 @@ public final class ModelGuildMemberListUpdate { return false; } ModelGuildMemberListUpdate modelGuildMemberListUpdate = (ModelGuildMemberListUpdate) obj; - return this.guildId == modelGuildMemberListUpdate.guildId && m.areEqual(this.f2025id, modelGuildMemberListUpdate.f2025id) && m.areEqual(this.operations, modelGuildMemberListUpdate.operations) && m.areEqual(this.groups, modelGuildMemberListUpdate.groups); + return this.guildId == modelGuildMemberListUpdate.guildId && m.areEqual(this.f2027id, modelGuildMemberListUpdate.f2027id) && m.areEqual(this.operations, modelGuildMemberListUpdate.operations) && m.areEqual(this.groups, modelGuildMemberListUpdate.groups); } public final List getGroups() { @@ -822,7 +822,7 @@ public final class ModelGuildMemberListUpdate { } public final String getId() { - return this.f2025id; + return this.f2027id; } public final List getOperations() { @@ -832,7 +832,7 @@ public final class ModelGuildMemberListUpdate { public int hashCode() { long j = this.guildId; int i = ((int) (j ^ (j >>> 32))) * 31; - String str = this.f2025id; + String str = this.f2027id; int i2 = 0; int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31; List list = this.operations; @@ -848,7 +848,7 @@ public final class ModelGuildMemberListUpdate { StringBuilder L = a.L("ModelGuildMemberListUpdate(guildId="); L.append(this.guildId); L.append(", id="); - L.append(this.f2025id); + L.append(this.f2027id); L.append(", operations="); L.append(this.operations); L.append(", groups="); diff --git a/app/src/main/java/com/discord/models/domain/ModelMessage.java b/app/src/main/java/com/discord/models/domain/ModelMessage.java deleted file mode 100644 index ddc7c4985d..0000000000 --- a/app/src/main/java/com/discord/models/domain/ModelMessage.java +++ /dev/null @@ -1,1179 +0,0 @@ -package com.discord.models.domain; - -import c.a.n.a.a; -import c.a.n.a.k; -import c.a.n.a.l; -import c.a.n.a.m; -import c.a.n.a.n; -import c.a.n.a.o; -import c.a.n.a.p; -import c.a.n.a.q; -import c.a.n.a.r0; -import c.a.n.a.s0; -import com.discord.api.application.Application; -import com.discord.api.botuikit.Component; -import com.discord.api.channel.Channel; -import com.discord.api.guildmember.GuildMember; -import com.discord.api.interaction.Interaction; -import com.discord.api.message.MessageReference; -import com.discord.api.message.activity.MessageActivity; -import com.discord.api.message.activity.MessageActivityType; -import com.discord.api.message.attachment.MessageAttachment; -import com.discord.api.message.call.MessageCall; -import com.discord.api.message.embed.MessageEmbed; -import com.discord.api.message.reaction.MessageReaction; -import com.discord.api.sticker.Sticker; -import com.discord.api.sticker.StickerPartial; -import com.discord.api.user.User; -import com.discord.api.utcdatetime.UtcDateTime; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; -import com.discord.models.domain.Model; -import com.discord.models.messages.LocalAttachment; -import com.discord.utilities.time.Clock; -import com.discord.utilities.time.TimeUtils; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -public class ModelMessage implements Model { - private static final List EMPTY_ATTACHMENTS = new ArrayList(); - private static final List EMPTY_EMBEDS = new ArrayList(); - private static final List EMPTY_MENTIONS = new ArrayList(); - private static final Map EMPTY_REACTIONS = new HashMap(); - private static final User EMPTY_USER; - public static final int TYPE_LOCAL = -1; - public static final int TYPE_LOCAL_APPLICATION_COMMAND = -5; - public static final int TYPE_LOCAL_APPLICATION_COMMAND_SEND_FAILED = -4; - public static final int TYPE_LOCAL_INVALID_ATTACHMENTS = -3; - public static final int TYPE_LOCAL_SEND_FAILED = -2; - private static final Comparator sortByIds = s0.i; - private MessageActivity activity; - private ModelAllowedMentions allowedMentions; - private Application application; - private Long applicationId; - private List attachments; - private User author; - private MessageCall call; - private long channelId; - private List components; - private String content; - private String editedTimestamp; - private transient Long editedTimestampMilliseconds; - private List embeds; - private Long flags; - private transient Long guildId; - private transient boolean hasLocalUploads; - private transient boolean hit; - - /* renamed from: id reason: collision with root package name */ - private long f2027id; - private Long initialAttemptTimestamp; - private Interaction interaction; - private Long lastManualAttemptTimestamp; - public List localAttachments; - private transient GuildMember member; - private boolean mentionEveryone; - private List mentionRoles; - private List mentions; - private MessageReference messageReference; - private String nonce; - private Integer numRetries; - private Boolean pinned; - private LinkedHashMap reactions; - private ModelMessage referencedMessage; - private transient boolean stale; - private List stickerItems; - private List stickers; - private Channel thread; - private String timestamp; - private transient Long timestampMilliseconds; - private boolean tts; - private int type; - private Long webhookId; - - static { - Boolean bool = Boolean.FALSE; - EMPTY_USER = new User(0, "", null, null, "0000", 0, null, null, bool, null, null, bool, null, null, null, null, null, null, null, null, null, null); - } - - public ModelMessage() { - this.author = EMPTY_USER; - } - - public ModelMessage(long j, String str, long j2, int i, String str2, User user, List list, String str3, String str4, List list2, List list3, boolean z2, MessageCall messageCall, boolean z3, LinkedHashMap linkedHashMap, Boolean bool, Long l, Application application, MessageActivity messageActivity, boolean z4, List list4, boolean z5, Long l2, MessageReference messageReference, Interaction interaction, ModelAllowedMentions modelAllowedMentions, List list5, Long l3, Long l4, Integer num, List list6, List list7) { - this.author = EMPTY_USER; - Objects.requireNonNull(user, "author is marked non-null but is null"); - this.f2027id = j; - this.nonce = str; - this.channelId = j2; - this.type = i; - this.content = str2; - this.author = user; - this.mentions = list; - this.timestamp = str3; - this.editedTimestamp = str4; - this.attachments = list2; - this.embeds = list3; - this.tts = z2; - this.call = messageCall; - this.mentionEveryone = z3; - this.reactions = linkedHashMap; - this.pinned = bool; - this.webhookId = l; - this.application = application; - this.activity = messageActivity; - this.hit = z4; - this.mentionRoles = list4; - this.hasLocalUploads = z5; - this.flags = l2; - this.messageReference = messageReference; - this.interaction = interaction; - this.allowedMentions = modelAllowedMentions; - this.stickers = list6; - this.localAttachments = list5; - this.lastManualAttemptTimestamp = l3; - this.initialAttemptTimestamp = l4; - this.numRetries = num; - this.components = list7; - } - - public ModelMessage(ModelMessage modelMessage) { - this(modelMessage.f2027id, modelMessage.nonce, modelMessage.channelId, modelMessage.type, modelMessage.content, modelMessage.author, modelMessage.mentions, modelMessage.timestamp, modelMessage.editedTimestamp, modelMessage.attachments, modelMessage.embeds, modelMessage.tts, modelMessage.call, modelMessage.mentionEveryone, modelMessage.reactions, modelMessage.pinned, modelMessage.webhookId, modelMessage.application, modelMessage.activity, modelMessage.hit, modelMessage.mentionRoles, modelMessage.hasLocalUploads, modelMessage.flags, modelMessage.messageReference, modelMessage.interaction, modelMessage.allowedMentions, modelMessage.localAttachments, modelMessage.lastManualAttemptTimestamp, modelMessage.initialAttemptTimestamp, modelMessage.numRetries, modelMessage.stickers, modelMessage.components); - } - - /* JADX WARNING: Illegal instructions before constructor call */ - public ModelMessage(ModelMessage modelMessage, ModelMessage modelMessage2) { - this(r2, r2, r2, r2, r2, r2, r2, r2, r2, r2, r2, r20, r2, r22, r2, r2, r2, r2, r2, r28, r2, r30, r2, r2, r2, r2, r2, r2, r2, r2, r2, r1 == null ? modelMessage.components : r1); - long j = modelMessage2.f2027id; - j = j == 0 ? modelMessage.f2027id : j; - String str = modelMessage2.nonce; - str = str == null ? modelMessage.nonce : str; - long j2 = modelMessage2.channelId; - j2 = j2 == 0 ? modelMessage.channelId : j2; - int i = modelMessage2.type; - i = i == 0 ? modelMessage.type : i; - String str2 = modelMessage2.content; - str2 = str2 == null ? modelMessage.content : str2; - User user = modelMessage2.author; - user = user == EMPTY_USER ? modelMessage.author : user; - List list = modelMessage2.mentions; - list = list == null ? modelMessage.mentions : list; - String str3 = modelMessage2.timestamp; - str3 = str3 == null ? modelMessage.timestamp : str3; - String str4 = modelMessage2.editedTimestamp; - str4 = str4 == null ? modelMessage.editedTimestamp : str4; - List list2 = modelMessage2.attachments; - list2 = list2 == null ? modelMessage.attachments : list2; - List list3 = modelMessage2.embeds; - list3 = list3 == null ? modelMessage.embeds : list3; - boolean z2 = modelMessage2.tts || modelMessage.tts; - MessageCall messageCall = modelMessage2.call; - messageCall = messageCall == null ? modelMessage.call : messageCall; - boolean z3 = modelMessage2.mentionEveryone || modelMessage.mentionEveryone; - LinkedHashMap linkedHashMap = modelMessage2.reactions; - linkedHashMap = linkedHashMap == null ? modelMessage.reactions : linkedHashMap; - Boolean bool = modelMessage2.pinned; - bool = bool == null ? modelMessage.pinned : bool; - Long l = modelMessage2.webhookId; - l = l == null ? modelMessage.webhookId : l; - Application application = modelMessage2.application; - application = application == null ? modelMessage.application : application; - MessageActivity messageActivity = modelMessage2.activity; - messageActivity = messageActivity == null ? modelMessage.activity : messageActivity; - boolean z4 = modelMessage2.hit || modelMessage.hit; - List list4 = modelMessage2.mentionRoles; - list4 = list4 == null ? modelMessage.mentionRoles : list4; - boolean z5 = modelMessage2.hasLocalUploads || modelMessage.hasLocalUploads; - Long l2 = modelMessage2.flags; - l2 = l2 == null ? modelMessage.flags : l2; - MessageReference messageReference = modelMessage2.messageReference; - messageReference = messageReference == null ? modelMessage.messageReference : messageReference; - Interaction interaction = modelMessage2.interaction; - interaction = interaction == null ? modelMessage.interaction : interaction; - ModelAllowedMentions modelAllowedMentions = modelMessage2.allowedMentions; - modelAllowedMentions = modelAllowedMentions == null ? modelMessage.allowedMentions : modelAllowedMentions; - List list5 = modelMessage2.localAttachments; - list5 = list5 == null ? modelMessage.localAttachments : list5; - Long l3 = modelMessage2.lastManualAttemptTimestamp; - l3 = l3 == null ? modelMessage.lastManualAttemptTimestamp : l3; - Long l4 = modelMessage2.initialAttemptTimestamp; - l4 = l4 == null ? modelMessage.initialAttemptTimestamp : l4; - Integer num = modelMessage2.numRetries; - num = num == null ? modelMessage.numRetries : num; - List list6 = modelMessage2.stickers; - list6 = list6 == null ? modelMessage.stickers : list6; - List list7 = modelMessage2.components; - Objects.requireNonNull(modelMessage, "other is marked non-null but is null"); - } - - public static int compare(Long l, Long l2) { - if (l == null) { - l = 0L; - } - if (l2 == null) { - l2 = 0L; - } - if (l.longValue() == l2.longValue()) { - return 0; - } - return l.longValue() < l2.longValue() ? -1 : 1; - } - - public static ModelMessage createInvalidAttachmentsMessage(long j, User user, Clock clock, List list) { - Objects.requireNonNull(user, "author is marked non-null but is null"); - long computeNonce = NonceGenerator.computeNonce(clock); - return new ModelMessage(computeNonce, String.valueOf(computeNonce), j, -3, null, user, null, TimeUtils.currentTimeUTCDateString(clock), null, null, null, false, null, false, null, null, null, null, null, false, null, true, null, null, null, null, list, null, null, null, null, null); - } - - public static ModelMessage createLocalApplicationCommandMessage(long j, String str, long j2, User user, User user2, boolean z2, boolean z3, Long l, Clock clock) { - Objects.requireNonNull(user, "interactionAuthor is marked non-null but is null"); - Objects.requireNonNull(user2, "application is marked non-null but is null"); - return new ModelMessage(j, String.valueOf(j), j2, z2 ? -4 : -5, "", user2, null, TimeUtils.currentTimeUTCDateString(clock), null, null, null, false, null, false, null, null, null, null, null, false, null, false, z3 ? 128L : null, null, new Interaction(l, 2, str, user, null), null, null, null, null, null, null, null); - } - - public static ModelMessage createLocalApplicationCommandMessage(ModelMessage modelMessage, Long l, boolean z2, boolean z3, Clock clock) { - Interaction interaction = modelMessage.interaction; - User user = null; - String b = interaction == null ? null : interaction.b(); - Interaction interaction2 = modelMessage.interaction; - if (interaction2 != null) { - user = interaction2.c(); - } - return createLocalApplicationCommandMessage(modelMessage.f2027id, b, modelMessage.channelId, user, modelMessage.author, z2, z3, l, clock); - } - - public static ModelMessage createLocalMessage(String str, long j, User user, List list, boolean z2, boolean z3, Application application, MessageActivity messageActivity, Clock clock, List list2, Long l, Long l2, Integer num, List list3, MessageReference messageReference, ModelAllowedMentions modelAllowedMentions) { - Objects.requireNonNull(user, "author is marked non-null but is null"); - long computeNonce = NonceGenerator.computeNonce(clock); - return new ModelMessage(computeNonce, String.valueOf(computeNonce), j, z2 ? -2 : -1, str, user, list, TimeUtils.currentTimeUTCDateString(clock), null, null, null, false, null, false, null, null, null, application, messageActivity, false, null, z3, null, messageReference, null, modelAllowedMentions, list2, l, l2, num, list3, null); - } - - public static ModelMessage createThreadStarterMessageNotFoundMessage(long j, User user, Clock clock) { - Objects.requireNonNull(user, "author is marked non-null but is null"); - long computeNonce = NonceGenerator.computeNonce(clock); - return new ModelMessage(computeNonce, String.valueOf(computeNonce), j, 23, null, user, null, TimeUtils.currentTimeUTCDateString(clock), null, null, null, false, null, false, null, null, null, null, null, false, null, true, null, null, null, null, null, null, null, null, null, null); - } - - public static ModelMessage createWithReactions(ModelMessage modelMessage, LinkedHashMap linkedHashMap) { - ModelMessage modelMessage2 = new ModelMessage(modelMessage); - modelMessage2.reactions = linkedHashMap; - return modelMessage2; - } - - public static Comparator getSortByIds() { - return sortByIds; - } - - public static boolean isNewer(Long l, Long l2) { - return compare(l, l2) < 0; - } - - private boolean isOn(long j) { - return ((getFlags() != null ? getFlags().longValue() : 0) & j) == j; - } - - @Override // com.discord.models.domain.Model - public void assignField(Model.JsonReader jsonReader) throws IOException { - String nextName = jsonReader.nextName(); - nextName.hashCode(); - char c2 = 65535; - switch (nextName.hashCode()) { - case -2136704984: - if (nextName.equals("mention_roles")) { - c2 = 0; - break; - } - break; - case -1930808873: - if (nextName.equals("channel_id")) { - c2 = 1; - break; - } - break; - case -1655966961: - if (nextName.equals("activity")) { - c2 = 2; - break; - } - break; - case -1406328437: - if (nextName.equals("author")) { - c2 = 3; - break; - } - break; - case -1399921536: - if (nextName.equals("edited_timestamp")) { - c2 = 4; - break; - } - break; - case -1306538777: - if (nextName.equals("guild_id")) { - c2 = 5; - break; - } - break; - case -1299739462: - if (nextName.equals("embeds")) { - c2 = 6; - break; - } - break; - case -1287148950: - if (nextName.equals("application_id")) { - c2 = 7; - break; - } - break; - case -1122997398: - if (nextName.equals("reactions")) { - c2 = '\b'; - break; - } - break; - case -1077769574: - if (nextName.equals("member")) { - c2 = '\t'; - break; - } - break; - case -988146728: - if (nextName.equals("pinned")) { - c2 = '\n'; - break; - } - break; - case -874443254: - if (nextName.equals("thread")) { - c2 = 11; - break; - } - break; - case -779608813: - if (nextName.equals("message_reference")) { - c2 = '\f'; - break; - } - break; - case -738997328: - if (nextName.equals("attachments")) { - c2 = '\r'; - break; - } - break; - case -604069943: - if (nextName.equals("mentions")) { - c2 = 14; - break; - } - break; - case -447446250: - if (nextName.equals("components")) { - c2 = 15; - break; - } - break; - case 3355: - if (nextName.equals("id")) { - c2 = 16; - break; - } - break; - case 103315: - if (nextName.equals("hit")) { - c2 = 17; - break; - } - break; - case 115187: - if (nextName.equals("tts")) { - c2 = 18; - break; - } - break; - case 3045982: - if (nextName.equals("call")) { - c2 = 19; - break; - } - break; - case 3575610: - if (nextName.equals("type")) { - c2 = 20; - break; - } - break; - case 55126294: - if (nextName.equals("timestamp")) { - c2 = 21; - break; - } - break; - case 97513095: - if (nextName.equals("flags")) { - c2 = 22; - break; - } - break; - case 105002991: - if (nextName.equals("nonce")) { - c2 = 23; - break; - } - break; - case 311874531: - if (nextName.equals("webhook_id")) { - c2 = 24; - break; - } - break; - case 951530617: - if (nextName.equals("content")) { - c2 = 25; - break; - } - break; - case 1377159233: - if (nextName.equals("referenced_message")) { - c2 = 26; - break; - } - break; - case 1531715286: - if (nextName.equals("stickers")) { - c2 = 27; - break; - } - break; - case 1554253136: - if (nextName.equals("application")) { - c2 = 28; - break; - } - break; - case 1679866912: - if (nextName.equals("mention_everyone")) { - c2 = 29; - break; - } - break; - case 1844104722: - if (nextName.equals("interaction")) { - c2 = 30; - break; - } - break; - } - switch (c2) { - case 0: - this.mentionRoles = jsonReader.nextList(new a(jsonReader)); - return; - case 1: - this.channelId = jsonReader.nextLong(this.channelId); - return; - case 2: - this.activity = (MessageActivity) InboundGatewayGsonParser.fromJson(jsonReader, MessageActivity.class); - return; - case 3: - this.author = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class); - return; - case 4: - this.editedTimestamp = jsonReader.nextString(null); - return; - case 5: - this.guildId = jsonReader.nextLongOrNull(); - return; - case 6: - this.embeds = jsonReader.nextList(new q(jsonReader)); - return; - case 7: - this.applicationId = jsonReader.nextLongOrNull(); - return; - case '\b': - this.reactions = (LinkedHashMap) jsonReader.nextListAsMap(new m(jsonReader), o.a, r0.i); - return; - case '\t': - this.member = (GuildMember) InboundGatewayGsonParser.fromJson(jsonReader, GuildMember.class); - return; - case '\n': - this.pinned = jsonReader.nextBooleanOrNull(); - return; - case 11: - this.thread = (Channel) InboundGatewayGsonParser.fromJson(jsonReader, Channel.class); - return; - case '\f': - this.messageReference = (MessageReference) InboundGatewayGsonParser.fromJson(jsonReader, MessageReference.class); - return; - case '\r': - this.attachments = jsonReader.nextList(new n(jsonReader)); - return; - case 14: - this.mentions = jsonReader.nextList(new p(jsonReader)); - return; - case 15: - this.components = jsonReader.nextList(new k(jsonReader)); - return; - case 16: - this.f2027id = jsonReader.nextLong(this.f2027id); - return; - case 17: - this.hit = jsonReader.nextBoolean(this.hit); - return; - case 18: - this.tts = jsonReader.nextBoolean(false); - return; - case 19: - this.call = (MessageCall) InboundGatewayGsonParser.fromJson(jsonReader, MessageCall.class); - return; - case 20: - this.type = jsonReader.nextInt(this.type); - return; - case 21: - this.timestamp = jsonReader.nextString(null); - return; - case 22: - this.flags = jsonReader.nextLongOrNull(); - return; - case 23: - this.nonce = jsonReader.nextString(this.nonce); - return; - case 24: - this.webhookId = jsonReader.nextLongOrNull(); - return; - case 25: - this.content = jsonReader.nextString(this.content); - return; - case 26: - this.referencedMessage = (ModelMessage) jsonReader.parse(new ModelMessage()); - return; - case 27: - this.stickers = jsonReader.nextList(new l(jsonReader)); - return; - case 28: - this.application = (Application) InboundGatewayGsonParser.fromJson(jsonReader, Application.class); - return; - case 29: - this.mentionEveryone = jsonReader.nextBoolean(this.mentionEveryone); - return; - case 30: - this.interaction = (Interaction) InboundGatewayGsonParser.fromJson(jsonReader, Interaction.class); - return; - default: - jsonReader.skipValue(); - return; - } - } - - public boolean canEqual(Object obj) { - return obj instanceof ModelMessage; - } - - public boolean canResend() { - return this.type == -2; - } - - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof ModelMessage)) { - return false; - } - ModelMessage modelMessage = (ModelMessage) obj; - if (!modelMessage.canEqual(this) || getId() != modelMessage.getId() || getChannelId() != modelMessage.getChannelId() || getType() != modelMessage.getType() || isTts() != modelMessage.isTts() || isMentionEveryone() != modelMessage.isMentionEveryone()) { - return false; - } - Boolean pinned = getPinned(); - Boolean pinned2 = modelMessage.getPinned(); - if (pinned != null ? !pinned.equals(pinned2) : pinned2 != null) { - return false; - } - Long applicationId = getApplicationId(); - Long applicationId2 = modelMessage.getApplicationId(); - if (applicationId != null ? !applicationId.equals(applicationId2) : applicationId2 != null) { - return false; - } - Long webhookId = getWebhookId(); - Long webhookId2 = modelMessage.getWebhookId(); - if (webhookId != null ? !webhookId.equals(webhookId2) : webhookId2 != null) { - return false; - } - Long flags = getFlags(); - Long flags2 = modelMessage.getFlags(); - if (flags != null ? !flags.equals(flags2) : flags2 != null) { - return false; - } - Long lastManualAttemptTimestamp = getLastManualAttemptTimestamp(); - Long lastManualAttemptTimestamp2 = modelMessage.getLastManualAttemptTimestamp(); - if (lastManualAttemptTimestamp != null ? !lastManualAttemptTimestamp.equals(lastManualAttemptTimestamp2) : lastManualAttemptTimestamp2 != null) { - return false; - } - Long initialAttemptTimestamp = getInitialAttemptTimestamp(); - Long initialAttemptTimestamp2 = modelMessage.getInitialAttemptTimestamp(); - if (initialAttemptTimestamp != null ? !initialAttemptTimestamp.equals(initialAttemptTimestamp2) : initialAttemptTimestamp2 != null) { - return false; - } - Integer numRetries = getNumRetries(); - Integer numRetries2 = modelMessage.getNumRetries(); - if (numRetries != null ? !numRetries.equals(numRetries2) : numRetries2 != null) { - return false; - } - String nonce = getNonce(); - String nonce2 = modelMessage.getNonce(); - if (nonce != null ? !nonce.equals(nonce2) : nonce2 != null) { - return false; - } - String content = getContent(); - String content2 = modelMessage.getContent(); - if (content != null ? !content.equals(content2) : content2 != null) { - return false; - } - User author = getAuthor(); - User author2 = modelMessage.getAuthor(); - if (author != null ? !author.equals(author2) : author2 != null) { - return false; - } - List mentions = getMentions(); - List mentions2 = modelMessage.getMentions(); - if (mentions != null ? !mentions.equals(mentions2) : mentions2 != null) { - return false; - } - List mentionRoles = getMentionRoles(); - List mentionRoles2 = modelMessage.getMentionRoles(); - if (mentionRoles != null ? !mentionRoles.equals(mentionRoles2) : mentionRoles2 != null) { - return false; - } - if (getTimestamp() != modelMessage.getTimestamp() || getEditedTimestamp() != modelMessage.getEditedTimestamp()) { - return false; - } - List attachments = getAttachments(); - List attachments2 = modelMessage.getAttachments(); - if (attachments != null ? !attachments.equals(attachments2) : attachments2 != null) { - return false; - } - List embeds = getEmbeds(); - List embeds2 = modelMessage.getEmbeds(); - if (embeds != null ? !embeds.equals(embeds2) : embeds2 != null) { - return false; - } - MessageCall call = getCall(); - MessageCall call2 = modelMessage.getCall(); - if (call != null ? !call.equals(call2) : call2 != null) { - return false; - } - Map reactions = getReactions(); - Map reactions2 = modelMessage.getReactions(); - if (reactions != null ? !reactions.equals(reactions2) : reactions2 != null) { - return false; - } - Application application = getApplication(); - Application application2 = modelMessage.getApplication(); - if (application != null ? !application.equals(application2) : application2 != null) { - return false; - } - MessageActivity activity = getActivity(); - MessageActivity activity2 = modelMessage.getActivity(); - if (activity != null ? !activity.equals(activity2) : activity2 != null) { - return false; - } - MessageReference messageReference = getMessageReference(); - MessageReference messageReference2 = modelMessage.getMessageReference(); - if (messageReference != null ? !messageReference.equals(messageReference2) : messageReference2 != null) { - return false; - } - ModelMessage referencedMessage = getReferencedMessage(); - ModelMessage referencedMessage2 = modelMessage.getReferencedMessage(); - if (referencedMessage != null ? !referencedMessage.equals(referencedMessage2) : referencedMessage2 != null) { - return false; - } - Interaction interaction = getInteraction(); - Interaction interaction2 = modelMessage.getInteraction(); - if (interaction != null ? !interaction.equals(interaction2) : interaction2 != null) { - return false; - } - List stickers = getStickers(); - List stickers2 = modelMessage.getStickers(); - if (stickers != null ? !stickers.equals(stickers2) : stickers2 != null) { - return false; - } - List stickerItems = getStickerItems(); - List stickerItems2 = modelMessage.getStickerItems(); - if (stickerItems != null ? !stickerItems.equals(stickerItems2) : stickerItems2 != null) { - return false; - } - ModelAllowedMentions allowedMentions = getAllowedMentions(); - ModelAllowedMentions allowedMentions2 = modelMessage.getAllowedMentions(); - if (allowedMentions != null ? !allowedMentions.equals(allowedMentions2) : allowedMentions2 != null) { - return false; - } - Channel thread = getThread(); - Channel thread2 = modelMessage.getThread(); - if (thread != null ? !thread.equals(thread2) : thread2 != null) { - return false; - } - List components = getComponents(); - List components2 = modelMessage.getComponents(); - if (components != null ? !components.equals(components2) : components2 != null) { - return false; - } - List localAttachments = getLocalAttachments(); - List localAttachments2 = modelMessage.getLocalAttachments(); - return localAttachments != null ? localAttachments.equals(localAttachments2) : localAttachments2 == null; - } - - public MessageActivity getActivity() { - return this.activity; - } - - public ModelAllowedMentions getAllowedMentions() { - return this.allowedMentions; - } - - public Application getApplication() { - return this.application; - } - - public Long getApplicationId() { - return this.applicationId; - } - - public List getAttachments() { - List list = this.attachments; - return list != null ? list : EMPTY_ATTACHMENTS; - } - - public User getAuthor() { - return this.author; - } - - public MessageCall getCall() { - return this.call; - } - - public long getCallDuration() { - UtcDateTime a; - MessageCall messageCall = this.call; - if (messageCall == null || (a = messageCall.a()) == null) { - return 0; - } - return a.f() - getTimestamp(); - } - - public long getChannelId() { - return this.channelId; - } - - public List getComponents() { - return this.components; - } - - public String getContent() { - return this.content; - } - - public long getEditedTimestamp() { - if (this.editedTimestampMilliseconds == null) { - this.editedTimestampMilliseconds = Long.valueOf(TimeUtils.parseUTCDate(this.editedTimestamp)); - } - return this.editedTimestampMilliseconds.longValue(); - } - - public Long getEditedTimestampMilliseconds() { - return this.editedTimestampMilliseconds; - } - - public String getEditedTimestampString() { - return this.editedTimestamp; - } - - public List getEmbeds() { - List list = this.embeds; - return list != null ? list : EMPTY_EMBEDS; - } - - public Long getFlags() { - return this.flags; - } - - public Long getGuildId() { - return this.guildId; - } - - public long getId() { - return this.f2027id; - } - - public Long getInitialAttemptTimestamp() { - return this.initialAttemptTimestamp; - } - - public Interaction getInteraction() { - return this.interaction; - } - - public Long getLastManualAttemptTimestamp() { - return this.lastManualAttemptTimestamp; - } - - public List getLocalAttachments() { - return this.localAttachments; - } - - public GuildMember getMember() { - return this.member; - } - - public List getMentionRoles() { - return this.mentionRoles; - } - - public List getMentions() { - List list = this.mentions; - return list != null ? list : EMPTY_MENTIONS; - } - - public MessageReference getMessageReference() { - return this.messageReference; - } - - public String getNonce() { - return this.nonce; - } - - public Integer getNumRetries() { - return this.numRetries; - } - - public Boolean getPinned() { - return this.pinned; - } - - public Map getReactions() { - LinkedHashMap linkedHashMap = this.reactions; - return linkedHashMap != null ? linkedHashMap : EMPTY_REACTIONS; - } - - public ModelMessage getReferencedMessage() { - return this.referencedMessage; - } - - public List getStickerItems() { - return this.stickerItems; - } - - public List getStickers() { - return this.stickers; - } - - public Channel getThread() { - return this.thread; - } - - public long getTimestamp() { - if (this.timestampMilliseconds == null) { - this.timestampMilliseconds = Long.valueOf(TimeUtils.parseUTCDate(this.timestamp)); - } - return this.timestampMilliseconds.longValue(); - } - - public Long getTimestampMilliseconds() { - return this.timestampMilliseconds; - } - - public String getTimestampString() { - return this.timestamp; - } - - public int getType() { - return this.type; - } - - public Long getWebhookId() { - return this.webhookId; - } - - public boolean hasAttachments() { - List list = this.attachments; - return list != null && list.size() > 0; - } - - public boolean hasEmbeds() { - List list = this.embeds; - return list != null && list.size() > 0; - } - - public boolean hasMentions() { - List list = this.mentions; - return list != null && list.size() > 0; - } - - public boolean hasStickers() { - List list = this.stickers; - return list != null && list.size() > 0; - } - - public boolean hasThread() { - return isOn(32); - } - - public int hashCode() { - long id2 = getId(); - long channelId = getChannelId(); - int i = 79; - int type = (((getType() + ((((((int) (id2 ^ (id2 >>> 32))) + 59) * 59) + ((int) (channelId ^ (channelId >>> 32)))) * 59)) * 59) + (isTts() ? 79 : 97)) * 59; - if (!isMentionEveryone()) { - i = 97; - } - Boolean pinned = getPinned(); - int i2 = (type + i) * 59; - int i3 = 43; - int hashCode = i2 + (pinned == null ? 43 : pinned.hashCode()); - Long applicationId = getApplicationId(); - int hashCode2 = (hashCode * 59) + (applicationId == null ? 43 : applicationId.hashCode()); - Long webhookId = getWebhookId(); - int hashCode3 = (hashCode2 * 59) + (webhookId == null ? 43 : webhookId.hashCode()); - Long flags = getFlags(); - int hashCode4 = (hashCode3 * 59) + (flags == null ? 43 : flags.hashCode()); - Long lastManualAttemptTimestamp = getLastManualAttemptTimestamp(); - int hashCode5 = (hashCode4 * 59) + (lastManualAttemptTimestamp == null ? 43 : lastManualAttemptTimestamp.hashCode()); - Long initialAttemptTimestamp = getInitialAttemptTimestamp(); - int hashCode6 = (hashCode5 * 59) + (initialAttemptTimestamp == null ? 43 : initialAttemptTimestamp.hashCode()); - Integer numRetries = getNumRetries(); - int hashCode7 = (hashCode6 * 59) + (numRetries == null ? 43 : numRetries.hashCode()); - String nonce = getNonce(); - int hashCode8 = (hashCode7 * 59) + (nonce == null ? 43 : nonce.hashCode()); - String content = getContent(); - int hashCode9 = (hashCode8 * 59) + (content == null ? 43 : content.hashCode()); - User author = getAuthor(); - int hashCode10 = (hashCode9 * 59) + (author == null ? 43 : author.hashCode()); - List mentions = getMentions(); - int hashCode11 = (hashCode10 * 59) + (mentions == null ? 43 : mentions.hashCode()); - List mentionRoles = getMentionRoles(); - int i4 = hashCode11 * 59; - int hashCode12 = mentionRoles == null ? 43 : mentionRoles.hashCode(); - long timestamp = getTimestamp(); - long editedTimestamp = getEditedTimestamp(); - List attachments = getAttachments(); - int hashCode13 = ((((((i4 + hashCode12) * 59) + ((int) (timestamp ^ (timestamp >>> 32)))) * 59) + ((int) ((editedTimestamp >>> 32) ^ editedTimestamp))) * 59) + (attachments == null ? 43 : attachments.hashCode()); - List embeds = getEmbeds(); - int hashCode14 = (hashCode13 * 59) + (embeds == null ? 43 : embeds.hashCode()); - MessageCall call = getCall(); - int hashCode15 = (hashCode14 * 59) + (call == null ? 43 : call.hashCode()); - Map reactions = getReactions(); - int hashCode16 = (hashCode15 * 59) + (reactions == null ? 43 : reactions.hashCode()); - Application application = getApplication(); - int hashCode17 = (hashCode16 * 59) + (application == null ? 43 : application.hashCode()); - MessageActivity activity = getActivity(); - int hashCode18 = (hashCode17 * 59) + (activity == null ? 43 : activity.hashCode()); - MessageReference messageReference = getMessageReference(); - int hashCode19 = (hashCode18 * 59) + (messageReference == null ? 43 : messageReference.hashCode()); - ModelMessage referencedMessage = getReferencedMessage(); - int hashCode20 = (hashCode19 * 59) + (referencedMessage == null ? 43 : referencedMessage.hashCode()); - Interaction interaction = getInteraction(); - int hashCode21 = (hashCode20 * 59) + (interaction == null ? 43 : interaction.hashCode()); - List stickers = getStickers(); - int hashCode22 = (hashCode21 * 59) + (stickers == null ? 43 : stickers.hashCode()); - List stickerItems = getStickerItems(); - int hashCode23 = (hashCode22 * 59) + (stickerItems == null ? 43 : stickerItems.hashCode()); - ModelAllowedMentions allowedMentions = getAllowedMentions(); - int hashCode24 = (hashCode23 * 59) + (allowedMentions == null ? 43 : allowedMentions.hashCode()); - Channel thread = getThread(); - int hashCode25 = (hashCode24 * 59) + (thread == null ? 43 : thread.hashCode()); - List components = getComponents(); - int hashCode26 = (hashCode25 * 59) + (components == null ? 43 : components.hashCode()); - List localAttachments = getLocalAttachments(); - int i5 = hashCode26 * 59; - if (localAttachments != null) { - i3 = localAttachments.hashCode(); - } - return i5 + i3; - } - - public boolean isCrosspost() { - return isOn(2); - } - - public boolean isCrossposted() { - return isOn(1); - } - - public boolean isEmbeddedMessageType() { - int i = this.type; - return i == 19 || i == 21; - } - - public boolean isEphemeralMessage() { - return isOn(64); - } - - public boolean isFailed() { - int i = this.type; - return i == -3 || i == -2 || i == -4; - } - - public boolean isHasLocalUploads() { - return this.hasLocalUploads; - } - - public boolean isHit() { - return this.hit; - } - - public boolean isInteraction() { - int i = this.type; - return i == -5 || i == -4 || this.interaction != null; - } - - public boolean isLoading() { - return isOn(128); - } - - public boolean isLocal() { - int i = this.type; - return i == -1 || i == -2 || i == -3 || i == 23 || isLocalApplicationCommand(); - } - - public boolean isLocalApplicationCommand() { - int i = this.type; - return i == -5 || i == -4; - } - - public boolean isMentionEveryone() { - return this.mentionEveryone; - } - - public boolean isPinned() { - Boolean bool = this.pinned; - return bool != null && bool.booleanValue(); - } - - public boolean isSourceDeleted() { - return isOn(8); - } - - public boolean isSpotifyListeningActivity() { - MessageActivity messageActivity = this.activity; - return messageActivity != null && messageActivity.b() == MessageActivityType.LISTEN && this.activity.a().contains("spotify"); - } - - public boolean isStale() { - return this.stale; - } - - public boolean isSystemMessage() { - return !isUserMessage(); - } - - public boolean isTts() { - return this.tts; - } - - public boolean isUrgent() { - return isOn(16); - } - - public boolean isUserMessage() { - int i = this.type; - return i == 0 || i == 19; - } - - public boolean isWebhook() { - return this.webhookId != null; - } - - public void markStale() { - this.stale = true; - } - - public String toString() { - StringBuilder L = c.d.b.a.a.L("ModelMessage(id="); - L.append(getId()); - L.append(", nonce="); - L.append(getNonce()); - L.append(", channelId="); - L.append(getChannelId()); - L.append(", type="); - L.append(getType()); - L.append(", content="); - L.append(getContent()); - L.append(", author="); - L.append(getAuthor()); - L.append(", mentions="); - L.append(getMentions()); - L.append(", mentionRoles="); - L.append(getMentionRoles()); - L.append(", timestamp="); - L.append(getTimestamp()); - L.append(", editedTimestamp="); - L.append(getEditedTimestamp()); - L.append(", attachments="); - L.append(getAttachments()); - L.append(", embeds="); - L.append(getEmbeds()); - L.append(", tts="); - L.append(isTts()); - L.append(", call="); - L.append(getCall()); - L.append(", mentionEveryone="); - L.append(isMentionEveryone()); - L.append(", reactions="); - L.append(getReactions()); - L.append(", pinned="); - L.append(getPinned()); - L.append(", applicationId="); - L.append(getApplicationId()); - L.append(", webhookId="); - L.append(getWebhookId()); - L.append(", application="); - L.append(getApplication()); - L.append(", activity="); - L.append(getActivity()); - L.append(", flags="); - L.append(getFlags()); - L.append(", messageReference="); - L.append(getMessageReference()); - L.append(", referencedMessage="); - L.append(getReferencedMessage()); - L.append(", interaction="); - L.append(getInteraction()); - L.append(", stickers="); - L.append(getStickers()); - L.append(", stickerItems="); - L.append(getStickerItems()); - L.append(", allowedMentions="); - L.append(getAllowedMentions()); - L.append(", lastManualAttemptTimestamp="); - L.append(getLastManualAttemptTimestamp()); - L.append(", initialAttemptTimestamp="); - L.append(getInitialAttemptTimestamp()); - L.append(", numRetries="); - L.append(getNumRetries()); - L.append(", thread="); - L.append(getThread()); - L.append(", components="); - L.append(getComponents()); - L.append(", timestampMilliseconds="); - L.append(getTimestampMilliseconds()); - L.append(", editedTimestampMilliseconds="); - L.append(getEditedTimestampMilliseconds()); - L.append(", stale="); - L.append(isStale()); - L.append(", hit="); - L.append(isHit()); - L.append(", hasLocalUploads="); - L.append(isHasLocalUploads()); - L.append(", localAttachments="); - L.append(getLocalAttachments()); - L.append(", guildId="); - L.append(getGuildId()); - L.append(", member="); - L.append(getMember()); - L.append(")"); - return L.toString(); - } -} diff --git a/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java b/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java index 0fe4e9450c..d4c1eb160f 100644 --- a/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java +++ b/app/src/main/java/com/discord/models/domain/ModelNotificationSettings.java @@ -1,6 +1,6 @@ package com.discord.models.domain; -import c.a.n.a.r; +import c.a.n.a.k; import c.d.b.a.a; import com.discord.models.domain.Model; import com.discord.utilities.time.Clock; @@ -285,7 +285,7 @@ public class ModelNotificationSettings implements Model { this.guildId = jsonReader.nextLong(this.guildId); return; case 3: - this.channelOverrides = jsonReader.nextList(new r(jsonReader)); + this.channelOverrides = jsonReader.nextList(new k(jsonReader)); return; case 4: this.muted = jsonReader.nextBoolean(this.muted); diff --git a/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java b/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java index 66ab782cd6..9e0cd99dcc 100644 --- a/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java +++ b/app/src/main/java/com/discord/models/domain/ModelOAuth2Token.java @@ -10,7 +10,7 @@ public final class ModelOAuth2Token { private final Application application; /* renamed from: id reason: collision with root package name */ - private final long f2028id; + private final long f2029id; private final List scopes; /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List */ @@ -18,7 +18,7 @@ public final class ModelOAuth2Token { public ModelOAuth2Token(long j, List list, Application application) { m.checkNotNullParameter(list, "scopes"); m.checkNotNullParameter(application, "application"); - this.f2028id = j; + this.f2029id = j; this.scopes = list; this.application = application; } @@ -27,7 +27,7 @@ public final class ModelOAuth2Token { /* JADX WARN: Multi-variable type inference failed */ public static /* synthetic */ ModelOAuth2Token copy$default(ModelOAuth2Token modelOAuth2Token, long j, List list, Application application, int i, Object obj) { if ((i & 1) != 0) { - j = modelOAuth2Token.f2028id; + j = modelOAuth2Token.f2029id; } if ((i & 2) != 0) { list = modelOAuth2Token.scopes; @@ -39,7 +39,7 @@ public final class ModelOAuth2Token { } public final long component1() { - return this.f2028id; + return this.f2029id; } public final List component2() { @@ -64,7 +64,7 @@ public final class ModelOAuth2Token { return false; } ModelOAuth2Token modelOAuth2Token = (ModelOAuth2Token) obj; - return this.f2028id == modelOAuth2Token.f2028id && m.areEqual(this.scopes, modelOAuth2Token.scopes) && m.areEqual(this.application, modelOAuth2Token.application); + return this.f2029id == modelOAuth2Token.f2029id && m.areEqual(this.scopes, modelOAuth2Token.scopes) && m.areEqual(this.application, modelOAuth2Token.application); } public final Application getApplication() { @@ -72,7 +72,7 @@ public final class ModelOAuth2Token { } public final long getId() { - return this.f2028id; + return this.f2029id; } public final List getScopes() { @@ -80,7 +80,7 @@ public final class ModelOAuth2Token { } public int hashCode() { - long j = this.f2028id; + long j = this.f2029id; int i = ((int) (j ^ (j >>> 32))) * 31; List list = this.scopes; int i2 = 0; @@ -94,7 +94,7 @@ public final class ModelOAuth2Token { public String toString() { StringBuilder L = a.L("ModelOAuth2Token(id="); - L.append(this.f2028id); + L.append(this.f2029id); L.append(", scopes="); L.append(this.scopes); L.append(", application="); diff --git a/app/src/main/java/com/discord/models/domain/ModelPayload.java b/app/src/main/java/com/discord/models/domain/ModelPayload.java index 148010f8fe..7b4a38c52b 100644 --- a/app/src/main/java/com/discord/models/domain/ModelPayload.java +++ b/app/src/main/java/com/discord/models/domain/ModelPayload.java @@ -1,20 +1,20 @@ package com.discord.models.domain; import androidx.annotation.Nullable; +import c.a.n.a.a0; import c.a.n.a.b0; -import c.a.n.a.c0; -import c.a.n.a.d0; -import c.a.n.a.e0; -import c.a.n.a.f0; -import c.a.n.a.g0; -import c.a.n.a.h0; import c.a.n.a.i0; -import c.a.n.a.p0; -import c.a.n.a.q0; +import c.a.n.a.j0; +import c.a.n.a.l; +import c.a.n.a.m; +import c.a.n.a.n; +import c.a.n.a.o; +import c.a.n.a.q; +import c.a.n.a.r; import c.a.n.a.s; -import c.a.n.a.t; import c.a.n.a.u; import c.a.n.a.v; +import c.a.n.a.w; import c.a.n.a.x; import c.a.n.a.y; import c.a.n.a.z; @@ -49,7 +49,7 @@ public class ModelPayload implements Model { private List guilds; /* renamed from: me reason: collision with root package name */ - private User f2029me; + private User f2030me; private List presences; private List privateChannels; private VersionedReadStates readState; @@ -73,7 +73,7 @@ public class ModelPayload implements Model { String nextName = jsonReader.nextName(); nextName.hashCode(); if (nextName.equals("_trace")) { - this.trace = jsonReader.nextList(new u(jsonReader)); + this.trace = jsonReader.nextList(new n(jsonReader)); } else if (!nextName.equals("heartbeat_interval")) { jsonReader.skipValue(); } else { @@ -141,11 +141,11 @@ public class ModelPayload implements Model { String nextName = jsonReader.nextName(); nextName.hashCode(); if (nextName.equals("guilds")) { - this.guilds = jsonReader.nextList(new x(jsonReader)); + this.guilds = jsonReader.nextList(new q(jsonReader)); } else if (!nextName.equals("friends")) { jsonReader.skipValue(); } else { - this.friends = jsonReader.nextList(new v(jsonReader)); + this.friends = jsonReader.nextList(new o(jsonReader)); } } @@ -244,7 +244,7 @@ public class ModelPayload implements Model { } switch (c2) { case 0: - this.entries = jsonReader.nextList(new z(this, jsonReader)); + this.entries = jsonReader.nextList(new s(this, jsonReader)); return; case 1: this.partial = jsonReader.nextBoolean(this.partial); @@ -329,7 +329,7 @@ public class ModelPayload implements Model { public ModelPayload(ModelPayload modelPayload) { this.v = modelPayload.v; - this.f2029me = modelPayload.f2029me; + this.f2030me = modelPayload.f2030me; this.userSettings = modelPayload.userSettings; this.userGuildSettings = modelPayload.userGuildSettings; this.sessionId = modelPayload.sessionId; @@ -356,7 +356,7 @@ public class ModelPayload implements Model { private Object getTraces(Model.JsonReader jsonReader) throws IOException { jsonReader.getClass(); - List nextList = jsonReader.nextList(new q0(jsonReader)); + List nextList = jsonReader.nextList(new j0(jsonReader)); if (nextList.size() <= 0 || nextList.get(0) == null) { return null; } @@ -522,7 +522,7 @@ public class ModelPayload implements Model { this.trace = getTraces(jsonReader); return; case 2: - this.guildMembers = jsonReader.nextList(new y(jsonReader)); + this.guildMembers = jsonReader.nextList(new r(jsonReader)); return; case 3: MergedPresences mergedPresences = (MergedPresences) jsonReader.parse(new MergedPresences()); @@ -530,13 +530,13 @@ public class ModelPayload implements Model { this.guildPresences = MergedPresences.access$100(mergedPresences); return; case 4: - this.guilds = jsonReader.nextList(new s(jsonReader)); + this.guilds = jsonReader.nextList(new l(jsonReader)); return; case 5: - this.presences = jsonReader.nextList(new b0(jsonReader)); + this.presences = jsonReader.nextList(new u(jsonReader)); return; case 6: - this.guildJoinRequests = jsonReader.nextList(new f0(jsonReader)); + this.guildJoinRequests = jsonReader.nextList(new y(jsonReader)); return; case 7: this.readState = (VersionedReadStates) jsonReader.parse(new VersionedReadStates()); @@ -548,19 +548,19 @@ public class ModelPayload implements Model { this.v = jsonReader.nextInt(this.v); return; case '\n': - this.f2029me = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class); + this.f2030me = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class); return; case 11: - this.users = jsonReader.nextList(new d0(jsonReader)); + this.users = jsonReader.nextList(new w(jsonReader)); return; case '\f': - this.connectedAccounts = jsonReader.nextList(new c0(jsonReader)); + this.connectedAccounts = jsonReader.nextList(new v(jsonReader)); return; case '\r': - this.guildExperiments = jsonReader.nextList(new g0(jsonReader)); + this.guildExperiments = jsonReader.nextList(new z(jsonReader)); return; case 14: - this.relationships = jsonReader.nextList(new e0(jsonReader)); + this.relationships = jsonReader.nextList(new x(jsonReader)); return; case 15: this.requiredAction = jsonReader.nextString(this.requiredAction); @@ -572,7 +572,7 @@ public class ModelPayload implements Model { this.friendSuggestionCount = jsonReader.nextInt(0); return; case 18: - this.sessions = jsonReader.nextList(new t(jsonReader)); + this.sessions = jsonReader.nextList(new m(jsonReader)); return; case 19: this.countryCode = jsonReader.nextString(this.countryCode); @@ -581,13 +581,13 @@ public class ModelPayload implements Model { this.userSettings = (ModelUserSettings) jsonReader.parse(new ModelUserSettings()); return; case 21: - this.experiments = jsonReader.nextListAsMap(new h0(jsonReader), p0.a); + this.experiments = jsonReader.nextListAsMap(new a0(jsonReader), i0.a); return; case 22: this.sessionId = jsonReader.nextString(this.sessionId); return; case 23: - this.privateChannels = jsonReader.nextList(new i0(jsonReader)); + this.privateChannels = jsonReader.nextList(new b0(jsonReader)); return; default: jsonReader.skipValue(); @@ -762,7 +762,7 @@ public class ModelPayload implements Model { } public User getMe() { - return this.f2029me; + return this.f2030me; } public List getPresences() { diff --git a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java index 2bf87a04ae..72f933c765 100644 --- a/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java +++ b/app/src/main/java/com/discord/models/domain/ModelPaymentSource.java @@ -15,7 +15,7 @@ public abstract class ModelPaymentSource { private final boolean f4default; /* renamed from: id reason: collision with root package name */ - private final String f2030id; + private final String f2031id; private final boolean invalid; /* compiled from: ModelPaymentSource.kt */ @@ -61,7 +61,7 @@ public abstract class ModelPaymentSource { private final int expiresYear; /* renamed from: id reason: collision with root package name */ - private final String f2031id; + private final String f2032id; private final boolean invalid; private final String last4; @@ -76,7 +76,7 @@ public abstract class ModelPaymentSource { this.last4 = str2; this.expiresMonth = i; this.expiresYear = i2; - this.f2031id = str3; + this.f2032id = str3; this.invalid = z2; this.billingAddress = modelBillingAddress; this.f5default = z3; @@ -161,7 +161,7 @@ public abstract class ModelPaymentSource { @Override // com.discord.models.domain.ModelPaymentSource public String getId() { - return this.f2031id; + return this.f2032id; } @Override // com.discord.models.domain.ModelPaymentSource @@ -233,7 +233,7 @@ public abstract class ModelPaymentSource { private final String email; /* renamed from: id reason: collision with root package name */ - private final String f2032id; + private final String f2033id; private final boolean invalid; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -243,7 +243,7 @@ public abstract class ModelPaymentSource { m.checkNotNullParameter(str2, "id"); m.checkNotNullParameter(modelBillingAddress, "billingAddress"); this.email = str; - this.f2032id = str2; + this.f2033id = str2; this.invalid = z2; this.billingAddress = modelBillingAddress; this.f6default = z3; @@ -322,7 +322,7 @@ public abstract class ModelPaymentSource { @Override // com.discord.models.domain.ModelPaymentSource public String getId() { - return this.f2032id; + return this.f2033id; } @Override // com.discord.models.domain.ModelPaymentSource @@ -383,7 +383,7 @@ public abstract class ModelPaymentSource { } private ModelPaymentSource(String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3) { - this.f2030id = str; + this.f2031id = str; this.invalid = z2; this.billingAddress = modelBillingAddress; this.f4default = z3; @@ -402,7 +402,7 @@ public abstract class ModelPaymentSource { } public String getId() { - return this.f2030id; + return this.f2031id; } public boolean getInvalid() { diff --git a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java index be3b0e8644..46c9aecf56 100644 --- a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java +++ b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscription.java @@ -6,18 +6,18 @@ public final class ModelPremiumGuildSubscription { private final long guildId; /* renamed from: id reason: collision with root package name */ - private final long f2033id; + private final long f2034id; private final long userId; public ModelPremiumGuildSubscription(long j, long j2, long j3) { - this.f2033id = j; + this.f2034id = j; this.guildId = j2; this.userId = j3; } public static /* synthetic */ ModelPremiumGuildSubscription copy$default(ModelPremiumGuildSubscription modelPremiumGuildSubscription, long j, long j2, long j3, int i, Object obj) { if ((i & 1) != 0) { - j = modelPremiumGuildSubscription.f2033id; + j = modelPremiumGuildSubscription.f2034id; } if ((i & 2) != 0) { j2 = modelPremiumGuildSubscription.guildId; @@ -29,7 +29,7 @@ public final class ModelPremiumGuildSubscription { } public final long component1() { - return this.f2033id; + return this.f2034id; } public final long component2() { @@ -52,7 +52,7 @@ public final class ModelPremiumGuildSubscription { return false; } ModelPremiumGuildSubscription modelPremiumGuildSubscription = (ModelPremiumGuildSubscription) obj; - return this.f2033id == modelPremiumGuildSubscription.f2033id && this.guildId == modelPremiumGuildSubscription.guildId && this.userId == modelPremiumGuildSubscription.userId; + return this.f2034id == modelPremiumGuildSubscription.f2034id && this.guildId == modelPremiumGuildSubscription.guildId && this.userId == modelPremiumGuildSubscription.userId; } public final long getGuildId() { @@ -60,7 +60,7 @@ public final class ModelPremiumGuildSubscription { } public final long getId() { - return this.f2033id; + return this.f2034id; } public final long getUserId() { @@ -68,7 +68,7 @@ public final class ModelPremiumGuildSubscription { } public int hashCode() { - long j = this.f2033id; + long j = this.f2034id; long j2 = this.guildId; long j3 = this.userId; return (((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + ((int) (j3 ^ (j3 >>> 32))); @@ -76,7 +76,7 @@ public final class ModelPremiumGuildSubscription { public String toString() { StringBuilder L = a.L("ModelPremiumGuildSubscription(id="); - L.append(this.f2033id); + L.append(this.f2034id); L.append(", guildId="); L.append(this.guildId); L.append(", userId="); diff --git a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java index 7e994b252b..9363049aad 100644 --- a/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java +++ b/app/src/main/java/com/discord/models/domain/ModelPremiumGuildSubscriptionSlot.java @@ -9,13 +9,13 @@ public final class ModelPremiumGuildSubscriptionSlot { private final String cooldownEndsAt; /* renamed from: id reason: collision with root package name */ - private final long f2034id; + private final long f2035id; private final ModelPremiumGuildSubscription premiumGuildSubscription; private final long subscriptionId; public ModelPremiumGuildSubscriptionSlot(String str, long j, long j2, ModelPremiumGuildSubscription modelPremiumGuildSubscription, boolean z2) { this.cooldownEndsAt = str; - this.f2034id = j; + this.f2035id = j; this.subscriptionId = j2; this.premiumGuildSubscription = modelPremiumGuildSubscription; this.canceled = z2; @@ -30,7 +30,7 @@ public final class ModelPremiumGuildSubscriptionSlot { str = modelPremiumGuildSubscriptionSlot.cooldownEndsAt; } if ((i & 2) != 0) { - j = modelPremiumGuildSubscriptionSlot.f2034id; + j = modelPremiumGuildSubscriptionSlot.f2035id; } if ((i & 4) != 0) { j2 = modelPremiumGuildSubscriptionSlot.subscriptionId; @@ -45,7 +45,7 @@ public final class ModelPremiumGuildSubscriptionSlot { } public final long component2() { - return this.f2034id; + return this.f2035id; } public final long component3() { @@ -72,7 +72,7 @@ public final class ModelPremiumGuildSubscriptionSlot { return false; } ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot = (ModelPremiumGuildSubscriptionSlot) obj; - return m.areEqual(this.cooldownEndsAt, modelPremiumGuildSubscriptionSlot.cooldownEndsAt) && this.f2034id == modelPremiumGuildSubscriptionSlot.f2034id && this.subscriptionId == modelPremiumGuildSubscriptionSlot.subscriptionId && m.areEqual(this.premiumGuildSubscription, modelPremiumGuildSubscriptionSlot.premiumGuildSubscription) && this.canceled == modelPremiumGuildSubscriptionSlot.canceled; + return m.areEqual(this.cooldownEndsAt, modelPremiumGuildSubscriptionSlot.cooldownEndsAt) && this.f2035id == modelPremiumGuildSubscriptionSlot.f2035id && this.subscriptionId == modelPremiumGuildSubscriptionSlot.subscriptionId && m.areEqual(this.premiumGuildSubscription, modelPremiumGuildSubscriptionSlot.premiumGuildSubscription) && this.canceled == modelPremiumGuildSubscriptionSlot.canceled; } public final boolean getCanceled() { @@ -84,7 +84,7 @@ public final class ModelPremiumGuildSubscriptionSlot { } public final long getId() { - return this.f2034id; + return this.f2035id; } public final ModelPremiumGuildSubscription getPremiumGuildSubscription() { @@ -99,7 +99,7 @@ public final class ModelPremiumGuildSubscriptionSlot { String str = this.cooldownEndsAt; int i = 0; int hashCode = str != null ? str.hashCode() : 0; - long j = this.f2034id; + long j = this.f2035id; long j2 = this.subscriptionId; int i2 = ((((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31; ModelPremiumGuildSubscription modelPremiumGuildSubscription = this.premiumGuildSubscription; @@ -121,7 +121,7 @@ public final class ModelPremiumGuildSubscriptionSlot { StringBuilder L = a.L("ModelPremiumGuildSubscriptionSlot(cooldownEndsAt="); L.append(this.cooldownEndsAt); L.append(", id="); - L.append(this.f2034id); + L.append(this.f2035id); L.append(", subscriptionId="); L.append(this.subscriptionId); L.append(", premiumGuildSubscription="); diff --git a/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java b/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java index 4d4c556561..4e4706a659 100644 --- a/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java +++ b/app/src/main/java/com/discord/models/domain/ModelSearchResponse$hits$2.java @@ -1,5 +1,6 @@ package com.discord.models.domain; +import com.discord.api.message.Message; import d0.t.n; import d0.t.u; import d0.z.d.o; @@ -8,7 +9,7 @@ import java.util.Iterator; import java.util.List; import kotlin.jvm.functions.Function0; /* compiled from: ModelSearchResponse.kt */ -public final class ModelSearchResponse$hits$2 extends o implements Function0> { +public final class ModelSearchResponse$hits$2 extends o implements Function0> { public final /* synthetic */ ModelSearchResponse this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -17,12 +18,13 @@ public final class ModelSearchResponse$hits$2 extends o implements Function0' to match base method */ + /* Return type fixed from 'java.util.List' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ - public final List mo1invoke() { + public final List mo1invoke() { Object obj; - List> messages = this.this$0.getMessages(); + boolean z2; + List> messages = this.this$0.getMessages(); if (messages != null) { ArrayList arrayList = new ArrayList(); Iterator it = messages.iterator(); @@ -34,16 +36,24 @@ public final class ModelSearchResponse$hits$2 extends o implements Function0 list = u.toList(arrayList); + List list = u.toList(arrayList); if (list != null) { return list; } diff --git a/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java b/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java index b219958883..2103c1efc2 100644 --- a/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java +++ b/app/src/main/java/com/discord/models/domain/ModelSearchResponse.java @@ -2,6 +2,7 @@ package com.discord.models.domain; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.thread.ThreadMember; import d0.g; import d0.z.d.m; @@ -16,7 +17,7 @@ public final class ModelSearchResponse { private final Lazy hits$delegate; private final List members; private final String message; - private final List> messages; + private final List> messages; private final Integer retryAfter; private final long retryMillis; private final List threads; @@ -26,9 +27,9 @@ public final class ModelSearchResponse { this(0, null, null, null, null, null, null, null, null, 511, null); } - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List> */ + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List> */ /* JADX WARN: Multi-variable type inference failed */ - public ModelSearchResponse(int i, List> list, List list2, List list3, String str, String str2, Integer num, Integer num2, Integer num3) { + public ModelSearchResponse(int i, List> list, List list2, List list3, String str, String str2, Integer num, Integer num2, Integer num3) { this.totalResults = i; this.messages = list; this.threads = list2; @@ -59,7 +60,7 @@ public final class ModelSearchResponse { return this.totalResults; } - public final List> component2() { + public final List> component2() { return this.messages; } @@ -87,7 +88,7 @@ public final class ModelSearchResponse { return this.documentIndexed; } - public final ModelSearchResponse copy(int i, List> list, List list2, List list3, String str, String str2, Integer num, Integer num2, Integer num3) { + public final ModelSearchResponse copy(int i, List> list, List list2, List list3, String str, String str2, Integer num, Integer num2, Integer num3) { return new ModelSearchResponse(i, list, list2, list3, str, str2, num, num2, num3); } @@ -114,7 +115,7 @@ public final class ModelSearchResponse { return this.errorCode; } - public final List getHits() { + public final List getHits() { return (List) this.hits$delegate.getValue(); } @@ -126,7 +127,7 @@ public final class ModelSearchResponse { return this.message; } - public final List> getMessages() { + public final List> getMessages() { return this.messages; } @@ -144,7 +145,7 @@ public final class ModelSearchResponse { public int hashCode() { int i = this.totalResults * 31; - List> list = this.messages; + List> list = this.messages; int i2 = 0; int hashCode = (i + (list != null ? list.hashCode() : 0)) * 31; List list2 = this.threads; diff --git a/app/src/main/java/com/discord/models/domain/ModelSession.java b/app/src/main/java/com/discord/models/domain/ModelSession.java index 4636269d5a..cf73490c20 100644 --- a/app/src/main/java/com/discord/models/domain/ModelSession.java +++ b/app/src/main/java/com/discord/models/domain/ModelSession.java @@ -1,6 +1,6 @@ package com.discord.models.domain; -import c.a.n.a.j0; +import c.a.n.a.c0; import c.d.b.a.a; import com.discord.api.activity.Activity; import com.discord.models.domain.Model; @@ -181,7 +181,7 @@ public class ModelSession implements Model { this.sessionId = jsonReader.nextString(this.sessionId); return; case 5: - this.activities = jsonReader.nextList(new j0(jsonReader)); + this.activities = jsonReader.nextList(new c0(jsonReader)); return; default: jsonReader.skipValue(); diff --git a/app/src/main/java/com/discord/models/domain/ModelSku.java b/app/src/main/java/com/discord/models/domain/ModelSku.java index 1283cd9b53..2e8ab9c05c 100644 --- a/app/src/main/java/com/discord/models/domain/ModelSku.java +++ b/app/src/main/java/com/discord/models/domain/ModelSku.java @@ -16,7 +16,7 @@ public final class ModelSku { private final int flags; /* renamed from: id reason: collision with root package name */ - private final long f2035id; + private final long f2036id; private final String name; private final boolean premium; private final Price price; @@ -359,7 +359,7 @@ public final class ModelSku { m.checkNotNullParameter(str, "name"); this.applicationId = j; this.name = str; - this.f2035id = j2; + this.f2036id = j2; this.application = application; this.premium = z2; this.type = i; @@ -369,7 +369,7 @@ public final class ModelSku { } public static /* synthetic */ ModelSku copy$default(ModelSku modelSku, long j, String str, long j2, Application application, boolean z2, int i, Price price, int i2, Map map, int i3, Object obj) { - return modelSku.copy((i3 & 1) != 0 ? modelSku.applicationId : j, (i3 & 2) != 0 ? modelSku.name : str, (i3 & 4) != 0 ? modelSku.f2035id : j2, (i3 & 8) != 0 ? modelSku.application : application, (i3 & 16) != 0 ? modelSku.premium : z2, (i3 & 32) != 0 ? modelSku.type : i, (i3 & 64) != 0 ? modelSku.price : price, (i3 & 128) != 0 ? modelSku.flags : i2, (i3 & 256) != 0 ? modelSku.externalSkuStrategies : map); + return modelSku.copy((i3 & 1) != 0 ? modelSku.applicationId : j, (i3 & 2) != 0 ? modelSku.name : str, (i3 & 4) != 0 ? modelSku.f2036id : j2, (i3 & 8) != 0 ? modelSku.application : application, (i3 & 16) != 0 ? modelSku.premium : z2, (i3 & 32) != 0 ? modelSku.type : i, (i3 & 64) != 0 ? modelSku.price : price, (i3 & 128) != 0 ? modelSku.flags : i2, (i3 & 256) != 0 ? modelSku.externalSkuStrategies : map); } public final long component1() { @@ -381,7 +381,7 @@ public final class ModelSku { } public final long component3() { - return this.f2035id; + return this.f2036id; } public final Application component4() { @@ -421,7 +421,7 @@ public final class ModelSku { return false; } ModelSku modelSku = (ModelSku) obj; - return this.applicationId == modelSku.applicationId && m.areEqual(this.name, modelSku.name) && this.f2035id == modelSku.f2035id && m.areEqual(this.application, modelSku.application) && this.premium == modelSku.premium && this.type == modelSku.type && m.areEqual(this.price, modelSku.price) && this.flags == modelSku.flags && m.areEqual(this.externalSkuStrategies, modelSku.externalSkuStrategies); + return this.applicationId == modelSku.applicationId && m.areEqual(this.name, modelSku.name) && this.f2036id == modelSku.f2036id && m.areEqual(this.application, modelSku.application) && this.premium == modelSku.premium && this.type == modelSku.type && m.areEqual(this.price, modelSku.price) && this.flags == modelSku.flags && m.areEqual(this.externalSkuStrategies, modelSku.externalSkuStrategies); } public final Application getApplication() { @@ -441,7 +441,7 @@ public final class ModelSku { } public final long getId() { - return this.f2035id; + return this.f2036id; } public final String getName() { @@ -457,7 +457,7 @@ public final class ModelSku { } public final SkuCategory getSkuCategory() { - long j = this.f2035id; + long j = this.f2036id; return j == ModelSkuKt.getPREMIUM_TIER_1_SKU_ID() ? SkuCategory.NITRO_CLASSIC : j == ModelSkuKt.getPREMIUM_TIER_2_SKU_ID() ? SkuCategory.NITRO : SkuCategory.GAME; } @@ -471,7 +471,7 @@ public final class ModelSku { String str = this.name; int i2 = 0; int hashCode = str != null ? str.hashCode() : 0; - long j2 = this.f2035id; + long j2 = this.f2036id; int i3 = (((i + hashCode) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31; Application application = this.application; int hashCode2 = (i3 + (application != null ? application.hashCode() : 0)) * 31; @@ -506,7 +506,7 @@ public final class ModelSku { L.append(", name="); L.append(this.name); L.append(", id="); - L.append(this.f2035id); + L.append(this.f2036id); L.append(", application="); L.append(this.application); L.append(", premium="); diff --git a/app/src/main/java/com/discord/models/domain/ModelStoreListing.java b/app/src/main/java/com/discord/models/domain/ModelStoreListing.java index 6f092e1364..ae30113e5c 100644 --- a/app/src/main/java/com/discord/models/domain/ModelStoreListing.java +++ b/app/src/main/java/com/discord/models/domain/ModelStoreListing.java @@ -8,7 +8,7 @@ import kotlin.jvm.internal.Ref$ObjectRef; public final class ModelStoreListing { /* renamed from: id reason: collision with root package name */ - private final long f2036id; + private final long f2037id; private final ModelSku sku; /* compiled from: ModelStoreListing.kt */ @@ -35,7 +35,7 @@ public final class ModelStoreListing { public ModelStoreListing(ModelSku modelSku, long j) { m.checkNotNullParameter(modelSku, "sku"); this.sku = modelSku; - this.f2036id = j; + this.f2037id = j; } public static /* synthetic */ ModelStoreListing copy$default(ModelStoreListing modelStoreListing, ModelSku modelSku, long j, int i, Object obj) { @@ -43,7 +43,7 @@ public final class ModelStoreListing { modelSku = modelStoreListing.sku; } if ((i & 2) != 0) { - j = modelStoreListing.f2036id; + j = modelStoreListing.f2037id; } return modelStoreListing.copy(modelSku, j); } @@ -53,7 +53,7 @@ public final class ModelStoreListing { } public final long component2() { - return this.f2036id; + return this.f2037id; } public final ModelStoreListing copy(ModelSku modelSku, long j) { @@ -69,11 +69,11 @@ public final class ModelStoreListing { return false; } ModelStoreListing modelStoreListing = (ModelStoreListing) obj; - return m.areEqual(this.sku, modelStoreListing.sku) && this.f2036id == modelStoreListing.f2036id; + return m.areEqual(this.sku, modelStoreListing.sku) && this.f2037id == modelStoreListing.f2037id; } public final long getId() { - return this.f2036id; + return this.f2037id; } public final ModelSku getSku() { @@ -83,7 +83,7 @@ public final class ModelStoreListing { public int hashCode() { ModelSku modelSku = this.sku; int hashCode = modelSku != null ? modelSku.hashCode() : 0; - long j = this.f2036id; + long j = this.f2037id; return (hashCode * 31) + ((int) (j ^ (j >>> 32))); } @@ -91,6 +91,6 @@ public final class ModelStoreListing { StringBuilder L = a.L("ModelStoreListing(sku="); L.append(this.sku); L.append(", id="); - return a.A(L, this.f2036id, ")"); + return a.A(L, this.f2037id, ")"); } } diff --git a/app/src/main/java/com/discord/models/domain/ModelSubscription.java b/app/src/main/java/com/discord/models/domain/ModelSubscription.java index de3f2e7bae..cbd19fae34 100644 --- a/app/src/main/java/com/discord/models/domain/ModelSubscription.java +++ b/app/src/main/java/com/discord/models/domain/ModelSubscription.java @@ -22,7 +22,7 @@ public final class ModelSubscription { private final String currentPeriodStart; /* renamed from: id reason: collision with root package name */ - private final String f2037id; + private final String f2038id; private final List items; private final Integer paymentGateway; private final String paymentGatewayPlanId; @@ -209,19 +209,19 @@ public final class ModelSubscription { public static final class SubscriptionItem { /* renamed from: id reason: collision with root package name */ - private final long f2038id; + private final long f2039id; private final long planId; private final int quantity; public SubscriptionItem(long j, long j2, int i) { - this.f2038id = j; + this.f2039id = j; this.planId = j2; this.quantity = i; } public static /* synthetic */ SubscriptionItem copy$default(SubscriptionItem subscriptionItem, long j, long j2, int i, int i2, Object obj) { if ((i2 & 1) != 0) { - j = subscriptionItem.f2038id; + j = subscriptionItem.f2039id; } if ((i2 & 2) != 0) { j2 = subscriptionItem.planId; @@ -233,7 +233,7 @@ public final class ModelSubscription { } public final long component1() { - return this.f2038id; + return this.f2039id; } public final long component2() { @@ -256,11 +256,11 @@ public final class ModelSubscription { return false; } SubscriptionItem subscriptionItem = (SubscriptionItem) obj; - return this.f2038id == subscriptionItem.f2038id && this.planId == subscriptionItem.planId && this.quantity == subscriptionItem.quantity; + return this.f2039id == subscriptionItem.f2039id && this.planId == subscriptionItem.planId && this.quantity == subscriptionItem.quantity; } public final long getId() { - return this.f2038id; + return this.f2039id; } public final long getPlanId() { @@ -272,14 +272,14 @@ public final class ModelSubscription { } public int hashCode() { - long j = this.f2038id; + long j = this.f2039id; long j2 = this.planId; return (((((int) (j ^ (j >>> 32))) * 31) + ((int) (j2 ^ (j2 >>> 32)))) * 31) + this.quantity; } public String toString() { StringBuilder L = a.L("SubscriptionItem(id="); - L.append(this.f2038id); + L.append(this.f2039id); L.append(", planId="); L.append(this.planId); L.append(", quantity="); @@ -416,7 +416,7 @@ public final class ModelSubscription { m.checkNotNullParameter(str4, "currentPeriodStart"); m.checkNotNullParameter(str5, "currentPeriodEnd"); m.checkNotNullParameter(list, "items"); - this.f2037id = str; + this.f2038id = str; this.createdAt = str2; this.canceledAt = str3; this.currentPeriodStart = str4; @@ -478,7 +478,7 @@ public final class ModelSubscription { } public static /* synthetic */ ModelSubscription copy$default(ModelSubscription modelSubscription, String str, String str2, String str3, String str4, String str5, String str6, Integer num, String str7, String str8, SubscriptionRenewalMutations subscriptionRenewalMutations, List list, String str9, int i, int i2, int i3, Object obj) { - return modelSubscription.copy((i3 & 1) != 0 ? modelSubscription.f2037id : str, (i3 & 2) != 0 ? modelSubscription.createdAt : str2, (i3 & 4) != 0 ? modelSubscription.canceledAt : str3, (i3 & 8) != 0 ? modelSubscription.currentPeriodStart : str4, (i3 & 16) != 0 ? modelSubscription.currentPeriodEnd : str5, (i3 & 32) != 0 ? modelSubscription.paymentSourceId : str6, (i3 & 64) != 0 ? modelSubscription.paymentGateway : num, (i3 & 128) != 0 ? modelSubscription.trialId : str7, (i3 & 256) != 0 ? modelSubscription.trialEndsAt : str8, (i3 & 512) != 0 ? modelSubscription.renewalMutations : subscriptionRenewalMutations, (i3 & 1024) != 0 ? modelSubscription.items : list, (i3 & 2048) != 0 ? modelSubscription.paymentGatewayPlanId : str9, (i3 & 4096) != 0 ? modelSubscription.status : i, (i3 & 8192) != 0 ? modelSubscription.type : i2); + return modelSubscription.copy((i3 & 1) != 0 ? modelSubscription.f2038id : str, (i3 & 2) != 0 ? modelSubscription.createdAt : str2, (i3 & 4) != 0 ? modelSubscription.canceledAt : str3, (i3 & 8) != 0 ? modelSubscription.currentPeriodStart : str4, (i3 & 16) != 0 ? modelSubscription.currentPeriodEnd : str5, (i3 & 32) != 0 ? modelSubscription.paymentSourceId : str6, (i3 & 64) != 0 ? modelSubscription.paymentGateway : num, (i3 & 128) != 0 ? modelSubscription.trialId : str7, (i3 & 256) != 0 ? modelSubscription.trialEndsAt : str8, (i3 & 512) != 0 ? modelSubscription.renewalMutations : subscriptionRenewalMutations, (i3 & 1024) != 0 ? modelSubscription.items : list, (i3 & 2048) != 0 ? modelSubscription.paymentGatewayPlanId : str9, (i3 & 4096) != 0 ? modelSubscription.status : i, (i3 & 8192) != 0 ? modelSubscription.type : i2); } public static /* synthetic */ void getAdditionalPlans$annotations() { @@ -488,7 +488,7 @@ public final class ModelSubscription { } public final String component1() { - return this.f2037id; + return this.f2038id; } public final SubscriptionRenewalMutations component10() { @@ -552,7 +552,7 @@ public final class ModelSubscription { return false; } ModelSubscription modelSubscription = (ModelSubscription) obj; - return m.areEqual(this.f2037id, modelSubscription.f2037id) && m.areEqual(this.createdAt, modelSubscription.createdAt) && m.areEqual(this.canceledAt, modelSubscription.canceledAt) && m.areEqual(this.currentPeriodStart, modelSubscription.currentPeriodStart) && m.areEqual(this.currentPeriodEnd, modelSubscription.currentPeriodEnd) && m.areEqual(this.paymentSourceId, modelSubscription.paymentSourceId) && m.areEqual(this.paymentGateway, modelSubscription.paymentGateway) && m.areEqual(this.trialId, modelSubscription.trialId) && m.areEqual(this.trialEndsAt, modelSubscription.trialEndsAt) && m.areEqual(this.renewalMutations, modelSubscription.renewalMutations) && m.areEqual(this.items, modelSubscription.items) && m.areEqual(this.paymentGatewayPlanId, modelSubscription.paymentGatewayPlanId) && this.status == modelSubscription.status && this.type == modelSubscription.type; + return m.areEqual(this.f2038id, modelSubscription.f2038id) && m.areEqual(this.createdAt, modelSubscription.createdAt) && m.areEqual(this.canceledAt, modelSubscription.canceledAt) && m.areEqual(this.currentPeriodStart, modelSubscription.currentPeriodStart) && m.areEqual(this.currentPeriodEnd, modelSubscription.currentPeriodEnd) && m.areEqual(this.paymentSourceId, modelSubscription.paymentSourceId) && m.areEqual(this.paymentGateway, modelSubscription.paymentGateway) && m.areEqual(this.trialId, modelSubscription.trialId) && m.areEqual(this.trialEndsAt, modelSubscription.trialEndsAt) && m.areEqual(this.renewalMutations, modelSubscription.renewalMutations) && m.areEqual(this.items, modelSubscription.items) && m.areEqual(this.paymentGatewayPlanId, modelSubscription.paymentGatewayPlanId) && this.status == modelSubscription.status && this.type == modelSubscription.type; } public final long getAccountHoldEstimatedExpirationTimestamp() { @@ -580,7 +580,7 @@ public final class ModelSubscription { } public final String getId() { - return this.f2037id; + return this.f2038id; } public final List getItems() { @@ -642,7 +642,7 @@ public final class ModelSubscription { } public int hashCode() { - String str = this.f2037id; + String str = this.f2038id; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.createdAt; @@ -686,7 +686,7 @@ public final class ModelSubscription { public String toString() { StringBuilder L = a.L("ModelSubscription(id="); - L.append(this.f2037id); + L.append(this.f2038id); L.append(", createdAt="); L.append(this.createdAt); L.append(", canceledAt="); 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 a3266c6562..4c86fb8557 100644 --- a/app/src/main/java/com/discord/models/domain/ModelUserNote.java +++ b/app/src/main/java/com/discord/models/domain/ModelUserNote.java @@ -14,7 +14,7 @@ public final class ModelUserNote { public static final class Update { /* renamed from: id reason: collision with root package name */ - private final long f2039id; + private final long f2040id; private final String note; /* compiled from: ModelUserNote.kt */ @@ -38,13 +38,13 @@ public final class ModelUserNote { public Update(long j, String str) { m.checkNotNullParameter(str, "note"); - this.f2039id = j; + this.f2040id = j; this.note = str; } public static /* synthetic */ Update copy$default(Update update, long j, String str, int i, Object obj) { if ((i & 1) != 0) { - j = update.f2039id; + j = update.f2040id; } if ((i & 2) != 0) { str = update.note; @@ -53,7 +53,7 @@ public final class ModelUserNote { } public final long component1() { - return this.f2039id; + return this.f2040id; } public final String component2() { @@ -73,11 +73,11 @@ public final class ModelUserNote { return false; } Update update = (Update) obj; - return this.f2039id == update.f2039id && m.areEqual(this.note, update.note); + return this.f2040id == update.f2040id && m.areEqual(this.note, update.note); } public final long getId() { - return this.f2039id; + return this.f2040id; } public final String getNote() { @@ -85,7 +85,7 @@ public final class ModelUserNote { } public int hashCode() { - long j = this.f2039id; + long j = this.f2040id; int i = ((int) (j ^ (j >>> 32))) * 31; String str = this.note; return i + (str != null ? str.hashCode() : 0); @@ -93,7 +93,7 @@ public final class ModelUserNote { public String toString() { StringBuilder L = a.L("Update(id="); - L.append(this.f2039id); + L.append(this.f2040id); L.append(", note="); return a.D(L, this.note, ")"); } diff --git a/app/src/main/java/com/discord/models/domain/ModelUserProfile.java b/app/src/main/java/com/discord/models/domain/ModelUserProfile.java index 6c1625d4ae..6dcd65cd05 100644 --- a/app/src/main/java/com/discord/models/domain/ModelUserProfile.java +++ b/app/src/main/java/com/discord/models/domain/ModelUserProfile.java @@ -2,9 +2,9 @@ package com.discord.models.domain; import android.content.Context; import android.text.TextUtils; -import c.a.n.a.k0; -import c.a.n.a.l0; -import c.a.n.a.n0; +import c.a.n.a.d0; +import c.a.n.a.e0; +import c.a.n.a.g0; import c.d.b.a.a; import com.discord.api.premium.PremiumTier; import com.discord.api.user.NsfwAllowance; @@ -140,7 +140,7 @@ public class ModelUserProfile implements Model { } switch (c2) { case 0: - this.mutualGuilds = jsonReader.nextListAsMap(new k0(jsonReader), n0.a); + this.mutualGuilds = jsonReader.nextListAsMap(new d0(jsonReader), g0.a); return; case 1: this.user = (User) InboundGatewayGsonParser.fromJson(jsonReader, User.class); @@ -149,7 +149,7 @@ public class ModelUserProfile implements Model { this.premiumSince = jsonReader.nextString(this.premiumSince); return; case 3: - this.connectedAccounts = jsonReader.nextList(new l0(jsonReader)); + this.connectedAccounts = jsonReader.nextList(new e0(jsonReader)); return; case 4: this.premiumGuildSince = jsonReader.nextString(this.premiumGuildSince); diff --git a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java index 94f50601c0..2f71ed5c98 100644 --- a/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java +++ b/app/src/main/java/com/discord/models/domain/ModelUserRelationship.java @@ -14,7 +14,7 @@ public class ModelUserRelationship implements Model { public static final int TYPE_NONE = 0; /* renamed from: id reason: collision with root package name */ - private long f2040id; + private long f2041id; private int type; private User user; private Long userId; @@ -23,14 +23,14 @@ public class ModelUserRelationship implements Model { } public ModelUserRelationship(long j, int i, User user, Long l) { - this.f2040id = j; + this.f2041id = j; this.type = i; this.user = user; this.userId = l; } public ModelUserRelationship(ModelUserRelationship modelUserRelationship) { - this(modelUserRelationship.f2040id, modelUserRelationship.type, modelUserRelationship.user, modelUserRelationship.userId); + this(modelUserRelationship.f2041id, modelUserRelationship.type, modelUserRelationship.user, modelUserRelationship.userId); } public static int getType(Integer num) { @@ -80,7 +80,7 @@ public class ModelUserRelationship implements Model { this.userId = jsonReader.nextLongOrNull(); return; case 1: - this.f2040id = jsonReader.nextLong(this.f2040id); + this.f2041id = jsonReader.nextLong(this.f2041id); return; case 2: this.type = jsonReader.nextInt(this.type); @@ -120,7 +120,7 @@ public class ModelUserRelationship implements Model { } public long getId() { - return this.f2040id; + return this.f2041id; } public int getType() { diff --git a/app/src/main/java/com/discord/models/domain/ModelUserSettings.java b/app/src/main/java/com/discord/models/domain/ModelUserSettings.java index 283682feac..3432e5887a 100644 --- a/app/src/main/java/com/discord/models/domain/ModelUserSettings.java +++ b/app/src/main/java/com/discord/models/domain/ModelUserSettings.java @@ -1,7 +1,7 @@ package com.discord.models.domain; import android.text.TextUtils; -import c.a.n.a.m0; +import c.a.n.a.f0; import c.d.b.a.a; import com.discord.api.presence.ClientStatus; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; @@ -316,7 +316,7 @@ public class ModelUserSettings implements Model { this.status = (ClientStatus) InboundGatewayGsonParser.fromJson(jsonReader, ClientStatus.class); return; case '\n': - List nextList = jsonReader.nextList(new m0(jsonReader)); + List nextList = jsonReader.nextList(new f0(jsonReader)); if (!nextList.isEmpty()) { this.guildFolders = nextList; return; diff --git a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java index 2fd332d167..7e74bdd9c7 100644 --- a/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java +++ b/app/src/main/java/com/discord/models/domain/ModelVoiceRegion.java @@ -7,7 +7,7 @@ public class ModelVoiceRegion implements Model { private boolean deprecated; /* renamed from: id reason: collision with root package name */ - private String f2041id; + private String f2042id; private String name; private boolean optimal; private String sampleHostname; @@ -64,7 +64,7 @@ public class ModelVoiceRegion implements Model { this.optimal = jsonReader.nextBoolean(this.optimal); return; case 2: - this.f2041id = jsonReader.nextString(this.f2041id); + this.f2042id = jsonReader.nextString(this.f2042id); return; case 3: this.name = jsonReader.nextString(this.name); @@ -112,7 +112,7 @@ public class ModelVoiceRegion implements Model { } public String getId() { - return this.f2041id; + return this.f2042id; } public String getName() { diff --git a/app/src/main/java/com/discord/models/domain/ModelWebhook.java b/app/src/main/java/com/discord/models/domain/ModelWebhook.java index 5ea306fc24..058d4a1cfc 100644 --- a/app/src/main/java/com/discord/models/domain/ModelWebhook.java +++ b/app/src/main/java/com/discord/models/domain/ModelWebhook.java @@ -9,7 +9,7 @@ public class ModelWebhook implements Model { private long guildId; /* renamed from: id reason: collision with root package name */ - private long f2042id; + private long f2043id; private String name; @Override // com.discord.models.domain.Model @@ -60,7 +60,7 @@ public class ModelWebhook implements Model { this.guildId = jsonReader.nextLong(this.guildId); return; case 3: - this.f2042id = jsonReader.nextLong(this.f2042id); + this.f2043id = jsonReader.nextLong(this.f2043id); return; case 4: this.name = jsonReader.nextString(this.name); @@ -109,7 +109,7 @@ public class ModelWebhook implements Model { } public long getId() { - return this.f2042id; + return this.f2043id; } public String getName() { diff --git a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java index e507342e92..52e4040c24 100644 --- a/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java +++ b/app/src/main/java/com/discord/models/domain/PaymentSourceRaw.java @@ -15,7 +15,7 @@ public final class PaymentSourceRaw { private final int expiresYear; /* renamed from: id reason: collision with root package name */ - private final String f2043id; + private final String f2044id; private final boolean invalid; private final String last_4; private final int type; @@ -24,7 +24,7 @@ public final class PaymentSourceRaw { m.checkNotNullParameter(str, "id"); m.checkNotNullParameter(modelBillingAddress, "billingAddress"); this.type = i; - this.f2043id = str; + this.f2044id = str; this.invalid = z2; this.billingAddress = modelBillingAddress; this.f8default = z3; @@ -36,7 +36,7 @@ public final class PaymentSourceRaw { } public static /* synthetic */ PaymentSourceRaw copy$default(PaymentSourceRaw paymentSourceRaw, int i, String str, boolean z2, ModelBillingAddress modelBillingAddress, boolean z3, String str2, String str3, String str4, int i2, int i3, int i4, Object obj) { - return paymentSourceRaw.copy((i4 & 1) != 0 ? paymentSourceRaw.type : i, (i4 & 2) != 0 ? paymentSourceRaw.f2043id : str, (i4 & 4) != 0 ? paymentSourceRaw.invalid : z2, (i4 & 8) != 0 ? paymentSourceRaw.billingAddress : modelBillingAddress, (i4 & 16) != 0 ? paymentSourceRaw.f8default : z3, (i4 & 32) != 0 ? paymentSourceRaw.email : str2, (i4 & 64) != 0 ? paymentSourceRaw.brand : str3, (i4 & 128) != 0 ? paymentSourceRaw.last_4 : str4, (i4 & 256) != 0 ? paymentSourceRaw.expiresMonth : i2, (i4 & 512) != 0 ? paymentSourceRaw.expiresYear : i3); + return paymentSourceRaw.copy((i4 & 1) != 0 ? paymentSourceRaw.type : i, (i4 & 2) != 0 ? paymentSourceRaw.f2044id : str, (i4 & 4) != 0 ? paymentSourceRaw.invalid : z2, (i4 & 8) != 0 ? paymentSourceRaw.billingAddress : modelBillingAddress, (i4 & 16) != 0 ? paymentSourceRaw.f8default : z3, (i4 & 32) != 0 ? paymentSourceRaw.email : str2, (i4 & 64) != 0 ? paymentSourceRaw.brand : str3, (i4 & 128) != 0 ? paymentSourceRaw.last_4 : str4, (i4 & 256) != 0 ? paymentSourceRaw.expiresMonth : i2, (i4 & 512) != 0 ? paymentSourceRaw.expiresYear : i3); } public final int component1() { @@ -48,7 +48,7 @@ public final class PaymentSourceRaw { } public final String component2() { - return this.f2043id; + return this.f2044id; } public final boolean component3() { @@ -93,7 +93,7 @@ public final class PaymentSourceRaw { return false; } PaymentSourceRaw paymentSourceRaw = (PaymentSourceRaw) obj; - return this.type == paymentSourceRaw.type && m.areEqual(this.f2043id, paymentSourceRaw.f2043id) && this.invalid == paymentSourceRaw.invalid && m.areEqual(this.billingAddress, paymentSourceRaw.billingAddress) && this.f8default == paymentSourceRaw.f8default && m.areEqual(this.email, paymentSourceRaw.email) && m.areEqual(this.brand, paymentSourceRaw.brand) && m.areEqual(this.last_4, paymentSourceRaw.last_4) && this.expiresMonth == paymentSourceRaw.expiresMonth && this.expiresYear == paymentSourceRaw.expiresYear; + return this.type == paymentSourceRaw.type && m.areEqual(this.f2044id, paymentSourceRaw.f2044id) && this.invalid == paymentSourceRaw.invalid && m.areEqual(this.billingAddress, paymentSourceRaw.billingAddress) && this.f8default == paymentSourceRaw.f8default && m.areEqual(this.email, paymentSourceRaw.email) && m.areEqual(this.brand, paymentSourceRaw.brand) && m.areEqual(this.last_4, paymentSourceRaw.last_4) && this.expiresMonth == paymentSourceRaw.expiresMonth && this.expiresYear == paymentSourceRaw.expiresYear; } public final ModelBillingAddress getBillingAddress() { @@ -121,7 +121,7 @@ public final class PaymentSourceRaw { } public final String getId() { - return this.f2043id; + return this.f2044id; } public final boolean getInvalid() { @@ -138,7 +138,7 @@ public final class PaymentSourceRaw { public int hashCode() { int i = this.type * 31; - String str = this.f2043id; + String str = this.f2044id; int i2 = 0; int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31; boolean z2 = this.invalid; @@ -172,7 +172,7 @@ public final class PaymentSourceRaw { StringBuilder L = a.L("PaymentSourceRaw(type="); L.append(this.type); L.append(", id="); - L.append(this.f2043id); + L.append(this.f2044id); L.append(", invalid="); L.append(this.invalid); L.append(", billingAddress="); diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java b/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java index ff7954fb10..041ef83a75 100644 --- a/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java +++ b/app/src/main/java/com/discord/models/domain/billing/ModelInvoiceItem.java @@ -9,7 +9,7 @@ public final class ModelInvoiceItem { private final List discount; /* renamed from: id reason: collision with root package name */ - private final long f2044id; + private final long f2045id; private final boolean proration; private final int quantity; private final long subscriptionPlanId; @@ -19,7 +19,7 @@ public final class ModelInvoiceItem { m.checkNotNullParameter(list, "discount"); this.amount = i; this.discount = list; - this.f2044id = j; + this.f2045id = j; this.proration = z2; this.quantity = i2; this.subscriptionPlanId = j2; @@ -27,7 +27,7 @@ public final class ModelInvoiceItem { } public static /* synthetic */ ModelInvoiceItem copy$default(ModelInvoiceItem modelInvoiceItem, int i, List list, long j, boolean z2, int i2, long j2, int i3, int i4, Object obj) { - return modelInvoiceItem.copy((i4 & 1) != 0 ? modelInvoiceItem.amount : i, (i4 & 2) != 0 ? modelInvoiceItem.discount : list, (i4 & 4) != 0 ? modelInvoiceItem.f2044id : j, (i4 & 8) != 0 ? modelInvoiceItem.proration : z2, (i4 & 16) != 0 ? modelInvoiceItem.quantity : i2, (i4 & 32) != 0 ? modelInvoiceItem.subscriptionPlanId : j2, (i4 & 64) != 0 ? modelInvoiceItem.subscriptionPlanPrice : i3); + return modelInvoiceItem.copy((i4 & 1) != 0 ? modelInvoiceItem.amount : i, (i4 & 2) != 0 ? modelInvoiceItem.discount : list, (i4 & 4) != 0 ? modelInvoiceItem.f2045id : j, (i4 & 8) != 0 ? modelInvoiceItem.proration : z2, (i4 & 16) != 0 ? modelInvoiceItem.quantity : i2, (i4 & 32) != 0 ? modelInvoiceItem.subscriptionPlanId : j2, (i4 & 64) != 0 ? modelInvoiceItem.subscriptionPlanPrice : i3); } public final int component1() { @@ -39,7 +39,7 @@ public final class ModelInvoiceItem { } public final long component3() { - return this.f2044id; + return this.f2045id; } public final boolean component4() { @@ -71,7 +71,7 @@ public final class ModelInvoiceItem { return false; } ModelInvoiceItem modelInvoiceItem = (ModelInvoiceItem) obj; - return this.amount == modelInvoiceItem.amount && m.areEqual(this.discount, modelInvoiceItem.discount) && this.f2044id == modelInvoiceItem.f2044id && this.proration == modelInvoiceItem.proration && this.quantity == modelInvoiceItem.quantity && this.subscriptionPlanId == modelInvoiceItem.subscriptionPlanId && this.subscriptionPlanPrice == modelInvoiceItem.subscriptionPlanPrice; + return this.amount == modelInvoiceItem.amount && m.areEqual(this.discount, modelInvoiceItem.discount) && this.f2045id == modelInvoiceItem.f2045id && this.proration == modelInvoiceItem.proration && this.quantity == modelInvoiceItem.quantity && this.subscriptionPlanId == modelInvoiceItem.subscriptionPlanId && this.subscriptionPlanPrice == modelInvoiceItem.subscriptionPlanPrice; } public final int getAmount() { @@ -83,7 +83,7 @@ public final class ModelInvoiceItem { } public final long getId() { - return this.f2044id; + return this.f2045id; } public final boolean getProration() { @@ -106,7 +106,7 @@ public final class ModelInvoiceItem { int i = this.amount * 31; List list = this.discount; int hashCode = list != null ? list.hashCode() : 0; - long j = this.f2044id; + long j = this.f2045id; int i2 = (((i + hashCode) * 31) + ((int) (j ^ (j >>> 32)))) * 31; boolean z2 = this.proration; if (z2) { @@ -125,7 +125,7 @@ public final class ModelInvoiceItem { L.append(", discount="); L.append(this.discount); L.append(", id="); - L.append(this.f2044id); + L.append(this.f2045id); L.append(", proration="); L.append(this.proration); L.append(", quantity="); diff --git a/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java b/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java index c50a626cb8..1fa7fdae6b 100644 --- a/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java +++ b/app/src/main/java/com/discord/models/domain/billing/ModelInvoicePreview.java @@ -8,7 +8,7 @@ public final class ModelInvoicePreview { private final String currency; /* renamed from: id reason: collision with root package name */ - private final long f2045id; + private final long f2046id; private final List invoiceItems; private final String subscriptionPeriodEnd; private final String subscriptionPeriodStart; @@ -23,7 +23,7 @@ public final class ModelInvoicePreview { m.checkNotNullParameter(str2, "subscriptionPeriodEnd"); m.checkNotNullParameter(str3, "subscriptionPeriodStart"); this.currency = str; - this.f2045id = j; + this.f2046id = j; this.invoiceItems = list; this.subscriptionPeriodEnd = str2; this.subscriptionPeriodStart = str3; @@ -34,7 +34,7 @@ public final class ModelInvoicePreview { } public static /* synthetic */ ModelInvoicePreview copy$default(ModelInvoicePreview modelInvoicePreview, String str, long j, List list, String str2, String str3, int i, int i2, boolean z2, int i3, int i4, Object obj) { - return modelInvoicePreview.copy((i4 & 1) != 0 ? modelInvoicePreview.currency : str, (i4 & 2) != 0 ? modelInvoicePreview.f2045id : j, (i4 & 4) != 0 ? modelInvoicePreview.invoiceItems : list, (i4 & 8) != 0 ? modelInvoicePreview.subscriptionPeriodEnd : str2, (i4 & 16) != 0 ? modelInvoicePreview.subscriptionPeriodStart : str3, (i4 & 32) != 0 ? modelInvoicePreview.subtotal : i, (i4 & 64) != 0 ? modelInvoicePreview.tax : i2, (i4 & 128) != 0 ? modelInvoicePreview.taxInclusive : z2, (i4 & 256) != 0 ? modelInvoicePreview.total : i3); + return modelInvoicePreview.copy((i4 & 1) != 0 ? modelInvoicePreview.currency : str, (i4 & 2) != 0 ? modelInvoicePreview.f2046id : j, (i4 & 4) != 0 ? modelInvoicePreview.invoiceItems : list, (i4 & 8) != 0 ? modelInvoicePreview.subscriptionPeriodEnd : str2, (i4 & 16) != 0 ? modelInvoicePreview.subscriptionPeriodStart : str3, (i4 & 32) != 0 ? modelInvoicePreview.subtotal : i, (i4 & 64) != 0 ? modelInvoicePreview.tax : i2, (i4 & 128) != 0 ? modelInvoicePreview.taxInclusive : z2, (i4 & 256) != 0 ? modelInvoicePreview.total : i3); } public final String component1() { @@ -42,7 +42,7 @@ public final class ModelInvoicePreview { } public final long component2() { - return this.f2045id; + return this.f2046id; } public final List component3() { @@ -89,7 +89,7 @@ public final class ModelInvoicePreview { return false; } ModelInvoicePreview modelInvoicePreview = (ModelInvoicePreview) obj; - return m.areEqual(this.currency, modelInvoicePreview.currency) && this.f2045id == modelInvoicePreview.f2045id && m.areEqual(this.invoiceItems, modelInvoicePreview.invoiceItems) && m.areEqual(this.subscriptionPeriodEnd, modelInvoicePreview.subscriptionPeriodEnd) && m.areEqual(this.subscriptionPeriodStart, modelInvoicePreview.subscriptionPeriodStart) && this.subtotal == modelInvoicePreview.subtotal && this.tax == modelInvoicePreview.tax && this.taxInclusive == modelInvoicePreview.taxInclusive && this.total == modelInvoicePreview.total; + return m.areEqual(this.currency, modelInvoicePreview.currency) && this.f2046id == modelInvoicePreview.f2046id && m.areEqual(this.invoiceItems, modelInvoicePreview.invoiceItems) && m.areEqual(this.subscriptionPeriodEnd, modelInvoicePreview.subscriptionPeriodEnd) && m.areEqual(this.subscriptionPeriodStart, modelInvoicePreview.subscriptionPeriodStart) && this.subtotal == modelInvoicePreview.subtotal && this.tax == modelInvoicePreview.tax && this.taxInclusive == modelInvoicePreview.taxInclusive && this.total == modelInvoicePreview.total; } public final String getCurrency() { @@ -97,7 +97,7 @@ public final class ModelInvoicePreview { } public final long getId() { - return this.f2045id; + return this.f2046id; } public final List getInvoiceItems() { @@ -132,7 +132,7 @@ public final class ModelInvoicePreview { String str = this.currency; int i = 0; int hashCode = str != null ? str.hashCode() : 0; - long j = this.f2045id; + long j = this.f2046id; int i2 = ((hashCode * 31) + ((int) (j ^ (j >>> 32)))) * 31; List list = this.invoiceItems; int hashCode2 = (i2 + (list != null ? list.hashCode() : 0)) * 31; @@ -157,7 +157,7 @@ public final class ModelInvoicePreview { StringBuilder L = a.L("ModelInvoicePreview(currency="); L.append(this.currency); L.append(", id="); - L.append(this.f2045id); + L.append(this.f2046id); L.append(", invoiceItems="); L.append(this.invoiceItems); L.append(", subscriptionPeriodEnd="); diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java index bc07f2d27c..1555946687 100644 --- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java +++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiCustom.java @@ -22,7 +22,7 @@ public class ModelEmojiCustom implements Emoji { private long guildId; /* renamed from: id reason: collision with root package name */ - private long f2046id; + private long f2047id; private String idStr; private boolean isAnimated; private transient boolean isUsable; @@ -59,7 +59,7 @@ public class ModelEmojiCustom implements Emoji { public ModelEmojiCustom(long j, String str, List list, boolean z2, boolean z3, int i, String str2, boolean z4, boolean z5, boolean z6, long j2) { this.idStr = "0"; - this.f2046id = j; + this.f2047id = j; this.idStr = String.valueOf(j); this.name = str; this.roles = list; @@ -77,7 +77,7 @@ public class ModelEmojiCustom implements Emoji { this.idStr = "0"; boolean z2 = true; this.isUsable = true; - this.f2046id = guildEmoji.c(); + this.f2047id = guildEmoji.c(); this.name = guildEmoji.e(); this.idStr = String.valueOf(guildEmoji.c()); this.roles = guildEmoji.g() != null ? guildEmoji.g() : new ArrayList<>(); @@ -90,7 +90,7 @@ public class ModelEmojiCustom implements Emoji { public ModelEmojiCustom(ModelEmojiCustom modelEmojiCustom, int i, boolean z2) { this.idStr = "0"; - this.f2046id = modelEmojiCustom.f2046id; + this.f2047id = modelEmojiCustom.f2047id; this.idStr = modelEmojiCustom.idStr; this.roles = modelEmojiCustom.getRoles(); this.requireColons = modelEmojiCustom.requireColons; @@ -206,7 +206,7 @@ public class ModelEmojiCustom implements Emoji { } public long getId() { - return this.f2046id; + return this.f2047id; } public String getIdStr() { @@ -215,7 +215,7 @@ public class ModelEmojiCustom implements Emoji { @Override // com.discord.models.domain.emoji.Emoji public String getImageUri(boolean z2, int i, Context context) { - return getImageUri(this.f2046id, this.isAnimated && z2, i); + return getImageUri(this.f2047id, this.isAnimated && z2, i); } @Override // com.discord.models.domain.emoji.Emoji @@ -232,7 +232,7 @@ public class ModelEmojiCustom implements Emoji { sb.append(str); sb.append(this.name); sb.append(':'); - sb.append(this.f2046id); + sb.append(this.f2047id); sb.append('>'); return sb.toString(); } @@ -248,7 +248,7 @@ public class ModelEmojiCustom implements Emoji { @Override // com.discord.models.domain.emoji.Emoji public String getReactionKey() { - return this.name + ':' + this.f2046id; + return this.name + ':' + this.f2047id; } @Override // com.discord.models.domain.emoji.Emoji @@ -329,7 +329,7 @@ public class ModelEmojiCustom implements Emoji { } public GuildEmoji toApiEmoji() { - return new GuildEmoji(this.f2046id, this.name, this.roles, this.requireColons, this.managed, this.isAnimated, this.available); + return new GuildEmoji(this.f2047id, this.name, this.roles, this.requireColons, this.managed, this.isAnimated, this.available); } @Override // java.lang.Object @@ -364,7 +364,7 @@ public class ModelEmojiCustom implements Emoji { @Override // android.os.Parcelable public void writeToParcel(Parcel parcel, int i) { - parcel.writeLong(this.f2046id); + parcel.writeLong(this.f2047id); parcel.writeString(this.name); parcel.writeList(this.roles); parcel.writeInt(this.requireColons ? 1 : 0); diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java index 6e14ed4f69..40b3c41f55 100644 --- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java +++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiGuild.java @@ -10,7 +10,7 @@ public final class ModelEmojiGuild { private final boolean available; /* renamed from: id reason: collision with root package name */ - private final long f2047id; + private final long f2048id; private final boolean managed; private final String name; private final boolean requiredColons; @@ -21,7 +21,7 @@ public final class ModelEmojiGuild { m.checkNotNullParameter(str, "name"); m.checkNotNullParameter(list, "roles"); m.checkNotNullParameter(user, "user"); - this.f2047id = j; + this.f2048id = j; this.name = str; this.managed = z2; this.roles = list; @@ -32,11 +32,11 @@ public final class ModelEmojiGuild { } public static /* synthetic */ ModelEmojiGuild copy$default(ModelEmojiGuild modelEmojiGuild, long j, String str, boolean z2, List list, boolean z3, User user, boolean z4, boolean z5, int i, Object obj) { - return modelEmojiGuild.copy((i & 1) != 0 ? modelEmojiGuild.f2047id : j, (i & 2) != 0 ? modelEmojiGuild.name : str, (i & 4) != 0 ? modelEmojiGuild.managed : z2, (i & 8) != 0 ? modelEmojiGuild.roles : list, (i & 16) != 0 ? modelEmojiGuild.requiredColons : z3, (i & 32) != 0 ? modelEmojiGuild.user : user, (i & 64) != 0 ? modelEmojiGuild.animated : z4, (i & 128) != 0 ? modelEmojiGuild.available : z5); + return modelEmojiGuild.copy((i & 1) != 0 ? modelEmojiGuild.f2048id : j, (i & 2) != 0 ? modelEmojiGuild.name : str, (i & 4) != 0 ? modelEmojiGuild.managed : z2, (i & 8) != 0 ? modelEmojiGuild.roles : list, (i & 16) != 0 ? modelEmojiGuild.requiredColons : z3, (i & 32) != 0 ? modelEmojiGuild.user : user, (i & 64) != 0 ? modelEmojiGuild.animated : z4, (i & 128) != 0 ? modelEmojiGuild.available : z5); } public final long component1() { - return this.f2047id; + return this.f2048id; } public final String component2() { @@ -82,7 +82,7 @@ public final class ModelEmojiGuild { return false; } ModelEmojiGuild modelEmojiGuild = (ModelEmojiGuild) obj; - return this.f2047id == modelEmojiGuild.f2047id && m.areEqual(this.name, modelEmojiGuild.name) && this.managed == modelEmojiGuild.managed && m.areEqual(this.roles, modelEmojiGuild.roles) && this.requiredColons == modelEmojiGuild.requiredColons && m.areEqual(this.user, modelEmojiGuild.user) && this.animated == modelEmojiGuild.animated && this.available == modelEmojiGuild.available; + return this.f2048id == modelEmojiGuild.f2048id && m.areEqual(this.name, modelEmojiGuild.name) && this.managed == modelEmojiGuild.managed && m.areEqual(this.roles, modelEmojiGuild.roles) && this.requiredColons == modelEmojiGuild.requiredColons && m.areEqual(this.user, modelEmojiGuild.user) && this.animated == modelEmojiGuild.animated && this.available == modelEmojiGuild.available; } public final boolean getAnimated() { @@ -94,7 +94,7 @@ public final class ModelEmojiGuild { } public final long getId() { - return this.f2047id; + return this.f2048id; } public final boolean getManaged() { @@ -118,7 +118,7 @@ public final class ModelEmojiGuild { } public int hashCode() { - long j = this.f2047id; + long j = this.f2048id; int i = ((int) (j ^ (j >>> 32))) * 31; String str = this.name; int i2 = 0; @@ -164,7 +164,7 @@ public final class ModelEmojiGuild { public String toString() { StringBuilder L = a.L("ModelEmojiGuild(id="); - L.append(this.f2047id); + L.append(this.f2048id); L.append(", name="); L.append(this.name); L.append(", managed="); diff --git a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java index 2421d2e993..32988d41a8 100644 --- a/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java +++ b/app/src/main/java/com/discord/models/domain/emoji/ModelEmojiUnicode.java @@ -5,9 +5,9 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; -import c.a.n.a.t0.a; -import c.a.n.a.t0.b; -import c.a.n.a.t0.c; +import c.a.n.a.k0.a; +import c.a.n.a.k0.b; +import c.a.n.a.k0.c; import com.discord.models.domain.Model; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java index 43bd873079..a5f8eea8f4 100644 --- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java +++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyAlbum.java @@ -8,7 +8,7 @@ public final class ModelSpotifyAlbum { private final String albumType; /* renamed from: id reason: collision with root package name */ - private final String f2048id; + private final String f2049id; private final List images; private final String name; @@ -65,7 +65,7 @@ public final class ModelSpotifyAlbum { m.checkNotNullParameter(list, "images"); m.checkNotNullParameter(str3, "name"); this.albumType = str; - this.f2048id = str2; + this.f2049id = str2; this.images = list; this.name = str3; } @@ -77,7 +77,7 @@ public final class ModelSpotifyAlbum { str = modelSpotifyAlbum.albumType; } if ((i & 2) != 0) { - str2 = modelSpotifyAlbum.f2048id; + str2 = modelSpotifyAlbum.f2049id; } if ((i & 4) != 0) { list = modelSpotifyAlbum.images; @@ -93,7 +93,7 @@ public final class ModelSpotifyAlbum { } public final String component2() { - return this.f2048id; + return this.f2049id; } public final List component3() { @@ -120,7 +120,7 @@ public final class ModelSpotifyAlbum { return false; } ModelSpotifyAlbum modelSpotifyAlbum = (ModelSpotifyAlbum) obj; - return m.areEqual(this.albumType, modelSpotifyAlbum.albumType) && m.areEqual(this.f2048id, modelSpotifyAlbum.f2048id) && m.areEqual(this.images, modelSpotifyAlbum.images) && m.areEqual(this.name, modelSpotifyAlbum.name); + return m.areEqual(this.albumType, modelSpotifyAlbum.albumType) && m.areEqual(this.f2049id, modelSpotifyAlbum.f2049id) && m.areEqual(this.images, modelSpotifyAlbum.images) && m.areEqual(this.name, modelSpotifyAlbum.name); } public final String getAlbumType() { @@ -128,7 +128,7 @@ public final class ModelSpotifyAlbum { } public final String getId() { - return this.f2048id; + return this.f2049id; } public final List getImages() { @@ -143,7 +143,7 @@ public final class ModelSpotifyAlbum { String str = this.albumType; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; - String str2 = this.f2048id; + String str2 = this.f2049id; int hashCode2 = (hashCode + (str2 != null ? str2.hashCode() : 0)) * 31; List list = this.images; int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31; @@ -158,7 +158,7 @@ public final class ModelSpotifyAlbum { StringBuilder L = a.L("ModelSpotifyAlbum(albumType="); L.append(this.albumType); L.append(", id="); - L.append(this.f2048id); + L.append(this.f2049id); L.append(", images="); L.append(this.images); L.append(", name="); diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java index c021617367..a3fe4b8284 100644 --- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java +++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyArtist.java @@ -6,19 +6,19 @@ import d0.z.d.m; public final class ModelSpotifyArtist { /* renamed from: id reason: collision with root package name */ - private final String f2049id; + private final String f2050id; private final String name; public ModelSpotifyArtist(String str, String str2) { m.checkNotNullParameter(str, "id"); m.checkNotNullParameter(str2, "name"); - this.f2049id = str; + this.f2050id = str; this.name = str2; } public static /* synthetic */ ModelSpotifyArtist copy$default(ModelSpotifyArtist modelSpotifyArtist, String str, String str2, int i, Object obj) { if ((i & 1) != 0) { - str = modelSpotifyArtist.f2049id; + str = modelSpotifyArtist.f2050id; } if ((i & 2) != 0) { str2 = modelSpotifyArtist.name; @@ -27,7 +27,7 @@ public final class ModelSpotifyArtist { } public final String component1() { - return this.f2049id; + return this.f2050id; } public final String component2() { @@ -48,11 +48,11 @@ public final class ModelSpotifyArtist { return false; } ModelSpotifyArtist modelSpotifyArtist = (ModelSpotifyArtist) obj; - return m.areEqual(this.f2049id, modelSpotifyArtist.f2049id) && m.areEqual(this.name, modelSpotifyArtist.name); + return m.areEqual(this.f2050id, modelSpotifyArtist.f2050id) && m.areEqual(this.name, modelSpotifyArtist.name); } public final String getId() { - return this.f2049id; + return this.f2050id; } public final String getName() { @@ -60,7 +60,7 @@ public final class ModelSpotifyArtist { } public int hashCode() { - String str = this.f2049id; + String str = this.f2050id; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.name; @@ -72,7 +72,7 @@ public final class ModelSpotifyArtist { public String toString() { StringBuilder L = a.L("ModelSpotifyArtist(id="); - L.append(this.f2049id); + L.append(this.f2050id); L.append(", name="); return a.D(L, this.name, ")"); } diff --git a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java index 75db6ccf09..745d1bbdbe 100644 --- a/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java +++ b/app/src/main/java/com/discord/models/domain/spotify/ModelSpotifyTrack.java @@ -10,7 +10,7 @@ public final class ModelSpotifyTrack { private final long durationMs; /* renamed from: id reason: collision with root package name */ - private final String f2050id; + private final String f2051id; private final boolean isLocal; private final String name; @@ -18,7 +18,7 @@ public final class ModelSpotifyTrack { m.checkNotNullParameter(str, "id"); m.checkNotNullParameter(str2, "name"); m.checkNotNullParameter(list, "artists"); - this.f2050id = str; + this.f2051id = str; this.name = str2; this.durationMs = j; this.album = modelSpotifyAlbum; @@ -30,7 +30,7 @@ public final class ModelSpotifyTrack { /* JADX WARN: Multi-variable type inference failed */ public static /* synthetic */ ModelSpotifyTrack copy$default(ModelSpotifyTrack modelSpotifyTrack, String str, String str2, long j, ModelSpotifyAlbum modelSpotifyAlbum, List list, boolean z2, int i, Object obj) { if ((i & 1) != 0) { - str = modelSpotifyTrack.f2050id; + str = modelSpotifyTrack.f2051id; } if ((i & 2) != 0) { str2 = modelSpotifyTrack.name; @@ -51,7 +51,7 @@ public final class ModelSpotifyTrack { } public final String component1() { - return this.f2050id; + return this.f2051id; } public final String component2() { @@ -89,7 +89,7 @@ public final class ModelSpotifyTrack { return false; } ModelSpotifyTrack modelSpotifyTrack = (ModelSpotifyTrack) obj; - return m.areEqual(this.f2050id, modelSpotifyTrack.f2050id) && m.areEqual(this.name, modelSpotifyTrack.name) && this.durationMs == modelSpotifyTrack.durationMs && m.areEqual(this.album, modelSpotifyTrack.album) && m.areEqual(this.artists, modelSpotifyTrack.artists) && this.isLocal == modelSpotifyTrack.isLocal; + return m.areEqual(this.f2051id, modelSpotifyTrack.f2051id) && m.areEqual(this.name, modelSpotifyTrack.name) && this.durationMs == modelSpotifyTrack.durationMs && m.areEqual(this.album, modelSpotifyTrack.album) && m.areEqual(this.artists, modelSpotifyTrack.artists) && this.isLocal == modelSpotifyTrack.isLocal; } public final ModelSpotifyAlbum getAlbum() { @@ -105,7 +105,7 @@ public final class ModelSpotifyTrack { } public final String getId() { - return this.f2050id; + return this.f2051id; } public final String getName() { @@ -113,7 +113,7 @@ public final class ModelSpotifyTrack { } public int hashCode() { - String str = this.f2050id; + String str = this.f2051id; int i = 0; int hashCode = (str != null ? str.hashCode() : 0) * 31; String str2 = this.name; @@ -143,7 +143,7 @@ public final class ModelSpotifyTrack { public String toString() { StringBuilder L = a.L("ModelSpotifyTrack(id="); - L.append(this.f2050id); + L.append(this.f2051id); L.append(", name="); L.append(this.name); L.append(", durationMs="); diff --git a/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java b/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java index 7b5e01c65b..dfbb4770d3 100644 --- a/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java +++ b/app/src/main/java/com/discord/models/experiments/domain/ExperimentHash.java @@ -11,7 +11,7 @@ public final class ExperimentHash { public final long from(CharSequence charSequence) { m.checkNotNullParameter(charSequence, "name"); - int G = a.G(charSequence, 0, charSequence.length(), 0); - return G < 0 ? ((long) G) + 4294967296L : (long) G; + int H = a.H(charSequence, 0, charSequence.length(), 0); + return H < 0 ? ((long) H) + 4294967296L : (long) H; } } diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.java index 5c181debd1..c6d5387c5b 100644 --- a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.java +++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.java @@ -1,13 +1,16 @@ package com.discord.models.experiments.dto; +import com.discord.api.guild.GuildFeature; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.GuildExperimentFilter; +import d0.t.u; +import d0.z.d.m; +import java.util.List; import kotlin.jvm.internal.Ref$ObjectRef; /* compiled from: GuildExperimentFilter.kt */ public final class GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 implements Runnable { + public final /* synthetic */ Ref$ObjectRef $features; public final /* synthetic */ Model.JsonReader $reader; - public final /* synthetic */ Ref$ObjectRef $result; /* compiled from: GuildExperimentFilter.kt */ /* renamed from: com.discord.models.experiments.dto.GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1$1 reason: invalid class name */ @@ -29,6 +32,21 @@ public final class GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 imp public static final class AnonymousClass2 implements Runnable { public final /* synthetic */ GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 this$0; + /* compiled from: GuildExperimentFilter.kt */ + /* renamed from: com.discord.models.experiments.dto.GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1$2$1 reason: invalid class name */ + public static final class AnonymousClass1 implements Model.JsonReader.ItemFactory { + public final /* synthetic */ AnonymousClass2 this$0; + + public AnonymousClass1(AnonymousClass2 r1) { + this.this$0 = r1; + } + + @Override // com.discord.models.domain.Model.JsonReader.ItemFactory + public final GuildFeature get() { + return (GuildFeature) InboundGatewayGsonParser.fromJson(this.this$0.this$0.$reader, GuildFeature.class); + } + } + public AnonymousClass2(GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1) { this.this$0 = guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1; } @@ -37,13 +55,16 @@ public final class GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 imp @Override // java.lang.Runnable public final void run() { GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1 = this.this$0; - guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.$result.element = (GuildExperimentFilter.GuildHasFeatureFilter) InboundGatewayGsonParser.fromJson(guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.$reader, GuildExperimentFilter.GuildHasFeatureFilter.class); + Ref$ObjectRef ref$ObjectRef = guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.$features; + List nextList = guildExperimentFilter$Parser$parseGuildHasFeatureFilter$1.$reader.nextList(new AnonymousClass1(this)); + m.checkNotNullExpressionValue(nextList, "reader.nextList {\n …ass.java)\n }"); + ref$ObjectRef.element = u.toSet(nextList); } } public GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1(Model.JsonReader jsonReader, Ref$ObjectRef ref$ObjectRef) { this.$reader = jsonReader; - this.$result = ref$ObjectRef; + this.$features = ref$ObjectRef; } @Override // java.lang.Runnable diff --git a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java index 69cd24eb8b..92ced0b230 100644 --- a/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java +++ b/app/src/main/java/com/discord/models/experiments/dto/GuildExperimentFilter.java @@ -285,12 +285,12 @@ public abstract class GuildExperimentFilter { return parser.parseGuildMemberCountRangeFilter(jsonReader); } + /* JADX WARNING: Unknown variable types count: 1 */ private final GuildHasFeatureFilter parseGuildHasFeatureFilter(Model.JsonReader jsonReader) { Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef(); - ref$ObjectRef.element = null; + ref$ObjectRef.element = n0.emptySet(); jsonReader.nextListIndexed(new GuildExperimentFilter$Parser$parseGuildHasFeatureFilter$1(jsonReader, ref$ObjectRef)); - GuildHasFeatureFilter guildHasFeatureFilter = ref$ObjectRef.element; - return guildHasFeatureFilter != null ? guildHasFeatureFilter : new GuildHasFeatureFilter(n0.emptySet()); + return new GuildHasFeatureFilter(ref$ObjectRef.element); } private final GuildIdRangeFilter parseGuildIdRangeFilter(Model.JsonReader jsonReader) { diff --git a/app/src/main/java/com/discord/models/guild/Guild.java b/app/src/main/java/com/discord/models/guild/Guild.java index f732755610..f2ebf3b1af 100644 --- a/app/src/main/java/com/discord/models/guild/Guild.java +++ b/app/src/main/java/com/discord/models/guild/Guild.java @@ -33,7 +33,7 @@ public final class Guild { private final String icon; /* renamed from: id reason: collision with root package name */ - private final long f2051id; + private final long f2052id; private final String joinedAt; private final GuildMaxVideoChannelUsers maxVideoChannelUsers; private final int memberCount; @@ -119,7 +119,7 @@ public final class Guild { this.name = str; this.description = str2; this.defaultMessageNotifications = i; - this.f2051id = j; + this.f2052id = j; this.region = str3; this.ownerId = j2; this.icon = str4; @@ -155,7 +155,7 @@ public final class Guild { } public static /* synthetic */ Guild copy$default(Guild guild, List list, List list2, List list3, String str, String str2, int i, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, boolean z2, int i2, int i3, Long l, Long l2, Set set, int i4, String str5, String str6, int i5, int i6, int i7, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i8, boolean z3, int i9, int i10, Object obj) { - return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2051id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & 1073741824) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3); + return guild.copy((i9 & 1) != 0 ? guild.roles : list, (i9 & 2) != 0 ? guild.emojis : list2, (i9 & 4) != 0 ? guild.stickers : list3, (i9 & 8) != 0 ? guild.name : str, (i9 & 16) != 0 ? guild.description : str2, (i9 & 32) != 0 ? guild.defaultMessageNotifications : i, (i9 & 64) != 0 ? guild.f2052id : j, (i9 & 128) != 0 ? guild.region : str3, (i9 & 256) != 0 ? guild.ownerId : j2, (i9 & 512) != 0 ? guild.icon : str4, (i9 & 1024) != 0 ? guild.verificationLevel : guildVerificationLevel, (i9 & 2048) != 0 ? guild.explicitContentFilter : guildExplicitContentFilter, (i9 & 4096) != 0 ? guild.unavailable : z2, (i9 & 8192) != 0 ? guild.mfaLevel : i2, (i9 & 16384) != 0 ? guild.afkTimeout : i3, (i9 & 32768) != 0 ? guild.afkChannelId : l, (i9 & 65536) != 0 ? guild.systemChannelId : l2, (i9 & 131072) != 0 ? guild.features : set, (i9 & 262144) != 0 ? guild.memberCount : i4, (i9 & 524288) != 0 ? guild.banner : str5, (i9 & 1048576) != 0 ? guild.splash : str6, (i9 & 2097152) != 0 ? guild.premiumTier : i5, (i9 & 4194304) != 0 ? guild.premiumSubscriptionCount : i6, (i9 & 8388608) != 0 ? guild.systemChannelFlags : i7, (i9 & 16777216) != 0 ? guild.joinedAt : str7, (i9 & 33554432) != 0 ? guild.rulesChannelId : l3, (i9 & 67108864) != 0 ? guild.publicUpdatesChannelId : l4, (i9 & 134217728) != 0 ? guild.preferredLocale : str8, (i9 & 268435456) != 0 ? guild.welcomeScreen : guildWelcomeScreen, (i9 & 536870912) != 0 ? guild.maxVideoChannelUsers : guildMaxVideoChannelUsers, (i9 & 1073741824) != 0 ? guild.vanityUrlCode : str9, (i9 & Integer.MIN_VALUE) != 0 ? guild.approximatePresenceCount : i8, (i10 & 1) != 0 ? guild.nsfw : z3); } public final boolean canHaveBanner() { @@ -291,7 +291,7 @@ public final class Guild { } public final long component7() { - return this.f2051id; + return this.f2052id; } public final String component8() { @@ -322,7 +322,7 @@ public final class Guild { return false; } Guild guild = (Guild) obj; - return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2051id == guild.f2051id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw; + return m.areEqual(this.roles, guild.roles) && m.areEqual(this.emojis, guild.emojis) && m.areEqual(this.stickers, guild.stickers) && m.areEqual(this.name, guild.name) && m.areEqual(this.description, guild.description) && this.defaultMessageNotifications == guild.defaultMessageNotifications && this.f2052id == guild.f2052id && m.areEqual(this.region, guild.region) && this.ownerId == guild.ownerId && m.areEqual(this.icon, guild.icon) && m.areEqual(this.verificationLevel, guild.verificationLevel) && m.areEqual(this.explicitContentFilter, guild.explicitContentFilter) && this.unavailable == guild.unavailable && this.mfaLevel == guild.mfaLevel && this.afkTimeout == guild.afkTimeout && m.areEqual(this.afkChannelId, guild.afkChannelId) && m.areEqual(this.systemChannelId, guild.systemChannelId) && m.areEqual(this.features, guild.features) && this.memberCount == guild.memberCount && m.areEqual(this.banner, guild.banner) && m.areEqual(this.splash, guild.splash) && this.premiumTier == guild.premiumTier && this.premiumSubscriptionCount == guild.premiumSubscriptionCount && this.systemChannelFlags == guild.systemChannelFlags && m.areEqual(this.joinedAt, guild.joinedAt) && m.areEqual(this.rulesChannelId, guild.rulesChannelId) && m.areEqual(this.publicUpdatesChannelId, guild.publicUpdatesChannelId) && m.areEqual(this.preferredLocale, guild.preferredLocale) && m.areEqual(this.welcomeScreen, guild.welcomeScreen) && m.areEqual(this.maxVideoChannelUsers, guild.maxVideoChannelUsers) && m.areEqual(this.vanityUrlCode, guild.vanityUrlCode) && this.approximatePresenceCount == guild.approximatePresenceCount && this.nsfw == guild.nsfw; } public final Long getAfkChannelId() { @@ -366,7 +366,7 @@ public final class Guild { } public final long getId() { - return this.f2051id; + return this.f2052id; } public final String getJoinedAt() { @@ -482,7 +482,7 @@ public final class Guild { String str = this.name; int hashCode4 = (hashCode3 + (str != null ? str.hashCode() : 0)) * 31; String str2 = this.description; - int a = (b.a(this.f2051id) + ((((hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.defaultMessageNotifications) * 31)) * 31; + int a = (b.a(this.f2052id) + ((((hashCode4 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.defaultMessageNotifications) * 31)) * 31; String str3 = this.region; int a2 = (b.a(this.ownerId) + ((a + (str3 != null ? str3.hashCode() : 0)) * 31)) * 31; String str4 = this.icon; @@ -552,7 +552,7 @@ public final class Guild { } Integer h = guild.h(); int intValue = h != null ? h.intValue() : this.defaultMessageNotifications; - long o = guild.o() != 0 ? guild.o() : this.f2051id; + long o = guild.o() != 0 ? guild.o() : this.f2052id; String C = guild.C(); if (C == null) { C = this.region; @@ -629,7 +629,7 @@ public final class Guild { L.append(", defaultMessageNotifications="); L.append(this.defaultMessageNotifications); L.append(", id="); - L.append(this.f2051id); + L.append(this.f2052id); L.append(", region="); L.append(this.region); L.append(", ownerId="); diff --git a/app/src/main/java/com/discord/models/invite/InviteUtils.java b/app/src/main/java/com/discord/models/invite/InviteUtils.java new file mode 100644 index 0000000000..507f61f285 --- /dev/null +++ b/app/src/main/java/com/discord/models/invite/InviteUtils.java @@ -0,0 +1,16 @@ +package com.discord.models.invite; + +import c.d.b.a.a; +import d0.z.d.m; +/* compiled from: InviteUtils.kt */ +public final class InviteUtils { + public static final InviteUtils INSTANCE = new InviteUtils(); + + private InviteUtils() { + } + + public final String createLinkFromCode(String str) { + m.checkNotNullParameter(str, "code"); + return a.H(new Object[]{"https://discord.gg", str}, 2, "%1$s/%2$s", "java.lang.String.format(format, *args)"); + } +} diff --git a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java index 41f5f94225..25b5e82fbd 100644 --- a/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java +++ b/app/src/main/java/com/discord/models/sticker/dto/ModelStickerPack.java @@ -179,7 +179,7 @@ public final class ModelStickerPack { return false; } for (Sticker sticker : list) { - if (sticker.j()) { + if (sticker.k()) { return true; } } diff --git a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java index ccbb7ff284..8a0cadb88e 100644 --- a/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java +++ b/app/src/main/java/com/discord/models/thread/dto/ModelThreadListSync$Parser$parse$1.java @@ -1,10 +1,10 @@ package com.discord.models.thread.dto; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.thread.ThreadMember; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelMessage; import com.google.gson.stream.JsonToken; import d0.z.d.m; import kotlin.jvm.internal.Ref$LongRef; @@ -65,7 +65,7 @@ public final class ModelThreadListSync$Parser$parse$1 implements Action1 implements Model.JsonReader.ItemFactory { + public static final class AnonymousClass4 implements Model.JsonReader.ItemFactory { public final /* synthetic */ ModelThreadListSync$Parser$parse$1 this$0; public AnonymousClass4(ModelThreadListSync$Parser$parse$1 modelThreadListSync$Parser$parse$1) { @@ -73,8 +73,8 @@ public final class ModelThreadListSync$Parser$parse$1 implements Action1 members; - private final List mostRecentMessages; + private final List mostRecentMessages; private final List threads; /* compiled from: ModelThreadListSync.kt */ @@ -47,9 +47,7 @@ public final class ModelThreadListSync { } } - /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public ModelThreadListSync(long j, List list, List list2, List list3) { + public ModelThreadListSync(long j, List list, List list2, List list3) { m.checkNotNullParameter(list, "threads"); this.guildId = j; this.threads = list; @@ -87,11 +85,11 @@ public final class ModelThreadListSync { return this.members; } - public final List component4() { + public final List component4() { return this.mostRecentMessages; } - public final ModelThreadListSync copy(long j, List list, List list2, List list3) { + public final ModelThreadListSync copy(long j, List list, List list2, List list3) { m.checkNotNullParameter(list, "threads"); return new ModelThreadListSync(j, list, list2, list3); } @@ -115,7 +113,7 @@ public final class ModelThreadListSync { return this.members; } - public final List getMostRecentMessages() { + public final List getMostRecentMessages() { return this.mostRecentMessages; } @@ -131,7 +129,7 @@ public final class ModelThreadListSync { int hashCode = (i + (list != null ? list.hashCode() : 0)) * 31; List list2 = this.members; int hashCode2 = (hashCode + (list2 != null ? list2.hashCode() : 0)) * 31; - List list3 = this.mostRecentMessages; + List list3 = this.mostRecentMessages; if (list3 != null) { i2 = list3.hashCode(); } diff --git a/app/src/main/java/com/discord/overlay/OverlayService.java b/app/src/main/java/com/discord/overlay/OverlayService.java index a402ebc0e3..6f636baae2 100644 --- a/app/src/main/java/com/discord/overlay/OverlayService.java +++ b/app/src/main/java/com/discord/overlay/OverlayService.java @@ -131,6 +131,15 @@ public abstract class OverlayService extends Service { return overlayManager; } + public final void handleStart(Intent intent) { + if (intent == null) { + intent = new Intent(); + } + if (attachBubbleToWindow(intent)) { + startForeground(5858, createNotification(intent)); + } + } + @Override // android.app.Service public IBinder onBind(Intent intent) { return null; @@ -163,18 +172,6 @@ public abstract class OverlayService extends Service { super.onDestroy(); } - @Override // android.app.Service - public int onStartCommand(Intent intent, int i, int i2) { - if (!attachBubbleToWindow(intent != null ? intent : new Intent())) { - return 3; - } - if (intent == null) { - intent = new Intent(); - } - startForeground(5858, createNotification(intent)); - return 3; - } - public final void setOverlayManager(OverlayManager overlayManager) { m.checkNotNullParameter(overlayManager, ""); this.overlayManager = overlayManager; diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java index bc90f1ca71..100dda72c7 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java +++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java @@ -12,6 +12,7 @@ import com.discord.api.auth.mfa.GetBackupCodesResponse; import com.discord.api.channel.Channel; import com.discord.api.commands.ApplicationCommand; import com.discord.api.commands.ApplicationCommandData; +import com.discord.api.directory.DirectoryEntry; import com.discord.api.fingerprint.FingerprintResponse; import com.discord.api.friendsuggestions.BulkAddFriendsResponse; import com.discord.api.friendsuggestions.BulkFriendSuggestions; @@ -21,6 +22,7 @@ import com.discord.api.guild.PruneCountResponse; import com.discord.api.guild.VanityUrlResponse; import com.discord.api.guild.preview.GuildPreview; import com.discord.api.guild.welcome.GuildWelcomeScreen; +import com.discord.api.message.Message; import com.discord.api.premium.ClaimedOutboundPromotion; import com.discord.api.premium.OutboundPromotion; import com.discord.api.report.MenuAPIResponse; @@ -53,7 +55,6 @@ import com.discord.models.domain.ModelLibraryApplication; import com.discord.models.domain.ModelLocationMetadata; import com.discord.models.domain.ModelMemberVerificationForm; import com.discord.models.domain.ModelMemberVerificationFormResponse; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelOAuth2Token; import com.discord.models.domain.ModelPhoneVerificationToken; @@ -343,7 +344,7 @@ public interface RestAPIInterface { Observable editGroupDM(@s("channelId") long j, @a RestAPIParams.GroupDM groupDM); @n("channels/{channel_id}/messages/{message_id}") - Observable editMessage(@s("channel_id") long j, @s("message_id") long j2, @a RestAPIParams.Message message); + Observable editMessage(@s("channel_id") long j, @s("message_id") long j2, @a RestAPIParams.Message message); @n("channels/{channelId}") Observable editTextChannel(@s("channelId") long j, @a RestAPIParams.TextChannel textChannel); @@ -406,13 +407,13 @@ public interface RestAPIInterface { Observable getChannelFollowerStats(@s("channelId") long j); @f("channels/{channelId}/messages") - Observable> getChannelMessages(@s("channelId") long j, @t("before") Long l, @t("after") Long l2, @t("limit") Integer num); + Observable> getChannelMessages(@s("channelId") long j, @t("before") Long l, @t("after") Long l2, @t("limit") Integer num); @f("channels/{channelId}/messages") - Observable> getChannelMessagesAround(@s("channelId") long j, @t("limit") int i, @t("around") long j2); + Observable> getChannelMessagesAround(@s("channelId") long j, @t("limit") int i, @t("around") long j2); @f("channels/{channelId}/pins") - Observable> getChannelPins(@s("channelId") long j); + Observable> getChannelPins(@s("channelId") long j); @f("/users/@me/outbound-promotions/codes") Observable> getClaimedOutboundPromotions(); @@ -429,6 +430,9 @@ public interface RestAPIInterface { @f("users/@me/consent") Observable getConsents(); + @f("channels/{channelId}/directory-entries") + Observable> getDirectoryEntries(@s("channelId") long j); + @f("emojis/{emojiId}/guild") Observable getEmojiGuild(@s("emojiId") long j); @@ -493,7 +497,7 @@ public interface RestAPIInterface { Observable getLocationMetadata(); @f("users/@me/mentions") - Observable> getMentions(@t("limit") int i, @t("roles") boolean z2, @t("everyone") boolean z3, @t("guild_id") Long l, @t("before") Long l2); + Observable> getMentions(@t("limit") int i, @t("roles") boolean z2, @t("everyone") boolean z3, @t("guild_id") Long l, @t("before") Long l2); @f("users/@me/applications/{applicationId}/entitlements") Observable> getMyEntitlements(@s("applicationId") long j, @t("exclude_consumed") boolean z2); @@ -722,14 +726,14 @@ public interface RestAPIInterface { Observable sendComponentInteraction(@a RestAPIParams.ComponentInteraction componentInteraction); @i0.g0.o("channels/{channelId}/greet") - Observable sendGreetMessage(@s("channelId") long j, @a RestAPIParams.GreetMessage greetMessage); + Observable sendGreetMessage(@s("channelId") long j, @a RestAPIParams.GreetMessage greetMessage); @l @i0.g0.o("channels/{channelId}/messages") - Observable sendMessage(@s("channelId") long j, @q("payload_json") PayloadJSON payloadJSON, @q MultipartBody.Part[] partArr); + Observable sendMessage(@s("channelId") long j, @q("payload_json") PayloadJSON payloadJSON, @q MultipartBody.Part[] partArr); @i0.g0.o("channels/{channelId}/messages") - Observable sendMessage(@s("channelId") long j, @a RestAPIParams.Message message); + Observable sendMessage(@s("channelId") long j, @a RestAPIParams.Message message); @i0.g0.o("users/@me/relationships") Observable sendRelationshipRequest(@a RestAPIParams.UserRelationship.Add add, @i("X-Context-Properties") String str); diff --git a/app/src/main/java/com/discord/restapi/RestAPIParams.java b/app/src/main/java/com/discord/restapi/RestAPIParams.java index 4da01c4c6e..70c2370184 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIParams.java +++ b/app/src/main/java/com/discord/restapi/RestAPIParams.java @@ -12,13 +12,14 @@ import com.discord.api.guild.GuildExplicitContentFilter; import com.discord.api.guild.GuildFeature; import com.discord.api.guild.GuildVerificationLevel; import com.discord.api.message.activity.MessageActivityType; +import com.discord.api.message.allowedmentions.MessageAllowedMentions; +import com.discord.api.message.allowedmentions.MessageAllowedMentionsTypes; import com.discord.api.permission.PermissionOverwrite; import com.discord.api.presence.ClientStatus; import com.discord.api.role.GuildRole; import com.discord.api.stageinstance.StageInstancePrivacyLevel; import com.discord.api.user.User; import com.discord.api.utcdatetime.UtcDateTime; -import com.discord.models.domain.ModelAllowedMentions; import com.discord.models.domain.ModelConnectedAccount; import com.discord.models.domain.ModelCustomStatusSetting; import com.discord.models.domain.ModelGuildFolder; @@ -1796,19 +1797,19 @@ public final class RestAPIParams { this(); } - public final AllowedMentions create(ModelAllowedMentions modelAllowedMentions) { + public final AllowedMentions create(MessageAllowedMentions messageAllowedMentions) { ArrayList arrayList; - m.checkNotNullParameter(modelAllowedMentions, "model"); - List parse = modelAllowedMentions.getParse(); - if (parse != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(parse, 10)); - for (ModelAllowedMentions.Types types : parse) { - arrayList.add(types.serialize()); + m.checkNotNullParameter(messageAllowedMentions, "model"); + List a = messageAllowedMentions.a(); + if (a != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(a, 10)); + for (MessageAllowedMentionsTypes messageAllowedMentionsTypes : a) { + arrayList.add(messageAllowedMentionsTypes.serialize()); } } else { arrayList = null; } - return new AllowedMentions(arrayList, modelAllowedMentions.getUsers(), modelAllowedMentions.getRoles(), modelAllowedMentions.getRepliedUser()); + return new AllowedMentions(arrayList, messageAllowedMentions.d(), messageAllowedMentions.c(), messageAllowedMentions.b()); } } diff --git a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java index 4ef79b179d..ad6d2e90e0 100644 --- a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java +++ b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java @@ -1,8 +1,7 @@ package com.discord.rtcconnection; -import c.a.r.d; -import c.a.r.g; -import c.a.r.l; +import c.a.r.e; +import c.a.r.h; import com.discord.rtcconnection.KrispOveruseDetector; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import com.discord.utilities.logging.Logger; @@ -38,7 +37,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { public Map g; public final long h; public final c.a.r.c i; - public final d j; + public final e j; public final Logger k; public final a l; @@ -147,14 +146,14 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { } } - public MediaSinkWantsManager(long j, c.a.r.c cVar, d dVar, Logger logger, a aVar) { + public MediaSinkWantsManager(long j, c.a.r.c cVar, e eVar, Logger logger, a aVar) { m.checkNotNullParameter(cVar, "mediaEngineThreadExecutor"); - m.checkNotNullParameter(dVar, "ladder"); + m.checkNotNullParameter(eVar, "ladder"); m.checkNotNullParameter(logger, "logger"); m.checkNotNullParameter(aVar, "listener"); this.h = j; this.i = cVar; - this.j = dVar; + this.j = eVar; this.k = logger; this.l = aVar; new LinkedHashMap(); @@ -173,7 +172,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { public final Future b(Function0 function0) { c.a.r.c cVar = this.i; - return cVar.j.submit(new l(function0)); + return cVar.k.submit(new c.a.r.m(function0)); } public final Future c(long j, Integer num) { @@ -194,11 +193,11 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { EncodeQuality encodeQuality2; EncodeQuality encodeQuality3; EncodeQuality encodeQuality4; - d.c cVar; + e.c cVar; boolean z2; MediaEngineConnection mediaEngineConnection = this.d; if (mediaEngineConnection != null) { - d dVar = this.j; + e eVar = this.j; int i2 = 1; if (mediaEngineConnection != null) { Set set = this.f2072c; @@ -209,19 +208,19 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { n.throwCountOverflow(); } } - Objects.requireNonNull(dVar); + Objects.requireNonNull(eVar); if (i >= 0) { encodeQuality = EncodeQuality.Hundred; } else { - List list2 = dVar.d; - ListIterator listIterator = list2.listIterator(list2.size()); + List list2 = eVar.d; + ListIterator listIterator = list2.listIterator(list2.size()); while (true) { if (!listIterator.hasPrevious()) { cVar = null; break; } cVar = listIterator.previous(); - if (cVar.b * i <= dVar.b) { + if (cVar.b * i <= eVar.b) { z2 = true; continue; } else { @@ -232,9 +231,9 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { break; } } - d.c cVar2 = cVar; + e.c cVar2 = cVar; if (cVar2 == null) { - cVar2 = (d.c) u.first((List) dVar.d); + cVar2 = (e.c) u.first((List) eVar.d); } encodeQuality = cVar2.f202c; } @@ -338,7 +337,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { } } i = 0; - Objects.requireNonNull(dVar); + Objects.requireNonNull(eVar); if (i >= 0) { } Map mutableMapOf = h0.mutableMapOf(d0.o.to("any", encodeQuality)); @@ -352,7 +351,7 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c - public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List list) { + public void onConnected(MediaEngineConnection mediaEngineConnection, MediaEngineConnection.TransportInfo transportInfo, List list) { m.checkNotNullParameter(mediaEngineConnection, "connection"); m.checkNotNullParameter(transportInfo, "transportInfo"); m.checkNotNullParameter(list, "supportedVideoCodecs"); @@ -383,12 +382,12 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.c { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c public void onLocalMute(long j, boolean z2) { - b(new g(this)); + b(new h(this)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c public void onLocalVideoOffScreen(long j, boolean z2) { - b(new g(this)); + b(new h(this)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.c diff --git a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java index 617065b561..1eed5540fe 100644 --- a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java +++ b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java @@ -2,14 +2,15 @@ package com.discord.rtcconnection; import android.content.Intent; import android.util.Log; -import c.a.r.c0; +import c.a.r.a0; import c.a.r.d0; import c.a.r.e0; -import c.a.r.f; -import c.a.r.i; +import c.a.r.f0; +import c.a.r.g; +import c.a.r.j; import c.a.r.p; import c.a.r.q; -import c.a.r.x; +import c.a.r.r; import c.a.r.y; import c.a.r.z; import co.discord.media_engine.InboundRtpAudio; @@ -50,8 +51,8 @@ import rx.subjects.BehaviorSubject; public final class RtcConnection implements DebugPrintable, MediaSinkWantsManager.a { public static int a; public static final a b = new a(null); - public final c0 A; - public final z B; + public final d0 A; + public final a0 B; public final Long C; public final long D; public String E; @@ -73,14 +74,14 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage public final String f2074c; public final String d; public final List e; - public c.a.r.k0.d f; + public c.a.r.l0.d f; public final Backoff g; public MediaEngineConnection.TransportInfo h; public StateChange i; public BehaviorSubject j; public boolean k; public List l; - public c.a.r.j0.a m; + public c.a.r.k0.a m; public MediaEngineConnection n; public String o; public Integer p; @@ -520,20 +521,20 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage this.i = stateChange; this.j = BehaviorSubject.m0(stateChange); this.l = new ArrayList(); - MediaSinkWantsManager mediaSinkWantsManager = z4 ? new MediaSinkWantsManager(j2, mediaEngine.c(), new c.a.r.d(null, 1), logger, this) : null; + MediaSinkWantsManager mediaSinkWantsManager = z4 ? new MediaSinkWantsManager(j2, mediaEngine.c(), new c.a.r.e(null, 1), logger, this) : null; this.v = mediaSinkWantsManager; if (z4) { m.checkNotNull(mediaSinkWantsManager); Observable> s2 = mediaSinkWantsManager.f.s(); m.checkNotNullExpressionValue(s2, "mediaSinkWantsSubject.distinctUntilChanged()"); - subscription = Observable.j(s2, this.j, x.i).W(new e0(new y(this))); + subscription = Observable.j(s2, this.j, y.i).W(new f0(new z(this))); } this.w = subscription; r("Created RtcConnection. GuildID: " + l + " ChannelID: " + j); - networkMonitor.observeIsConnected().T(1).X(new c.a.r.o(this), new p(this)); - arrayList.add(new q(this)); - this.A = new c0(this); - this.B = new z(this); + networkMonitor.observeIsConnected().T(1).X(new p(this), new q(this)); + arrayList.add(new r(this)); + this.A = new d0(this); + this.B = new a0(this); } public static void j(RtcConnection rtcConnection, boolean z2, String str, Throwable th, boolean z3, int i) { @@ -548,7 +549,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage } else { rtcConnection.J.i(rtcConnection.f2074c, str, th); } - c.a.r.k0.d dVar = rtcConnection.f; + c.a.r.l0.d dVar = rtcConnection.f; if (dVar != null) { dVar.a(); } @@ -638,14 +639,14 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage } public final void f(String str) { - c.a.r.k0.e eVar; - c.a.r.k0.e eVar2; + c.a.r.l0.e eVar; + c.a.r.l0.e eVar2; Map b2; this.g.cancel(); - c.a.r.j0.a aVar = this.m; + c.a.r.k0.a aVar = this.m; if (aVar != null) { aVar.g.clear(); - aVar.d(); + aVar.e(); } this.m = null; if (!(this.i.a instanceof State.d)) { @@ -653,18 +654,18 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage d dVar = this.L; if (dVar instanceof d.b) { long j = ((d.b) dVar).a; - c.a.r.k0.d dVar2 = this.f; + c.a.r.l0.d dVar2 = this.f; if (!(dVar2 == null || (eVar2 = dVar2.g) == null || (b2 = eVar2.b(String.valueOf(j))) == null)) { l(((d.b) this.L).a, b2); } long j2 = this.H; - c.a.r.k0.d dVar3 = this.f; + c.a.r.l0.d dVar3 = this.f; m(j2, (dVar3 == null || (eVar = dVar3.g) == null) ? null : eVar.c()); } } MediaSinkWantsManager mediaSinkWantsManager = this.v; if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.b(new f(mediaSinkWantsManager)); + mediaSinkWantsManager.b(new g(mediaSinkWantsManager)); } Subscription subscription = this.w; if (subscription != null) { @@ -732,8 +733,8 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage } public final void n(boolean z2, String str) { - c.a.r.k0.d dVar; - c.a.r.k0.e eVar; + c.a.r.l0.d dVar; + c.a.r.l0.e eVar; String str2; Stats stats; VoiceQuality voiceQuality; @@ -752,8 +753,8 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage if (str3 != null) { mutableMapOf.put("media_session_id", str3); } - c.a.r.k0.d dVar2 = this.f; - if (!(dVar2 == null || (stats = (Stats) u.lastOrNull((List) dVar2.a)) == null)) { + c.a.r.l0.d dVar2 = this.f; + if (!(dVar2 == null || (stats = (Stats) u.lastOrNull(dVar2.a)) == null)) { OutboundRtpAudio outboundRtpAudio = stats.getOutboundRtpAudio(); if (outboundRtpAudio != null) { mutableMapOf.put("packets_sent", Integer.valueOf(outboundRtpAudio.getPacketsSent())); @@ -766,7 +767,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage } mutableMapOf.put("packets_received", Integer.valueOf(i)); mutableMapOf.put("packets_received_lost", Integer.valueOf(i2)); - c.a.r.k0.d dVar3 = this.f; + c.a.r.l0.d dVar3 = this.f; if (!(dVar3 == null || (voiceQuality = dVar3.f) == null)) { voiceQuality.getDurationStats(mutableMapOf); voiceQuality.getMosStats(mutableMapOf); @@ -839,10 +840,10 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage this.r = Long.valueOf(this.K.currentTimeMillis()); } this.t++; - c.a.r.j0.a aVar = this.m; + c.a.r.k0.a aVar = this.m; if (aVar != null) { - aVar.d(); aVar.e(); + aVar.f(); } } @@ -855,7 +856,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage public final Future s(Function0 function0) { c.a.r.c c2 = this.I.c(); if (function0 != null) { - function0 = new d0(function0); + function0 = new e0(function0); } return c2.submit((Runnable) function0); } @@ -895,7 +896,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage public final void w(Long l) { MediaSinkWantsManager mediaSinkWantsManager = this.v; if (mediaSinkWantsManager != null) { - mediaSinkWantsManager.b(new i(mediaSinkWantsManager, l)); + mediaSinkWantsManager.b(new j(mediaSinkWantsManager, l)); } } } diff --git a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java index 6fda87c2f0..2304e6b43a 100644 --- a/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java +++ b/app/src/main/java/com/discord/rtcconnection/audio/DiscordAudioManager.java @@ -13,8 +13,8 @@ import android.os.Build; import android.os.Handler; import android.os.Looper; import androidx.annotation.MainThread; -import c.a.r.g0.f; -import c.a.r.h0.a; +import c.a.r.h0.f; +import c.a.r.i0.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.rtcconnection.enums.AudioManagerBroadcastAction; import com.discord.rtcconnection.enums.BluetoothBroadcastAction; @@ -53,8 +53,8 @@ public final class DiscordAudioManager { public final boolean h; public final Object i = this; public final long j; - public final c.a.r.g0.c k; - public final c.a.r.g0.a l; + public final c.a.r.h0.c k; + public final c.a.r.h0.a l; public BluetoothHeadset m; public BluetoothScoState n; public AudioManager.OnAudioFocusChangeListener o; @@ -221,7 +221,7 @@ public final class DiscordAudioManager { @Override // java.lang.Runnable public final void run() { DiscordAudioManager discordAudioManager = this.i; - c.a.r.g0.a aVar = discordAudioManager.l; + c.a.r.h0.a aVar = discordAudioManager.l; Objects.requireNonNull(aVar); ThreadUtils.checkIsOnMainThread(); boolean z2 = false; @@ -232,12 +232,12 @@ public final class DiscordAudioManager { intentFilter.addAction(audioManagerBroadcastAction.getAction()); } aVar.b.registerReceiver(aVar, intentFilter); - c.a.r.g0.c cVar = discordAudioManager.k; + c.a.r.h0.c cVar = discordAudioManager.k; Objects.requireNonNull(cVar); ThreadUtils.checkIsOnMainThread(); if (!cVar.k) { StringBuilder L = c.d.b.a.a.L("registering for broadcasts with actions: "); - Set set = c.a.r.g0.c.i; + Set set = c.a.r.h0.c.i; L.append(set); AnimatableValueParser.A1("BluetoothBroadcastReceiver", L.toString()); IntentFilter intentFilter2 = new IntentFilter(); @@ -245,8 +245,8 @@ public final class DiscordAudioManager { intentFilter2.addAction(bluetoothBroadcastAction.getAction()); } cVar.m.registerReceiver(cVar, intentFilter2); - c.a.r.g0.d dVar = c.a.r.g0.d.f206c; - Lazy lazy = c.a.r.g0.d.a; + c.a.r.h0.d dVar = c.a.r.h0.d.f206c; + Lazy lazy = c.a.r.h0.d.a; if (((String) lazy.getValue()) != null) { Context context = cVar.m; m.checkNotNullParameter(context, "context"); @@ -270,7 +270,7 @@ public final class DiscordAudioManager { } cVar.k = true; } - c.a.r.g0.e eVar = new c.a.r.g0.e(discordAudioManager); + c.a.r.h0.e eVar = new c.a.r.h0.e(discordAudioManager); synchronized (discordAudioManager.i) { discordAudioManager.o = eVar; } @@ -282,13 +282,13 @@ public final class DiscordAudioManager { public b() { } - @Override // c.a.r.g0.f + @Override // c.a.r.h0.f public void a(Context context, boolean z2) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(context, "context"); } - @Override // c.a.r.g0.f + @Override // c.a.r.h0.f @MainThread public void b(Context context, ScoAudioState.b bVar) { boolean z2; @@ -333,21 +333,21 @@ public final class DiscordAudioManager { } } - @Override // c.a.r.g0.f + @Override // c.a.r.h0.f public void c(Context context) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(context, "context"); } - @Override // c.a.r.g0.f + @Override // c.a.r.h0.f public void d(Context context, boolean z2) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(context, "context"); } - @Override // c.a.r.g0.f + @Override // c.a.r.h0.f @MainThread - public void e(Context context, c.a.r.h0.a aVar) { + public void e(Context context, c.a.r.i0.a aVar) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(aVar, "wiredHeadsetState"); AnimatableValueParser.A1("AudioManager", "[onWiredHeadsetPlug] wiredHeadsetState = " + aVar); @@ -381,11 +381,11 @@ public final class DiscordAudioManager { } /* compiled from: DiscordAudioManager.kt */ - public final class c implements c.a.r.g0.g { + public final class c implements c.a.r.h0.g { public c() { } - @Override // c.a.r.g0.g + @Override // c.a.r.h0.g @MainThread public void a(Context context, BluetoothHeadsetAudioState.b bVar) { m.checkNotNullParameter(context, "context"); @@ -418,24 +418,24 @@ public final class DiscordAudioManager { } } - @Override // c.a.r.g0.g + @Override // c.a.r.h0.g @MainThread public void b(BluetoothDevice bluetoothDevice) { - c.a.r.g0.d dVar = c.a.r.g0.d.f206c; - if (!(((String) c.a.r.g0.d.a.getValue()) != null)) { + c.a.r.h0.d dVar = c.a.r.h0.d.f206c; + if (!(((String) c.a.r.h0.d.a.getValue()) != null)) { throw new IllegalStateException("Check failed.".toString()); } else if (bluetoothDevice != null) { DiscordAudioManager.this.l(); } } - @Override // c.a.r.g0.g + @Override // c.a.r.h0.g @MainThread public void c(BluetoothHeadset bluetoothHeadset) { DiscordAudioManager.this.m = bluetoothHeadset; } - @Override // c.a.r.g0.g + @Override // c.a.r.h0.g @MainThread public void d(Context context, BluetoothProfileConnectionState.b bVar) { ArrayList arrayList; @@ -513,7 +513,7 @@ public final class DiscordAudioManager { } /* compiled from: DiscordAudioManager.kt */ - public static final class e extends d0.z.d.o implements Function0 { + public static final class e extends d0.z.d.o implements Function0 { public final /* synthetic */ Context $context; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -525,8 +525,8 @@ public final class DiscordAudioManager { /* Return type fixed from 'java.lang.Object' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ - public c.a.r.g0.b mo1invoke() { - return new c.a.r.g0.b(this.$context); + public c.a.r.h0.b mo1invoke() { + return new c.a.r.h0.b(this.$context); } } @@ -544,8 +544,8 @@ public final class DiscordAudioManager { Thread currentThread = Thread.currentThread(); m.checkNotNullExpressionValue(currentThread, "Thread.currentThread()"); this.j = currentThread.getId(); - this.k = new c.a.r.g0.c(context, new c()); - this.l = new c.a.r.g0.a(context, new b()); + this.k = new c.a.r.h0.c(context, new c()); + this.l = new c.a.r.h0.a(context, new b()); new Handler(Looper.getMainLooper()).post(new a(this)); this.n = BluetoothScoState.INVALID; List listOf = n.listOf((Object[]) new AudioDevice[]{new AudioDevice(DeviceTypes.SPEAKERPHONE, false, null, null, 14), new AudioDevice(DeviceTypes.WIRED_HEADSET, false, null, null, 14), new AudioDevice(DeviceTypes.EARPIECE, false, null, null, 14), new AudioDevice(DeviceTypes.BLUETOOTH_HEADSET, false, null, null, 14)}); @@ -648,8 +648,8 @@ public final class DiscordAudioManager { } } - public final c.a.r.g0.b e() { - return (c.a.r.g0.b) this.g.getValue(); + public final c.a.r.h0.b e() { + return (c.a.r.h0.b) this.g.getValue(); } /* JADX WARNING: Removed duplicated region for block: B:33:0x006c */ @@ -693,10 +693,10 @@ public final class DiscordAudioManager { BluetoothDevice bluetoothDevice3 = (BluetoothDevice) obj; BluetoothHeadset bluetoothHeadset3 = this.m; if (bluetoothHeadset3 != null) { - c.a.r.g0.d dVar = c.a.r.g0.d.f206c; + c.a.r.h0.d dVar = c.a.r.h0.d.f206c; m.checkNotNullParameter(bluetoothHeadset3, "headsetProfile"); try { - Method method = (Method) c.a.r.g0.d.b.getValue(); + Method method = (Method) c.a.r.h0.d.b.getValue(); Object invoke = method != null ? method.invoke(bluetoothHeadset3, new Object[0]) : null; if (!(invoke instanceof BluetoothDevice)) { invoke = null; diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java index d40d5a9053..8a96264716 100644 --- a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java +++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java @@ -275,7 +275,7 @@ public interface MediaEngineConnection { /* compiled from: MediaEngineConnection.kt */ public interface c { - void onConnected(MediaEngineConnection mediaEngineConnection, TransportInfo transportInfo, List list); + void onConnected(MediaEngineConnection mediaEngineConnection, TransportInfo transportInfo, List list); void onConnectionStateChange(MediaEngineConnection mediaEngineConnection, ConnectionState connectionState); diff --git a/app/src/main/java/com/discord/stores/BuiltInCommands.java b/app/src/main/java/com/discord/stores/BuiltInCommands.java index 7bb2f1432a..e1ded62e16 100644 --- a/app/src/main/java/com/discord/stores/BuiltInCommands.java +++ b/app/src/main/java/com/discord/stores/BuiltInCommands.java @@ -27,9 +27,9 @@ public final class BuiltInCommands implements BuiltInCommandsProvider { } public BuiltInCommands() { - List listOf = n.listOf((Object[]) new ApplicationCommand[]{createAppendToEndSlashCommand(-1, "shrug", 2131887439, 2131887440, "¯\\\\_(ツ)\\_/¯"), createAppendToEndSlashCommand(-2, "tableflip", 2131887443, 2131887444, "(╯°□°）╯︵ ┻━┻"), createAppendToEndSlashCommand(-3, "unflip", 2131887445, 2131887446, "┬─┬ ノ( ゜-゜ノ)"), createWrappedSlashCommand(-5, "me", 2131887430, 2131887431, "_"), createWrappedSlashCommand(-6, "spoiler", 2131887441, 2131887442, "||")}); + List listOf = n.listOf((Object[]) new ApplicationCommand[]{createAppendToEndSlashCommand(-1, "shrug", 2131887441, 2131887442, "¯\\\\_(ツ)\\_/¯"), createAppendToEndSlashCommand(-2, "tableflip", 2131887445, 2131887446, "(╯°□°）╯︵ ┻━┻"), createAppendToEndSlashCommand(-3, "unflip", 2131887447, 2131887448, "┬─┬ ノ( ゜-゜ノ)"), createWrappedSlashCommand(-5, "me", 2131887432, 2131887433, "_"), createWrappedSlashCommand(-6, "spoiler", 2131887443, 2131887444, "||")}); this.builtInCommands = listOf; - this.builtInApplication = new Application(-1, "Built-In", null, 2131231926, listOf.size(), null, true, 36, null); + this.builtInApplication = new Application(-1, "Built-In", null, 2131231929, listOf.size(), null, true, 36, null); } private final ApplicationCommand createAppendToEndSlashCommand(long j, String str, Integer num, Integer num2, String str2) { diff --git a/app/src/main/java/com/discord/stores/NotificationTextUtils.java b/app/src/main/java/com/discord/stores/NotificationTextUtils.java index b9701019c2..a215cd2f60 100644 --- a/app/src/main/java/com/discord/stores/NotificationTextUtils.java +++ b/app/src/main/java/com/discord/stores/NotificationTextUtils.java @@ -3,7 +3,7 @@ package com.discord.stores; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; @@ -23,7 +23,7 @@ public final class NotificationTextUtils { private NotificationTextUtils() { } - private final boolean isNotificationAllowed(ModelNotificationSettings modelNotificationSettings, User user, Collection collection, ModelMessage modelMessage, Guild guild, Channel channel) { + private final boolean isNotificationAllowed(ModelNotificationSettings modelNotificationSettings, User user, Collection collection, Message message, Guild guild, Channel channel) { Integer num; boolean z2 = false; if (!modelNotificationSettings.isMobilePush() || isGuildOrCategoryOrChannelMuted(modelNotificationSettings, channel)) { @@ -51,74 +51,72 @@ public final class NotificationTextUtils { } num = num2; } - return shouldNotifyForLevel(num, user, collection, modelMessage, modelNotificationSettings.isSuppressEveryone(), modelNotificationSettings.isSuppressRoles()); + return shouldNotifyForLevel(num, user, collection, message, modelNotificationSettings.isSuppressEveryone(), modelNotificationSettings.isSuppressRoles()); } - /* JADX WARNING: Removed duplicated region for block: B:21:0x0053 */ + /* JADX WARNING: Code restructure failed: missing block: B:20:0x004f, code lost: + if (r6 == true) goto L_0x0080; + */ /* JADX WARNING: Removed duplicated region for block: B:42:? A[RETURN, SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:43:? A[RETURN, SYNTHETIC] */ - private final boolean isThreadNotificationAllowed(User user, Collection collection, ModelMessage modelMessage, StoreThreadsJoined.JoinedThread joinedThread, ModelNotificationSettings modelNotificationSettings, Channel channel) { + private final boolean isThreadNotificationAllowed(User user, Collection collection, Message message, StoreThreadsJoined.JoinedThread joinedThread, ModelNotificationSettings modelNotificationSettings, Channel channel) { boolean z2; boolean z3; boolean z4; int computeThreadNotificationSetting = ThreadUtils.INSTANCE.computeThreadNotificationSetting(joinedThread, isGuildOrCategoryOrChannelMuted(modelNotificationSettings, channel)); - if (computeThreadNotificationSetting == 2) { - return true; - } - if (computeThreadNotificationSetting != 8) { - if (modelMessage.isMentionEveryone()) { - return true; + if (computeThreadNotificationSetting != 2) { + if (computeThreadNotificationSetting == 8) { + return false; } - List mentions = modelMessage.getMentions(); - m.checkNotNullExpressionValue(mentions, "message.mentions"); - if (!(mentions instanceof Collection) || !mentions.isEmpty()) { - Iterator it = mentions.iterator(); - while (true) { - if (!it.hasNext()) { - break; - } - if (((com.discord.api.user.User) it.next()).i() == user.getId()) { - z4 = true; - continue; - } else { - z4 = false; - continue; - } - if (z4) { - z2 = true; - break; + if (!m.areEqual(message.x(), Boolean.TRUE)) { + List z5 = message.z(); + if (z5 != null) { + if (!z5.isEmpty()) { + Iterator it = z5.iterator(); + while (true) { + if (!it.hasNext()) { + break; + } + if (((com.discord.api.user.User) it.next()).i() == user.getId()) { + z4 = true; + continue; + } else { + z4 = false; + continue; + } + if (z4) { + z3 = true; + break; + } + } } + z3 = false; } - if (!z2) { - return true; + List y2 = message.y(); + if (y2 == null) { + return false; } - List mentionRoles = modelMessage.getMentionRoles(); - m.checkNotNullExpressionValue(mentionRoles, "message.mentionRoles"); - if (!(mentionRoles instanceof Collection) || !mentionRoles.isEmpty()) { - Iterator it2 = mentionRoles.iterator(); + if (!y2.isEmpty()) { + Iterator it2 = y2.iterator(); while (true) { if (it2.hasNext()) { - if (collection.contains((Long) it2.next())) { - z3 = true; + if (collection.contains(Long.valueOf(((Number) it2.next()).longValue()))) { + z2 = true; break; } } else { break; } } - if (!z3) { - return true; + if (z2) { + return false; } } - z3 = false; - if (!z3) { + z2 = false; + if (z2) { } } - z2 = false; - if (!z2) { - } } - return false; + return true; } private final Integer messageNotifications(ModelNotificationSettings modelNotificationSettings, long j) { @@ -133,75 +131,75 @@ public final class NotificationTextUtils { return null; } - private final boolean shouldNotifyForLevel(Integer num, User user, Collection collection, ModelMessage modelMessage, boolean z2, boolean z3) { + /* JADX WARNING: Code restructure failed: missing block: B:30:0x0066, code lost: + if (r8 != true) goto L_0x0068; + */ + /* JADX WARNING: Removed duplicated region for block: B:52:? A[RETURN, SYNTHETIC] */ + private final boolean shouldNotifyForLevel(Integer num, User user, Collection collection, Message message, boolean z2, boolean z3) { + List y2; boolean z4; boolean z5; boolean z6; int i = ModelNotificationSettings.FREQUENCY_ALL; - if (num != null && num.intValue() == i) { - return true; - } - int i2 = ModelNotificationSettings.FREQUENCY_NOTHING; - if (num == null || num.intValue() != i2) { + if (num == null || num.intValue() != i) { + int i2 = ModelNotificationSettings.FREQUENCY_NOTHING; + if (num != null && num.intValue() == i2) { + return false; + } int i3 = ModelNotificationSettings.FREQUENCY_MENTIONS; - if (num == null || num.intValue() != i3) { - return true; - } - if (modelMessage.isMentionEveryone() && !z2) { - return true; - } - List mentions = modelMessage.getMentions(); - m.checkNotNullExpressionValue(mentions, "message.mentions"); - if (!(mentions instanceof Collection) || !mentions.isEmpty()) { - Iterator it = mentions.iterator(); - while (true) { - if (!it.hasNext()) { - break; - } - if (((com.discord.api.user.User) it.next()).i() == user.getId()) { - z6 = true; - continue; - } else { - z6 = false; - continue; - } - if (z6) { - z4 = true; - break; + if (num != null && num.intValue() == i3 && (!m.areEqual(message.x(), Boolean.TRUE) || z2)) { + List z7 = message.z(); + if (z7 != null) { + if (!z7.isEmpty()) { + Iterator it = z7.iterator(); + while (true) { + if (!it.hasNext()) { + break; + } + if (((com.discord.api.user.User) it.next()).i() == user.getId()) { + z6 = true; + continue; + } else { + z6 = false; + continue; + } + if (z6) { + z5 = true; + break; + } + } } + z5 = false; } - } - z4 = false; - if (z4) { - return true; - } - if (!z3) { - List mentionRoles = modelMessage.getMentionRoles(); - m.checkNotNullExpressionValue(mentionRoles, "message.mentionRoles"); - if (!(mentionRoles instanceof Collection) || !mentionRoles.isEmpty()) { - Iterator it2 = mentionRoles.iterator(); + if (z3 || (y2 = message.y()) == null) { + return false; + } + if (!y2.isEmpty()) { + Iterator it2 = y2.iterator(); while (true) { if (it2.hasNext()) { - if (collection.contains((Long) it2.next())) { - z5 = true; + if (collection.contains(Long.valueOf(((Number) it2.next()).longValue()))) { + z4 = true; break; } } else { break; } } + if (z4) { + return false; + } } - z5 = false; - if (z5) { - return true; + z4 = false; + if (z4) { } } } - return false; + return true; } - public static /* synthetic */ boolean shouldNotifyForLevel$default(NotificationTextUtils notificationTextUtils, Integer num, User user, Collection collection, ModelMessage modelMessage, boolean z2, boolean z3, int i, Object obj) { - return notificationTextUtils.shouldNotifyForLevel(num, user, collection, modelMessage, (i & 16) != 0 ? false : z2, (i & 32) != 0 ? false : z3); + public static /* synthetic */ boolean shouldNotifyForLevel$default(NotificationTextUtils notificationTextUtils, Integer num, User user, Collection collection, Message message, boolean z2, boolean z3, int i, Object obj) { + return notificationTextUtils.shouldNotifyForLevel(num, user, collection, message, (i & 16) != 0 ? false : z2, (i & 32) != 0 ? false : z3); } public final boolean isGuildOrCategoryOrChannelMuted(ModelNotificationSettings modelNotificationSettings, Channel channel) { @@ -222,37 +220,39 @@ public final class NotificationTextUtils { return channelOverride2 != null && channelOverride2.isMuted(); } - public final boolean shouldNotifyInAppPopup(User user, ModelMessage modelMessage, Channel channel, Map map, Channel channel2, Guild guild, Map> map2, Map map3, Map map4) { + public final boolean shouldNotifyInAppPopup(User user, Message message, Channel channel, Map map, Channel channel2, Guild guild, Map> map2, Map map3, Map map4) { + com.discord.api.user.User g; List list; m.checkNotNullParameter(user, "me"); - m.checkNotNullParameter(modelMessage, "msg"); + m.checkNotNullParameter(message, "msg"); m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(map, "blockedRelationships"); m.checkNotNullParameter(map2, "guildMembers"); m.checkNotNullParameter(map3, "guildSettings"); m.checkNotNullParameter(map4, "joinedThreads"); - if (AnimatableValueParser.o1(channel)) { + if (AnimatableValueParser.o1(channel) || (g = message.g()) == null || g.i() == 0 || g.i() == user.getId() || map.containsKey(Long.valueOf(g.i()))) { return false; } - com.discord.api.user.User author = modelMessage.getAuthor(); - if (author.i() == 0) { - author = null; - } - if (author == null || author.i() == user.getId() || map.containsKey(Long.valueOf(author.i())) || modelMessage.getType() == 3) { + Integer M = message.M(); + if (M != null && M.intValue() == 3) { return false; } Map map5 = (Map) a.c(channel, map2); + Integer num = null; GuildMember guildMember = map5 != null ? (GuildMember) a.e(user, map5) : null; if (guildMember == null || (list = guildMember.getRoles()) == null) { list = n.emptyList(); } ModelNotificationSettings modelNotificationSettings = (ModelNotificationSettings) a.c(channel, map3); if (AnimatableValueParser.y1(channel)) { - return isThreadNotificationAllowed(user, list, modelMessage, (StoreThreadsJoined.JoinedThread) a.d(channel, map4), modelNotificationSettings, channel2); + return isThreadNotificationAllowed(user, list, message, (StoreThreadsJoined.JoinedThread) a.d(channel, map4), modelNotificationSettings, channel2); } if (modelNotificationSettings != null) { - return isNotificationAllowed(modelNotificationSettings, user, list, modelMessage, guild, channel); + return isNotificationAllowed(modelNotificationSettings, user, list, message, guild, channel); } - return shouldNotifyForLevel$default(this, guild != null ? Integer.valueOf(guild.getDefaultMessageNotifications()) : null, user, list, modelMessage, false, false, 48, null); + if (guild != null) { + num = Integer.valueOf(guild.getDefaultMessageNotifications()); + } + return shouldNotifyForLevel$default(this, num, user, list, message, false, false, 48, null); } } diff --git a/app/src/main/java/com/discord/stores/StoreAnalytics.java b/app/src/main/java/com/discord/stores/StoreAnalytics.java index cf1328deb0..9e3489cea1 100644 --- a/app/src/main/java/com/discord/stores/StoreAnalytics.java +++ b/app/src/main/java/com/discord/stores/StoreAnalytics.java @@ -9,13 +9,13 @@ import co.discord.media_engine.VideoInputDeviceDescription; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.guild.GuildFeature; +import com.discord.api.message.Message; import com.discord.api.permission.PermissionOverwrite; import com.discord.api.role.GuildRole; import com.discord.api.thread.ThreadMetadata; import com.discord.api.voice.state.VoiceState; import com.discord.app.AppComponent; import com.discord.models.domain.ModelInvite; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelPayload; import com.discord.models.guild.Guild; @@ -664,21 +664,21 @@ public final class StoreAnalytics extends Store { (2 ??[int, float, short, byte, char]) (wrap: kotlin.Pair : 0x003c: INVOKE (r0v6 kotlin.Pair) = ("invite_guild_id"), (r0v5 java.lang.Long) type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) */ - public final void inviteSent(ModelInvite modelInvite, ModelMessage modelMessage, String str) { + public final void inviteSent(ModelInvite modelInvite, Message message, String str) { Channel channel; com.discord.api.guild.Guild guild; - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(str, "location"); Pair[] pairArr = new Pair[4]; pairArr[0] = o.to("location", str); - pairArr[1] = o.to("message_id", Long.valueOf(modelMessage.getId())); + pairArr[1] = o.to("message_id", Long.valueOf(message.r())); Long l = null; pairArr[2] = o.to("invite_guild_id", (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.o())); if (!(modelInvite == null || (channel = modelInvite.getChannel()) == null)) { l = Long.valueOf(channel.g()); } pairArr[3] = o.to("invite_channel_id", l); - AnalyticsTracker.INSTANCE.inviteSent(modelInvite, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(modelMessage.getChannelId()))); + AnalyticsTracker.INSTANCE.inviteSent(modelInvite, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(message.i()))); } /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0037: APUT @@ -686,19 +686,19 @@ public final class StoreAnalytics extends Store { (2 ??[int, float, short, byte, char]) (wrap: kotlin.Pair : 0x0032: INVOKE (r0v6 kotlin.Pair) = ("invite_guild_id"), (r0v5 java.lang.Long) type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) */ - public final void inviteSent(GuildInvite guildInvite, Channel channel, ModelMessage modelMessage, String str) { - m.checkNotNullParameter(modelMessage, "message"); + public final void inviteSent(GuildInvite guildInvite, Channel channel, Message message, String str) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(str, "location"); Pair[] pairArr = new Pair[4]; pairArr[0] = o.to("location", str); - pairArr[1] = o.to("message_id", Long.valueOf(modelMessage.getId())); + pairArr[1] = o.to("message_id", Long.valueOf(message.r())); Long l = null; pairArr[2] = o.to("invite_guild_id", guildInvite != null ? guildInvite.getGuildId() : null); if (guildInvite != null) { l = guildInvite.getChannelId(); } pairArr[3] = o.to("invite_channel_id", l); - AnalyticsTracker.INSTANCE.inviteSent(guildInvite, channel, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(modelMessage.getChannelId()))); + AnalyticsTracker.INSTANCE.inviteSent(guildInvite, channel, h0.plus(h0.mapOf(pairArr), getGuildAndChannelSnapshotAnalyticsProperties(message.i()))); } public final void inviteSuggestionOpened(long j, List list, List list2) { diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java index 5413c7fad0..de0f8a47bc 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandsKt.java @@ -104,10 +104,10 @@ public final class StoreApplicationCommandsKt { if (applicationCommandOption.getType() == ApplicationCommandType.STRING) { List choices = applicationCommandOption.getChoices(); if (!(choices == null || choices.isEmpty())) { - return resources.getString(2131887451); + return resources.getString(2131887453); } } - return applicationCommandOption.getType() == ApplicationCommandType.INTEGER ? resources.getString(2131887453) : applicationCommandOption.getType() == ApplicationCommandType.BOOLEAN ? resources.getString(2131887449) : applicationCommandOption.getType() == ApplicationCommandType.USER ? resources.getString(2131887457) : applicationCommandOption.getType() == ApplicationCommandType.CHANNEL ? resources.getString(2131887450) : applicationCommandOption.getType() == ApplicationCommandType.ROLE ? resources.getString(2131887456) : applicationCommandOption.getType() == ApplicationCommandType.MENTIONABLE ? resources.getString(2131887454) : resources.getString(2131887455); + return applicationCommandOption.getType() == ApplicationCommandType.INTEGER ? resources.getString(2131887455) : applicationCommandOption.getType() == ApplicationCommandType.BOOLEAN ? resources.getString(2131887451) : applicationCommandOption.getType() == ApplicationCommandType.USER ? resources.getString(2131887459) : applicationCommandOption.getType() == ApplicationCommandType.CHANNEL ? resources.getString(2131887452) : applicationCommandOption.getType() == ApplicationCommandType.ROLE ? resources.getString(2131887458) : applicationCommandOption.getType() == ApplicationCommandType.MENTIONABLE ? resources.getString(2131887456) : resources.getString(2131887457); } public static final Application toDomainApplication(com.discord.api.commands.Application application) { diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java index 19e3eadcff..b4ed1de107 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions$resendApplicationCommand$1.java @@ -1,22 +1,22 @@ package com.discord.stores; +import com.discord.api.message.Message; import com.discord.models.commands.ApplicationCommandLocalSendData; -import com.discord.models.domain.ModelMessage; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: StoreApplicationInteractions.kt */ public final class StoreApplicationInteractions$resendApplicationCommand$1 extends o implements Function0 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ String $nonce; public final /* synthetic */ ApplicationCommandLocalSendData $updatedSendData; public final /* synthetic */ StoreApplicationInteractions this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreApplicationInteractions$resendApplicationCommand$1(StoreApplicationInteractions storeApplicationInteractions, ModelMessage modelMessage, String str, ApplicationCommandLocalSendData applicationCommandLocalSendData) { + public StoreApplicationInteractions$resendApplicationCommand$1(StoreApplicationInteractions storeApplicationInteractions, Message message, String str, ApplicationCommandLocalSendData applicationCommandLocalSendData) { super(0); this.this$0 = storeApplicationInteractions; - this.$message = modelMessage; + this.$message = message; this.$nonce = str; this.$updatedSendData = applicationCommandLocalSendData; } @@ -24,7 +24,7 @@ public final class StoreApplicationInteractions$resendApplicationCommand$1 exten @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - StoreApplicationInteractions.access$getStoreMessages$p(this.this$0).deleteLocalMessage(this.$message.getChannelId(), this.$nonce); + StoreApplicationInteractions.access$getStoreMessages$p(this.this$0).deleteLocalMessage(this.$message.i(), this.$nonce); StoreApplicationInteractions.handleSendApplicationCommandRequest$default(this.this$0, this.$updatedSendData, null, null, 6, null); StoreApplicationInteractions.access$removeApplicationCommandSendData(this.this$0, this.$nonce); } diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java index ae823e2172..d63e5498ca 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java @@ -8,11 +8,11 @@ import c.i.d.e; import com.discord.api.commands.ApplicationCommandData; import com.discord.api.interaction.Interaction; import com.discord.api.interaction.InteractionStateUpdate; +import com.discord.api.message.Message; import com.discord.api.user.User; import com.discord.app.AppLog; import com.discord.models.commands.Application; import com.discord.models.commands.ApplicationCommandLocalSendData; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.NonceGenerator; import com.discord.nullserializable.NullSerializable; import com.discord.restapi.RestAPIParams; @@ -21,6 +21,7 @@ import com.discord.stores.updates.ObservationDeckProvider; import com.discord.utilities.cache.SharedPreferencesProvider; import com.discord.utilities.error.Error; import com.discord.utilities.logging.Logger; +import com.discord.utilities.message.LocalMessageCreatorsKt; import com.discord.utilities.messagesend.MessageResult; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -371,13 +372,11 @@ public final class StoreApplicationInteractions extends StoreV2 { markChanged(ComponentStateUpdate); } - private final ModelMessage buildApplicationCommandLocalMessage(ApplicationCommandLocalSendData applicationCommandLocalSendData, boolean z2, boolean z3) { - ModelMessage createLocalApplicationCommandMessage = ModelMessage.createLocalApplicationCommandMessage(applicationCommandLocalSendData.getNonce(), applicationCommandLocalSendData.getApplicationCommandName(), applicationCommandLocalSendData.getChannelId(), UserUtils.INSTANCE.synthesizeApiUser(this.storeUser.getMe()), toUser(applicationCommandLocalSendData.getApplication()), z3, z2, applicationCommandLocalSendData.getInteractionId(), this.clock); - m.checkNotNullExpressionValue(createLocalApplicationCommandMessage, "ModelMessage.createLocal…onId,\n clock\n )"); - return createLocalApplicationCommandMessage; + private final Message buildApplicationCommandLocalMessage(ApplicationCommandLocalSendData applicationCommandLocalSendData, boolean z2, boolean z3) { + return LocalMessageCreatorsKt.createLocalApplicationCommandMessage(applicationCommandLocalSendData.getNonce(), applicationCommandLocalSendData.getApplicationCommandName(), applicationCommandLocalSendData.getChannelId(), UserUtils.INSTANCE.synthesizeApiUser(this.storeUser.getMe()), toUser(applicationCommandLocalSendData.getApplication()), z3, z2, applicationCommandLocalSendData.getInteractionId(), this.clock); } - public static /* synthetic */ ModelMessage buildApplicationCommandLocalMessage$default(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, boolean z2, boolean z3, int i, Object obj) { + public static /* synthetic */ Message buildApplicationCommandLocalMessage$default(StoreApplicationInteractions storeApplicationInteractions, ApplicationCommandLocalSendData applicationCommandLocalSendData, boolean z2, boolean z3, int i, Object obj) { if ((i & 2) != 0) { z2 = false; } @@ -657,26 +656,25 @@ public final class StoreApplicationInteractions extends StoreV2 { } @StoreThread - public final void handleLocalMessageDelete(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - String nonce = modelMessage.getNonce(); - if (nonce != null) { - m.checkNotNullExpressionValue(nonce, "message.nonce ?: return"); - removeApplicationCommandSendData(nonce); + public final void handleLocalMessageDelete(Message message) { + m.checkNotNullParameter(message, "message"); + String B = message.B(); + if (B != null) { + removeApplicationCommandSendData(B); } } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - handleMessagesCreateOrLoad(d0.t.m.listOf(modelMessage)); + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + handleMessagesCreateOrLoad(d0.t.m.listOf(message)); } @StoreThread - public final void handleMessageUpdate(ModelMessage modelMessage) { + public final void handleMessageUpdate(Message message) { boolean z2; boolean z3; - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); Map map = this.componentInteractions; if (!map.isEmpty()) { Iterator> it = map.entrySet().iterator(); @@ -684,7 +682,7 @@ public final class StoreApplicationInteractions extends StoreV2 { if (!it.hasNext()) { break; } - if (it.next().getValue().getMessageId() == modelMessage.getId()) { + if (it.next().getValue().getMessageId() == message.r()) { z3 = true; continue; } else { @@ -699,11 +697,11 @@ public final class StoreApplicationInteractions extends StoreV2 { } z2 = false; if (z2) { - this.storeLocalActionComponentState.clearState(modelMessage.getId(), null); + this.storeLocalActionComponentState.clearState(message.r(), null); Map map2 = this.componentInteractions; LinkedHashMap linkedHashMap = new LinkedHashMap(); for (Map.Entry entry : map2.entrySet()) { - if (entry.getValue().getMessageId() == modelMessage.getId()) { + if (entry.getValue().getMessageId() == message.r()) { linkedHashMap.put(entry.getKey(), entry.getValue()); } } @@ -712,8 +710,8 @@ public final class StoreApplicationInteractions extends StoreV2 { } markChanged(ComponentStateUpdate); } - if (this.interactionComponentSendState.containsKey(Long.valueOf(modelMessage.getId()))) { - this.interactionComponentSendState.remove(Long.valueOf(modelMessage.getId())); + if (this.interactionComponentSendState.containsKey(Long.valueOf(message.r()))) { + this.interactionComponentSendState.remove(Long.valueOf(message.r())); markChanged(ComponentStateUpdate); } } @@ -721,16 +719,16 @@ public final class StoreApplicationInteractions extends StoreV2 { /* JADX DEBUG: Multi-variable search result rejected for r3v3, resolved type: java.lang.Object */ /* JADX WARN: Multi-variable type inference failed */ @StoreThread - public final void handleMessagesCreateOrLoad(List list) { + public final void handleMessagesCreateOrLoad(List list) { m.checkNotNullParameter(list, "messagesList"); - for (ModelMessage modelMessage : list) { - String nonce = modelMessage.getNonce(); - if (nonce == null || !this.componentInteractions.containsKey(nonce)) { - Interaction interaction = modelMessage.getInteraction(); + for (Message message : list) { + String B = message.B(); + if (B == null || !this.componentInteractions.containsKey(B)) { + Interaction t = message.t(); ApplicationCommandLocalSendData applicationCommandLocalSendData = null; - Long a = interaction != null ? interaction.a() : null; - if (!(nonce == null || t.isBlank(nonce)) && this.applicationCommandLocalSendDataSet.containsKey(nonce)) { - applicationCommandLocalSendData = this.applicationCommandLocalSendDataSet.get(nonce); + Long a = t != null ? t.a() : null; + if (!(B == null || t.isBlank(B)) && this.applicationCommandLocalSendDataSet.containsKey(B)) { + applicationCommandLocalSendData = this.applicationCommandLocalSendDataSet.get(B); } else if (a != null) { Iterator it = this.applicationCommandLocalSendDataSet.values().iterator(); while (true) { @@ -750,10 +748,10 @@ public final class StoreApplicationInteractions extends StoreV2 { this.storeMessages.deleteLocalMessage(applicationCommandLocalSendData.getChannelId(), applicationCommandLocalSendData.getNonceString()); } } else { - ComponentLocation componentLocation = this.componentInteractions.get(nonce); + ComponentLocation componentLocation = this.componentInteractions.get(B); if (componentLocation != null) { handleComponentInteractionMessage(componentLocation); - this.componentInteractions.remove(nonce); + this.componentInteractions.remove(B); } else { return; } @@ -787,15 +785,13 @@ public final class StoreApplicationInteractions extends StoreV2 { return s2; } - public final void resendApplicationCommand(ModelMessage modelMessage) { - String nonce; - m.checkNotNullParameter(modelMessage, "message"); - if (modelMessage.getType() == -4 && (nonce = modelMessage.getNonce()) != null) { - m.checkNotNullExpressionValue(nonce, "message.nonce ?: return"); - ApplicationCommandLocalSendData applicationCommandLocalSendData = this.applicationCommandLocalSendDataSnapshot.get(nonce); - if (applicationCommandLocalSendData != null) { - this.dispatcher.schedule(new StoreApplicationInteractions$resendApplicationCommand$1(this, modelMessage, nonce, ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, NonceGenerator.Companion.computeNonce$default(NonceGenerator.Companion, null, 1, null), 0, null, null, null, null, null, null, null, null, 510, null))); - } + public final void resendApplicationCommand(Message message) { + String B; + ApplicationCommandLocalSendData applicationCommandLocalSendData; + m.checkNotNullParameter(message, "message"); + Integer M = message.M(); + if (M != null && M.intValue() == -4 && (B = message.B()) != null && (applicationCommandLocalSendData = this.applicationCommandLocalSendDataSnapshot.get(B)) != null) { + this.dispatcher.schedule(new StoreApplicationInteractions$resendApplicationCommand$1(this, message, B, ApplicationCommandLocalSendData.copy$default(applicationCommandLocalSendData, NonceGenerator.Companion.computeNonce$default(NonceGenerator.Companion, null, 1, null), 0, null, null, null, null, null, null, null, null, 510, null))); } } diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java index 9c1cebe2da..69c6a2bfe2 100644 --- a/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java +++ b/app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java @@ -5,6 +5,7 @@ import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreAuthentication; import com.discord.stores.StoreInviteSettings; import com.discord.stores.StoreStream; +import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import d0.z.d.k; @@ -86,6 +87,7 @@ public final class StoreAuthentication$register$1 implements b publishSubject = this.userInitiatedAuthEventSubject; publishSubject.j.onNext(Boolean.TRUE); diff --git a/app/src/main/java/com/discord/stores/StoreChangeLog.java b/app/src/main/java/com/discord/stores/StoreChangeLog.java index 774a0378b3..d7cb70c82f 100644 --- a/app/src/main/java/com/discord/stores/StoreChangeLog.java +++ b/app/src/main/java/com/discord/stores/StoreChangeLog.java @@ -13,7 +13,7 @@ import d0.g0.t; import d0.g0.w; import d0.z.d.m; import s.a.j0; -import s.a.u0; +import s.a.w0; /* compiled from: StoreChangeLog.kt */ public final class StoreChangeLog extends Store { public Application app; @@ -83,18 +83,18 @@ public final class StoreChangeLog extends Store { private final boolean shouldShowChangelog(Context context, long j, String str, Integer num) { String str2; - int identifier = (num != null && num.intValue() == 1) ? context.getResources().getIdentifier("change_log_md_experiment_body", "string", context.getPackageName()) : 2131887240; + int identifier = (num != null && num.intValue() == 1) ? context.getResources().getIdentifier("change_log_md_experiment_body", "string", context.getPackageName()) : 2131887241; CharSequence stringByLocale = StringUtilsKt.getStringByLocale(context, identifier, "en"); CharSequence stringByLocale2 = StringUtilsKt.getStringByLocale(context, identifier, str); if ((!m.areEqual(str, "en")) && m.areEqual(stringByLocale, stringByLocale2)) { return false; } if (num != null && num.intValue() == 1) { - String string = context.getString(2131887241); + String string = context.getString(2131887242); m.checkNotNullExpressionValue(string, "context.getString(R.string.change_log_md_date)"); str2 = getChangelogExperimentString(context, "change_log_md_experiment_date", string); } else { - str2 = context.getString(2131887241); + str2 = context.getString(2131887242); m.checkNotNullExpressionValue(str2, "context.getString(R.string.change_log_md_date)"); } String lastSeenChangeLogVersion = getLastSeenChangeLogVersion(); @@ -115,7 +115,7 @@ public final class StoreChangeLog extends Store { @StoreThread public final void handleConnectionOpen() { - a.F(u0.i, j0.a, null, new StoreChangeLog$handleConnectionOpen$1(this, null), 2, null); + a.G(w0.i, j0.a, null, new StoreChangeLog$handleConnectionOpen$1(this, null), 2, null); } @StoreThread @@ -146,16 +146,16 @@ public final class StoreChangeLog extends Store { public final void openChangeLog(Context context, boolean z2) { m.checkNotNullParameter(context, "context"); - String string = context.getString(2131887241); + String string = context.getString(2131887242); m.checkNotNullExpressionValue(string, "context.getString(R.string.change_log_md_date)"); String changelogExperimentString = getChangelogExperimentString(context, "change_log_md_experiment_date", string); - String string2 = context.getString(2131887243); + String string2 = context.getString(2131887244); m.checkNotNullExpressionValue(string2, "context.getString(R.string.change_log_md_revision)"); String changelogExperimentString2 = getChangelogExperimentString(context, "change_log_md_revision", string2); - String string3 = context.getString(2131887244); + String string3 = context.getString(2131887245); m.checkNotNullExpressionValue(string3, "context.getString(R.string.change_log_md_video)"); String changelogExperimentString3 = getChangelogExperimentString(context, "change_log_md_experiment_video", string3); - String string4 = context.getString(2131887240); + String string4 = context.getString(2131887241); m.checkNotNullExpressionValue(string4, "context.getString(R.string.change_log_md_body)"); String changelogExperimentString4 = getChangelogExperimentString(context, "change_log_md_experiment_body", string4); String string5 = context.getString(2131886808); @@ -168,13 +168,13 @@ public final class StoreChangeLog extends Store { WidgetChangeLog.Companion.launch(context, changelogExperimentString, changelogExperimentString2, changelogExperimentString3, changelogExperimentString4); } else { WidgetChangeLog.Companion companion = WidgetChangeLog.Companion; - String string6 = context.getString(2131887241); + String string6 = context.getString(2131887242); m.checkNotNullExpressionValue(string6, "context.getString(R.string.change_log_md_date)"); - String string7 = context.getString(2131887243); + String string7 = context.getString(2131887244); m.checkNotNullExpressionValue(string7, "context.getString(R.string.change_log_md_revision)"); - String string8 = context.getString(2131887244); + String string8 = context.getString(2131887245); m.checkNotNullExpressionValue(string8, "context.getString(R.string.change_log_md_video)"); - String string9 = context.getString(2131887240); + String string9 = context.getString(2131887241); m.checkNotNullExpressionValue(string9, "context.getString(R.string.change_log_md_body)"); companion.launch(context, string6, string7, string8, string9); } diff --git a/app/src/main/java/com/discord/stores/StoreChannelMembers.java b/app/src/main/java/com/discord/stores/StoreChannelMembers.java index be9293e87e..4144ec2924 100644 --- a/app/src/main/java/com/discord/stores/StoreChannelMembers.java +++ b/app/src/main/java/com/discord/stores/StoreChannelMembers.java @@ -124,7 +124,7 @@ public final class StoreChannelMembers extends StoreV2 { } List sorted = u.sorted(arrayList); if (!(sorted == null || (joinToString$default = u.joinToString$default(sorted, ",", null, null, 0, null, null, 62, null)) == null)) { - str = String.valueOf(INSTANCE.toUnsignedLong(c.q.a.k.a.G(joinToString$default, 0, joinToString$default.length(), 0))); + str = String.valueOf(INSTANCE.toUnsignedLong(c.q.a.k.a.H(joinToString$default, 0, joinToString$default.length(), 0))); return str == null ? str : ""; } } @@ -438,7 +438,7 @@ public final class StoreChannelMembers extends StoreV2 { if (guildMember.getColor() != -16777216) { num = Integer.valueOf(guildMember.getColor()); } - return new ChannelMemberList.Row.Member(j2, GuildMember.Companion.getNickOrUsername(guildMember, user), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893685 : 2131887050), UserUtils.INSTANCE.isVerifiedBot(user), this.getPresence.invoke(Long.valueOf(j2)), num, IconUtils.getForGuildMemberOrUser$default(IconUtils.INSTANCE, user, guildMember, null, 4, null), z2 && guild != null && guild.getOwnerId() == j2, guildMember.getPremiumSince(), this.isUserStreaming.invoke(Long.valueOf(j2)).booleanValue()); + return new ChannelMemberList.Row.Member(j2, GuildMember.Companion.getNickOrUsername(guildMember, user), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893725 : 2131887051), UserUtils.INSTANCE.isVerifiedBot(user), this.getPresence.invoke(Long.valueOf(j2)), num, IconUtils.getForGuildMemberOrUser$default(IconUtils.INSTANCE, user, guildMember, null, 4, null), z2 && guild != null && guild.getOwnerId() == j2, guildMember.getPremiumSince(), this.isUserStreaming.invoke(Long.valueOf(j2)).booleanValue()); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java b/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java index 94dc41c51f..bd871eefb8 100644 --- a/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java +++ b/app/src/main/java/com/discord/stores/StoreChannels$observeThreadsFromMessages$1.java @@ -1,7 +1,8 @@ package com.discord.stores; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; +import com.discord.utilities.message.MessageUtils; import d0.d0.f; import d0.t.g0; import d0.z.d.o; @@ -27,15 +28,15 @@ public final class StoreChannels$observeThreadsFromMessages$1 extends o implemen /* renamed from: invoke */ public final Map mo1invoke() { List list = this.$messages; - ArrayList arrayList = new ArrayList(); + ArrayList arrayList = new ArrayList(); for (Object obj : list) { - if (((ModelMessage) obj).hasThread()) { + if (MessageUtils.INSTANCE.hasThread((Message) obj)) { arrayList.add(obj); } } ArrayList arrayList2 = new ArrayList(); - for (ModelMessage modelMessage : arrayList) { - Channel channel = this.this$0.getChannel(modelMessage.getId()); + for (Message message : arrayList) { + Channel channel = this.this$0.getChannel(message.r()); if (channel != null) { arrayList2.add(channel); } diff --git a/app/src/main/java/com/discord/stores/StoreChannels.java b/app/src/main/java/com/discord/stores/StoreChannels.java index b8b57ca0ac..954c841f1a 100644 --- a/app/src/main/java/com/discord/stores/StoreChannels.java +++ b/app/src/main/java/com/discord/stores/StoreChannels.java @@ -8,8 +8,8 @@ import com.discord.api.channel.Channel; import com.discord.api.channel.ChannelRecipient; import com.discord.api.channel.ChannelRecipientNick; import com.discord.api.guild.Guild; +import com.discord.api.message.Message; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelPayload; import com.discord.models.thread.dto.ModelThreadListSync; import com.discord.stores.updates.ObservationDeck; @@ -539,23 +539,17 @@ public final class StoreChannels extends StoreV2 { } @StoreThread - public final void handleMessagesLoaded(List list) { + public final void handleMessagesLoaded(List list) { m.checkNotNullParameter(list, "messages"); - for (ModelMessage modelMessage : list) { - Channel thread = modelMessage.getThread(); - if (thread != null) { - if (!this.threadsById.containsKey(Long.valueOf(thread.g()))) { - m.checkNotNullExpressionValue(thread, "thread"); - if (AnimatableValueParser.y1(thread)) { - storeThread$app_productionGoogleRelease$default(this, thread, 0, null, 6, null); - markChanged(); - } + for (Message message : list) { + Channel J = message.J(); + if (J != null) { + if (!this.threadsById.containsKey(Long.valueOf(J.g())) && AnimatableValueParser.y1(J)) { + storeThread$app_productionGoogleRelease$default(this, J, 0, null, 6, null); + markChanged(); } if (!this.isConnectionOpen) { - Map map = this.preloadedThreads; - Long valueOf = Long.valueOf(thread.g()); - m.checkNotNullExpressionValue(thread, "thread"); - map.put(valueOf, thread); + this.preloadedThreads.put(Long.valueOf(J.g()), J); } } } @@ -573,16 +567,13 @@ public final class StoreChannels extends StoreV2 { } } } - List hits = searchState.getHits(); + List hits = searchState.getHits(); if (hits != null) { - for (ModelMessage modelMessage : hits) { - Channel thread = modelMessage.getThread(); - if (thread != null && !this.threadsById.containsKey(Long.valueOf(thread.g()))) { - m.checkNotNullExpressionValue(thread, "thread"); - if (AnimatableValueParser.y1(thread)) { - storeThread$app_productionGoogleRelease$default(this, thread, 0, null, 6, null); - markChanged(); - } + for (Message message : hits) { + Channel J = message.J(); + if (J != null && !this.threadsById.containsKey(Long.valueOf(J.g())) && AnimatableValueParser.y1(J)) { + storeThread$app_productionGoogleRelease$default(this, J, 0, null, 6, null); + markChanged(); } } } @@ -725,7 +716,7 @@ public final class StoreChannels extends StoreV2 { return observeChannelsForGuild$default(this, 0, null, 2, null); } - public final Observable> observeThreadsFromMessages(List list) { + public final Observable> observeThreadsFromMessages(List list) { m.checkNotNullParameter(list, "messages"); Observable> s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreChannels$observeThreadsFromMessages$1(this, list), 14, null).s(); m.checkNotNullExpressionValue(s2, "observationDeck\n … .distinctUntilChanged()"); diff --git a/app/src/main/java/com/discord/stores/StoreChat.java b/app/src/main/java/com/discord/stores/StoreChat.java index 78cb1e3b65..06f579f023 100644 --- a/app/src/main/java/com/discord/stores/StoreChat.java +++ b/app/src/main/java/com/discord/stores/StoreChat.java @@ -3,7 +3,7 @@ package com.discord.stores; import a0.a.a.b; import androidx.recyclerview.widget.LinearLayoutManager; import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.user.User; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; @@ -30,26 +30,26 @@ public final class StoreChat extends StoreV2 { /* compiled from: StoreChat.kt */ public static final class EditingMessage { private final CharSequence content; - private final ModelMessage message; + private final Message message; - public EditingMessage(ModelMessage modelMessage, CharSequence charSequence) { - m.checkNotNullParameter(modelMessage, "message"); + public EditingMessage(Message message, CharSequence charSequence) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(charSequence, "content"); - this.message = modelMessage; + this.message = message; this.content = charSequence; } - public static /* synthetic */ EditingMessage copy$default(EditingMessage editingMessage, ModelMessage modelMessage, CharSequence charSequence, int i, Object obj) { + public static /* synthetic */ EditingMessage copy$default(EditingMessage editingMessage, Message message, CharSequence charSequence, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = editingMessage.message; + message = editingMessage.message; } if ((i & 2) != 0) { charSequence = editingMessage.content; } - return editingMessage.copy(modelMessage, charSequence); + return editingMessage.copy(message, charSequence); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -57,10 +57,10 @@ public final class StoreChat extends StoreV2 { return this.content; } - public final EditingMessage copy(ModelMessage modelMessage, CharSequence charSequence) { - m.checkNotNullParameter(modelMessage, "message"); + public final EditingMessage copy(Message message, CharSequence charSequence) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(charSequence, "content"); - return new EditingMessage(modelMessage, charSequence); + return new EditingMessage(message, charSequence); } public boolean equals(Object obj) { @@ -78,14 +78,14 @@ public final class StoreChat extends StoreV2 { return this.content; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (modelMessage != null ? modelMessage.hashCode() : 0) * 31; + int hashCode = (message != null ? message.hashCode() : 0) * 31; CharSequence charSequence = this.content; if (charSequence != null) { i = charSequence.hashCode(); diff --git a/app/src/main/java/com/discord/stores/StoreClientDataState.java b/app/src/main/java/com/discord/stores/StoreClientDataState.java index affdcadf1b..87828328b3 100644 --- a/app/src/main/java/com/discord/stores/StoreClientDataState.java +++ b/app/src/main/java/com/discord/stores/StoreClientDataState.java @@ -7,9 +7,9 @@ import com.discord.api.emoji.GuildEmojisUpdate; import com.discord.api.guild.Guild; import com.discord.api.guildhash.GuildHash; import com.discord.api.guildhash.GuildHashes; +import com.discord.api.message.Message; import com.discord.api.sticker.GuildStickerUpdate; import com.discord.gateway.io.OutgoingPayload; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelPayload; import com.discord.models.domain.ModelReadState; @@ -316,9 +316,9 @@ public final class StoreClientDataState extends StoreV2 { } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - updateHighestLastMessageId(modelMessage.getId()); + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + updateHighestLastMessageId(message.r()); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java index 05bb553681..559cef62a3 100644 --- a/app/src/main/java/com/discord/stores/StoreClientVersion.java +++ b/app/src/main/java/com/discord/stores/StoreClientVersion.java @@ -15,7 +15,7 @@ public final class StoreClientVersion extends Store { private int clientMinVersion; private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY"; private final SerializedSubject clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.m0(Boolean.FALSE)); - private final int clientVersion = 80011; + private final int clientVersion = 81014; public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) { storeClientVersion.setClientMinVersion(i); diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java new file mode 100644 index 0000000000..b3c06ec377 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreDirectories$fetchDirectoriesForChannel$1.java @@ -0,0 +1,56 @@ +package com.discord.stores; + +import com.discord.api.directory.DirectoryEntry; +import com.discord.stores.utilities.RestCallState; +import d0.z.d.m; +import d0.z.d.o; +import java.util.List; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreDirectories.kt */ +public final class StoreDirectories$fetchDirectoriesForChannel$1 extends o implements Function1>, Unit> { + public final /* synthetic */ long $channelId; + public final /* synthetic */ StoreDirectories this$0; + + /* compiled from: StoreDirectories.kt */ + /* renamed from: com.discord.stores.StoreDirectories$fetchDirectoriesForChannel$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ RestCallState $entriesResponse; + public final /* synthetic */ StoreDirectories$fetchDirectoriesForChannel$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreDirectories$fetchDirectoriesForChannel$1 storeDirectories$fetchDirectoriesForChannel$1, RestCallState restCallState) { + super(0); + this.this$0 = storeDirectories$fetchDirectoriesForChannel$1; + this.$entriesResponse = restCallState; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreDirectories.access$getDirectoriesMap$p(this.this$0.this$0).put(Long.valueOf(this.this$0.$channelId), this.$entriesResponse); + this.this$0.this$0.markChanged(); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreDirectories$fetchDirectoriesForChannel$1(StoreDirectories storeDirectories, long j) { + super(1); + this.this$0 = storeDirectories; + this.$channelId = j; + } + + /* 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(RestCallState> restCallState) { + invoke((RestCallState>) restCallState); + return Unit.a; + } + + public final void invoke(RestCallState> restCallState) { + m.checkNotNullParameter(restCallState, "entriesResponse"); + StoreDirectories.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, restCallState)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java new file mode 100644 index 0000000000..03bf88bf8f --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreDirectories$observeDirectoriesForChannel$1.java @@ -0,0 +1,23 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreDirectories.kt */ +public final class StoreDirectories$observeDirectoriesForChannel$1 extends o implements Function0 { + public final /* synthetic */ long $channelId; + public final /* synthetic */ StoreDirectories this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreDirectories$observeDirectoriesForChannel$1(StoreDirectories storeDirectories, long j) { + super(0); + this.this$0 = storeDirectories; + this.$channelId = j; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreDirectories.access$getDirectoriesMapSnapshot$p(this.this$0).get(Long.valueOf(this.$channelId)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreDirectories.java b/app/src/main/java/com/discord/stores/StoreDirectories.java new file mode 100644 index 0000000000..b9518f965f --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreDirectories.java @@ -0,0 +1,75 @@ +package com.discord.stores; + +import com.discord.api.directory.DirectoryEntry; +import com.discord.stores.updates.ObservationDeck; +import com.discord.stores.utilities.RestCallState; +import com.discord.stores.utilities.RestCallStateKt; +import com.discord.utilities.rest.RestAPI; +import d0.t.h0; +import d0.z.d.m; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: StoreDirectories.kt */ +public final class StoreDirectories extends StoreV2 { + private Map>> directoriesMap; + private Map>> directoriesMapSnapshot; + private final Dispatcher dispatcher; + private final ObservationDeck observationDeck; + private final RestAPI restApi; + + public StoreDirectories(Dispatcher dispatcher, ObservationDeck observationDeck, RestAPI restAPI) { + m.checkNotNullParameter(dispatcher, "dispatcher"); + m.checkNotNullParameter(observationDeck, "observationDeck"); + m.checkNotNullParameter(restAPI, "restApi"); + this.dispatcher = dispatcher; + this.observationDeck = observationDeck; + this.restApi = restAPI; + this.directoriesMapSnapshot = h0.emptyMap(); + this.directoriesMap = new LinkedHashMap(); + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ StoreDirectories(Dispatcher dispatcher, ObservationDeck observationDeck, RestAPI restAPI, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(dispatcher, observationDeck, (i & 4) != 0 ? RestAPI.Companion.getApi() : restAPI); + } + + public static final /* synthetic */ Map access$getDirectoriesMap$p(StoreDirectories storeDirectories) { + return storeDirectories.directoriesMap; + } + + public static final /* synthetic */ Map access$getDirectoriesMapSnapshot$p(StoreDirectories storeDirectories) { + return storeDirectories.directoriesMapSnapshot; + } + + public static final /* synthetic */ Dispatcher access$getDispatcher$p(StoreDirectories storeDirectories) { + return storeDirectories.dispatcher; + } + + public static final /* synthetic */ void access$setDirectoriesMap$p(StoreDirectories storeDirectories, Map map) { + storeDirectories.directoriesMap = map; + } + + public static final /* synthetic */ void access$setDirectoriesMapSnapshot$p(StoreDirectories storeDirectories, Map map) { + storeDirectories.directoriesMapSnapshot = map; + } + + public final void fetchDirectoriesForChannel(long j) { + RestCallStateKt.executeRequest(this.restApi.getDirectoryEntries(j), new StoreDirectories$fetchDirectoriesForChannel$1(this, j)); + } + + public final RestCallState> getDirectoriesForChannel(long j) { + return (RestCallState) this.directoriesMapSnapshot.get(Long.valueOf(j)); + } + + public final ObservationDeck.Observer observeDirectoriesForChannel(long j) { + return ObservationDeck.connect$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, new StoreDirectories$observeDirectoriesForChannel$1(this, j), 6, null); + } + + @Override // com.discord.stores.StoreV2 + public void snapshotData() { + this.directoriesMapSnapshot = new HashMap(this.directoriesMap); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java index 55b4a92efb..e64c54dc0f 100644 --- a/app/src/main/java/com/discord/stores/StoreGatewayConnection.java +++ b/app/src/main/java/com/discord/stores/StoreGatewayConnection.java @@ -17,6 +17,7 @@ import com.discord.api.guildmember.GuildMember; import com.discord.api.guildmember.GuildMemberRemove; import com.discord.api.guildmember.GuildMembersChunk; import com.discord.api.interaction.InteractionStateUpdate; +import com.discord.api.message.Message; import com.discord.api.message.reaction.MessageReactionUpdate; import com.discord.api.presence.ClientStatus; import com.discord.api.presence.Presence; @@ -44,7 +45,6 @@ import com.discord.models.domain.ModelCall; import com.discord.models.domain.ModelChannelUnreadUpdate; import com.discord.models.domain.ModelGuildIntegration; import com.discord.models.domain.ModelGuildMemberListUpdate; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelMessageDelete; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelPayload; @@ -59,6 +59,8 @@ import com.discord.models.domain.StreamServerUpdate; import com.discord.models.thread.dto.ModelThreadListSync; import com.discord.rtcconnection.RtcConnection; import com.discord.stores.StoreClientDataState; +import com.discord.stores.utilities.BatchManager; +import com.discord.stores.utilities.Batched; import com.discord.utilities.analytics.AnalyticSuperProperties; import com.discord.utilities.lazy.subscriptions.GuildSubscriptions; import com.discord.utilities.logging.AppGatewaySocketLogger; @@ -80,14 +82,17 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.ExecutorCoroutineDispatcher; import okhttp3.Interceptor; import rx.Observable; import rx.Scheduler; import rx.subjects.BehaviorSubject; import rx.subjects.PublishSubject; import rx.subjects.SerializedSubject; +import s.a.v0; /* compiled from: StoreGatewayConnection.kt */ public final class StoreGatewayConnection implements GatewayEventHandler { + private final BatchManager batches; private final SerializedSubject callCreateOrUpdate; private final SerializedSubject callDelete; private final SerializedSubject channelCreateOrUpdate; @@ -99,6 +104,8 @@ public final class StoreGatewayConnection implements GatewayEventHandler { private final Clock clock; private final SerializedSubject connected; private final SerializedSubject connectionReady; + private final ExecutorCoroutineDispatcher coroutineDispatcher; + private final ExecutorService executor; private final SerializedSubject friendSuggestionCreate; private final SerializedSubject friendSuggestionDelete; private final AppGatewaySocketLogger gatewaySocketLogger; @@ -123,13 +130,13 @@ public final class StoreGatewayConnection implements GatewayEventHandler { private final SerializedSubject interactionFailure; private final SerializedSubject interactionSuccess; private final SerializedSubject messageAck; - private final SerializedSubject messageCreate; + private final SerializedSubject messageCreate; private final SerializedSubject messageDelete; private final SerializedSubject messageReactionAdd; private final SerializedSubject messageReactionRemove; private final SerializedSubject messageReactionRemoveAll; private final SerializedSubject messageReactionRemoveEmoji; - private final SerializedSubject messageUpdate; + private final SerializedSubject messageUpdate; private final SerializedSubject, List> presenceReplace; private final SerializedSubject presenceUpdate; private final SerializedSubject ready; @@ -161,7 +168,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { private final SerializedSubject userSubscriptionsUpdate; private final SerializedSubject userUpdate; private final SerializedSubject voiceServerUpdate; - private final SerializedSubject voiceStateUpdate; + private final Batched voiceStateUpdate; /* compiled from: StoreGatewayConnection.kt */ public static final class ClientState { @@ -309,18 +316,28 @@ public final class StoreGatewayConnection implements GatewayEventHandler { } public StoreGatewayConnection(StoreStream storeStream, Clock clock, AppGatewaySocketLogger appGatewaySocketLogger) { - this(storeStream, clock, null, appGatewaySocketLogger, 4, null); + this(storeStream, clock, null, null, appGatewaySocketLogger, 12, null); } - public StoreGatewayConnection(StoreStream storeStream, Clock clock, Scheduler scheduler, AppGatewaySocketLogger appGatewaySocketLogger) { + public StoreGatewayConnection(StoreStream storeStream, Clock clock, ExecutorService executorService, AppGatewaySocketLogger appGatewaySocketLogger) { + this(storeStream, clock, executorService, null, appGatewaySocketLogger, 8, null); + } + + public StoreGatewayConnection(StoreStream storeStream, Clock clock, ExecutorService executorService, Scheduler scheduler, AppGatewaySocketLogger appGatewaySocketLogger) { m.checkNotNullParameter(storeStream, "stream"); m.checkNotNullParameter(clock, "clock"); + m.checkNotNullParameter(executorService, "executor"); m.checkNotNullParameter(scheduler, "scheduler"); m.checkNotNullParameter(appGatewaySocketLogger, "gatewaySocketLogger"); this.stream = storeStream; this.clock = clock; + this.executor = executorService; this.scheduler = scheduler; this.gatewaySocketLogger = appGatewaySocketLogger; + v0 v0Var = new v0(executorService); + this.coroutineDispatcher = v0Var; + BatchManager batchManager = new BatchManager(v0Var, null, 2, null); + this.batches = batchManager; Boolean bool = Boolean.FALSE; this.connected = new SerializedSubject<>(BehaviorSubject.m0(bool)); this.connectionReady = new SerializedSubject<>(BehaviorSubject.m0(bool)); @@ -368,7 +385,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { this.userNoteUpdate = new SerializedSubject<>(BehaviorSubject.l0()); this.userRequiredActionUpdate = new SerializedSubject<>(BehaviorSubject.l0()); this.sessionsReplace = new SerializedSubject<>(BehaviorSubject.l0()); - this.voiceStateUpdate = new SerializedSubject<>(BehaviorSubject.l0()); + this.voiceStateUpdate = BatchManager.createBatched$default(batchManager, "VOICE_STATE_UPDATE", 0, 0, 6, null); this.voiceServerUpdate = new SerializedSubject<>(BehaviorSubject.l0()); this.guildMemberListUpdate = new SerializedSubject<>(BehaviorSubject.l0()); this.userPaymentSourcesUpdate = new SerializedSubject<>(BehaviorSubject.l0()); @@ -393,14 +410,16 @@ public final class StoreGatewayConnection implements GatewayEventHandler { } /* JADX WARNING: Illegal instructions before constructor call */ - public StoreGatewayConnection(StoreStream storeStream, Clock clock, Scheduler scheduler, AppGatewaySocketLogger appGatewaySocketLogger, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(storeStream, clock, scheduler, appGatewaySocketLogger); + public StoreGatewayConnection(StoreStream storeStream, Clock clock, ExecutorService executorService, Scheduler scheduler, AppGatewaySocketLogger appGatewaySocketLogger, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(storeStream, clock, executorService, scheduler, appGatewaySocketLogger); if ((i & 4) != 0) { - ExecutorService newFixedThreadPool = Executors.newFixedThreadPool(1); + executorService = Executors.newFixedThreadPool(1); + m.checkNotNullExpressionValue(executorService, "Executors.newFixedThreadPool(1)"); + } + if ((i & 8) != 0) { AtomicReference atomicReference = j0.p.a.a; - c cVar = new c(newFixedThreadPool); - m.checkNotNullExpressionValue(cVar, "Schedulers.from(Executors.newFixedThreadPool(1))"); - scheduler = cVar; + scheduler = new c(executorService); + m.checkNotNullExpressionValue(scheduler, "Schedulers.from(executor)"); } } @@ -548,6 +567,10 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return s2; } + public final ExecutorCoroutineDispatcher getCoroutineDispatcher() { + return this.coroutineDispatcher; + } + public final SerializedSubject getFriendSuggestionCreate() { return this.friendSuggestionCreate; } @@ -640,7 +663,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return this.messageAck; } - public final SerializedSubject getMessageCreate() { + public final SerializedSubject getMessageCreate() { return this.messageCreate; } @@ -664,7 +687,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return this.messageReactionRemoveEmoji; } - public final SerializedSubject getMessageUpdate() { + public final SerializedSubject getMessageUpdate() { return this.messageUpdate; } @@ -780,7 +803,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return this.voiceServerUpdate; } - public final SerializedSubject getVoiceStateUpdate() { + public final Batched getVoiceStateUpdate() { return this.voiceStateUpdate; } @@ -806,6 +829,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { @Override // com.discord.gateway.GatewayEventHandler public void handleDispatch(String str, Object obj) { m.checkNotNullParameter(obj, "data"); + this.batches.flushBatches(str); if (str != null) { switch (str.hashCode()) { case -2137365335: @@ -1207,7 +1231,7 @@ public final class StoreGatewayConnection implements GatewayEventHandler { return; case 1699412580: if (str.equals("VOICE_STATE_UPDATE")) { - this.voiceStateUpdate.j.onNext(obj); + this.voiceStateUpdate.onNext(obj); return; } return; diff --git a/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java b/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java index 62b8d9051f..06cc7227fb 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java +++ b/app/src/main/java/com/discord/stores/StoreGuildMemberRequester.java @@ -2,8 +2,8 @@ package com.discord.stores; import com.discord.api.channel.Channel; import com.discord.api.guildmember.GuildMembersChunk; +import com.discord.api.message.Message; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.utilities.lazy.requester.GuildMemberRequestManager; import d0.t.o; @@ -16,7 +16,7 @@ import java.util.Map; import java.util.TreeMap; /* compiled from: StoreGuildMemberRequester.kt */ public final class StoreGuildMemberRequester extends Store { - private final TreeMap> channelPendingMessages = new TreeMap<>(); + private final TreeMap> channelPendingMessages = new TreeMap<>(); private final StoreStream collector; private final Dispatcher dispatcher; private boolean isConnected; @@ -48,16 +48,17 @@ public final class StoreGuildMemberRequester extends Store { } @StoreThread - private final void requestForMessages(long j, Iterable iterable) { - for (ModelMessage modelMessage : iterable) { - User author = modelMessage.getAuthor(); - if (author != null) { - this.requestManager.queueRequest(j, author.i()); + private final void requestForMessages(long j, Iterable iterable) { + for (Message message : iterable) { + User g = message.g(); + if (g != null) { + this.requestManager.queueRequest(j, g.i()); } - List mentions = modelMessage.getMentions(); - m.checkNotNullExpressionValue(mentions, "message.mentions"); - for (User user : mentions) { - this.requestManager.queueRequest(j, user.i()); + List z2 = message.z(); + if (z2 != null) { + for (User user : z2) { + this.requestManager.queueRequest(j, user.i()); + } } } } @@ -71,7 +72,7 @@ public final class StoreGuildMemberRequester extends Store { public final void handleConnectionOpen() { this.isConnected = true; this.requestManager.reset(); - for (Map.Entry> entry : this.channelPendingMessages.entrySet()) { + for (Map.Entry> entry : this.channelPendingMessages.entrySet()) { handleLoadMessages(entry.getKey().longValue(), entry.getValue().values()); } this.channelPendingMessages.clear(); @@ -107,7 +108,7 @@ public final class StoreGuildMemberRequester extends Store { /* JADX WARNING: Unknown variable types count: 1 */ @StoreThread - public final void handleLoadMessages(long j, Collection collection) { + public final void handleLoadMessages(long j, Collection collection) { m.checkNotNullParameter(collection, "messages"); if (this.isConnected) { Channel findChannelByIdInternal$app_productionGoogleRelease = this.collector.getChannels$app_productionGoogleRelease().findChannelByIdInternal$app_productionGoogleRelease(j); @@ -125,12 +126,12 @@ public final class StoreGuildMemberRequester extends Store { } return; } - Map map = this.channelPendingMessages.get(Long.valueOf(j)); + Map map = this.channelPendingMessages.get(Long.valueOf(j)); if (map == null) { map = new HashMap<>(collection.size()); } for (?? r1 : collection) { - map.put(Long.valueOf(((ModelMessage) r1).getId()), r1); + map.put(Long.valueOf(((Message) r1).r()), r1); } this.channelPendingMessages.put(Long.valueOf(j), map); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildProfiles.java b/app/src/main/java/com/discord/stores/StoreGuildProfiles.java index dd0a5d2298..4825e75a8c 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildProfiles.java +++ b/app/src/main/java/com/discord/stores/StoreGuildProfiles.java @@ -161,7 +161,7 @@ public final class StoreGuildProfiles extends StoreV2 { @StoreThread private final void handleGuildProfileFetchSuccess(GuildPreview guildPreview) { - this.guildProfilesState.put(Long.valueOf(guildPreview.h()), new GuildProfileData(FetchStates.SUCCEEDED, guildPreview)); + this.guildProfilesState.put(Long.valueOf(guildPreview.g()), new GuildProfileData(FetchStates.SUCCEEDED, guildPreview)); markChanged(); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildStickers.java b/app/src/main/java/com/discord/stores/StoreGuildStickers.java index 1f5d46d6e7..2bc3dc0f7f 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildStickers.java +++ b/app/src/main/java/com/discord/stores/StoreGuildStickers.java @@ -102,9 +102,9 @@ public final class StoreGuildStickers extends StoreV2 { } public final void handleFetchedSticker(Sticker sticker) { - Long e; - if (sticker != null && sticker.i() == StickerType.GUILD && (e = sticker.e()) != null) { - this.dispatcher.schedule(new StoreGuildStickers$handleFetchedSticker$1(this, e.longValue(), sticker)); + Long f; + if (sticker != null && sticker.j() == StickerType.GUILD && (f = sticker.f()) != null) { + this.dispatcher.schedule(new StoreGuildStickers$handleFetchedSticker$1(this, f.longValue(), sticker)); } } diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.java b/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.java index 0b81930111..eb0b958c25 100644 --- a/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.java +++ b/app/src/main/java/com/discord/stores/StoreInviteSettings$generateInviteDefaultChannel$4.java @@ -2,7 +2,7 @@ package com.discord.stores; import com.discord.models.domain.ModelInvite; import j0.k.b; -import j0.l.a.c; +import j0.l.e.j; import rx.Observable; /* compiled from: StoreInviteSettings.kt */ public final class StoreInviteSettings$generateInviteDefaultChannel$4 implements b> { @@ -23,6 +23,6 @@ public final class StoreInviteSettings$generateInviteDefaultChannel$4 impl return generateInvite; } } - return c.j; + return new j(null); } } diff --git a/app/src/main/java/com/discord/stores/StoreInviteSettings.java b/app/src/main/java/com/discord/stores/StoreInviteSettings.java index 904422a01a..88c57c7f46 100644 --- a/app/src/main/java/com/discord/stores/StoreInviteSettings.java +++ b/app/src/main/java/com/discord/stores/StoreInviteSettings.java @@ -139,7 +139,7 @@ public final class StoreInviteSettings extends Store { public final Observable generateInviteDefaultChannel(long j) { Observable A = getInvitableChannels(j).G(StoreInviteSettings$generateInviteDefaultChannel$1.INSTANCE).G(StoreInviteSettings$generateInviteDefaultChannel$2.INSTANCE).G(StoreInviteSettings$generateInviteDefaultChannel$3.INSTANCE).a0(1).A(new StoreInviteSettings$generateInviteDefaultChannel$4(this, j)); - m.checkNotNullExpressionValue(A, "getInvitableChannels(gui…vable.empty()\n }"); + m.checkNotNullExpressionValue(A, "getInvitableChannels(gui…le.just(null)\n }"); return A; } diff --git a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java index fc48b31b36..2752a8b106 100644 --- a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java +++ b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder$init$type$1.java @@ -1,9 +1,9 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.google.gson.reflect.TypeToken; import java.util.List; import java.util.Map; /* compiled from: StoreLocalMessagesHolder.kt */ -public final class StoreLocalMessagesHolder$init$type$1 extends TypeToken>> { +public final class StoreLocalMessagesHolder$init$type$1 extends TypeToken>> { } diff --git a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java index 57f706c448..cdb4a0acaf 100644 --- a/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java +++ b/app/src/main/java/com/discord/stores/StoreLocalMessagesHolder.java @@ -3,10 +3,11 @@ package com.discord.stores; import android.content.SharedPreferences; import c.a.b.a; import c.i.d.e; +import com.discord.api.message.Message; import com.discord.app.AppLog; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.cache.SharedPreferencesProvider; import com.discord.utilities.logging.Logger; +import com.discord.utilities.message.MessageUtils; import com.google.gson.Gson; import d0.t.h0; import d0.t.n; @@ -29,11 +30,11 @@ import rx.subjects.Subject; /* compiled from: StoreLocalMessagesHolder.kt */ public final class StoreLocalMessagesHolder { private boolean cacheEnabled; - private Map> cacheSnapshot = h0.emptyMap(); + private Map> cacheSnapshot = h0.emptyMap(); private final Gson gson; - private final HashMap> messages = new HashMap<>(); - private final Subject>, Map>> messagesPublisher = new SerializedSubject(BehaviorSubject.l0()); - private Map> messagesSnapshot = h0.emptyMap(); + private final HashMap> messages = new HashMap<>(); + private final Subject>, Map>> messagesPublisher = new SerializedSubject(BehaviorSubject.l0()); + private Map> messagesSnapshot = h0.emptyMap(); private SharedPreferences sharedPreferences; private final Set updatedChannels = new HashSet(); @@ -54,9 +55,9 @@ public final class StoreLocalMessagesHolder { private final void messageCacheTryPersist() { if (this.cacheEnabled) { HashMap hashMap = new HashMap(); - for (Map.Entry> entry : this.messages.entrySet()) { + for (Map.Entry> entry : this.messages.entrySet()) { Long key = entry.getKey(); - Collection values = entry.getValue().values(); + Collection values = entry.getValue().values(); m.checkNotNullExpressionValue(values, "entry.value.values"); hashMap.put(key, u.toList(values)); } @@ -67,19 +68,19 @@ public final class StoreLocalMessagesHolder { if (sharedPreferences == null) { m.throwUninitializedPropertyAccessException("sharedPreferences"); } - sharedPreferences.edit().putString("STORE_LOCAL_MESSAGES_CACHE_V7", m).apply(); + sharedPreferences.edit().putString("STORE_LOCAL_MESSAGES_CACHE_V10", m).apply(); } } } private final void publishIfUpdated(boolean z2) { - Collection collection; + Collection collection; if (!this.updatedChannels.isEmpty() || z2) { HashMap hashMap = new HashMap(this.messagesSnapshot); for (Long l : this.updatedChannels) { long longValue = l.longValue(); Long valueOf = Long.valueOf(longValue); - TreeMap treeMap = this.messages.get(Long.valueOf(longValue)); + TreeMap treeMap = this.messages.get(Long.valueOf(longValue)); if (treeMap == null || (collection = treeMap.values()) == null) { collection = n.emptyList(); } @@ -100,22 +101,22 @@ public final class StoreLocalMessagesHolder { } @StoreThread - public final void addMessage(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - long channelId = modelMessage.getChannelId(); - TreeMap treeMap = this.messages.get(Long.valueOf(channelId)); + public final void addMessage(Message message) { + m.checkNotNullParameter(message, "message"); + long i = message.i(); + TreeMap treeMap = this.messages.get(Long.valueOf(i)); if (treeMap == null) { treeMap = new TreeMap<>(); } - treeMap.put(Long.valueOf(modelMessage.getId()), modelMessage); - this.messages.put(Long.valueOf(channelId), treeMap); - this.updatedChannels.add(Long.valueOf(channelId)); + treeMap.put(Long.valueOf(message.r()), message); + this.messages.put(Long.valueOf(i), treeMap); + this.updatedChannels.add(Long.valueOf(i)); publishIfUpdated$default(this, false, 1, null); } @StoreThread public final void clearCache() { - for (Map.Entry> entry : this.messages.entrySet()) { + for (Map.Entry> entry : this.messages.entrySet()) { Long key = entry.getKey(); Set set = this.updatedChannels; m.checkNotNullExpressionValue(key, "channelId"); @@ -129,10 +130,10 @@ public final class StoreLocalMessagesHolder { public final void deleteMessage(long j, String str) { Object obj; m.checkNotNullParameter(str, "nonce"); - TreeMap treeMap = this.messages.get(Long.valueOf(j)); + TreeMap treeMap = this.messages.get(Long.valueOf(j)); if (treeMap != null) { m.checkNotNullExpressionValue(treeMap, "messages[channelId] ?: return"); - Collection values = treeMap.values(); + Collection values = treeMap.values(); m.checkNotNullExpressionValue(values, "messagesForChannel.values"); Iterator it = values.iterator(); while (true) { @@ -141,33 +142,31 @@ public final class StoreLocalMessagesHolder { break; } obj = it.next(); - ModelMessage modelMessage = (ModelMessage) obj; - m.checkNotNullExpressionValue(modelMessage, "message"); - if (m.areEqual(modelMessage.getNonce(), str)) { + if (m.areEqual(((Message) obj).B(), str)) { break; } } - ModelMessage modelMessage2 = (ModelMessage) obj; - if (modelMessage2 != null) { - m.checkNotNullExpressionValue(modelMessage2, "messagesForChannel.value…once == nonce } ?: return"); - deleteMessage(modelMessage2); + Message message = (Message) obj; + if (message != null) { + m.checkNotNullExpressionValue(message, "messagesForChannel.value…once == nonce } ?: return"); + deleteMessage(message); } } } @StoreThread - public final void deleteMessage(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - long id2 = modelMessage.getId(); - long channelId = modelMessage.getChannelId(); - TreeMap treeMap = this.messages.get(Long.valueOf(channelId)); + public final void deleteMessage(Message message) { + m.checkNotNullParameter(message, "message"); + long r = message.r(); + long i = message.i(); + TreeMap treeMap = this.messages.get(Long.valueOf(i)); if (treeMap != null) { m.checkNotNullExpressionValue(treeMap, "messages[channelId] ?: return"); - if (treeMap.containsKey(Long.valueOf(id2))) { - treeMap.remove(Long.valueOf(id2)); - this.updatedChannels.add(Long.valueOf(channelId)); + if (treeMap.containsKey(Long.valueOf(r))) { + treeMap.remove(Long.valueOf(r)); + this.updatedChannels.add(Long.valueOf(i)); if (treeMap.isEmpty()) { - this.messages.remove(Long.valueOf(channelId)); + this.messages.remove(Long.valueOf(i)); } } publishIfUpdated$default(this, false, 1, null); @@ -175,15 +174,15 @@ public final class StoreLocalMessagesHolder { } @StoreThread - public final List getFlattenedMessages() { + public final List getFlattenedMessages() { return o.flatten(this.messagesSnapshot.values()); } @StoreThread - public final ModelMessage getMessage(long j, String str) { - Collection values; + public final Message getMessage(long j, String str) { + Collection values; m.checkNotNullParameter(str, "nonce"); - TreeMap treeMap = this.messages.get(Long.valueOf(j)); + TreeMap treeMap = this.messages.get(Long.valueOf(j)); Object obj = null; if (treeMap == null || (values = treeMap.values()) == null) { return null; @@ -194,17 +193,15 @@ public final class StoreLocalMessagesHolder { break; } Object next = it.next(); - ModelMessage modelMessage = (ModelMessage) next; - m.checkNotNullExpressionValue(modelMessage, "it"); - if (m.areEqual(modelMessage.getNonce(), str)) { + if (m.areEqual(((Message) next).B(), str)) { obj = next; break; } } - return (ModelMessage) obj; + return (Message) obj; } - public final Observable>> getMessagesPublisher() { + public final Observable>> getMessagesPublisher() { return this.messagesPublisher; } @@ -217,16 +214,16 @@ public final class StoreLocalMessagesHolder { if (sharedPreferences == null) { m.throwUninitializedPropertyAccessException("sharedPreferences"); } - String string = sharedPreferences.getString("STORE_LOCAL_MESSAGES_CACHE_V7", null); + String string = sharedPreferences.getString("STORE_LOCAL_MESSAGES_CACHE_V10", null); for (Map.Entry entry : (string != null ? (Map) this.gson.g(string, new StoreLocalMessagesHolder$init$type$1().getType()) : h0.emptyMap()).entrySet()) { long longValue = ((Number) entry.getKey()).longValue(); - this.messages.put(Long.valueOf(longValue), new TreeMap<>(ModelMessage.getSortByIds())); - TreeMap treeMap = this.messages.get(Long.valueOf(longValue)); + this.messages.put(Long.valueOf(longValue), new TreeMap<>(MessageUtils.getSORT_BY_IDS_COMPARATOR())); + TreeMap treeMap = this.messages.get(Long.valueOf(longValue)); if (treeMap == null) { treeMap = new TreeMap<>(); } - for (ModelMessage modelMessage : (List) entry.getValue()) { - treeMap.put(Long.valueOf(modelMessage.getId()), modelMessage); + for (Message message : (List) entry.getValue()) { + treeMap.put(Long.valueOf(message.r()), message); } this.messages.put(Long.valueOf(longValue), treeMap); this.updatedChannels.add(Long.valueOf(longValue)); diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java new file mode 100644 index 0000000000..bf4196719e --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$getDefaultVideoDeviceGUID$1.java @@ -0,0 +1,26 @@ +package com.discord.stores; + +import d0.w.h.a.d; +import d0.w.h.a.e; +import kotlin.coroutines.Continuation; +/* compiled from: StoreMediaEngine.kt */ +@e(c = "com.discord.stores.StoreMediaEngine", f = "StoreMediaEngine.kt", l = {193}, m = "getDefaultVideoDeviceGUID") +public final class StoreMediaEngine$getDefaultVideoDeviceGUID$1 extends d { + public Object L$0; + public int label; + public /* synthetic */ Object result; + public final /* synthetic */ StoreMediaEngine this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreMediaEngine$getDefaultVideoDeviceGUID$1(StoreMediaEngine storeMediaEngine, Continuation continuation) { + super(continuation); + this.this$0 = storeMediaEngine; + } + + @Override // d0.w.h.a.a + public final Object invokeSuspend(Object obj) { + this.result = obj; + this.label |= Integer.MIN_VALUE; + return this.this$0.getDefaultVideoDeviceGUID(this); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNativeAsync$2$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNativeAsync$2$1.java new file mode 100644 index 0000000000..4cdaae7375 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$getVideoInputDevicesNativeAsync$2$1.java @@ -0,0 +1,30 @@ +package com.discord.stores; + +import co.discord.media_engine.VideoInputDeviceDescription; +import d0.k; +import d0.w.e; +import d0.z.d.k; +import d0.z.d.m; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.CancellableContinuation; +/* compiled from: StoreMediaEngine.kt */ +public final /* synthetic */ class StoreMediaEngine$getVideoInputDevicesNativeAsync$2$1 extends k implements Function1 { + public StoreMediaEngine$getVideoInputDevicesNativeAsync$2$1(CancellableContinuation cancellableContinuation) { + super(1, cancellableContinuation, e.class, "resume", "resume(Lkotlin/coroutines/Continuation;Ljava/lang/Object;)V", 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(VideoInputDeviceDescription[] videoInputDeviceDescriptionArr) { + invoke(videoInputDeviceDescriptionArr); + return Unit.a; + } + + public final void invoke(VideoInputDeviceDescription[] videoInputDeviceDescriptionArr) { + m.checkNotNullParameter(videoInputDeviceDescriptionArr, "p1"); + k.a aVar = d0.k.i; + ((CancellableContinuation) this.receiver).resumeWith(d0.k.m78constructorimpl(videoInputDeviceDescriptionArr)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java index 21415ea0cd..d05fe31868 100644 --- a/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java +++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$handleNewConnection$1.java @@ -1,6 +1,6 @@ package com.discord.stores; -import c.a.r.i0.a; +import c.a.r.j0.a; import com.discord.app.AppLog; import com.discord.rtcconnection.KrispOveruseDetector; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$init$2.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$init$2.java index d0a96301c6..fe9f342050 100644 --- a/app/src/main/java/com/discord/stores/StoreMediaEngine$init$2.java +++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$init$2.java @@ -24,6 +24,7 @@ public final class StoreMediaEngine$init$2 extends o implements Function1 { +@e(c = "com.discord.stores.StoreMediaEngine$selectDefaultVideoDevice$1", f = "StoreMediaEngine.kt", l = {173}, m = "invokeSuspend") +public final class StoreMediaEngine$selectDefaultVideoDevice$1 extends k implements Function2, Object> { public final /* synthetic */ Function1 $onSelected; + public int label; public final /* synthetic */ StoreMediaEngine this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMediaEngine$selectDefaultVideoDevice$1(StoreMediaEngine storeMediaEngine, Function1 function1) { - super(1); + public StoreMediaEngine$selectDefaultVideoDevice$1(StoreMediaEngine storeMediaEngine, Function1 function1, Continuation continuation) { + super(2, continuation); this.this$0 = storeMediaEngine; this.$onSelected = function1; } - /* 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(VideoInputDeviceDescription[] videoInputDeviceDescriptionArr) { - invoke(videoInputDeviceDescriptionArr); - return Unit.a; + @Override // d0.w.h.a.a + public final Continuation create(Object obj, Continuation continuation) { + m.checkNotNullParameter(continuation, "completion"); + return new StoreMediaEngine$selectDefaultVideoDevice$1(this.this$0, this.$onSelected, continuation); } - public final void invoke(VideoInputDeviceDescription[] videoInputDeviceDescriptionArr) { - boolean z2; - VideoInputDeviceDescription videoInputDeviceDescription; - m.checkNotNullParameter(videoInputDeviceDescriptionArr, "devices"); - int length = videoInputDeviceDescriptionArr.length; - int i = 0; - while (true) { - if (i >= length) { - z2 = false; - break; - } else if (m.areEqual(videoInputDeviceDescriptionArr[i].getGuid(), StoreMediaEngine.access$getPreferredVideoInputDeviceGUID$p(this.this$0))) { - z2 = true; - break; - } else { - i++; + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public final Object invoke(CoroutineScope coroutineScope, Continuation continuation) { + return ((StoreMediaEngine$selectDefaultVideoDevice$1) create(coroutineScope, continuation)).invokeSuspend(Unit.a); + } + + @Override // d0.w.h.a.a + public final Object invokeSuspend(Object obj) { + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + int i = this.label; + if (i == 0) { + l.throwOnFailure(obj); + StoreMediaEngine storeMediaEngine = this.this$0; + this.label = 1; + obj = storeMediaEngine.getVideoInputDevicesNativeAsync(this); + if (obj == coroutine_suspended) { + return coroutine_suspended; } - } - String str = null; - if (z2) { - str = StoreMediaEngine.access$getPreferredVideoInputDeviceGUID$p(this.this$0); + } else if (i == 1) { + l.throwOnFailure(obj); } else { - int length2 = videoInputDeviceDescriptionArr.length; - int i2 = 0; - while (true) { - if (i2 >= length2) { - videoInputDeviceDescription = null; - break; - } - videoInputDeviceDescription = videoInputDeviceDescriptionArr[i2]; - if (videoInputDeviceDescription.getFacing() == VideoInputDeviceFacing.Front) { - break; - } - i2++; - } - if (videoInputDeviceDescription == null) { - videoInputDeviceDescription = (VideoInputDeviceDescription) k.firstOrNull(videoInputDeviceDescriptionArr); - } - if (videoInputDeviceDescription != null) { - str = videoInputDeviceDescription.getGuid(); - } + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } - StoreMediaEngine.access$handleVideoInputDevices(this.this$0, videoInputDeviceDescriptionArr, str, this.$onSelected); + VideoInputDeviceDescription[] videoInputDeviceDescriptionArr = (VideoInputDeviceDescription[]) obj; + StoreMediaEngine.access$handleVideoInputDevices(this.this$0, videoInputDeviceDescriptionArr, StoreMediaEngine.access$pickDefaultDeviceGUID(this.this$0, videoInputDeviceDescriptionArr), this.$onSelected); + return Unit.a; } } diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java new file mode 100644 index 0000000000..60f845d112 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMediaEngine$selectDefaultVideoDeviceAsync$1.java @@ -0,0 +1,26 @@ +package com.discord.stores; + +import d0.w.h.a.d; +import d0.w.h.a.e; +import kotlin.coroutines.Continuation; +/* compiled from: StoreMediaEngine.kt */ +@e(c = "com.discord.stores.StoreMediaEngine", f = "StoreMediaEngine.kt", l = {186}, m = "selectDefaultVideoDeviceAsync") +public final class StoreMediaEngine$selectDefaultVideoDeviceAsync$1 extends d { + public Object L$0; + public int label; + public /* synthetic */ Object result; + public final /* synthetic */ StoreMediaEngine this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreMediaEngine$selectDefaultVideoDeviceAsync$1(StoreMediaEngine storeMediaEngine, Continuation continuation) { + super(continuation); + this.this$0 = storeMediaEngine; + } + + @Override // d0.w.h.a.a + public final Object invokeSuspend(Object obj) { + this.result = obj; + this.label |= Integer.MIN_VALUE; + return this.this$0.selectDefaultVideoDeviceAsync(this); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMediaEngine.java b/app/src/main/java/com/discord/stores/StoreMediaEngine.java index 3412ae9829..8bb2897090 100644 --- a/app/src/main/java/com/discord/stores/StoreMediaEngine.java +++ b/app/src/main/java/com/discord/stores/StoreMediaEngine.java @@ -5,9 +5,10 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.os.PowerManager; -import c.a.r.c; +import c.q.a.k.a; import co.discord.media_engine.RtcRegion; import co.discord.media_engine.VideoInputDeviceDescription; +import co.discord.media_engine.VideoInputDeviceFacing; import com.discord.app.AppLog; import com.discord.models.domain.ModelPayload; import com.discord.models.domain.ModelRtcLatencyRegion; @@ -23,9 +24,13 @@ import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1; import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2; import com.hammerandchisel.libdiscord.Discord; +import d0.l; import d0.t.j; import d0.t.k; import d0.t.o; +import d0.w.g.b; +import d0.w.g.c; +import d0.w.h.a.g; import d0.z.d.m; import java.util.ArrayList; import java.util.List; @@ -33,14 +38,19 @@ import java.util.Objects; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import kotlin.Unit; +import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import rx.Observable; import rx.Subscription; import rx.subjects.BehaviorSubject; import rx.subjects.PublishSubject; import rx.subjects.SerializedSubject; +import s.a.a.n; +import s.a.j0; +import s.a.w0; /* compiled from: StoreMediaEngine.kt */ public final class StoreMediaEngine extends Store { public static final Companion Companion = new Companion(null); @@ -222,14 +232,14 @@ public final class StoreMediaEngine extends Store { return storeMediaEngine.onKrispStatusSubject; } - public static final /* synthetic */ String access$getPreferredVideoInputDeviceGUID$p(StoreMediaEngine storeMediaEngine) { - return storeMediaEngine.preferredVideoInputDeviceGUID; - } - public static final /* synthetic */ VideoInputDeviceDescription access$getSelectedVideoInputDevice$p(StoreMediaEngine storeMediaEngine) { return storeMediaEngine.selectedVideoInputDevice; } + public static final /* synthetic */ void access$getVideoInputDevicesNative(StoreMediaEngine storeMediaEngine, Function1 function1) { + storeMediaEngine.getVideoInputDevicesNative(function1); + } + public static final /* synthetic */ void access$handleNativeEngineInitialized(StoreMediaEngine storeMediaEngine) { storeMediaEngine.handleNativeEngineInitialized(); } @@ -246,6 +256,10 @@ public final class StoreMediaEngine extends Store { storeMediaEngine.handleVoiceConfigChanged(voiceConfiguration); } + public static final /* synthetic */ String access$pickDefaultDeviceGUID(StoreMediaEngine storeMediaEngine, VideoInputDeviceDescription[] videoInputDeviceDescriptionArr) { + return storeMediaEngine.pickDefaultDeviceGUID(videoInputDeviceDescriptionArr); + } + public static final /* synthetic */ void access$restartLocalMicrophone(StoreMediaEngine storeMediaEngine) { storeMediaEngine.restartLocalMicrophone(); } @@ -258,10 +272,6 @@ public final class StoreMediaEngine extends Store { storeMediaEngine.mediaEngineSettingsSubscription = subscription; } - public static final /* synthetic */ void access$setPreferredVideoInputDeviceGUID$p(StoreMediaEngine storeMediaEngine, String str) { - storeMediaEngine.preferredVideoInputDeviceGUID = str; - } - public static final /* synthetic */ void access$setSelectedVideoInputDevice$p(StoreMediaEngine storeMediaEngine, VideoInputDeviceDescription videoInputDeviceDescription) { storeMediaEngine.selectedVideoInputDevice = videoInputDeviceDescription; } @@ -378,6 +388,47 @@ public final class StoreMediaEngine extends Store { } } + private final String pickDefaultDeviceGUID(VideoInputDeviceDescription[] videoInputDeviceDescriptionArr) { + boolean z2; + VideoInputDeviceDescription videoInputDeviceDescription; + int length = videoInputDeviceDescriptionArr.length; + int i = 0; + while (true) { + if (i >= length) { + z2 = false; + break; + } else if (m.areEqual(videoInputDeviceDescriptionArr[i].getGuid(), this.preferredVideoInputDeviceGUID)) { + z2 = true; + break; + } else { + i++; + } + } + if (z2) { + return this.preferredVideoInputDeviceGUID; + } + int length2 = videoInputDeviceDescriptionArr.length; + int i2 = 0; + while (true) { + if (i2 >= length2) { + videoInputDeviceDescription = null; + break; + } + videoInputDeviceDescription = videoInputDeviceDescriptionArr[i2]; + if (videoInputDeviceDescription.getFacing() == VideoInputDeviceFacing.Front) { + break; + } + i2++; + } + if (videoInputDeviceDescription == null) { + videoInputDeviceDescription = (VideoInputDeviceDescription) k.firstOrNull(videoInputDeviceDescriptionArr); + } + if (videoInputDeviceDescription != null) { + return videoInputDeviceDescription.getGuid(); + } + return null; + } + private final synchronized void restartLocalMicrophone() { enableLocalVoiceStatusListening(); disableLocalVoiceStatusListening(); @@ -416,6 +467,47 @@ public final class StoreMediaEngine extends Store { } } + /* JADX WARNING: Removed duplicated region for block: B:12:0x0035 */ + /* JADX WARNING: Removed duplicated region for block: B:8:0x0023 */ + public final Object getDefaultVideoDeviceGUID(Continuation continuation) { + StoreMediaEngine$getDefaultVideoDeviceGUID$1 storeMediaEngine$getDefaultVideoDeviceGUID$1; + int i; + StoreMediaEngine storeMediaEngine; + if (continuation instanceof StoreMediaEngine$getDefaultVideoDeviceGUID$1) { + storeMediaEngine$getDefaultVideoDeviceGUID$1 = (StoreMediaEngine$getDefaultVideoDeviceGUID$1) continuation; + int i2 = storeMediaEngine$getDefaultVideoDeviceGUID$1.label; + if ((i2 & Integer.MIN_VALUE) != 0) { + storeMediaEngine$getDefaultVideoDeviceGUID$1.label = i2 - Integer.MIN_VALUE; + Object obj = storeMediaEngine$getDefaultVideoDeviceGUID$1.result; + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + i = storeMediaEngine$getDefaultVideoDeviceGUID$1.label; + if (i != 0) { + l.throwOnFailure(obj); + storeMediaEngine$getDefaultVideoDeviceGUID$1.L$0 = this; + storeMediaEngine$getDefaultVideoDeviceGUID$1.label = 1; + obj = getVideoInputDevicesNativeAsync(storeMediaEngine$getDefaultVideoDeviceGUID$1); + if (obj == coroutine_suspended) { + return coroutine_suspended; + } + storeMediaEngine = this; + } else if (i == 1) { + storeMediaEngine = (StoreMediaEngine) storeMediaEngine$getDefaultVideoDeviceGUID$1.L$0; + l.throwOnFailure(obj); + } else { + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); + } + return storeMediaEngine.pickDefaultDeviceGUID((VideoInputDeviceDescription[]) obj); + } + } + storeMediaEngine$getDefaultVideoDeviceGUID$1 = new StoreMediaEngine$getDefaultVideoDeviceGUID$1(this, continuation); + Object obj = storeMediaEngine$getDefaultVideoDeviceGUID$1.result; + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + i = storeMediaEngine$getDefaultVideoDeviceGUID$1.label; + if (i != 0) { + } + return storeMediaEngine.pickDefaultDeviceGUID((VideoInputDeviceDescription[]) obj); + } + public final Observable getIsNativeEngineInitialized() { return this.isNativeEngineInitializedSubject; } @@ -478,6 +570,17 @@ public final class StoreMediaEngine extends Store { return s2; } + public final Object getVideoInputDevicesNativeAsync(Continuation continuation) { + s.a.k kVar = new s.a.k(b.intercepted(continuation), 1); + kVar.A(); + access$getVideoInputDevicesNative(this, new StoreMediaEngine$getVideoInputDevicesNativeAsync$2$1(kVar)); + Object u = kVar.u(); + if (u == c.getCOROUTINE_SUSPENDED()) { + g.probeCoroutineSuspended(continuation); + } + return u; + } + public final synchronized Discord getVoiceEngineNative() { MediaEngine mediaEngine; mediaEngine = this.mediaEngine; @@ -539,7 +642,7 @@ public final class StoreMediaEngine extends Store { m.checkNotNullParameter(newSingleThreadExecutor, "singleThreadExecutorService"); m.checkNotNullParameter(valueOf, "openSLESConfig"); m.checkNotNullParameter(appLog, "logger"); - c.a.r.i0.c.j jVar = new c.a.r.i0.c.j(context, new c(newSingleThreadExecutor), valueOf, appLog, null, null, 48); + c.a.r.j0.c.j jVar = new c.a.r.j0.c.j(context, new c.a.r.c(newSingleThreadExecutor, false), valueOf, appLog, null, null, 48); EngineListener engineListener = new EngineListener(); m.checkNotNullParameter(engineListener, "listener"); jVar.e.add(engineListener); @@ -558,7 +661,56 @@ public final class StoreMediaEngine extends Store { } public final void selectDefaultVideoDevice(Function1 function1) { - getVideoInputDevicesNative(new StoreMediaEngine$selectDefaultVideoDevice$1(this, function1)); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher = j0.a; + a.G(w0Var, n.b.H(), null, new StoreMediaEngine$selectDefaultVideoDevice$1(this, function1, null), 2, null); + } + + /* JADX WARNING: Removed duplicated region for block: B:12:0x0035 */ + /* JADX WARNING: Removed duplicated region for block: B:8:0x0023 */ + public final Object selectDefaultVideoDeviceAsync(Continuation continuation) { + StoreMediaEngine$selectDefaultVideoDeviceAsync$1 storeMediaEngine$selectDefaultVideoDeviceAsync$1; + int i; + StoreMediaEngine storeMediaEngine; + if (continuation instanceof StoreMediaEngine$selectDefaultVideoDeviceAsync$1) { + storeMediaEngine$selectDefaultVideoDeviceAsync$1 = (StoreMediaEngine$selectDefaultVideoDeviceAsync$1) continuation; + int i2 = storeMediaEngine$selectDefaultVideoDeviceAsync$1.label; + if ((i2 & Integer.MIN_VALUE) != 0) { + storeMediaEngine$selectDefaultVideoDeviceAsync$1.label = i2 - Integer.MIN_VALUE; + Object obj = storeMediaEngine$selectDefaultVideoDeviceAsync$1.result; + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + i = storeMediaEngine$selectDefaultVideoDeviceAsync$1.label; + if (i != 0) { + l.throwOnFailure(obj); + storeMediaEngine$selectDefaultVideoDeviceAsync$1.L$0 = this; + storeMediaEngine$selectDefaultVideoDeviceAsync$1.label = 1; + obj = getVideoInputDevicesNativeAsync(storeMediaEngine$selectDefaultVideoDeviceAsync$1); + if (obj == coroutine_suspended) { + return coroutine_suspended; + } + storeMediaEngine = this; + } else if (i == 1) { + storeMediaEngine = (StoreMediaEngine) storeMediaEngine$selectDefaultVideoDeviceAsync$1.L$0; + l.throwOnFailure(obj); + } else { + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); + } + VideoInputDeviceDescription[] videoInputDeviceDescriptionArr = (VideoInputDeviceDescription[]) obj; + String pickDefaultDeviceGUID = storeMediaEngine.pickDefaultDeviceGUID(videoInputDeviceDescriptionArr); + handleVideoInputDevices$default(storeMediaEngine, videoInputDeviceDescriptionArr, pickDefaultDeviceGUID, null, 4, null); + return pickDefaultDeviceGUID; + } + } + storeMediaEngine$selectDefaultVideoDeviceAsync$1 = new StoreMediaEngine$selectDefaultVideoDeviceAsync$1(this, continuation); + Object obj = storeMediaEngine$selectDefaultVideoDeviceAsync$1.result; + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + i = storeMediaEngine$selectDefaultVideoDeviceAsync$1.label; + if (i != 0) { + } + VideoInputDeviceDescription[] videoInputDeviceDescriptionArr = (VideoInputDeviceDescription[]) obj; + String pickDefaultDeviceGUID = storeMediaEngine.pickDefaultDeviceGUID(videoInputDeviceDescriptionArr); + handleVideoInputDevices$default(storeMediaEngine, videoInputDeviceDescriptionArr, pickDefaultDeviceGUID, null, 4, null); + return pickDefaultDeviceGUID; } public final void selectVideoInputDevice(String str) { diff --git a/app/src/main/java/com/discord/stores/StoreMentions.java b/app/src/main/java/com/discord/stores/StoreMentions.java index 70843885a2..4a75dabac5 100644 --- a/app/src/main/java/com/discord/stores/StoreMentions.java +++ b/app/src/main/java/com/discord/stores/StoreMentions.java @@ -5,9 +5,9 @@ import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.guild.Guild; import com.discord.api.guildmember.GuildMember; +import com.discord.api.message.Message; import com.discord.api.thread.ThreadMembersUpdate; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelMessageDelete; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelPayload; @@ -17,6 +17,7 @@ import com.discord.models.thread.dto.ModelThreadListSync; import com.discord.stores.StoreMessageAck; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.persister.Persister; import d0.t.h0; @@ -25,7 +26,6 @@ import d0.t.r; import d0.t.u; import d0.z.d.m; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -41,7 +41,7 @@ public final class StoreMentions extends StoreV2 { private final Persister> countsCache; private final Map countsEmpty; private Map countsSnapshot; - private final HashMap mentionedMessages; + private final HashMap mentionedMessages; private long myId; private final HashMap> myRoleIds; private final ObservationDeck observationDeck; @@ -110,14 +110,14 @@ public final class StoreMentions extends StoreV2 { hashMap.put(valueOf, Integer.valueOf(num.intValue() + component3)); } } - for (ModelMessage modelMessage : this.mentionedMessages.values()) { - m.checkNotNullExpressionValue(modelMessage, "message"); - long channelId = modelMessage.getChannelId(); - if (!ModelUserRelationship.isType(this.storeUserRelationships.getRelationships().get(Long.valueOf(modelMessage.getAuthor().i())), 2) && isMentionableChannel(channelId)) { - StoreMessageAck.Ack ack2 = allInternal.get(Long.valueOf(channelId)); - if (ack2 == null || ack2.component1() < modelMessage.getId()) { - Long valueOf2 = Long.valueOf(channelId); - Integer num2 = (Integer) hashMap.get(Long.valueOf(channelId)); + for (Message message : this.mentionedMessages.values()) { + long i = message.i(); + User g = message.g(); + if (!ModelUserRelationship.isType(this.storeUserRelationships.getRelationships().get(g != null ? Long.valueOf(g.i()) : null), 2) && isMentionableChannel(i)) { + StoreMessageAck.Ack ack2 = allInternal.get(Long.valueOf(i)); + if (ack2 == null || ack2.component1() < message.r()) { + Long valueOf2 = Long.valueOf(i); + Integer num2 = (Integer) hashMap.get(Long.valueOf(i)); if (num2 == null) { num2 = 0; } @@ -128,68 +128,69 @@ public final class StoreMentions extends StoreV2 { return hashMap; } - /* JADX WARNING: Removed duplicated region for block: B:31:0x00a4 A[RETURN] */ - /* JADX WARNING: Removed duplicated region for block: B:32:0x00a5 */ + /* JADX WARNING: Removed duplicated region for block: B:34:0x009f A[RETURN] */ @StoreThread - private final boolean hasMention(ModelMessage modelMessage) { - boolean z2; + private final boolean hasMention(Message message) { List list; - List mentionRoles; + List y2; + boolean z2; boolean z3; ModelNotificationSettings modelNotificationSettings; ModelNotificationSettings.ChannelOverride channelOverride; - Long l = this.channelGuildIds.get(Long.valueOf(modelMessage.getChannelId())); + Long l = this.channelGuildIds.get(Long.valueOf(message.i())); if (l == null) { l = 0L; } m.checkNotNullExpressionValue(l, "channelGuildIds[channelId] ?: 0"); long longValue = l.longValue(); - if (modelMessage.getAuthor().i() == this.myId || modelMessage.getEditedTimestamp() > 0) { + User g = message.g(); + if ((g != null && g.i() == this.myId) || MessageUtils.INSTANCE.getEditedTimestampMillis(message) > 0) { return false; } Map guildSettingsInternal$app_productionGoogleRelease = this.storeUserGuildSettings.getGuildSettingsInternal$app_productionGoogleRelease(); - if (this.privateChannels.contains(Long.valueOf(modelMessage.getChannelId())) && ((modelNotificationSettings = guildSettingsInternal$app_productionGoogleRelease.get(0L)) == null || (channelOverride = modelNotificationSettings.getChannelOverride(modelMessage.getChannelId())) == null || !channelOverride.isMuted())) { + if (this.privateChannels.contains(Long.valueOf(message.i())) && ((modelNotificationSettings = guildSettingsInternal$app_productionGoogleRelease.get(0L)) == null || (channelOverride = modelNotificationSettings.getChannelOverride(message.i())) == null || !channelOverride.isMuted())) { return true; } - List mentions = modelMessage.getMentions(); - m.checkNotNullExpressionValue(mentions, "mentions"); - if (!(mentions instanceof Collection) || !mentions.isEmpty()) { - Iterator it = mentions.iterator(); - while (true) { - if (!it.hasNext()) { - break; + List z4 = message.z(); + if (z4 != null) { + if (!z4.isEmpty()) { + Iterator it = z4.iterator(); + while (true) { + if (!it.hasNext()) { + break; + } + if (((User) it.next()).i() == this.myId) { + z3 = true; + continue; + } else { + z3 = false; + continue; + } + if (z3) { + z2 = true; + break; + } } - if (((User) it.next()).i() == this.myId) { - z3 = true; - continue; - } else { - z3 = false; - continue; - } - if (z3) { - z2 = true; - break; + if (z2) { + return true; } } - if (!z2) { - return true; + z2 = false; + if (z2) { } - ModelNotificationSettings modelNotificationSettings2 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue)); - if (!((modelNotificationSettings2 != null && modelNotificationSettings2.isSuppressRoles()) || (list = this.myRoleIds.get(Long.valueOf(longValue))) == null || (mentionRoles = modelMessage.getMentionRoles()) == null)) { - Iterator it2 = mentionRoles.iterator(); - if (it2.hasNext()) { - return list.contains((Long) it2.next()); - } - } - if (!modelMessage.isMentionEveryone()) { - return false; - } - ModelNotificationSettings modelNotificationSettings3 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue)); - return modelNotificationSettings3 == null || !modelNotificationSettings3.isSuppressEveryone(); } - z2 = false; - if (!z2) { + ModelNotificationSettings modelNotificationSettings2 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue)); + if (!((modelNotificationSettings2 != null && modelNotificationSettings2.isSuppressRoles()) || (list = this.myRoleIds.get(Long.valueOf(longValue))) == null || (y2 = message.y()) == null)) { + Iterator it2 = y2.iterator(); + if (it2.hasNext()) { + return list.contains(Long.valueOf(((Number) it2.next()).longValue())); + } } + if (!m.areEqual(message.x(), Boolean.TRUE)) { + return false; + } + ModelNotificationSettings modelNotificationSettings3 = guildSettingsInternal$app_productionGoogleRelease.get(Long.valueOf(longValue)); + return modelNotificationSettings3 == null || !modelNotificationSettings3.isSuppressEveryone(); } @StoreThread @@ -204,10 +205,10 @@ public final class StoreMentions extends StoreV2 { @StoreThread private final void removeAllMessagesForChannel(long j) { - HashMap hashMap = this.mentionedMessages; + HashMap hashMap = this.mentionedMessages; LinkedHashMap linkedHashMap = new LinkedHashMap(); - for (Map.Entry entry : hashMap.entrySet()) { - if (entry.getValue().getChannelId() == j) { + for (Map.Entry entry : hashMap.entrySet()) { + if (entry.getValue().i() == j) { linkedHashMap.put(entry.getKey(), entry.getValue()); } } @@ -364,10 +365,10 @@ public final class StoreMentions extends StoreV2 { } @StoreThread - public final void handleMessageCreateOrUpdate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - if (hasMention(modelMessage)) { - this.mentionedMessages.put(Long.valueOf(modelMessage.getId()), modelMessage); + public final void handleMessageCreateOrUpdate(Message message) { + m.checkNotNullParameter(message, "message"); + if (hasMention(message)) { + this.mentionedMessages.put(Long.valueOf(message.r()), message); markChanged(); } } @@ -379,7 +380,7 @@ public final class StoreMentions extends StoreV2 { List messageIds = modelMessageDelete.getMessageIds(); m.checkNotNullExpressionValue(messageIds, "messageDeleteBulk.messageIds"); for (Long l : messageIds) { - HashMap hashMap = this.mentionedMessages; + HashMap hashMap = this.mentionedMessages; m.checkNotNullExpressionValue(l, "it"); hashMap.remove(l); } @@ -417,12 +418,12 @@ public final class StoreMentions extends StoreV2 { } @StoreThread - public final int processMarkUnread$app_productionGoogleRelease(long j, List list) { + public final int processMarkUnread$app_productionGoogleRelease(long j, List list) { m.checkNotNullParameter(list, "messagesAfter"); int i = 0; - for (ModelMessage modelMessage : list) { - if (!this.mentionedMessages.containsKey(Long.valueOf(modelMessage.getId())) && hasMention(modelMessage)) { - this.mentionedMessages.put(Long.valueOf(modelMessage.getId()), modelMessage); + for (Message message : list) { + if (!this.mentionedMessages.containsKey(Long.valueOf(message.r())) && hasMention(message)) { + this.mentionedMessages.put(Long.valueOf(message.r()), message); i++; } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$getPendingAck$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$getPendingAck$1.java index 631e26069d..99df5dc197 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck$getPendingAck$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck$getPendingAck$1.java @@ -1,7 +1,7 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StoreMessageAck; +import com.discord.utilities.message.MessageUtils; import d0.z.d.o; import kotlin.jvm.functions.Function2; /* compiled from: StoreMessageAck.kt */ @@ -22,7 +22,7 @@ public final class StoreMessageAck$getPendingAck$1 extends o implements Function } public final boolean invoke(StoreMessageAck.Ack ack, long j) { - boolean isNewer = ModelMessage.isNewer(ack != null ? Long.valueOf(ack.getMessageId()) : null, Long.valueOf(j)); + boolean isNewer = MessageUtils.isNewer(ack != null ? Long.valueOf(ack.getMessageId()) : null, Long.valueOf(j)); boolean z2 = ack == null || !ack.isLockedAck(); if (isNewer) { return this.$clearLock || z2; diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java index 428b3454ee..f33a904f3a 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$1.java @@ -1,15 +1,22 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; import j0.k.b; import java.util.List; /* compiled from: StoreMessageAck.kt */ -public final class StoreMessageAck$markUnread$1 implements b, Boolean> { +public final class StoreMessageAck$markUnread$1 implements b, Boolean> { public static final StoreMessageAck$markUnread$1 INSTANCE = new StoreMessageAck$markUnread$1(); - public final Boolean call(List list) { + public final Boolean call(List list) { m.checkNotNullExpressionValue(list, "it"); return Boolean.valueOf(!list.isEmpty()); } + + /* 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 // j0.k.b + public /* bridge */ /* synthetic */ Boolean call(List list) { + return call((List) list); + } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java index c18bf13f07..670b67486c 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$2.java @@ -1,15 +1,22 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessageAck; import java.util.List; import kotlin.Pair; import rx.functions.Func2; /* compiled from: StoreMessageAck.kt */ -public final class StoreMessageAck$markUnread$2 implements Func2, StoreMessageAck.ThreadState, Pair, ? extends StoreMessageAck.ThreadState>> { +public final class StoreMessageAck$markUnread$2 implements Func2, StoreMessageAck.ThreadState, Pair, ? extends StoreMessageAck.ThreadState>> { public static final StoreMessageAck$markUnread$2 INSTANCE = new StoreMessageAck$markUnread$2(); - public final Pair, StoreMessageAck.ThreadState> call(List list, StoreMessageAck.ThreadState threadState) { + /* 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, java.lang.Object] */ + @Override // rx.functions.Func2 + public /* bridge */ /* synthetic */ Pair, ? extends StoreMessageAck.ThreadState> call(List list, StoreMessageAck.ThreadState threadState) { + return call((List) list, threadState); + } + + public final Pair, StoreMessageAck.ThreadState> call(List list, StoreMessageAck.ThreadState threadState) { return new Pair<>(list, threadState); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java index 35a6774826..8b4bdf67c2 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck$markUnread$3.java @@ -1,7 +1,7 @@ package com.discord.stores; import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessageAck; import d0.z.d.m; import d0.z.d.o; @@ -14,7 +14,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StoreMessageAck.kt */ -public final class StoreMessageAck$markUnread$3 extends o implements Function1, ? extends StoreMessageAck.ThreadState>, Unit> { +public final class StoreMessageAck$markUnread$3 extends o implements Function1, ? extends StoreMessageAck.ThreadState>, Unit> { public final /* synthetic */ long $channelId; public final /* synthetic */ long $messageId; public final /* synthetic */ StoreMessageAck this$0; @@ -36,7 +36,7 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1

= this.this$0.$messageId) { + if (((Message) next).r() >= this.this$0.$messageId) { z2 = false; } if (z2) { @@ -55,31 +55,31 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1

= this.this$0.$messageId) { + if (((Message) obj).r() >= this.this$0.$messageId) { S2.add(obj); } } - StoreMessageAck.Ack ack = new StoreMessageAck.Ack(modelMessage2 != null ? modelMessage2.getId() : (((this.this$0.$messageId >>> 22) - 1) - 1420070400000L) << 22, false, true); + StoreMessageAck.Ack ack = new StoreMessageAck.Ack(message2 != null ? message2.r() : (((this.this$0.$messageId >>> 22) - 1) - 1420070400000L) << 22, false, true); StoreMessageAck$markUnread$3 storeMessageAck$markUnread$3 = this.this$0; StoreMessageAck.access$updateAcks(storeMessageAck$markUnread$3.this$0, storeMessageAck$markUnread$3.$channelId, ack); int processMarkUnread$app_productionGoogleRelease = StoreStream.Companion.getMentions().processMarkUnread$app_productionGoogleRelease(this.this$0.$channelId, S2); @@ -101,12 +101,12 @@ public final class StoreMessageAck$markUnread$3 extends o implements Function1

, ? extends StoreMessageAck.ThreadState> pair) { - invoke(pair); + public /* bridge */ /* synthetic */ Unit invoke(Pair, ? extends StoreMessageAck.ThreadState> pair) { + invoke((Pair, ? extends StoreMessageAck.ThreadState>) pair); return Unit.a; } - public final void invoke(Pair, ? extends StoreMessageAck.ThreadState> pair) { + public final void invoke(Pair, ? extends StoreMessageAck.ThreadState> pair) { List list = (List) pair.component1(); StoreMessageAck.ThreadState threadState = (StoreMessageAck.ThreadState) pair.component2(); StoreMessageAck storeMessageAck = this.this$0; diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java index 613f532d56..13bc8c9b0b 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java @@ -7,12 +7,14 @@ import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.guild.Guild; import com.discord.api.guildmember.GuildMember; +import com.discord.api.message.Message; +import com.discord.api.user.User; import com.discord.api.utcdatetime.UtcDateTime; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelPayload; import com.discord.models.domain.ModelReadState; import com.discord.stores.StoreThreadsActiveJoined; import com.discord.stores.updates.ObservationDeck; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.persister.Persister; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -450,7 +452,7 @@ public final class StoreMessageAck extends StoreV2 { private final void updateAcks(long j, Ack ack) { if (shouldAck(getThreadStateInternal(j))) { Ack ack2 = this.acks.get(Long.valueOf(j)); - if (ack2 == null || ModelMessage.compare(Long.valueOf(ack2.getMessageId()), Long.valueOf(ack.getMessageId())) != 0 || (ack.isLockedAck() && !ack2.isLockedAck())) { + if (ack2 == null || MessageUtils.compareMessages(Long.valueOf(ack2.getMessageId()), Long.valueOf(ack.getMessageId())) != 0 || (ack.isLockedAck() && !ack2.isLockedAck())) { this.acks.put(Long.valueOf(j), ack); markChanged(); } @@ -608,10 +610,11 @@ public final class StoreMessageAck extends StoreV2 { } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - if (modelMessage.getAuthor().i() == this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId()) { - updateAcks(modelMessage.getChannelId(), new Ack(modelMessage.getId(), false, false)); + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + User g = message.g(); + if (g != null && g.i() == this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease().getId()) { + updateAcks(message.i(), new Ack(message.r(), false, false)); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageReplies.java b/app/src/main/java/com/discord/stores/StoreMessageReplies.java index 78a5a78954..f970d3fed9 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageReplies.java +++ b/app/src/main/java/com/discord/stores/StoreMessageReplies.java @@ -1,11 +1,12 @@ package com.discord.stores; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelMessageDelete; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.utilities.message.MessageUtils; import d0.d0.f; import d0.t.g0; import d0.t.h0; @@ -104,53 +105,53 @@ public final class StoreMessageReplies extends StoreV2 { /* compiled from: StoreMessageReplies.kt */ public static final class Loaded extends MessageState { - private final ModelMessage modelMessage; + private final Message message; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Loaded(ModelMessage modelMessage) { + public Loaded(Message message) { super(null); - m.checkNotNullParameter(modelMessage, "modelMessage"); - this.modelMessage = modelMessage; + m.checkNotNullParameter(message, "message"); + this.message = message; } - public static /* synthetic */ Loaded copy$default(Loaded loaded, ModelMessage modelMessage, int i, Object obj) { + public static /* synthetic */ Loaded copy$default(Loaded loaded, Message message, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = loaded.modelMessage; + message = loaded.message; } - return loaded.copy(modelMessage); + return loaded.copy(message); } - public final ModelMessage component1() { - return this.modelMessage; + public final Message component1() { + return this.message; } - public final Loaded copy(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "modelMessage"); - return new Loaded(modelMessage); + public final Loaded copy(Message message) { + m.checkNotNullParameter(message, "message"); + return new Loaded(message); } public boolean equals(Object obj) { if (this != obj) { - return (obj instanceof Loaded) && m.areEqual(this.modelMessage, ((Loaded) obj).modelMessage); + return (obj instanceof Loaded) && m.areEqual(this.message, ((Loaded) obj).message); } return true; } - public final ModelMessage getModelMessage() { - return this.modelMessage; + public final Message getMessage() { + return this.message; } public int hashCode() { - ModelMessage modelMessage = this.modelMessage; - if (modelMessage != null) { - return modelMessage.hashCode(); + Message message = this.message; + if (message != null) { + return message.hashCode(); } return 0; } public String toString() { - StringBuilder L = a.L("Loaded(modelMessage="); - L.append(this.modelMessage); + StringBuilder L = a.L("Loaded(message="); + L.append(this.message); L.append(")"); return L.toString(); } @@ -210,34 +211,33 @@ public final class StoreMessageReplies extends StoreV2 { } @StoreThread - private final boolean processMessage(ModelMessage modelMessage) { + private final boolean processMessage(Message message) { boolean z2; - if (this.repliedMessagesCache.containsKey(Long.valueOf(modelMessage.getId()))) { - updateCache(modelMessage.getId(), modelMessage.getChannelId(), new MessageState.Loaded(modelMessage)); + if (this.repliedMessagesCache.containsKey(Long.valueOf(message.r()))) { + updateCache(message.r(), message.i(), new MessageState.Loaded(message)); z2 = true; } else { z2 = false; } - if (!modelMessage.isEmbeddedMessageType()) { + if (!MessageUtils.INSTANCE.isEmbeddedMessageType(message)) { return z2; } - MessageReference messageReference = modelMessage.getMessageReference(); - if (messageReference == null) { + MessageReference A = message.A(); + if (A == null) { return z2; } - m.checkNotNullExpressionValue(messageReference, "message.messageReference ?: return updated"); - ModelMessage referencedMessage = modelMessage.getReferencedMessage(); - Long a = messageReference.a(); - Long c2 = messageReference.c(); - if (referencedMessage != null) { - processReferencedMessage(referencedMessage); + Message G = message.G(); + Long a = A.a(); + Long c2 = A.c(); + if (G != null) { + processReferencedMessage(G); return true; } else if (a == null || c2 == null) { return true; } else { - ModelMessage message = this.storeMessages.getMessage(a.longValue(), c2.longValue()); - if (message != null) { - processReferencedMessage(message); + Message message2 = this.storeMessages.getMessage(a.longValue(), c2.longValue()); + if (message2 != null) { + processReferencedMessage(message2); return true; } updateCache(c2.longValue(), a.longValue(), MessageState.Unloaded.INSTANCE); @@ -245,10 +245,11 @@ public final class StoreMessageReplies extends StoreV2 { } } - private final void processReferencedMessage(ModelMessage modelMessage) { - updateCache(modelMessage.getId(), modelMessage.getChannelId(), new MessageState.Loaded(modelMessage)); - if (modelMessage.getType() == 19) { - processMessage(modelMessage); + private final void processReferencedMessage(Message message) { + updateCache(message.r(), message.i(), new MessageState.Loaded(message)); + Integer M = message.M(); + if (M != null && M.intValue() == 19) { + processMessage(message); } } @@ -297,11 +298,11 @@ public final class StoreMessageReplies extends StoreV2 { } @StoreThread - public final void handleLoadMessages(Collection collection) { + public final void handleLoadMessages(Collection collection) { m.checkNotNullParameter(collection, "messages"); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(collection, 10)); - for (ModelMessage modelMessage : collection) { - arrayList.add(Boolean.valueOf(processMessage(modelMessage))); + for (Message message : collection) { + arrayList.add(Boolean.valueOf(processMessage(message))); } if (arrayList.contains(Boolean.TRUE)) { markChanged(); @@ -309,9 +310,9 @@ public final class StoreMessageReplies extends StoreV2 { } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - if (processMessage(modelMessage)) { + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + if (processMessage(message)) { markChanged(); } } @@ -343,12 +344,12 @@ public final class StoreMessageReplies extends StoreV2 { } @StoreThread - public final void handleMessageUpdate(ModelMessage modelMessage) { + public final void handleMessageUpdate(Message message) { MessageState messageState; - m.checkNotNullParameter(modelMessage, "message"); - if (this.repliedMessagesCache.containsKey(Long.valueOf(modelMessage.getId())) && (messageState = this.repliedMessagesCache.get(Long.valueOf(modelMessage.getId()))) != null && (messageState instanceof MessageState.Loaded)) { - ModelMessage modelMessage2 = new ModelMessage(((MessageState.Loaded) messageState).getModelMessage(), modelMessage); - updateCache(modelMessage2.getId(), modelMessage2.getChannelId(), new MessageState.Loaded(modelMessage2)); + m.checkNotNullParameter(message, "message"); + if (this.repliedMessagesCache.containsKey(Long.valueOf(message.r())) && (messageState = this.repliedMessagesCache.get(Long.valueOf(message.r()))) != null && (messageState instanceof MessageState.Loaded)) { + Message merge = MessageUtils.merge(((MessageState.Loaded) messageState).getMessage(), message); + updateCache(merge.r(), merge.i(), new MessageState.Loaded(merge)); markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessageState.java b/app/src/main/java/com/discord/stores/StoreMessageState.java index c00b9cbf06..ac41174b08 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageState.java +++ b/app/src/main/java/com/discord/stores/StoreMessageState.java @@ -1,7 +1,7 @@ package com.discord.stores; import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.domain.ModelMessageDelete; import d0.o; import d0.t.h0; @@ -169,9 +169,9 @@ public final class StoreMessageState { } @StoreThread - public final void handleMessageUpdate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - resetState(d0.t.m.listOf(Long.valueOf(modelMessage.getId()))); + public final void handleMessageUpdate(Message message) { + m.checkNotNullParameter(message, "message"); + resetState(d0.t.m.listOf(Long.valueOf(message.r()))); } public final void revealSpoiler(long j, int i) { diff --git a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java index 914090564c..6e82c9f54e 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java @@ -1,24 +1,23 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.domain.ModelMessageDelete; -import com.discord.utilities.messagesend.MessageQueue; -import d0.z.d.m; +import com.discord.utilities.message.MessageUtils; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: StoreMessages.kt */ public final class StoreMessages$deleteMessage$2 extends o implements Function0 { public final /* synthetic */ long $channelId; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ long $messageId; public final /* synthetic */ StoreMessages this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$deleteMessage$2(StoreMessages storeMessages, ModelMessage modelMessage, long j, long j2) { + public StoreMessages$deleteMessage$2(StoreMessages storeMessages, Message message, long j, long j2) { super(0); this.this$0 = storeMessages; - this.$message = modelMessage; + this.$message = message; this.$channelId = j; this.$messageId = j2; } @@ -26,18 +25,17 @@ public final class StoreMessages$deleteMessage$2 extends o implements Function0< @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - if (this.$message.isLocal()) { - String nonce = this.$message.getNonce(); - if (nonce != null) { - MessageQueue access$getMessageQueue = StoreMessages.access$getMessageQueue(this.this$0, this.$channelId); - m.checkNotNullExpressionValue(nonce, "nonce"); - access$getMessageQueue.cancel(nonce); + if (MessageUtils.isLocal(this.$message)) { + String B = this.$message.B(); + if (B != null) { + StoreMessages.access$getMessageQueue(this.this$0, this.$channelId).cancel(B); } StoreMessages.access$handleLocalMessageDelete(this.this$0, this.$message); - if (this.$message.getType() == -2) { + Integer M = this.$message.M(); + if (M != null && M.intValue() == -2) { StoreMessages.access$trackFailedLocalMessageResolved(this.this$0, this.$message, FailedMessageResolutionType.DELETED); } - } else if (this.$message.isEphemeralMessage()) { + } else if (MessageUtils.INSTANCE.isEphemeralMessage(this.$message)) { this.this$0.handleMessageDelete(new ModelMessageDelete(this.$channelId, this.$messageId)); } StoreMessages.access$getStream$p(this.this$0).handleLocalMessageDelete(this.$message); diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java index cd500aa0a7..276908b91c 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$1.java @@ -1,20 +1,27 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.t.n; import j0.k.b; import java.util.List; import java.util.Map; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$observeLocalMessagesForChannel$1 implements b>, List> { +public final class StoreMessages$observeLocalMessagesForChannel$1 implements b>, List> { public final /* synthetic */ long $channelId; public StoreMessages$observeLocalMessagesForChannel$1(long j) { this.$channelId = j; } - public final List call(Map> map) { - List list = (List) map.get(Long.valueOf(this.$channelId)); + /* 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 // j0.k.b + public /* bridge */ /* synthetic */ List call(Map> map) { + return call((Map>) map); + } + + public final List call(Map> map) { + List list = (List) map.get(Long.valueOf(this.$channelId)); return list != null ? list : n.emptyList(); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java index ef69151272..439ee3085d 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$observeLocalMessagesForChannel$2.java @@ -1,13 +1,20 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import java.util.List; import rx.functions.Func2; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$observeLocalMessagesForChannel$2 implements Func2, List, Boolean> { +public final class StoreMessages$observeLocalMessagesForChannel$2 implements Func2, List, Boolean> { public static final StoreMessages$observeLocalMessagesForChannel$2 INSTANCE = new StoreMessages$observeLocalMessagesForChannel$2(); - public final Boolean call(List list, List list2) { + public final Boolean call(List list, List list2) { return Boolean.valueOf(list == list2); } + + /* 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, java.lang.Object] */ + @Override // rx.functions.Func2 + public /* bridge */ /* synthetic */ Boolean call(List list, List list2) { + return call((List) list, (List) list2); + } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java index 1207195e15..67f550e228 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$1.java @@ -1,18 +1,23 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.t.u; import d0.z.d.m; import java.util.Collection; import java.util.List; import rx.functions.Func3; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$observeMessagesForChannel$1 implements Func3, List, Boolean, List> { +public final class StoreMessages$observeMessagesForChannel$1 implements Func3, List, Boolean, List> { public static final StoreMessages$observeMessagesForChannel$1 INSTANCE = new StoreMessages$observeMessagesForChannel$1(); - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public final List call(List list, List list2, Boolean bool) { + /* 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, java.lang.Object, java.lang.Object] */ + @Override // rx.functions.Func3 + public /* bridge */ /* synthetic */ List call(List list, List list2, Boolean bool) { + return call((List) list, (List) list2, bool); + } + + public final List call(List list, List list2, Boolean bool) { m.checkNotNullExpressionValue(bool, "isDetached"); if (bool.booleanValue()) { return list; diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java index dfbe8dd886..4cae8e56a3 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$observeMessagesForChannel$2.java @@ -1,19 +1,19 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; import j0.k.b; import java.util.Iterator; import java.util.List; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$observeMessagesForChannel$2 implements b, ModelMessage> { +public final class StoreMessages$observeMessagesForChannel$2 implements b, Message> { public final /* synthetic */ long $messageId; public StoreMessages$observeMessagesForChannel$2(long j) { this.$messageId = j; } - public final ModelMessage call(List list) { + public final Message call(List list) { T t; boolean z2; m.checkNotNullExpressionValue(list, "messages"); @@ -24,7 +24,7 @@ public final class StoreMessages$observeMessagesForChannel$2 implements b< break; } t = it.next(); - if (t.getId() == this.$messageId) { + if (t.r() == this.$messageId) { z2 = true; continue; } else { @@ -37,4 +37,11 @@ public final class StoreMessages$observeMessagesForChannel$2 implements b< } return t; } + + /* 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 // j0.k.b + public /* bridge */ /* synthetic */ Message call(List list) { + return call((List) list); + } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java index 1c087045f7..4d511d0381 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$1.java @@ -1,20 +1,20 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.t.n; import j0.k.b; import java.util.List; import java.util.Map; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$observeSyncedMessagesForChannel$1 implements b>, List> { +public final class StoreMessages$observeSyncedMessagesForChannel$1 implements b>, List> { public final /* synthetic */ long $channelId; public StoreMessages$observeSyncedMessagesForChannel$1(long j) { this.$channelId = j; } - public final List call(Map> map) { - List list = map.get(Long.valueOf(this.$channelId)); + public final List call(Map> map) { + List list = map.get(Long.valueOf(this.$channelId)); return list != null ? list : n.emptyList(); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java index 1def95ddbe..905ffce654 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$observeSyncedMessagesForChannel$2.java @@ -1,13 +1,20 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import java.util.List; import rx.functions.Func2; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$observeSyncedMessagesForChannel$2 implements Func2, List, Boolean> { +public final class StoreMessages$observeSyncedMessagesForChannel$2 implements Func2, List, Boolean> { public static final StoreMessages$observeSyncedMessagesForChannel$2 INSTANCE = new StoreMessages$observeSyncedMessagesForChannel$2(); - public final Boolean call(List list, List list2) { + public final Boolean call(List list, List list2) { return Boolean.valueOf(list == list2); } + + /* 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, java.lang.Object] */ + @Override // rx.functions.Func2 + public /* bridge */ /* synthetic */ Boolean call(List list, List list2) { + return call((List) list, (List) list2); + } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java b/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java index 9e36dce10b..5a2e214386 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$resendMessage$1.java @@ -1,19 +1,19 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: StoreMessages.kt */ public final class StoreMessages$resendMessage$1 extends o implements Function0 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ StoreMessages this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$resendMessage$1(StoreMessages storeMessages, ModelMessage modelMessage) { + public StoreMessages$resendMessage$1(StoreMessages storeMessages, Message message) { super(0); this.this$0 = storeMessages; - this.$message = modelMessage; + this.$message = message; } @Override // kotlin.jvm.functions.Function0 diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java index fd8c64d7c2..acd70f6ddf 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$1.java @@ -1,28 +1,24 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; -import d0.z.d.m; +import com.discord.api.message.Message; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: StoreMessages.kt */ public final class StoreMessages$sendMessage$1 extends o implements Function0 { - public final /* synthetic */ ModelMessage $invalidAttachmentsMessage; + public final /* synthetic */ Message $invalidAttachmentsMessage; public final /* synthetic */ StoreMessages this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$1(StoreMessages storeMessages, ModelMessage modelMessage) { + public StoreMessages$sendMessage$1(StoreMessages storeMessages, Message message) { super(0); this.this$0 = storeMessages; - this.$invalidAttachmentsMessage = modelMessage; + this.$invalidAttachmentsMessage = message; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - StoreMessages storeMessages = this.this$0; - ModelMessage modelMessage = this.$invalidAttachmentsMessage; - m.checkNotNullExpressionValue(modelMessage, "invalidAttachmentsMessage"); - StoreMessages.access$handleLocalMessageCreate(storeMessages, modelMessage); + StoreMessages.access$handleLocalMessageCreate(this.this$0, this.$invalidAttachmentsMessage); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java index 5f47a5a9d6..fc25b40e2b 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$3.java @@ -1,28 +1,24 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; -import d0.z.d.m; +import com.discord.api.message.Message; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: StoreMessages.kt */ public final class StoreMessages$sendMessage$3 extends o implements Function0 { - public final /* synthetic */ ModelMessage $localMessage; + public final /* synthetic */ Message $localMessage; public final /* synthetic */ StoreMessages this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$3(StoreMessages storeMessages, ModelMessage modelMessage) { + public StoreMessages$sendMessage$3(StoreMessages storeMessages, Message message) { super(0); this.this$0 = storeMessages; - this.$localMessage = modelMessage; + this.$localMessage = message; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - StoreMessages storeMessages = this.this$0; - ModelMessage modelMessage = this.$localMessage; - m.checkNotNullExpressionValue(modelMessage, "localMessage"); - StoreMessages.access$handleLocalMessageCreate(storeMessages, modelMessage); + StoreMessages.access$handleLocalMessageCreate(this.this$0, this.$localMessage); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java index 51dbda4080..84318cef0d 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java @@ -6,7 +6,7 @@ import androidx.work.ExistingWorkPolicy; import androidx.work.NetworkType; import androidx.work.OneTimeWorkRequest; import androidx.work.WorkManager; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.workers.BackgroundMessageSendWorker; import d0.z.d.m; import d0.z.d.o; @@ -15,14 +15,14 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: StoreMessages.kt */ public final class StoreMessages$sendMessage$6 extends o implements Function0 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ StoreMessages this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$6(StoreMessages storeMessages, ModelMessage modelMessage) { + public StoreMessages$sendMessage$6(StoreMessages storeMessages, Message message) { super(0); this.this$0 = storeMessages; - this.$message = modelMessage; + this.$message = message; } @Override // kotlin.jvm.functions.Function0 diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java index c0c863fd53..183998cc50 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java @@ -1,7 +1,8 @@ package com.discord.stores; +import com.discord.api.message.Message; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.models.commands.ApplicationCommandLocalSendData; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.messagesend.MessageRequest; import com.discord.utilities.messagesend.MessageResult; import rx.Emitter; @@ -9,17 +10,19 @@ import rx.functions.Action1; /* compiled from: StoreMessages.kt */ public final class StoreMessages$sendMessage$7 implements Action1> { public final /* synthetic */ ApplicationCommandLocalSendData $applicationCommandLocalSendData; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ StoreMessages this$0; - public StoreMessages$sendMessage$7(StoreMessages storeMessages, ModelMessage modelMessage, ApplicationCommandLocalSendData applicationCommandLocalSendData) { + public StoreMessages$sendMessage$7(StoreMessages storeMessages, Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData) { this.this$0 = storeMessages; - this.$message = modelMessage; + this.$message = message; this.$applicationCommandLocalSendData = applicationCommandLocalSendData; } public final void call(Emitter emitter) { - ModelMessage modelMessage = this.$message; - StoreMessages.access$getMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(modelMessage, this.$applicationCommandLocalSendData, new StoreMessages$sendMessage$7$request$1(this, emitter), modelMessage.getTimestamp())); + Message message = this.$message; + ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$applicationCommandLocalSendData; + UtcDateTime K = message.K(); + StoreMessages.access$getMessageQueue(this.this$0, this.$message.i()).enqueue(new MessageRequest.SendApplicationCommand(message, applicationCommandLocalSendData, new StoreMessages$sendMessage$7$request$1(this, emitter), K != null ? K.f() : 0)); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java index 0d0dfd90ef..8e5b0333a6 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java @@ -1,7 +1,7 @@ package com.discord.stores; import com.discord.api.activity.Activity; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessages; import com.discord.utilities.messagesend.MessageRequest; import com.discord.utilities.messagesend.MessageResult; @@ -19,7 +19,7 @@ import rx.Emitter; public final class StoreMessages$sendMessage$request$1 extends o implements Function1, MessageRequest.Send> { public final /* synthetic */ Activity $activity; public final /* synthetic */ long $attemptTimestamp; - public final /* synthetic */ ModelMessage $localMessage; + public final /* synthetic */ Message $localMessage; public final /* synthetic */ Ref$ObjectRef $validAttachments; public final /* synthetic */ StoreMessages this$0; @@ -52,54 +52,30 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } MessageResult messageResult = this.$result; if (messageResult instanceof MessageResult.Success) { - StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onMessageSent(((MessageResult.Success) this.$result).getMessage().getChannelId()); + StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onMessageSent(((MessageResult.Success) this.$result).getMessage().i()); this.this$0.this$0.this$0.handleMessageCreate(m.listOf(((MessageResult.Success) this.$result).getMessage())); - ModelMessage modelMessage = this.this$0.this$0.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage, "localMessage"); - Integer numRetries = modelMessage.getNumRetries(); - if (numRetries == null) { - numRetries = 0; - } - d0.z.d.m.checkNotNullExpressionValue(numRetries, "localMessage.numRetries ?: 0"); - if (numRetries.intValue() > 0) { + Integer C = this.this$0.this$0.$localMessage.C(); + if ((C != null ? C.intValue() : 0) > 0) { StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$1 = this.this$0.this$0; - StoreMessages storeMessages = storeMessages$sendMessage$request$1.this$0; - ModelMessage modelMessage2 = storeMessages$sendMessage$request$1.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage2, "localMessage"); - StoreMessages.access$trackFailedLocalMessageResolved(storeMessages, modelMessage2, FailedMessageResolutionType.RESENT); + StoreMessages.access$trackFailedLocalMessageResolved(storeMessages$sendMessage$request$1.this$0, storeMessages$sendMessage$request$1.$localMessage, FailedMessageResolutionType.RESENT); } } else if (messageResult instanceof MessageResult.Slowmode) { StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$12 = this.this$0.this$0; - StoreMessages storeMessages2 = storeMessages$sendMessage$request$12.this$0; - ModelMessage modelMessage3 = storeMessages$sendMessage$request$12.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage3, "localMessage"); - StoreMessages.access$handleSendMessageFailure(storeMessages2, modelMessage3); - StoreSlowMode slowMode$app_productionGoogleRelease = StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease(); - ModelMessage modelMessage4 = this.this$0.this$0.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage4, "localMessage"); - slowMode$app_productionGoogleRelease.onCooldown(modelMessage4.getChannelId(), ((MessageResult.Slowmode) this.$result).getCooldownMs()); + StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$12.this$0, storeMessages$sendMessage$request$12.$localMessage); + StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionGoogleRelease().onCooldown(this.this$0.this$0.$localMessage.i(), ((MessageResult.Slowmode) this.$result).getCooldownMs()); } else if (!(messageResult instanceof MessageResult.RateLimited)) { if (messageResult instanceof MessageResult.UserCancelled) { StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$13 = this.this$0.this$0; - StoreMessages storeMessages3 = storeMessages$sendMessage$request$13.this$0; - ModelMessage modelMessage5 = storeMessages$sendMessage$request$13.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage5, "localMessage"); - StoreMessages.access$handleLocalMessageDelete(storeMessages3, modelMessage5); + StoreMessages.access$handleLocalMessageDelete(storeMessages$sendMessage$request$13.this$0, storeMessages$sendMessage$request$13.$localMessage); } else if (messageResult instanceof MessageResult.UnknownFailure) { StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$14 = this.this$0.this$0; - StoreMessages storeMessages4 = storeMessages$sendMessage$request$14.this$0; - ModelMessage modelMessage6 = storeMessages$sendMessage$request$14.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage6, "localMessage"); - StoreMessages.access$handleSendMessageFailure(storeMessages4, modelMessage6); + StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$14.this$0, storeMessages$sendMessage$request$14.$localMessage); } else if (messageResult instanceof MessageResult.ValidationError) { StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$15 = this.this$0.this$0; StoreMessages.access$handleSendMessageValidationError(storeMessages$sendMessage$request$15.this$0, storeMessages$sendMessage$request$15.$localMessage, ((MessageResult.ValidationError) messageResult).getMessage()); } else if (!(messageResult instanceof MessageResult.NetworkFailure) && (messageResult instanceof MessageResult.Timeout)) { StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$16 = this.this$0.this$0; - StoreMessages storeMessages5 = storeMessages$sendMessage$request$16.this$0; - ModelMessage modelMessage7 = storeMessages$sendMessage$request$16.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage7, "localMessage"); - StoreMessages.access$handleSendMessageFailure(storeMessages5, modelMessage7); + StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$16.this$0, storeMessages$sendMessage$request$16.$localMessage); } } this.this$0.$emitter.onNext(this.$result); @@ -154,12 +130,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func /* renamed from: invoke */ public final void mo1invoke() { StoreMessageUploads messageUploads$app_productionGoogleRelease = StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionGoogleRelease(); - ModelMessage modelMessage = this.this$0.this$0.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage, "localMessage"); - String nonce = modelMessage.getNonce(); - d0.z.d.m.checkNotNull(nonce); - d0.z.d.m.checkNotNullExpressionValue(nonce, "localMessage.nonce!!"); - messageUploads$app_productionGoogleRelease.onPreprocessing(nonce, this.$numFiles, this.$displayName, this.$mimeType); + String B = this.this$0.this$0.$localMessage.B(); + d0.z.d.m.checkNotNull(B); + messageUploads$app_productionGoogleRelease.onPreprocessing(B, this.$numFiles, this.$displayName, this.$mimeType); } } @@ -205,12 +178,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func /* renamed from: invoke */ public final void mo1invoke() { StoreMessageUploads messageUploads$app_productionGoogleRelease = StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionGoogleRelease(); - ModelMessage modelMessage = this.this$0.this$0.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage, "localMessage"); - String nonce = modelMessage.getNonce(); - d0.z.d.m.checkNotNull(nonce); - d0.z.d.m.checkNotNullExpressionValue(nonce, "localMessage.nonce!!"); - messageUploads$app_productionGoogleRelease.bindUpload(nonce, this.$uploads); + String B = this.this$0.this$0.$localMessage.B(); + d0.z.d.m.checkNotNull(B); + messageUploads$app_productionGoogleRelease.bindUpload(B, this.$uploads); } } @@ -235,10 +205,10 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$request$1(StoreMessages storeMessages, ModelMessage modelMessage, Ref$ObjectRef ref$ObjectRef, Activity activity, long j) { + public StoreMessages$sendMessage$request$1(StoreMessages storeMessages, Message message, Ref$ObjectRef ref$ObjectRef, Activity activity, long j) { super(1); this.this$0 = storeMessages; - this.$localMessage = modelMessage; + this.$localMessage = message; this.$validAttachments = ref$ObjectRef; this.$activity = activity; this.$attemptTimestamp = j; @@ -246,8 +216,6 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func public final MessageRequest.Send invoke(Emitter emitter) { d0.z.d.m.checkNotNullParameter(emitter, "emitter"); - ModelMessage modelMessage = this.$localMessage; - d0.z.d.m.checkNotNullExpressionValue(modelMessage, "localMessage"); - return new MessageRequest.Send(modelMessage, this.$activity, this.$validAttachments.element, new AnonymousClass1(this, emitter), new AnonymousClass2(this), new AnonymousClass3(this), this.$attemptTimestamp); + return new MessageRequest.Send(this.$localMessage, this.$activity, this.$validAttachments.element, new AnonymousClass1(this, emitter), new AnonymousClass2(this), new AnonymousClass3(this), this.$attemptTimestamp); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages.java b/app/src/main/java/com/discord/stores/StoreMessages.java index e67bc8aeb8..265bb44158 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages.java +++ b/app/src/main/java/com/discord/stores/StoreMessages.java @@ -8,22 +8,24 @@ import androidx.work.WorkManager; import com.discord.api.activity.Activity; import com.discord.api.application.Application; import com.discord.api.interaction.InteractionStateUpdate; +import com.discord.api.message.LocalAttachment; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; import com.discord.api.message.activity.MessageActivity; +import com.discord.api.message.allowedmentions.MessageAllowedMentions; import com.discord.api.message.reaction.MessageReactionUpdate; import com.discord.api.sticker.Sticker; +import com.discord.api.user.User; import com.discord.app.AppLog; import com.discord.models.commands.ApplicationCommandLocalSendData; -import com.discord.models.domain.ModelAllowedMentions; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelMessageDelete; import com.discord.models.domain.ModelPayload; -import com.discord.models.messages.LocalAttachment; import com.discord.models.user.CoreUser; -import com.discord.models.user.User; import com.discord.stores.StoreMessagesLoader; import com.discord.utilities.attachments.AttachmentUtilsKt; import com.discord.utilities.logging.Logger; +import com.discord.utilities.message.LocalMessageCreatorsKt; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.messagesend.MessageQueue; import com.discord.utilities.messagesend.MessageRequest; import com.discord.utilities.messagesend.MessageResult; @@ -34,6 +36,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.time.Clock; import com.discord.utilities.user.UserUtils; import com.lytefast.flexinput.model.Attachment; +import d0.t.n; import d0.t.o; import d0.t.u; import d0.z.d.m; @@ -124,28 +127,28 @@ public final class StoreMessages extends Store { return storeMessages.stream; } - public static final /* synthetic */ void access$handleLocalMessageCreate(StoreMessages storeMessages, ModelMessage modelMessage) { - storeMessages.handleLocalMessageCreate(modelMessage); + public static final /* synthetic */ void access$handleLocalMessageCreate(StoreMessages storeMessages, Message message) { + storeMessages.handleLocalMessageCreate(message); } - public static final /* synthetic */ void access$handleLocalMessageDelete(StoreMessages storeMessages, ModelMessage modelMessage) { - storeMessages.handleLocalMessageDelete(modelMessage); + public static final /* synthetic */ void access$handleLocalMessageDelete(StoreMessages storeMessages, Message message) { + storeMessages.handleLocalMessageDelete(message); } - public static final /* synthetic */ void access$handleSendMessageFailure(StoreMessages storeMessages, ModelMessage modelMessage) { - storeMessages.handleSendMessageFailure(modelMessage); + public static final /* synthetic */ void access$handleSendMessageFailure(StoreMessages storeMessages, Message message) { + storeMessages.handleSendMessageFailure(message); } - public static final /* synthetic */ void access$handleSendMessageValidationError(StoreMessages storeMessages, ModelMessage modelMessage, String str) { - storeMessages.handleSendMessageValidationError(modelMessage, str); + public static final /* synthetic */ void access$handleSendMessageValidationError(StoreMessages storeMessages, Message message, String str) { + storeMessages.handleSendMessageValidationError(message, str); } public static final /* synthetic */ void access$setContext$p(StoreMessages storeMessages, Context context) { storeMessages.context = context; } - public static final /* synthetic */ void access$trackFailedLocalMessageResolved(StoreMessages storeMessages, ModelMessage modelMessage, FailedMessageResolutionType failedMessageResolutionType) { - storeMessages.trackFailedLocalMessageResolved(modelMessage, failedMessageResolutionType); + public static final /* synthetic */ void access$trackFailedLocalMessageResolved(StoreMessages storeMessages, Message message, FailedMessageResolutionType failedMessageResolutionType) { + storeMessages.trackFailedLocalMessageResolved(message, failedMessageResolutionType); } private final synchronized MessageQueue getMessageQueue(long j) { @@ -168,13 +171,10 @@ public final class StoreMessages extends Store { @StoreThread private final void handleInteractionStateUpdate(InteractionStateUpdate interactionStateUpdate, boolean z2, boolean z3) { - ModelMessage message; + Message message; ApplicationCommandLocalSendData applicationCommandLocalSendData = this.stream.getApplicationInteractions$app_productionGoogleRelease().getApplicationCommandLocalSendDataSet$app_productionGoogleRelease().get(interactionStateUpdate.b()); if (applicationCommandLocalSendData != null && (message = this.localMessagesHolder.getMessage(applicationCommandLocalSendData.getChannelId(), applicationCommandLocalSendData.getNonceString())) != null) { - ModelMessage createLocalApplicationCommandMessage = ModelMessage.createLocalApplicationCommandMessage(message, interactionStateUpdate.a(), z2, z3, this.clock); - StoreLocalMessagesHolder storeLocalMessagesHolder = this.localMessagesHolder; - m.checkNotNullExpressionValue(createLocalApplicationCommandMessage, "updatedMessage"); - storeLocalMessagesHolder.addMessage(createLocalApplicationCommandMessage); + this.localMessagesHolder.addMessage(LocalMessageCreatorsKt.createLocalApplicationCommandMessage(message, interactionStateUpdate.a(), z2, z3, this.clock)); } } @@ -189,8 +189,8 @@ public final class StoreMessages extends Store { } @StoreThread - private final void handleLocalMessageCreate(ModelMessage modelMessage) { - this.localMessagesHolder.addMessage(modelMessage); + private final void handleLocalMessageCreate(Message message) { + this.localMessagesHolder.addMessage(message); } @StoreThread @@ -199,8 +199,8 @@ public final class StoreMessages extends Store { } @StoreThread - private final void handleLocalMessageDelete(ModelMessage modelMessage) { - this.localMessagesHolder.deleteMessage(modelMessage); + private final void handleLocalMessageDelete(Message message) { + this.localMessagesHolder.deleteMessage(message); } private final void handleMessageDelete(long j, List list) { @@ -208,40 +208,45 @@ public final class StoreMessages extends Store { } @StoreThread - private final void handleSendMessageFailure(ModelMessage modelMessage) { - deleteMessage(modelMessage); - ModelMessage createLocalMessage = ModelMessage.createLocalMessage(modelMessage.getContent(), modelMessage.getChannelId(), modelMessage.getAuthor(), modelMessage.getMentions(), true, modelMessage.isHasLocalUploads(), modelMessage.getApplication(), modelMessage.getActivity(), this.clock, modelMessage.localAttachments, modelMessage.getLastManualAttemptTimestamp(), modelMessage.getInitialAttemptTimestamp(), modelMessage.getNumRetries(), modelMessage.getStickers(), modelMessage.getMessageReference(), modelMessage.getAllowedMentions()); - m.checkNotNullExpressionValue(createLocalMessage, "failedMessage"); - handleLocalMessageCreate(createLocalMessage); + private final void handleSendMessageFailure(Message message) { + deleteMessage(message); + String k = message.k(); + if (k == null) { + k = ""; + } + long i = message.i(); + User g = message.g(); + m.checkNotNull(g); + handleLocalMessageCreate(LocalMessageCreatorsKt.createLocalMessage(k, i, g, message.z(), true, message.p(), message.d(), message.b(), this.clock, message.v(), message.u(), message.s(), message.C(), message.I(), message.A(), message.c())); } - private final void handleSendMessageValidationError(ModelMessage modelMessage, String str) { + private final void handleSendMessageValidationError(Message message, String str) { Logger.e$default(AppLog.g, "ValidationError", str, null, null, 12, null); - deleteMessage(modelMessage); + deleteMessage(message); } - private final Observable> observeLocalMessagesForChannel(long j) { + private final Observable> observeLocalMessagesForChannel(long j) { Observable G = this.localMessagesHolder.getMessagesPublisher().G(new StoreMessages$observeLocalMessagesForChannel$1(j)); m.checkNotNullExpressionValue(G, "localMessagesHolder\n …annelId] ?: emptyList() }"); Observable computationBuffered = ObservableExtensionsKt.computationBuffered(G); - Observable> i02 = Observable.i0(new r(computationBuffered.i, new u0(StoreMessages$observeLocalMessagesForChannel$2.INSTANCE))); + Observable> i02 = Observable.i0(new r(computationBuffered.i, new u0(StoreMessages$observeLocalMessagesForChannel$2.INSTANCE))); m.checkNotNullExpressionValue(i02, "localMessagesHolder\n …messages1 === messages2 }"); return i02; } - private final Observable> observeSyncedMessagesForChannel(long j) { + private final Observable> observeSyncedMessagesForChannel(long j) { Observable G = this.holder.getMessagesPublisher().G(new StoreMessages$observeSyncedMessagesForChannel$1(j)); m.checkNotNullExpressionValue(G, "holder\n .messag…annelId] ?: emptyList() }"); Observable computationBuffered = ObservableExtensionsKt.computationBuffered(G); - Observable> i02 = Observable.i0(new r(computationBuffered.i, new u0(StoreMessages$observeSyncedMessagesForChannel$2.INSTANCE))); + Observable> i02 = Observable.i0(new r(computationBuffered.i, new u0(StoreMessages$observeSyncedMessagesForChannel$2.INSTANCE))); m.checkNotNullExpressionValue(i02, "holder\n .messag…messages1 === messages2 }"); return i02; } @StoreThread private final void resendAllLocalMessages() { - List flattenedMessages = this.localMessagesHolder.getFlattenedMessages(); - ArrayList arrayList = new ArrayList(); + List flattenedMessages = this.localMessagesHolder.getFlattenedMessages(); + ArrayList arrayList = new ArrayList(); Iterator it = flattenedMessages.iterator(); while (true) { boolean z2 = true; @@ -249,7 +254,8 @@ public final class StoreMessages extends Store { break; } Object next = it.next(); - if (((ModelMessage) next).getType() != -1) { + Integer M = ((Message) next).M(); + if (M == null || M.intValue() != -1) { z2 = false; } if (z2) { @@ -257,8 +263,8 @@ public final class StoreMessages extends Store { } } ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); - for (ModelMessage modelMessage : arrayList) { - arrayList2.add(resendMessage(modelMessage, true)); + for (Message message : arrayList) { + arrayList2.add(resendMessage(message, true)); } Observable i02 = Observable.i0(new q(arrayList2)); Observable i03 = Observable.i0(new r(i02.i, x0.a.a)); @@ -266,49 +272,47 @@ public final class StoreMessages extends Store { ObservableExtensionsKt.appSubscribe$default(i03, StoreMessages.class, (Context) null, (Function1) null, (Function1) null, new StoreMessages$resendAllLocalMessages$1(this), (Function0) null, StoreMessages$resendAllLocalMessages$2.INSTANCE, 46, (Object) null); } - public static /* synthetic */ Observable resendMessage$default(StoreMessages storeMessages, ModelMessage modelMessage, boolean z2, int i, Object obj) { + public static /* synthetic */ Observable resendMessage$default(StoreMessages storeMessages, Message message, boolean z2, int i, Object obj) { if ((i & 2) != 0) { z2 = false; } - return storeMessages.resendMessage(modelMessage, z2); + return storeMessages.resendMessage(message, z2); } - public static /* synthetic */ Observable sendMessage$default(StoreMessages storeMessages, long j, User user, String str, List list, List list2, List list3, MessageReference messageReference, ModelAllowedMentions modelAllowedMentions, Application application, Activity activity, MessageActivity messageActivity, Long l, Long l2, Integer num, int i, Object obj) { - return storeMessages.sendMessage(j, user, str, list, list2, (i & 32) != 0 ? null : list3, (i & 64) != 0 ? null : messageReference, (i & 128) != 0 ? null : modelAllowedMentions, (i & 256) != 0 ? null : application, (i & 512) != 0 ? null : activity, (i & 1024) != 0 ? null : messageActivity, (i & 2048) != 0 ? null : l, (i & 4096) != 0 ? null : l2, (i & 8192) != 0 ? null : num); + public static /* synthetic */ Observable sendMessage$default(StoreMessages storeMessages, long j, com.discord.models.user.User user, String str, List list, List list2, List list3, MessageReference messageReference, MessageAllowedMentions messageAllowedMentions, Application application, Activity activity, MessageActivity messageActivity, Long l, Long l2, Integer num, int i, Object obj) { + return storeMessages.sendMessage(j, user, str, list, list2, (i & 32) != 0 ? null : list3, (i & 64) != 0 ? null : messageReference, (i & 128) != 0 ? null : messageAllowedMentions, (i & 256) != 0 ? null : application, (i & 512) != 0 ? null : activity, (i & 1024) != 0 ? null : messageActivity, (i & 2048) != 0 ? null : l, (i & 4096) != 0 ? null : l2, (i & 8192) != 0 ? null : num); } - /* JADX WARNING: Removed duplicated region for block: B:15:0x0042 */ - /* JADX WARNING: Removed duplicated region for block: B:19:0x0049 */ - /* JADX WARNING: Removed duplicated region for block: B:36:0x0082 */ - /* JADX WARNING: Removed duplicated region for block: B:43:0x00c4 */ - /* JADX WARNING: Removed duplicated region for block: B:45:0x00c7 */ - /* JADX WARNING: Removed duplicated region for block: B:50:0x00d9 */ - /* JADX WARNING: Removed duplicated region for block: B:51:0x00e0 */ - /* JADX WARNING: Removed duplicated region for block: B:54:0x00eb */ - /* JADX WARNING: Removed duplicated region for block: B:55:0x00f1 */ - /* JADX WARNING: Removed duplicated region for block: B:58:0x00f9 */ - /* JADX WARNING: Removed duplicated region for block: B:61:0x010f */ - private final void trackFailedLocalMessageResolved(ModelMessage modelMessage, FailedMessageResolutionType failedMessageResolutionType) { + /* JADX WARNING: Removed duplicated region for block: B:19:0x0046 */ + /* JADX WARNING: Removed duplicated region for block: B:36:0x007e */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x00c0 */ + /* JADX WARNING: Removed duplicated region for block: B:45:0x00c3 */ + /* JADX WARNING: Removed duplicated region for block: B:50:0x00d5 */ + /* JADX WARNING: Removed duplicated region for block: B:51:0x00dc */ + /* JADX WARNING: Removed duplicated region for block: B:54:0x00e9 */ + /* JADX WARNING: Removed duplicated region for block: B:55:0x00ef */ + /* JADX WARNING: Removed duplicated region for block: B:58:0x00f6 */ + /* JADX WARNING: Removed duplicated region for block: B:59:0x00fb */ + /* JADX WARNING: Removed duplicated region for block: B:62:0x0104 */ + /* JADX WARNING: Removed duplicated region for block: B:63:0x010a */ + private final void trackFailedLocalMessageResolved(Message message, FailedMessageResolutionType failedMessageResolutionType) { boolean z2; - List list; + List v; boolean z3; - List list2; + List v2; ArrayList arrayList; - Long initialAttemptTimestamp; - Integer numRetries; Long l; boolean z4; boolean z5; - List list3 = modelMessage.localAttachments; - if (list3 != null) { - if (!list3.isEmpty()) { - Iterator it = list3.iterator(); + List v3 = message.v(); + if (v3 != null) { + if (!v3.isEmpty()) { + Iterator it = v3.iterator(); while (true) { if (!it.hasNext()) { break; } LocalAttachment localAttachment = (LocalAttachment) it.next(); - m.checkNotNullExpressionValue(localAttachment, "localAttachment"); Context context = this.context; if (context == null) { m.throwUninitializedPropertyAccessException("context"); @@ -320,123 +324,102 @@ public final class StoreMessages extends Store { break; } } - if (z5) { - z2 = true; - list = modelMessage.localAttachments; - if (list != null) { - if (!list.isEmpty()) { - Iterator it2 = list.iterator(); - while (true) { - if (!it2.hasNext()) { - break; - } - LocalAttachment localAttachment2 = (LocalAttachment) it2.next(); - m.checkNotNullExpressionValue(localAttachment2, "localAttachment"); - Context context2 = this.context; - if (context2 == null) { - m.throwUninitializedPropertyAccessException("context"); - } - ContentResolver contentResolver2 = context2.getContentResolver(); - m.checkNotNullExpressionValue(contentResolver2, "context.contentResolver"); - if (AttachmentUtilsKt.isVideoAttachment(localAttachment2, contentResolver2)) { - z4 = true; - break; - } - } - } - z4 = false; - if (z4) { - z3 = true; - list2 = modelMessage.localAttachments; - if (list2 != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(list2, 10)); - for (LocalAttachment localAttachment3 : list2) { - Uri parse = Uri.parse(localAttachment3.getUriString()); - m.checkNotNullExpressionValue(parse, "Uri.parse(localAttachment.uriString)"); - Context context3 = this.context; - if (context3 == null) { - m.throwUninitializedPropertyAccessException("context"); - } - ContentResolver contentResolver3 = context3.getContentResolver(); - m.checkNotNullExpressionValue(contentResolver3, "context.contentResolver"); - arrayList.add(Long.valueOf(SendUtilsKt.computeFileSizeBytes(parse, contentResolver3))); - } - } else { - arrayList = null; - } - int longValue = (arrayList != null || (l = (Long) u.maxOrNull(arrayList)) == null) ? 0 : (int) l.longValue(); - int sumOfLong = arrayList != null ? (int) u.sumOfLong(arrayList) : 0; - StoreAnalytics analytics = StoreStream.Companion.getAnalytics(); - List list4 = modelMessage.localAttachments; - int size = list4 != null ? list4.size() : 0; - initialAttemptTimestamp = modelMessage.getInitialAttemptTimestamp(); - if (initialAttemptTimestamp == null) { - initialAttemptTimestamp = 0L; - } - m.checkNotNullExpressionValue(initialAttemptTimestamp, "localMessage.initialAttemptTimestamp ?: 0L"); - long longValue2 = initialAttemptTimestamp.longValue(); - numRetries = modelMessage.getNumRetries(); - if (numRetries == null) { - numRetries = 0; - } - m.checkNotNullExpressionValue(numRetries, "localMessage.numRetries ?: 0"); - analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, numRetries.intValue(), modelMessage.getChannelId()); - } - } - z3 = false; - list2 = modelMessage.localAttachments; - if (list2 != null) { - } - if (arrayList != null) { - } - if (arrayList != null) { - } - StoreAnalytics analytics = StoreStream.Companion.getAnalytics(); - List list4 = modelMessage.localAttachments; - if (list4 != null) { - } - initialAttemptTimestamp = modelMessage.getInitialAttemptTimestamp(); - if (initialAttemptTimestamp == null) { - } - m.checkNotNullExpressionValue(initialAttemptTimestamp, "localMessage.initialAttemptTimestamp ?: 0L"); - long longValue2 = initialAttemptTimestamp.longValue(); - numRetries = modelMessage.getNumRetries(); - if (numRetries == null) { - } - m.checkNotNullExpressionValue(numRetries, "localMessage.numRetries ?: 0"); - analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, numRetries.intValue(), modelMessage.getChannelId()); - } } z5 = false; if (z5) { + z2 = true; + v = message.v(); + if (v != null) { + if (!v.isEmpty()) { + Iterator it2 = v.iterator(); + while (true) { + if (!it2.hasNext()) { + break; + } + LocalAttachment localAttachment2 = (LocalAttachment) it2.next(); + Context context2 = this.context; + if (context2 == null) { + m.throwUninitializedPropertyAccessException("context"); + } + ContentResolver contentResolver2 = context2.getContentResolver(); + m.checkNotNullExpressionValue(contentResolver2, "context.contentResolver"); + if (AttachmentUtilsKt.isVideoAttachment(localAttachment2, contentResolver2)) { + z4 = true; + break; + } + } + } + z4 = false; + if (z4) { + z3 = true; + v2 = message.v(); + if (v2 != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(v2, 10)); + for (LocalAttachment localAttachment3 : v2) { + Uri parse = Uri.parse(localAttachment3.c()); + m.checkNotNullExpressionValue(parse, "Uri.parse(localAttachment.uriString)"); + Context context3 = this.context; + if (context3 == null) { + m.throwUninitializedPropertyAccessException("context"); + } + ContentResolver contentResolver3 = context3.getContentResolver(); + m.checkNotNullExpressionValue(contentResolver3, "context.contentResolver"); + arrayList.add(Long.valueOf(SendUtilsKt.computeFileSizeBytes(parse, contentResolver3))); + } + } else { + arrayList = null; + } + int longValue = (arrayList != null || (l = (Long) u.maxOrNull(arrayList)) == null) ? 0 : (int) l.longValue(); + int sumOfLong = arrayList != null ? (int) u.sumOfLong(arrayList) : 0; + StoreAnalytics analytics = StoreStream.Companion.getAnalytics(); + List v4 = message.v(); + int size = v4 != null ? v4.size() : 0; + Long s2 = message.s(); + long longValue2 = s2 != null ? s2.longValue() : 0; + Integer C = message.C(); + analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, C != null ? C.intValue() : 0, message.i()); + } + } + z3 = false; + v2 = message.v(); + if (v2 != null) { + } + if (arrayList != null) { + } + if (arrayList != null) { + } + StoreAnalytics analytics = StoreStream.Companion.getAnalytics(); + List v4 = message.v(); + if (v4 != null) { + } + Long s2 = message.s(); + if (s2 != null) { + } + Integer C = message.C(); + analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, C != null ? C.intValue() : 0, message.i()); } } z2 = false; - list = modelMessage.localAttachments; - if (list != null) { + v = message.v(); + if (v != null) { } z3 = false; - list2 = modelMessage.localAttachments; - if (list2 != null) { + v2 = message.v(); + if (v2 != null) { } if (arrayList != null) { } if (arrayList != null) { } StoreAnalytics analytics = StoreStream.Companion.getAnalytics(); - List list4 = modelMessage.localAttachments; - if (list4 != null) { + List v4 = message.v(); + if (v4 != null) { } - initialAttemptTimestamp = modelMessage.getInitialAttemptTimestamp(); - if (initialAttemptTimestamp == null) { + Long s2 = message.s(); + if (s2 != null) { } - m.checkNotNullExpressionValue(initialAttemptTimestamp, "localMessage.initialAttemptTimestamp ?: 0L"); - long longValue2 = initialAttemptTimestamp.longValue(); - numRetries = modelMessage.getNumRetries(); - if (numRetries == null) { - } - m.checkNotNullExpressionValue(numRetries, "localMessage.numRetries ?: 0"); - analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, numRetries.intValue(), modelMessage.getChannelId()); + Integer C = message.C(); + analytics.trackFailedMessageResolved(size, longValue, sumOfLong, z2, z3, failedMessageResolutionType, longValue2, C != null ? C.intValue() : 0, message.i()); } public final void cancelMessageSend(long j, String str) { @@ -451,21 +434,21 @@ public final class StoreMessages extends Store { handleLocalMessageDelete(j, str); } - public final void deleteMessage(ModelMessage modelMessage) { - if (modelMessage != null) { - long id2 = modelMessage.getId(); - long channelId = modelMessage.getChannelId(); - if (modelMessage.isLocal() || modelMessage.isEphemeralMessage()) { - this.dispatcher.schedule(new StoreMessages$deleteMessage$2(this, modelMessage, channelId, id2)); + public final void deleteMessage(Message message) { + if (message != null) { + long r = message.r(); + long i = message.i(); + if (MessageUtils.isLocal(message) || MessageUtils.INSTANCE.isEphemeralMessage(message)) { + this.dispatcher.schedule(new StoreMessages$deleteMessage$2(this, message, i, r)); } else { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteMessage(channelId, id2), false, 1, null), (Context) null, "deleteMessage", (Function1) null, StoreMessages$deleteMessage$1.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteMessage(i, r), false, 1, null), (Context) null, "deleteMessage", (Function1) null, StoreMessages$deleteMessage$1.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null); } } } - public final void editMessage(long j, long j2, String str, ModelAllowedMentions modelAllowedMentions) { + public final void editMessage(long j, long j2, String str, MessageAllowedMentions messageAllowedMentions) { m.checkNotNullParameter(str, "content"); - getMessageQueue(j2).enqueue(new MessageRequest.Edit(j2, str, j, modelAllowedMentions, this.clock.currentTimeMillis())); + getMessageQueue(j2).enqueue(new MessageRequest.Edit(j2, str, j, messageAllowedMentions, this.clock.currentTimeMillis())); } public final Observable> getAllDetached() { @@ -475,8 +458,8 @@ public final class StoreMessages extends Store { } @StoreThread - public final ModelMessage getMessage(long j, long j2) { - TreeMap messagesForChannel = this.holder.getMessagesForChannel(Long.valueOf(j)); + public final Message getMessage(long j, long j2) { + TreeMap messagesForChannel = this.holder.getMessagesForChannel(Long.valueOf(j)); if (messagesForChannel != null) { return messagesForChannel.get(Long.valueOf(j2)); } @@ -516,12 +499,12 @@ public final class StoreMessages extends Store { handleInteractionStateUpdate$default(this, interactionStateUpdate, true, false, 4, null); } - public final void handleMessageCreate(List list) { + public final void handleMessageCreate(List list) { m.checkNotNullParameter(list, "messagesList"); - for (ModelMessage modelMessage : list) { - String nonce = modelMessage.getNonce(); - if (nonce != null) { - this.localMessagesHolder.deleteMessage(modelMessage.getChannelId(), nonce); + for (Message message : list) { + String B = message.B(); + if (B != null) { + this.localMessagesHolder.deleteMessage(message.i(), B); } } this.holder.addMessages(list); @@ -535,9 +518,9 @@ public final class StoreMessages extends Store { handleMessageDelete(channelId, messageIds); } - public final void handleMessageUpdate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - this.holder.updateMessages(modelMessage); + public final void handleMessageUpdate(Message message) { + m.checkNotNullParameter(message, "message"); + this.holder.updateMessages(message); } public final void handleMessagesLoaded(StoreMessagesLoader.ChannelChunk channelChunk) { @@ -586,69 +569,67 @@ public final class StoreMessages extends Store { return s2; } - public final Observable> observeMessagesForChannel(long j) { - Observable> i = Observable.i(observeSyncedMessagesForChannel(j), observeLocalMessagesForChannel(j), observeIsDetached(j), StoreMessages$observeMessagesForChannel$1.INSTANCE); + public final Observable> observeMessagesForChannel(long j) { + Observable> i = Observable.i(observeSyncedMessagesForChannel(j), observeLocalMessagesForChannel(j), observeIsDetached(j), StoreMessages$observeMessagesForChannel$1.INSTANCE); m.checkNotNullExpressionValue(i, "Observable.combineLatest…ges + localMessages\n }"); return i; } - public final Observable observeMessagesForChannel(long j, long j2) { - Observable s2 = observeMessagesForChannel(j).G(new StoreMessages$observeMessagesForChannel$2(j2)).s(); + public final Observable observeMessagesForChannel(long j, long j2) { + Observable s2 = observeMessagesForChannel(j).G(new StoreMessages$observeMessagesForChannel$2(j2)).s(); m.checkNotNullExpressionValue(s2, "observeMessagesForChanne… .distinctUntilChanged()"); return s2; } - public final Observable resendMessage(ModelMessage modelMessage, boolean z2) { + public final Observable resendMessage(Message message, boolean z2) { ArrayList arrayList; ArrayList arrayList2; - m.checkNotNullParameter(modelMessage, "message"); - if ((!z2 || modelMessage.getType() == -1) && (z2 || modelMessage.getType() == -2)) { - this.dispatcher.schedule(new StoreMessages$resendMessage$1(this, modelMessage)); - Integer numRetries = modelMessage.getNumRetries(); - if (numRetries == null) { - numRetries = 0; + Integer M; + Integer M2; + m.checkNotNullParameter(message, "message"); + if ((!z2 || ((M2 = message.M()) != null && M2.intValue() == -1)) && (z2 || ((M = message.M()) != null && M.intValue() == -2))) { + this.dispatcher.schedule(new StoreMessages$resendMessage$1(this, message)); + Integer C = message.C(); + int intValue = C != null ? C.intValue() : 0; + long i = message.i(); + User g = message.g(); + m.checkNotNull(g); + CoreUser coreUser = new CoreUser(g); + String k = message.k(); + if (k == null) { + k = ""; } - m.checkNotNullExpressionValue(numRetries, "message.numRetries ?: 0"); - int intValue = numRetries.intValue(); - long channelId = modelMessage.getChannelId(); - com.discord.api.user.User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - CoreUser coreUser = new CoreUser(author); - String content = modelMessage.getContent(); - if (content == null) { - content = ""; - } - List mentions = modelMessage.getMentions(); - if (mentions != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(mentions, 10)); - for (com.discord.api.user.User user : mentions) { - m.checkNotNullExpressionValue(user, "it"); + List z3 = message.z(); + if (z3 != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(z3, 10)); + for (User user : z3) { arrayList.add(new CoreUser(user)); } } else { arrayList = null; } - List list = modelMessage.localAttachments; - if (list != null) { - arrayList2 = new ArrayList(o.collectionSizeOrDefault(list, 10)); - for (LocalAttachment localAttachment : list) { - Uri parse = Uri.parse(localAttachment.getUriString()); - long id2 = localAttachment.getId(); + List v = message.v(); + if (v != null) { + arrayList2 = new ArrayList(o.collectionSizeOrDefault(v, 10)); + for (LocalAttachment localAttachment : v) { + Uri parse = Uri.parse(localAttachment.c()); + long b = localAttachment.b(); m.checkNotNullExpressionValue(parse, "contentUri"); - arrayList2.add(new Attachment(id2, parse, localAttachment.getDisplayName(), null)); + arrayList2.add(new Attachment(b, parse, localAttachment.a(), null)); } } else { arrayList2 = null; } - return sendMessage$default(this, channelId, coreUser, content, arrayList, arrayList2, null, modelMessage.getMessageReference(), modelMessage.getAllowedMentions(), null, null, null, z2 ? modelMessage.getLastManualAttemptTimestamp() : null, modelMessage.getInitialAttemptTimestamp(), Integer.valueOf(intValue + 1), 1824, null); + return sendMessage$default(this, i, coreUser, k, arrayList, arrayList2, null, message.A(), message.c(), null, null, null, z2 ? message.u() : null, message.s(), Integer.valueOf(intValue + 1), 1824, null); } - throw new IllegalArgumentException("Incorrect " + z2 + " auto attempt and message type " + modelMessage.getType()); + throw new IllegalArgumentException("Incorrect " + z2 + " auto attempt and message type " + message.M()); } /* JADX DEBUG: Multi-variable search result rejected for r31v0, resolved type: java.util.List> */ /* JADX WARN: Multi-variable type inference failed */ /* JADX WARNING: Unknown variable types count: 1 */ - public final Observable sendMessage(long j, User user, String str, List list, List> list2, List list3, MessageReference messageReference, ModelAllowedMentions modelAllowedMentions, Application application, Activity activity, MessageActivity messageActivity, Long l, Long l2, Integer num) { + public final Observable sendMessage(long j, com.discord.models.user.User user, String str, List list, List> list2, List list3, MessageReference messageReference, MessageAllowedMentions messageAllowedMentions, Application application, Activity activity, MessageActivity messageActivity, Long l, Long l2, Integer num) { + List list4; ArrayList arrayList; String str2 = str; Emitter.BackpressureMode backpressureMode = Emitter.BackpressureMode.ERROR; @@ -665,19 +646,19 @@ public final class StoreMessages extends Store { ProcessedMessageContent fromAttachments = companion.fromAttachments(list2, str2, context); List> invalidAttachments = fromAttachments.getInvalidAttachments(); if (!invalidAttachments.isEmpty()) { - com.discord.api.user.User synthesizeApiUser = UserUtils.INSTANCE.synthesizeApiUser(user); + User synthesizeApiUser = UserUtils.INSTANCE.synthesizeApiUser(user); Clock clock = this.clock; ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(invalidAttachments, 10)); Iterator it = invalidAttachments.iterator(); while (it.hasNext()) { arrayList2.add(AttachmentUtilsKt.toLocalAttachment((Attachment) it.next())); } - this.dispatcher.schedule(new StoreMessages$sendMessage$1(this, ModelMessage.createInvalidAttachmentsMessage(j, synthesizeApiUser, clock, arrayList2))); + this.dispatcher.schedule(new StoreMessages$sendMessage$1(this, LocalMessageCreatorsKt.createInvalidAttachmentsMessage(j, synthesizeApiUser, clock, arrayList2))); } ref$ObjectRef.element = fromAttachments.getValidAttachments(); str2 = fromAttachments.getContent(); - List list4 = ref$ObjectRef.element; - if (list4 == null || list4.isEmpty()) { + List list5 = ref$ObjectRef.element; + if (list5 == null || list5.isEmpty()) { if (str2.length() == 0) { Observable n = Observable.n(StoreMessages$sendMessage$2.INSTANCE, backpressureMode); m.checkNotNullExpressionValue(n, "Observable.create({ emit…r.BackpressureMode.ERROR)"); @@ -686,27 +667,29 @@ public final class StoreMessages extends Store { } } long longValue = l != null ? l.longValue() : this.clock.currentTimeMillis(); - com.discord.api.user.User synthesizeApiUser2 = UserUtils.INSTANCE.synthesizeApiUser(user); - ArrayList arrayList3 = null; + User synthesizeApiUser2 = UserUtils.INSTANCE.synthesizeApiUser(user); if (list != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10)); - for (User user2 : list) { - arrayList.add(UserUtils.INSTANCE.synthesizeApiUser(user2)); + list4 = new ArrayList(o.collectionSizeOrDefault(list, 10)); + for (com.discord.models.user.User user2 : list) { + list4.add(UserUtils.INSTANCE.synthesizeApiUser(user2)); } + } else { + list4 = n.emptyList(); + } + List list6 = ref$ObjectRef.element; + boolean z2 = !(list6 == null || list6.isEmpty()); + Clock clock2 = this.clock; + List list7 = ref$ObjectRef.element; + if (list7 != null) { + ArrayList arrayList3 = new ArrayList(o.collectionSizeOrDefault(list7, 10)); + for (Attachment attachment : list7) { + arrayList3.add(AttachmentUtilsKt.toLocalAttachment(attachment)); + } + arrayList = arrayList3; } else { arrayList = null; } - List list5 = ref$ObjectRef.element; - boolean z2 = !(list5 == null || list5.isEmpty()); - Clock clock2 = this.clock; - List list6 = ref$ObjectRef.element; - if (list6 != null) { - arrayList3 = new ArrayList(o.collectionSizeOrDefault(list6, 10)); - for (Attachment attachment : list6) { - arrayList3.add(AttachmentUtilsKt.toLocalAttachment(attachment)); - } - } - ModelMessage createLocalMessage = ModelMessage.createLocalMessage(str2, j, synthesizeApiUser2, arrayList, false, z2, application, messageActivity, clock2, arrayList3, Long.valueOf(longValue), Long.valueOf(l2 != null ? l2.longValue() : this.clock.currentTimeMillis()), Integer.valueOf(num != null ? num.intValue() : 0), list3, messageReference, modelAllowedMentions); + Message createLocalMessage = LocalMessageCreatorsKt.createLocalMessage(str2, j, synthesizeApiUser2, list4, false, z2, application, messageActivity, clock2, arrayList, Long.valueOf(longValue), Long.valueOf(l2 != null ? l2.longValue() : this.clock.currentTimeMillis()), Integer.valueOf(num != null ? num.intValue() : 0), list3, messageReference, messageAllowedMentions); if (messageActivity == null) { this.dispatcher.schedule(new StoreMessages$sendMessage$3(this, createLocalMessage)); } @@ -716,11 +699,11 @@ public final class StoreMessages extends Store { return n2; } - public final Observable sendMessage(ModelMessage modelMessage, ApplicationCommandLocalSendData applicationCommandLocalSendData) { - m.checkNotNullParameter(modelMessage, "message"); + public final Observable sendMessage(Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(applicationCommandLocalSendData, "applicationCommandLocalSendData"); - this.dispatcher.schedule(new StoreMessages$sendMessage$6(this, modelMessage)); - Observable n = Observable.n(new StoreMessages$sendMessage$7(this, modelMessage, applicationCommandLocalSendData), Emitter.BackpressureMode.NONE); + this.dispatcher.schedule(new StoreMessages$sendMessage$6(this, message)); + Observable n = Observable.n(new StoreMessages$sendMessage$7(this, message, applicationCommandLocalSendData), Emitter.BackpressureMode.NONE); m.checkNotNullExpressionValue(n, "Observable.create({ emit…er.BackpressureMode.NONE)"); return n; } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java index 604837ccfc..fcfd1bfee2 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java @@ -4,11 +4,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import c.a.v.a; import c.a.v.b; +import com.discord.api.message.Message; import com.discord.api.message.reaction.MessageReaction; import com.discord.api.message.reaction.MessageReactionEmoji; import com.discord.api.message.reaction.MessageReactionUpdate; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StoreMessagesLoader; +import com.discord.utilities.message.LocalMessageCreatorsKt; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.persister.Persister; import com.discord.utilities.time.ClockFactory; import j0.l.e.j; @@ -37,19 +39,20 @@ public class StoreMessagesHolder { private static final int MAX_MESSAGES_PER_CHANNEL_TRIM = 100; private final Object $lock = new Object[0]; private final Set activeChannels = new HashSet(); - private final Persister>> cache = new Persister<>("STORE_MESSAGES_CACHE_V32", new HashMap()); + private final Persister>> cache = new Persister<>("STORE_MESSAGES_CACHE_V35", new HashMap()); private boolean cacheEnabled; private Subscription cachePersistSubscription; private long cachePersistedAt = ClockFactory.get().currentTimeMillis(); - private Map> cacheSnapshot = Collections.emptyMap(); + private Map> cacheSnapshot = Collections.emptyMap(); private final Set detachedChannels; private Subject, Set> detachedChannelsSubject; private final Map messageNonceIds = new HashMap(); - private final LinkedHashMap> messages = new LinkedHashMap<>(); - private final Subject>, Map>> messagesPublisher = new SerializedSubject(BehaviorSubject.l0()); - private Map> messagesSnapshot = Collections.emptyMap(); + private final LinkedHashMap> messages = new LinkedHashMap<>(); + private final Subject>, Map>> messagesPublisher = new SerializedSubject(BehaviorSubject.l0()); + private Map> messagesSnapshot = Collections.emptyMap(); private long myUserId; private long selectedChannelId; + private final Set staleMessages = new HashSet(); private final Set updatedChannels = new HashSet(); public StoreMessagesHolder() { @@ -58,16 +61,16 @@ public class StoreMessagesHolder { this.detachedChannelsSubject = new SerializedSubject(BehaviorSubject.m0(new HashSet(hashSet))); } - private static ModelMessage addReaction(ModelMessage modelMessage, MessageReactionEmoji messageReactionEmoji, boolean z2) { + private static Message addReaction(Message message, MessageReactionEmoji messageReactionEmoji, boolean z2) { MessageReaction messageReaction; - Map reactions = modelMessage.getReactions(); + Map F = message.F(); String c2 = messageReactionEmoji.c(); - if (z2 && reactions.containsKey(c2) && reactions.get(c2).c()) { - return modelMessage; + if (z2 && F.containsKey(c2) && F.get(c2).c()) { + return message; } - LinkedHashMap linkedHashMap = new LinkedHashMap(reactions); + LinkedHashMap linkedHashMap = new LinkedHashMap(F); boolean z3 = true; - if (reactions.containsKey(c2)) { + if (F.containsKey(c2)) { MessageReaction messageReaction2 = (MessageReaction) linkedHashMap.get(messageReactionEmoji.c()); int a = messageReaction2.a() + 1; MessageReactionEmoji b = messageReaction2.b(); @@ -79,17 +82,17 @@ public class StoreMessagesHolder { messageReaction = new MessageReaction(1, messageReactionEmoji, z2); } linkedHashMap.put(c2, messageReaction); - return ModelMessage.createWithReactions(modelMessage, linkedHashMap); + return LocalMessageCreatorsKt.createWithReactions(message, linkedHashMap); } - private Map> computeMessagesCache() { + private Map> computeMessagesCache() { HashMap hashMap = new HashMap(); ListIterator listIterator = new ArrayList(this.messages.entrySet()).listIterator(this.messages.size()); int i = 8; while (listIterator.hasPrevious() && i > 0) { Map.Entry entry = (Map.Entry) listIterator.previous(); long longValue = ((Long) entry.getKey()).longValue(); - Map map = (Map) entry.getValue(); + Map map = (Map) entry.getValue(); if (map.size() > 0) { hashMap.put(Long.valueOf(longValue), computeMessagesCacheSubList(longValue, map)); i--; @@ -98,7 +101,7 @@ public class StoreMessagesHolder { return hashMap; } - private List computeMessagesCacheSubList(long j, @NonNull Map map) { + private List computeMessagesCacheSubList(long j, @NonNull Map map) { return new ArrayList(new ArrayList(map.values()).subList(Math.max(0, map.size() - (j == this.selectedChannelId ? 20 : 10)), map.size())); } @@ -117,7 +120,7 @@ public class StoreMessagesHolder { long j = this.cachePersistedAt + 60000; if (j < currentTimeMillis) { this.cachePersistedAt = currentTimeMillis; - Map> computeMessagesCache = computeMessagesCache(); + Map> computeMessagesCache = computeMessagesCache(); if (!this.cacheSnapshot.equals(computeMessagesCache)) { this.cacheSnapshot = computeMessagesCache; this.cache.set(computeMessagesCache); @@ -145,7 +148,7 @@ public class StoreMessagesHolder { long longValue = l.longValue(); hashMap.put(Long.valueOf(longValue), new ArrayList(this.messages.get(Long.valueOf(longValue)).values())); } - for (Map.Entry> entry : this.messagesSnapshot.entrySet()) { + for (Map.Entry> entry : this.messagesSnapshot.entrySet()) { long longValue2 = entry.getKey().longValue(); if (!this.updatedChannels.contains(Long.valueOf(longValue2))) { hashMap.put(Long.valueOf(longValue2), entry.getValue()); @@ -158,16 +161,16 @@ public class StoreMessagesHolder { } } - private static ModelMessage removeReaction(ModelMessage modelMessage, MessageReactionEmoji messageReactionEmoji, boolean z2) { - Map reactions = modelMessage.getReactions(); + private static Message removeReaction(Message message, MessageReactionEmoji messageReactionEmoji, boolean z2) { + Map F = message.F(); String c2 = messageReactionEmoji.c(); - if (!reactions.containsKey(c2)) { - return modelMessage; + if (!F.containsKey(c2)) { + return message; } - if (z2 && !reactions.get(c2).c()) { - return modelMessage; + if (z2 && !F.get(c2).c()) { + return message; } - LinkedHashMap linkedHashMap = new LinkedHashMap(reactions); + LinkedHashMap linkedHashMap = new LinkedHashMap(F); MessageReaction messageReaction = (MessageReaction) linkedHashMap.get(c2); boolean z3 = true; if (messageReaction.a() == 1) { @@ -183,16 +186,16 @@ public class StoreMessagesHolder { if (linkedHashMap.isEmpty()) { linkedHashMap = null; } - return ModelMessage.createWithReactions(modelMessage, linkedHashMap); + return LocalMessageCreatorsKt.createWithReactions(message, linkedHashMap); } - private boolean updateDetachedState(long j, Map map, boolean z2, boolean z3, boolean z4) { + private boolean updateDetachedState(long j, Map map, boolean z2, boolean z3, boolean z4) { int size = map.size(); boolean z5 = true; boolean z6 = size >= 200; if (z6) { int i = z2 ? 100 : size - 100; - Iterator> it = map.entrySet().iterator(); + Iterator> it = map.entrySet().iterator(); int i2 = 0; while (it.hasNext()) { it.next(); @@ -220,35 +223,35 @@ public class StoreMessagesHolder { messageCacheTryPersist(); } - public void addMessages(@NonNull List list) { + public void addMessages(@NonNull List list) { boolean z2; synchronized (this.$lock) { - for (ModelMessage modelMessage : list) { - long channelId = modelMessage.getChannelId(); - TreeMap treeMap = this.messages.get(Long.valueOf(channelId)); - if (isChannelActive(channelId) && !isChannelDetached(channelId)) { - String nonce = modelMessage.getNonce(); - if (modelMessage.isLocal()) { - this.messageNonceIds.put(nonce, Long.valueOf(modelMessage.getId())); + for (Message message : list) { + long i = message.i(); + TreeMap treeMap = this.messages.get(Long.valueOf(i)); + if (isChannelActive(i) && !isChannelDetached(i)) { + String B = message.B(); + if (MessageUtils.isLocal(message)) { + this.messageNonceIds.put(B, Long.valueOf(message.r())); } else { - Long l = this.messageNonceIds.get(nonce); + Long l = this.messageNonceIds.get(B); if (l != null) { - this.messageNonceIds.remove(nonce); + this.messageNonceIds.remove(B); if (treeMap.containsKey(l)) { treeMap.remove(l); z2 = true; - treeMap.put(Long.valueOf(modelMessage.getId()), modelMessage); - if (!updateDetachedState(channelId, treeMap, false, true, false) || !z2) { - this.updatedChannels.add(Long.valueOf(channelId)); + treeMap.put(Long.valueOf(message.r()), message); + if (!updateDetachedState(i, treeMap, false, true, false) || !z2) { + this.updatedChannels.add(Long.valueOf(i)); } } } } z2 = false; - treeMap.put(Long.valueOf(modelMessage.getId()), modelMessage); - if (!updateDetachedState(channelId, treeMap, false, true, false)) { + treeMap.put(Long.valueOf(message.r()), message); + if (!updateDetachedState(i, treeMap, false, true, false)) { } - this.updatedChannels.add(Long.valueOf(channelId)); + this.updatedChannels.add(Long.valueOf(i)); } } publishIfUpdated(); @@ -257,7 +260,7 @@ public class StoreMessagesHolder { public void deleteMessages(long j, @Nullable List list) { synchronized (this.$lock) { - TreeMap treeMap = this.messages.get(Long.valueOf(j)); + TreeMap treeMap = this.messages.get(Long.valueOf(j)); if (isChannelActive(j) && list != null) { if (!list.isEmpty()) { for (Long l : list) { @@ -278,30 +281,30 @@ public class StoreMessagesHolder { } @Nullable - public TreeMap getMessagesForChannel(Long l) { - TreeMap treeMap; + public TreeMap getMessagesForChannel(Long l) { + TreeMap treeMap; synchronized (this.$lock) { treeMap = this.messages.get(l); } return treeMap; } - public Observable>> getMessagesPublisher() { + public Observable>> getMessagesPublisher() { return this.messagesPublisher; } public void init(boolean z2) { synchronized (this.$lock) { if (z2) { - for (Map.Entry> entry : this.cache.get().entrySet()) { + for (Map.Entry> entry : this.cache.get().entrySet()) { if (entry != null) { if (entry.getKey() != null) { long longValue = entry.getKey().longValue(); - this.messages.put(Long.valueOf(longValue), new TreeMap<>(ModelMessage.getSortByIds())); - TreeMap treeMap = this.messages.get(Long.valueOf(longValue)); - for (ModelMessage modelMessage : entry.getValue()) { - modelMessage.markStale(); - treeMap.put(Long.valueOf(modelMessage.getId()), modelMessage); + this.messages.put(Long.valueOf(longValue), new TreeMap<>(MessageUtils.getSORT_BY_IDS_COMPARATOR())); + TreeMap treeMap = this.messages.get(Long.valueOf(longValue)); + for (Message message : entry.getValue()) { + this.staleMessages.add(Long.valueOf(message.r())); + treeMap.put(Long.valueOf(message.r()), message); } this.updatedChannels.add(Long.valueOf(longValue)); } @@ -315,9 +318,9 @@ public class StoreMessagesHolder { public void invalidate() { synchronized (this.$lock) { - for (Map.Entry> entry : this.messages.entrySet()) { - for (Map.Entry entry2 : entry.getValue().entrySet()) { - entry2.getValue().markStale(); + for (Map.Entry> entry : this.messages.entrySet()) { + for (Map.Entry entry2 : entry.getValue().entrySet()) { + this.staleMessages.add(Long.valueOf(entry2.getValue().r())); } } this.activeChannels.clear(); @@ -328,24 +331,26 @@ public class StoreMessagesHolder { public void loadMessageChunks(@NonNull List list) { synchronized (this.$lock) { for (StoreMessagesLoader.ChannelChunk channelChunk : list) { - List messages = channelChunk.getMessages(); + List messages = channelChunk.getMessages(); long channelId = channelChunk.getChannelId(); if (this.activeChannels.contains(Long.valueOf(channelId))) { - TreeMap treeMap = this.messages.get(Long.valueOf(channelId)); + TreeMap treeMap = this.messages.get(Long.valueOf(channelId)); boolean isChannelDetached = isChannelDetached(channelId); boolean isJump = channelChunk.isJump(); boolean isInitial = channelChunk.isInitial(); boolean isPresent = channelChunk.isPresent(); if (isInitial || isJump) { - Iterator> it = treeMap.entrySet().iterator(); + Iterator> it = treeMap.entrySet().iterator(); while (it.hasNext()) { - if (it.next().getValue().isStale() || isChannelDetached || isJump) { + Long valueOf = Long.valueOf(it.next().getValue().r()); + if (this.staleMessages.contains(valueOf) || isChannelDetached || isJump) { it.remove(); + this.staleMessages.remove(valueOf); } } } - for (ModelMessage modelMessage : messages) { - treeMap.put(Long.valueOf(modelMessage.getId()), modelMessage); + for (Message message : messages) { + treeMap.put(Long.valueOf(message.r()), message); } updateDetachedState(channelId, treeMap, channelChunk.isAppendingTop(), isPresent, isJump); this.updatedChannels.add(Long.valueOf(channelId)); @@ -360,10 +365,10 @@ public class StoreMessagesHolder { long a = messageReactionUpdate.a(); if (isChannelActive(a)) { long c2 = messageReactionUpdate.c(); - TreeMap treeMap = this.messages.get(Long.valueOf(a)); - ModelMessage modelMessage = treeMap.get(Long.valueOf(c2)); - if (modelMessage != null) { - treeMap.put(Long.valueOf(c2), ModelMessage.createWithReactions(modelMessage, null)); + TreeMap treeMap = this.messages.get(Long.valueOf(a)); + Message message = treeMap.get(Long.valueOf(c2)); + if (message != null) { + treeMap.put(Long.valueOf(c2), LocalMessageCreatorsKt.createWithReactions(message, null)); this.updatedChannels.add(Long.valueOf(a)); publishIfUpdated(); } @@ -376,20 +381,20 @@ public class StoreMessagesHolder { long a = messageReactionUpdate.a(); if (isChannelActive(a)) { long c2 = messageReactionUpdate.c(); - TreeMap treeMap = this.messages.get(Long.valueOf(a)); - ModelMessage modelMessage = treeMap.get(Long.valueOf(c2)); - if (modelMessage != null) { + TreeMap treeMap = this.messages.get(Long.valueOf(a)); + Message message = treeMap.get(Long.valueOf(c2)); + if (message != null) { String c3 = messageReactionUpdate.b().c(); - Map reactions = modelMessage.getReactions(); - if (reactions.containsKey(c3)) { + Map F = message.F(); + if (F.containsKey(c3)) { LinkedHashMap linkedHashMap = new LinkedHashMap(); - for (Map.Entry entry : reactions.entrySet()) { + for (Map.Entry entry : F.entrySet()) { String key = entry.getKey(); if (!key.equals(c3)) { linkedHashMap.put(key, entry.getValue()); } } - treeMap.put(Long.valueOf(c2), ModelMessage.createWithReactions(modelMessage, linkedHashMap)); + treeMap.put(Long.valueOf(c2), LocalMessageCreatorsKt.createWithReactions(message, linkedHashMap)); this.updatedChannels.add(Long.valueOf(a)); publishIfUpdated(); } @@ -405,27 +410,27 @@ public class StoreMessagesHolder { public void setSelectedChannelId(long j) { synchronized (this.$lock) { this.selectedChannelId = j; - TreeMap treeMap = this.messages.get(Long.valueOf(j)); + TreeMap treeMap = this.messages.get(Long.valueOf(j)); if (treeMap != null) { this.messages.remove(Long.valueOf(j)); this.messages.put(Long.valueOf(j), treeMap); } else { - this.messages.put(Long.valueOf(j), new TreeMap<>(ModelMessage.getSortByIds())); + this.messages.put(Long.valueOf(j), new TreeMap<>(MessageUtils.getSORT_BY_IDS_COMPARATOR())); } this.activeChannels.add(Long.valueOf(j)); } } - public void updateMessages(@NonNull ModelMessage modelMessage) { + public void updateMessages(@NonNull Message message) { synchronized (this.$lock) { - long channelId = modelMessage.getChannelId(); - TreeMap treeMap = this.messages.get(Long.valueOf(channelId)); - if (isChannelActive(channelId)) { - ModelMessage modelMessage2 = treeMap.get(Long.valueOf(modelMessage.getId())); - if (!isChannelDetached(channelId)) { - if (modelMessage2 != null) { - treeMap.put(Long.valueOf(modelMessage.getId()), new ModelMessage(modelMessage2, modelMessage)); - this.updatedChannels.add(Long.valueOf(channelId)); + long i = message.i(); + TreeMap treeMap = this.messages.get(Long.valueOf(i)); + if (isChannelActive(i)) { + Message message2 = treeMap.get(Long.valueOf(message.r())); + if (!isChannelDetached(i)) { + if (message2 != null) { + treeMap.put(Long.valueOf(message.r()), MessageUtils.merge(message2, message)); + this.updatedChannels.add(Long.valueOf(i)); } } return; @@ -442,10 +447,10 @@ public class StoreMessagesHolder { long c2 = messageReactionUpdate.c(); MessageReactionEmoji b = messageReactionUpdate.b(); boolean z3 = messageReactionUpdate.d() == this.myUserId; - TreeMap treeMap = this.messages.get(Long.valueOf(a)); - ModelMessage modelMessage = treeMap.get(Long.valueOf(c2)); - if (modelMessage != null) { - treeMap.put(Long.valueOf(c2), z2 ? addReaction(modelMessage, b, z3) : removeReaction(modelMessage, b, z3)); + TreeMap treeMap = this.messages.get(Long.valueOf(a)); + Message message = treeMap.get(Long.valueOf(c2)); + if (message != null) { + treeMap.put(Long.valueOf(c2), z2 ? addReaction(message, b, z3) : removeReaction(message, b, z3)); this.updatedChannels.add(Long.valueOf(a)); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java index 03dc9da1e9..53e62f5e5b 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$handleLoadedMessages$1.java @@ -1,6 +1,7 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; +import com.discord.api.user.User; import com.discord.stores.StoreMessagesLoader; import d0.z.d.m; import d0.z.d.o; @@ -40,20 +41,21 @@ public final class StoreMessagesLoader$handleLoadedMessages$1 extends o implemen break; } obj = it.next(); - if (((ModelMessage) obj).getAuthor().i() == StoreMessagesLoader.access$getStream$p(this.this$0).getUsers$app_productionGoogleRelease().getMe().getId()) { - z2 = true; + User g = ((Message) obj).g(); + if (g == null || g.i() != StoreMessagesLoader.access$getStream$p(this.this$0).getUsers$app_productionGoogleRelease().getMe().getId()) { + z2 = false; continue; } else { - z2 = false; + z2 = true; continue; } if (z2) { break; } } - ModelMessage modelMessage = (ModelMessage) obj; - if (modelMessage != null) { - l = Long.valueOf(modelMessage.getId()); + Message message = (Message) obj; + if (message != null) { + l = Long.valueOf(message.r()); } return StoreMessagesLoader.ChannelLoadedState.copy$default(channelLoadedState, isInitialMessagesLoaded, isOldestMessagesLoaded, false, false, l, 8, null); } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java index abc66922ce..2653ff7b42 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$1.java @@ -1,6 +1,6 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessagesLoader; import d0.z.d.m; import d0.z.d.o; @@ -8,7 +8,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; import rx.subjects.SerializedSubject; /* compiled from: StoreMessagesLoader.kt */ -public final class StoreMessagesLoader$jumpToMessage$1 extends o implements Function1 { +public final class StoreMessagesLoader$jumpToMessage$1 extends o implements Function1 { public final /* synthetic */ long $channelId; public final /* synthetic */ long $messageId; public final /* synthetic */ StoreMessagesLoader this$0; @@ -39,15 +39,15 @@ public final class StoreMessagesLoader$jumpToMessage$1 extends o implements Func /* 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(ModelMessage modelMessage) { - invoke(modelMessage); + public /* bridge */ /* synthetic */ Unit invoke(Message message) { + invoke(message); return Unit.a; } - public final synchronized void invoke(ModelMessage modelMessage) { - if (modelMessage != null) { + public final synchronized void invoke(Message message) { + if (message != null) { SerializedSubject access$getScrollToSubject$p = StoreMessagesLoader.access$getScrollToSubject$p(this.this$0); - access$getScrollToSubject$p.j.onNext(Long.valueOf(modelMessage.getId())); + access$getScrollToSubject$p.j.onNext(Long.valueOf(message.r())); } else { StoreMessagesLoader.access$channelLoadedStateUpdate(this.this$0, this.$channelId, AnonymousClass1.INSTANCE); StoreMessagesLoader.tryLoadMessages$default(this.this$0, 0, true, false, false, Long.valueOf(this.$channelId), Long.valueOf(this.$messageId), 9, null); diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java index e7003ea1e1..a803dc75f0 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$4.java @@ -1,10 +1,10 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import j0.k.b; import rx.Observable; /* compiled from: StoreMessagesLoader.kt */ -public final class StoreMessagesLoader$jumpToMessage$4 implements b> { +public final class StoreMessagesLoader$jumpToMessage$4 implements b> { public final /* synthetic */ long $channelId; public final /* synthetic */ long $messageId; public final /* synthetic */ StoreMessagesLoader this$0; @@ -15,7 +15,7 @@ public final class StoreMessagesLoader$jumpToMessage$4 implements b call(Long l) { + public final Observable call(Long l) { return StoreMessagesLoader.access$getStream$p(this.this$0).getMessages$app_productionGoogleRelease().observeMessagesForChannel(this.$channelId, this.$messageId); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java index dee3d30ac1..780c51ab48 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$jumpToMessage$5.java @@ -1,26 +1,26 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StoreMessagesLoader.kt */ -public final class StoreMessagesLoader$jumpToMessage$5 extends o implements Function1 { +public final class StoreMessagesLoader$jumpToMessage$5 extends o implements Function1 { public final /* synthetic */ StoreMessagesLoader$jumpToMessage$1 $handleTargetChannelSelected$1; public final /* synthetic */ StoreMessagesLoader this$0; /* compiled from: StoreMessagesLoader.kt */ /* renamed from: com.discord.stores.StoreMessagesLoader$jumpToMessage$5$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ StoreMessagesLoader$jumpToMessage$5 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreMessagesLoader$jumpToMessage$5 storeMessagesLoader$jumpToMessage$5, ModelMessage modelMessage) { + public AnonymousClass1(StoreMessagesLoader$jumpToMessage$5 storeMessagesLoader$jumpToMessage$5, Message message) { super(0); this.this$0 = storeMessagesLoader$jumpToMessage$5; - this.$message = modelMessage; + this.$message = message; } @Override // kotlin.jvm.functions.Function0 @@ -40,12 +40,12 @@ public final class StoreMessagesLoader$jumpToMessage$5 extends o implements Func /* 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(ModelMessage modelMessage) { - invoke(modelMessage); + public /* bridge */ /* synthetic */ Unit invoke(Message message) { + invoke(message); return Unit.a; } - public final void invoke(ModelMessage modelMessage) { - StoreMessagesLoader.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, modelMessage)); + public final void invoke(Message message) { + StoreMessagesLoader.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, message)); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java index 5f38841b11..8d4001802d 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1.java @@ -1,6 +1,6 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessagesLoader; import d0.z.d.m; import d0.z.d.o; @@ -8,7 +8,7 @@ import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: StoreMessagesLoader.kt */ -public final class StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1 extends o implements Function1, Unit> { +public final class StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1 extends o implements Function1, Unit> { public final /* synthetic */ long $channelId$inlined; public final /* synthetic */ StoreMessagesLoader.ChannelLoadedState $channelLoadedState$inlined; public final /* synthetic */ StoreMessagesLoader$tryLoadMessages$4 $loadPagedMessages$4$inlined; @@ -30,12 +30,12 @@ public final class StoreMessagesLoader$tryLoadMessages$$inlined$apply$lambda$1 e /* 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(List list) { - invoke(list); + public /* bridge */ /* synthetic */ Unit invoke(List list) { + invoke((List) list); return Unit.a; } - public final void invoke(List list) { + public final void invoke(List list) { StoreMessagesLoader$tryLoadMessages$4 storeMessagesLoader$tryLoadMessages$4 = this.$loadPagedMessages$4$inlined; long j = this.$channelId$inlined; m.checkNotNullExpressionValue(list, "messages"); diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java index bd2ff921a1..92890720d7 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$3.java @@ -1,7 +1,7 @@ package com.discord.stores; import android.content.Context; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessagesLoader; import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPI; @@ -37,7 +37,7 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu /* compiled from: StoreMessagesLoader.kt */ /* renamed from: com.discord.stores.StoreMessagesLoader$tryLoadMessages$3$2 reason: invalid class name */ - public static final class AnonymousClass2 extends o implements Function1, Unit> { + public static final class AnonymousClass2 extends o implements Function1, Unit> { public final /* synthetic */ Long $after; public final /* synthetic */ Long $before; public final /* synthetic */ long $channelId; @@ -57,12 +57,12 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu /* 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(List list) { - invoke(list); + public /* bridge */ /* synthetic */ Unit invoke(List list) { + invoke((List) list); return Unit.a; } - public final void invoke(List list) { + public final void invoke(List list) { m.checkNotNullParameter(list, "it"); StoreMessagesLoader storeMessagesLoader = this.this$0.this$0; long j = this.$channelId; @@ -142,7 +142,7 @@ public final class StoreMessagesLoader$tryLoadMessages$3 extends o implements Fu } public final synchronized void invoke(long j, Long l, Long l2, Long l3) { - Observable> observable; + Observable> observable; StoreMessagesLoader.access$channelLoadedStateUpdate(this.this$0, j, AnonymousClass1.INSTANCE); if (l != null) { if (l.longValue() == 1) { diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java index 07198a8031..52cfe10562 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader$tryLoadMessages$4.java @@ -1,6 +1,6 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreMessagesLoader; import d0.z.d.m; import d0.z.d.o; @@ -9,7 +9,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function4; /* compiled from: StoreMessagesLoader.kt */ -public final class StoreMessagesLoader$tryLoadMessages$4 extends o implements Function4, Boolean, Boolean, Unit> { +public final class StoreMessagesLoader$tryLoadMessages$4 extends o implements Function4, Boolean, Boolean, Unit> { public final /* synthetic */ StoreMessagesLoader$tryLoadMessages$3 $loadMessages$3; public final /* synthetic */ StoreMessagesLoader this$0; @@ -38,21 +38,21 @@ public final class StoreMessagesLoader$tryLoadMessages$4 extends o implements Fu /* 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, java.lang.Object, java.lang.Object, java.lang.Object] */ @Override // kotlin.jvm.functions.Function4 - public /* bridge */ /* synthetic */ Unit invoke(Long l, List list, Boolean bool, Boolean bool2) { - invoke(l.longValue(), list, bool.booleanValue(), bool2.booleanValue()); + public /* bridge */ /* synthetic */ Unit invoke(Long l, List list, Boolean bool, Boolean bool2) { + invoke(l.longValue(), (List) list, bool.booleanValue(), bool2.booleanValue()); return Unit.a; } - public final synchronized void invoke(long j, List list, boolean z2, boolean z3) { + public final synchronized void invoke(long j, List list, boolean z2, boolean z3) { m.checkNotNullParameter(list, "messages"); if (list.isEmpty()) { StoreMessagesLoader.access$channelLoadedStateUpdate(this.this$0, j, AnonymousClass1.INSTANCE); return; } if (z2) { - StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, Long.valueOf(((ModelMessage) list.get(0)).getId()), null, 10, null); + StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, Long.valueOf(list.get(0).r()), null, 10, null); } else if (z3) { - StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, null, Long.valueOf(((ModelMessage) list.get(list.size() - 1)).getId()), 6, null); + StoreMessagesLoader$tryLoadMessages$3.invoke$default(this.$loadMessages$3, j, null, null, Long.valueOf(list.get(list.size() - 1).r()), 6, null); } } } diff --git a/app/src/main/java/com/discord/stores/StoreMessagesLoader.java b/app/src/main/java/com/discord/stores/StoreMessagesLoader.java index 54534cc208..36873bc971 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesLoader.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesLoader.java @@ -4,8 +4,8 @@ import a0.a.a.b; import android.content.Context; import c.a.d.q; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.app.AppLog; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StoreChat; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1; @@ -59,11 +59,9 @@ public final class StoreMessagesLoader extends Store { private final boolean isInitial; private final boolean isJump; private final boolean isPresent; - private final List messages; + private final List messages; - /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public ChannelChunk(long j, List list, boolean z2, boolean z3, boolean z4, boolean z5) { + public ChannelChunk(long j, List list, boolean z2, boolean z3, boolean z4, boolean z5) { m.checkNotNullParameter(list, "messages"); this.channelId = j; this.messages = list; @@ -81,7 +79,7 @@ public final class StoreMessagesLoader extends Store { return this.channelId; } - public final List component2() { + public final List component2() { return this.messages; } @@ -101,7 +99,7 @@ public final class StoreMessagesLoader extends Store { return this.isJump; } - public final ChannelChunk copy(long j, List list, boolean z2, boolean z3, boolean z4, boolean z5) { + public final ChannelChunk copy(long j, List list, boolean z2, boolean z3, boolean z4, boolean z5) { m.checkNotNullParameter(list, "messages"); return new ChannelChunk(j, list, z2, z3, z4, z5); } @@ -121,13 +119,13 @@ public final class StoreMessagesLoader extends Store { return this.channelId; } - public final List getMessages() { + public final List getMessages() { return this.messages; } public int hashCode() { int a = b.a(this.channelId) * 31; - List list = this.messages; + List list = this.messages; int hashCode = (a + (list != null ? list.hashCode() : 0)) * 31; boolean z2 = this.isInitial; int i = 1; @@ -492,7 +490,7 @@ public final class StoreMessagesLoader extends Store { /* JADX WARNING: Removed duplicated region for block: B:35:0x0082 */ /* JADX WARNING: Removed duplicated region for block: B:36:0x008e */ /* JADX WARNING: Removed duplicated region for block: B:39:0x009f */ - private final synchronized void handleLoadedMessages(List list, long j, long j2, Long l, Long l2) { + private final synchronized void handleLoadedMessages(List list, long j, long j2, Long l, Long l2) { boolean z2; boolean z3; Object obj; @@ -524,7 +522,7 @@ public final class StoreMessagesLoader extends Store { break; } obj = it.next(); - if (((ModelMessage) obj).getId() == j2) { + if (((Message) obj).r() == j2) { z4 = true; continue; } else { @@ -535,11 +533,11 @@ public final class StoreMessagesLoader extends Store { break; } } - ModelMessage modelMessage = (ModelMessage) obj; - if (modelMessage == null) { + Message message = (Message) obj; + if (message == null) { StoreStream.Companion.getReadStates().markAsRead(Long.valueOf(j)); } else { - this.scrollToSubject.j.onNext(Long.valueOf(modelMessage.getId())); + this.scrollToSubject.j.onNext(Long.valueOf(message.r())); } } if (!z8 && !z3) { diff --git a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java index 7ba040c360..a53aab898d 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesMostRecent.java @@ -3,13 +3,14 @@ package com.discord.stores; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.guild.Guild; +import com.discord.api.message.Message; import com.discord.models.domain.ModelChannelUnreadUpdate; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelPayload; import com.discord.models.domain.ModelReadState; import com.discord.models.thread.dto.ModelThreadListSync; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.persister.Persister; import d0.t.h0; import d0.z.d.m; @@ -64,15 +65,15 @@ public final class StoreMessagesMostRecent extends StoreV2 { } @StoreThread - private final void mostRecentIdsUpdateFromMessage(ModelMessage modelMessage) { - if (updateMostRecentIds(modelMessage.getChannelId(), modelMessage.getId())) { + private final void mostRecentIdsUpdateFromMessage(Message message) { + if (updateMostRecentIds(message.i(), message.r())) { markChanged(); } } @StoreThread private final boolean updateMostRecentIds(long j, long j2) { - boolean z2 = ModelMessage.compare(this.mostRecentIds.get(Long.valueOf(j)), Long.valueOf(j2)) < 0; + boolean z2 = MessageUtils.compareMessages(this.mostRecentIds.get(Long.valueOf(j)), Long.valueOf(j2)) < 0; if (z2) { this.mostRecentIds.put(Long.valueOf(j), Long.valueOf(j2)); } @@ -142,9 +143,9 @@ public final class StoreMessagesMostRecent extends StoreV2 { } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - mostRecentIdsUpdateFromMessage(modelMessage); + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + mostRecentIdsUpdateFromMessage(message); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java b/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java index ffd810fb3d..a54e61ee1e 100644 --- a/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java +++ b/app/src/main/java/com/discord/stores/StoreNotifications$displayPopup$1.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.Intent; import android.view.View; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.utilities.intent.IntentUtils; import d0.z.d.m; import d0.z.d.o; @@ -13,13 +13,13 @@ import kotlin.jvm.functions.Function1; /* compiled from: StoreNotifications.kt */ public final class StoreNotifications$displayPopup$1 extends o implements Function1 { public final /* synthetic */ Channel $channel; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreNotifications$displayPopup$1(Channel channel, ModelMessage modelMessage) { + public StoreNotifications$displayPopup$1(Channel channel, Message message) { super(1); this.$channel = channel; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -32,7 +32,7 @@ public final class StoreNotifications$displayPopup$1 extends o implements Functi public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - Intent selectChannel = IntentUtils.RouteBuilders.selectChannel(this.$channel.g(), this.$channel.e(), Long.valueOf(this.$message.getId())); + Intent selectChannel = IntentUtils.RouteBuilders.selectChannel(this.$channel.g(), this.$channel.e(), Long.valueOf(this.$message.r())); selectChannel.putExtra("com.discord.intent.ORIGIN_SOURCE", "com.discord.intent.ORIGIN_NOTIF_INAPP"); IntentUtils intentUtils = IntentUtils.INSTANCE; Context context = view.getContext(); diff --git a/app/src/main/java/com/discord/stores/StoreNotifications.java b/app/src/main/java/com/discord/stores/StoreNotifications.java index c02caeaa33..24b5d213e1 100644 --- a/app/src/main/java/com/discord/stores/StoreNotifications.java +++ b/app/src/main/java/com/discord/stores/StoreNotifications.java @@ -6,8 +6,8 @@ import c.a.d.q; import c.a.e.d; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.presence.ClientStatus; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreStream; @@ -95,13 +95,13 @@ public final class StoreNotifications extends Store { ObservableExtensionsKt.appSubscribe$default(s2, (Context) null, "nsClient", (Function1) null, StoreNotifications$configureNotificationClient$3.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null); } - private final void displayPopup(ModelMessage modelMessage, Channel channel) { + private final void displayPopup(Message message, Channel channel) { Context context; - if ((modelMessage.getId() >>> 22) + 1420070400000L + 10000 > this.clock.currentTimeMillis() && (context = this.context) != null) { + if ((message.r() >>> 22) + 1420070400000L + 10000 > this.clock.currentTimeMillis() && (context = this.context) != null) { NoticePopupChannel noticePopupChannel = NoticePopupChannel.INSTANCE; StringBuilder L = a.L("{InAppNotif}#"); - L.append(modelMessage.getChannelId()); - noticePopupChannel.enqueue(context, L.toString(), modelMessage, new StoreNotifications$displayPopup$1(channel, modelMessage)); + L.append(message.i()); + noticePopupChannel.enqueue(context, L.toString(), message, new StoreNotifications$displayPopup$1(channel, message)); } } @@ -146,15 +146,15 @@ public final class StoreNotifications extends Store { @StoreThread public final void handleChannelSelected(long j) { - c.q.a.k.a.F(c.q.a.k.a.a(j0.a), null, null, new StoreNotifications$handleChannelSelected$1(j, null), 3, null); + c.q.a.k.a.G(c.q.a.k.a.a(j0.a), null, null, new StoreNotifications$handleChannelSelected$1(j, null), 3, null); } - /* JADX WARNING: Removed duplicated region for block: B:28:0x00ca */ - /* JADX WARNING: Removed duplicated region for block: B:40:? A[RETURN, SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:29:0x00ce */ + /* JADX WARNING: Removed duplicated region for block: B:41:? A[RETURN, SYNTHETIC] */ @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { + public final void handleMessageCreate(Message message) { Channel channel; - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); if (this.notificationSettings.get().isEnabledInApp() && this.stream.getPresences$app_productionGoogleRelease().getLocalPresence$app_productionGoogleRelease().getStatus() != ClientStatus.DND) { Map relationships = this.stream.getUserRelationships$app_productionGoogleRelease().getRelationships(); LinkedHashMap linkedHashMap = new LinkedHashMap(); @@ -163,22 +163,19 @@ public final class StoreNotifications extends Store { linkedHashMap.put(entry.getKey(), entry.getValue()); } } - if (modelMessage.getChannelId() != this.stream.getChannelsSelected$app_productionGoogleRelease().getId()) { + if (message.i() != this.stream.getChannelsSelected$app_productionGoogleRelease().getId()) { Map> channelsByGuildInternal$app_productionGoogleRelease = this.stream.getChannels$app_productionGoogleRelease().getChannelsByGuildInternal$app_productionGoogleRelease(); - long guildId = modelMessage.getGuildId(); - if (guildId == null) { - guildId = 0L; - } - Map map = channelsByGuildInternal$app_productionGoogleRelease.get(guildId); - Channel channel2 = this.stream.getChannels$app_productionGoogleRelease().getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(modelMessage.getChannelId())); + Long o = message.o(); + Map map = channelsByGuildInternal$app_productionGoogleRelease.get(Long.valueOf(o != null ? o.longValue() : 0)); + Channel channel2 = this.stream.getChannels$app_productionGoogleRelease().getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(message.i())); if (channel2 == null) { if (map != null) { - channel2 = map.get(Long.valueOf(modelMessage.getChannelId())); + channel2 = map.get(Long.valueOf(message.i())); } else { channel = null; if (channel == null) { - if (NotificationTextUtils.INSTANCE.shouldNotifyInAppPopup(this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease(), modelMessage, channel, linkedHashMap, map != null ? map.get(Long.valueOf(channel.q())) : null, (Guild) a.c(channel, this.stream.getGuilds$app_productionGoogleRelease().getGuildsInternal$app_productionGoogleRelease()), this.stream.getGuilds$app_productionGoogleRelease().getGuildMembersComputedInternal$app_productionGoogleRelease(), this.stream.getGuildSettings$app_productionGoogleRelease().getGuildSettingsInternal$app_productionGoogleRelease(), this.stream.getThreadsJoined$app_productionGoogleRelease().getAllJoinedThreadsInternal$app_productionGoogleRelease())) { - displayPopup(modelMessage, channel); + if (NotificationTextUtils.INSTANCE.shouldNotifyInAppPopup(this.stream.getUsers$app_productionGoogleRelease().getMeInternal$app_productionGoogleRelease(), message, channel, linkedHashMap, map != null ? map.get(Long.valueOf(channel.q())) : null, (Guild) a.c(channel, this.stream.getGuilds$app_productionGoogleRelease().getGuildsInternal$app_productionGoogleRelease()), this.stream.getGuilds$app_productionGoogleRelease().getGuildMembersComputedInternal$app_productionGoogleRelease(), this.stream.getGuildSettings$app_productionGoogleRelease().getGuildSettingsInternal$app_productionGoogleRelease(), this.stream.getThreadsJoined$app_productionGoogleRelease().getAllJoinedThreadsInternal$app_productionGoogleRelease())) { + displayPopup(message, channel); return; } return; diff --git a/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java b/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java index 744d3708de..3ed558faf5 100644 --- a/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java +++ b/app/src/main/java/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.java @@ -2,8 +2,8 @@ package com.discord.stores; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StorePendingReplies; import d0.z.d.o; import kotlin.Unit; @@ -11,17 +11,17 @@ import kotlin.jvm.functions.Function0; /* compiled from: StorePendingReplies.kt */ public final class StorePendingReplies$onCreatePendingReply$1 extends o implements Function0 { public final /* synthetic */ Channel $channel; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ boolean $shouldMention; public final /* synthetic */ boolean $showMentionToggle; public final /* synthetic */ StorePendingReplies this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StorePendingReplies$onCreatePendingReply$1(StorePendingReplies storePendingReplies, Channel channel, ModelMessage modelMessage, boolean z2, boolean z3) { + public StorePendingReplies$onCreatePendingReply$1(StorePendingReplies storePendingReplies, Channel channel, Message message, boolean z2, boolean z3) { super(0); this.this$0 = storePendingReplies; this.$channel = channel; - this.$message = modelMessage; + this.$message = message; this.$shouldMention = z2; this.$showMentionToggle = z3; } @@ -29,7 +29,7 @@ public final class StorePendingReplies$onCreatePendingReply$1 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - StorePendingReplies.access$getPendingReplies$p(this.this$0).put(Long.valueOf(this.$channel.g()), new StorePendingReplies.PendingReply(new MessageReference(AnimatableValueParser.r1(this.$channel) ? null : Long.valueOf(this.$channel.e()), Long.valueOf(this.$channel.g()), Long.valueOf(this.$message.getId())), this.$message, this.$shouldMention, this.$showMentionToggle)); + StorePendingReplies.access$getPendingReplies$p(this.this$0).put(Long.valueOf(this.$channel.g()), new StorePendingReplies.PendingReply(new MessageReference(AnimatableValueParser.r1(this.$channel) ? null : Long.valueOf(this.$channel.e()), Long.valueOf(this.$channel.g()), Long.valueOf(this.$message.r())), this.$message, this.$shouldMention, this.$showMentionToggle)); this.this$0.markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StorePendingReplies.java b/app/src/main/java/com/discord/stores/StorePendingReplies.java index af7b86d0e6..72eafa7129 100644 --- a/app/src/main/java/com/discord/stores/StorePendingReplies.java +++ b/app/src/main/java/com/discord/stores/StorePendingReplies.java @@ -2,8 +2,8 @@ package com.discord.stores; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelMessageDelete; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; @@ -23,25 +23,25 @@ public final class StorePendingReplies extends StoreV2 { /* compiled from: StorePendingReplies.kt */ public static final class PendingReply { private final MessageReference messageReference; - private final ModelMessage originalMessage; + private final Message originalMessage; private boolean shouldMention; private final boolean showMentionToggle; - public PendingReply(MessageReference messageReference, ModelMessage modelMessage, boolean z2, boolean z3) { + public PendingReply(MessageReference messageReference, Message message, boolean z2, boolean z3) { m.checkNotNullParameter(messageReference, "messageReference"); - m.checkNotNullParameter(modelMessage, "originalMessage"); + m.checkNotNullParameter(message, "originalMessage"); this.messageReference = messageReference; - this.originalMessage = modelMessage; + this.originalMessage = message; this.shouldMention = z2; this.showMentionToggle = z3; } - public static /* synthetic */ PendingReply copy$default(PendingReply pendingReply, MessageReference messageReference, ModelMessage modelMessage, boolean z2, boolean z3, int i, Object obj) { + public static /* synthetic */ PendingReply copy$default(PendingReply pendingReply, MessageReference messageReference, Message message, boolean z2, boolean z3, int i, Object obj) { if ((i & 1) != 0) { messageReference = pendingReply.messageReference; } if ((i & 2) != 0) { - modelMessage = pendingReply.originalMessage; + message = pendingReply.originalMessage; } if ((i & 4) != 0) { z2 = pendingReply.shouldMention; @@ -49,14 +49,14 @@ public final class StorePendingReplies extends StoreV2 { if ((i & 8) != 0) { z3 = pendingReply.showMentionToggle; } - return pendingReply.copy(messageReference, modelMessage, z2, z3); + return pendingReply.copy(messageReference, message, z2, z3); } public final MessageReference component1() { return this.messageReference; } - public final ModelMessage component2() { + public final Message component2() { return this.originalMessage; } @@ -68,10 +68,10 @@ public final class StorePendingReplies extends StoreV2 { return this.showMentionToggle; } - public final PendingReply copy(MessageReference messageReference, ModelMessage modelMessage, boolean z2, boolean z3) { + public final PendingReply copy(MessageReference messageReference, Message message, boolean z2, boolean z3) { m.checkNotNullParameter(messageReference, "messageReference"); - m.checkNotNullParameter(modelMessage, "originalMessage"); - return new PendingReply(messageReference, modelMessage, z2, z3); + m.checkNotNullParameter(message, "originalMessage"); + return new PendingReply(messageReference, message, z2, z3); } public boolean equals(Object obj) { @@ -89,7 +89,7 @@ public final class StorePendingReplies extends StoreV2 { return this.messageReference; } - public final ModelMessage getOriginalMessage() { + public final Message getOriginalMessage() { return this.originalMessage; } @@ -105,9 +105,9 @@ public final class StorePendingReplies extends StoreV2 { MessageReference messageReference = this.messageReference; int i = 0; int hashCode = (messageReference != null ? messageReference.hashCode() : 0) * 31; - ModelMessage modelMessage = this.originalMessage; - if (modelMessage != null) { - i = modelMessage.hashCode(); + Message message = this.originalMessage; + if (message != null) { + i = message.hashCode(); } int i2 = (hashCode + i) * 31; boolean z2 = this.shouldMention; @@ -160,14 +160,14 @@ public final class StorePendingReplies extends StoreV2 { return storePendingReplies.pendingReplies; } - public static /* synthetic */ void onCreatePendingReply$default(StorePendingReplies storePendingReplies, Channel channel, ModelMessage modelMessage, boolean z2, boolean z3, int i, Object obj) { + public static /* synthetic */ void onCreatePendingReply$default(StorePendingReplies storePendingReplies, Channel channel, Message message, boolean z2, boolean z3, int i, Object obj) { if ((i & 4) != 0) { z2 = true; } if ((i & 8) != 0) { z3 = true; } - storePendingReplies.onCreatePendingReply(channel, modelMessage, z2, z3); + storePendingReplies.onCreatePendingReply(channel, message, z2, z3); } public final PendingReply getPendingReply(long j) { @@ -194,10 +194,10 @@ public final class StorePendingReplies extends StoreV2 { return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePendingReplies$observePendingReply$1(this, j), 14, null); } - public final void onCreatePendingReply(Channel channel, ModelMessage modelMessage, boolean z2, boolean z3) { + public final void onCreatePendingReply(Channel channel, Message message, boolean z2, boolean z3) { m.checkNotNullParameter(channel, "channel"); - m.checkNotNullParameter(modelMessage, "message"); - this.dispatcher.schedule(new StorePendingReplies$onCreatePendingReply$1(this, channel, modelMessage, z2, z3)); + m.checkNotNullParameter(message, "message"); + this.dispatcher.schedule(new StorePendingReplies$onCreatePendingReply$1(this, channel, message, z2, z3)); } public final void onDeletePendingReply(long j) { diff --git a/app/src/main/java/com/discord/stores/StorePermissions.java b/app/src/main/java/com/discord/stores/StorePermissions.java index e0cd30899d..b41428ba17 100644 --- a/app/src/main/java/com/discord/stores/StorePermissions.java +++ b/app/src/main/java/com/discord/stores/StorePermissions.java @@ -2,12 +2,12 @@ package com.discord.stores; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; import com.discord.api.stageinstance.StageInstance; import com.discord.api.thread.ThreadMember; import com.discord.api.thread.ThreadMemberUpdate; import com.discord.api.thread.ThreadMembersUpdate; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.thread.dto.ModelThreadListSync; @@ -243,14 +243,14 @@ public final class StorePermissions extends StoreV2 { } @StoreThread - public final void handleMessagesLoaded(List list) { + public final void handleMessagesLoaded(List list) { m.checkNotNullParameter(list, "messages"); if (getMeId() != 0) { ArrayList arrayList = new ArrayList(); - for (ModelMessage modelMessage : list) { - Channel thread = modelMessage.getThread(); - if (thread != null) { - arrayList.add(thread); + for (Message message : list) { + Channel J = message.J(); + if (J != null) { + arrayList.add(J); } } Channel channel = (Channel) u.firstOrNull((List) arrayList); @@ -268,11 +268,11 @@ public final class StorePermissions extends StoreV2 { Long l; m.checkNotNullParameter(searchState, "searchState"); if (getMeId() != 0) { - List hits = searchState.getHits(); + List hits = searchState.getHits(); if (hits != null) { ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(hits, 10)); - for (ModelMessage modelMessage : hits) { - arrayList.add(modelMessage.getThread()); + for (Message message : hits) { + arrayList.add(message.J()); } Channel channel = (Channel) u.firstOrNull((List) arrayList); if (channel != null) { diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java index 4cd1b4df96..a366f707f9 100644 --- a/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java +++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$loadPinnedMessages$1.java @@ -1,6 +1,6 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; import d0.z.d.o; import java.util.List; @@ -8,7 +8,7 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StorePinnedMessages.kt */ -public final class StorePinnedMessages$loadPinnedMessages$1 extends o implements Function1, Unit> { +public final class StorePinnedMessages$loadPinnedMessages$1 extends o implements Function1, Unit> { public final /* synthetic */ long $channelId; public final /* synthetic */ StorePinnedMessages this$0; @@ -43,12 +43,12 @@ public final class StorePinnedMessages$loadPinnedMessages$1 extends o implements /* 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(List list) { - invoke(list); + public /* bridge */ /* synthetic */ Unit invoke(List list) { + invoke((List) list); return Unit.a; } - public final void invoke(List list) { + public final void invoke(List list) { m.checkNotNullParameter(list, "it"); this.this$0.getDispatcher().schedule(new AnonymousClass1(this, list)); } diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java index 39e5487194..6c7223d3f6 100644 --- a/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java +++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$observeForChannel$1.java @@ -1,12 +1,12 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.t.n; import d0.z.d.o; import java.util.List; import kotlin.jvm.functions.Function0; /* compiled from: StorePinnedMessages.kt */ -public final class StorePinnedMessages$observeForChannel$1 extends o implements Function0> { +public final class StorePinnedMessages$observeForChannel$1 extends o implements Function0> { public final /* synthetic */ long $channelId; public final /* synthetic */ StorePinnedMessages this$0; @@ -17,11 +17,11 @@ public final class StorePinnedMessages$observeForChannel$1 extends o implements this.$channelId = j; } - /* Return type fixed from 'java.util.List' to match base method */ + /* Return type fixed from 'java.util.List' to match base method */ @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ - public final List mo1invoke() { - List list = (List) StorePinnedMessages.access$getPinnedMessages$p(this.this$0).get(Long.valueOf(this.$channelId)); + public final List mo1invoke() { + List list = (List) StorePinnedMessages.access$getPinnedMessages$p(this.this$0).get(Long.valueOf(this.$channelId)); return list != null ? list : n.emptyList(); } } diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java b/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java index 610f7a6004..458bcdf0f4 100644 --- a/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java +++ b/app/src/main/java/com/discord/stores/StorePinnedMessages$observePinnedMessage$1.java @@ -1,13 +1,13 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StorePinnedMessages; import d0.t.n; import d0.z.d.o; import java.util.List; import kotlin.jvm.functions.Function0; /* compiled from: StorePinnedMessages.kt */ -public final class StorePinnedMessages$observePinnedMessage$1 extends o implements Function0 { +public final class StorePinnedMessages$observePinnedMessage$1 extends o implements Function0 { public final /* synthetic */ long $channelId; public final /* synthetic */ long $messageId; public final /* synthetic */ StorePinnedMessages this$0; @@ -22,7 +22,7 @@ public final class StorePinnedMessages$observePinnedMessage$1 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ - public final ModelMessage mo1invoke() { + public final Message mo1invoke() { List list = (List) StorePinnedMessages.access$getPinnedMessages$p(this.this$0).get(Long.valueOf(this.$channelId)); if (list == null) { list = n.emptyList(); diff --git a/app/src/main/java/com/discord/stores/StorePinnedMessages.java b/app/src/main/java/com/discord/stores/StorePinnedMessages.java index bc5c0f657e..baa8689798 100644 --- a/app/src/main/java/com/discord/stores/StorePinnedMessages.java +++ b/app/src/main/java/com/discord/stores/StorePinnedMessages.java @@ -1,8 +1,10 @@ package com.discord.stores; import android.content.Context; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.stores.updates.ObservationDeck; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import d0.t.n; @@ -25,8 +27,8 @@ public final class StorePinnedMessages extends StoreV2 { public static final Companion Companion = new Companion(null); private final Dispatcher dispatcher; private final ObservationDeck observationDeck; - private final Map> pinnedMessages = new HashMap(); - private Map> pinnedMessagesSnapshot = new HashMap(); + private final Map> pinnedMessages = new HashMap(); + private Map> pinnedMessagesSnapshot = new HashMap(); private final Set updatedChannelIds = new HashSet(); /* compiled from: StorePinnedMessages.kt */ @@ -38,7 +40,7 @@ public final class StorePinnedMessages extends StoreV2 { this(); } - public static final /* synthetic */ ModelMessage access$getMessage(Companion companion, List list, long j) { + public static final /* synthetic */ Message access$getMessage(Companion companion, List list, long j) { return companion.getMessage(list, j); } @@ -46,7 +48,7 @@ public final class StorePinnedMessages extends StoreV2 { return companion.getMessageIndex(list, j); } - private final ModelMessage getMessage(List list, long j) { + private final Message getMessage(List list, long j) { boolean z2; Object obj = null; if (list == null) { @@ -58,7 +60,7 @@ public final class StorePinnedMessages extends StoreV2 { break; } Object next = it.next(); - if (((ModelMessage) next).getId() == j) { + if (((Message) next).r() == j) { z2 = true; continue; } else { @@ -70,13 +72,13 @@ public final class StorePinnedMessages extends StoreV2 { break; } } - return (ModelMessage) obj; + return (Message) obj; } - private final int getMessageIndex(List list, long j) { + private final int getMessageIndex(List list, long j) { int i = 0; - for (ModelMessage modelMessage : list) { - if (modelMessage.getId() == j) { + for (Message message : list) { + if (message.r() == j) { return i; } i++; @@ -101,7 +103,7 @@ public final class StorePinnedMessages extends StoreV2 { } @StoreThread - private final void handlePinnedMessagesLoaded(long j, List list) { + private final void handlePinnedMessagesLoaded(long j, List list) { this.pinnedMessages.put(Long.valueOf(j), u.toMutableList((Collection) list)); this.updatedChannelIds.add(Long.valueOf(j)); markChanged(); @@ -124,11 +126,11 @@ public final class StorePinnedMessages extends StoreV2 { @StoreThread public final void handleMessageDeleteBulk(long j, Collection collection) { m.checkNotNullParameter(collection, "messageIds"); - List list = this.pinnedMessages.get(Long.valueOf(j)); + List list = this.pinnedMessages.get(Long.valueOf(j)); if (list != null) { - Iterator it = list.iterator(); + Iterator it = list.iterator(); while (it.hasNext()) { - if (collection.contains(Long.valueOf(it.next().getId()))) { + if (collection.contains(Long.valueOf(it.next().r()))) { it.remove(); this.updatedChannelIds.add(Long.valueOf(j)); } @@ -140,40 +142,48 @@ public final class StorePinnedMessages extends StoreV2 { } @StoreThread - public final void handleMessageUpdate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "updatedMessage"); - long channelId = modelMessage.getChannelId(); - long id2 = modelMessage.getId(); - List list = this.pinnedMessages.get(Long.valueOf(channelId)); + public final void handleMessageUpdate(Message message) { + UtcDateTime K; + m.checkNotNullParameter(message, "updatedMessage"); + long i = message.i(); + long r = message.r(); + boolean areEqual = m.areEqual(message.D(), Boolean.TRUE); + List list = this.pinnedMessages.get(Long.valueOf(i)); if (list != null) { - int access$getMessageIndex = Companion.access$getMessageIndex(Companion, list, id2); + int access$getMessageIndex = Companion.access$getMessageIndex(Companion, list, r); if (access$getMessageIndex != -1) { - if (!modelMessage.isPinned()) { + if (!areEqual) { list.remove(access$getMessageIndex); } else { - list.set(access$getMessageIndex, new ModelMessage(list.get(access$getMessageIndex), modelMessage)); + list.set(access$getMessageIndex, MessageUtils.merge(list.get(access$getMessageIndex), message)); } - this.updatedChannelIds.add(Long.valueOf(channelId)); + this.updatedChannelIds.add(Long.valueOf(i)); markChanged(); - } else if (modelMessage.isPinned()) { - int i = 0; - while (i < list.size() && modelMessage.getTimestamp() < list.get(i).getTimestamp()) { - i++; + } else if (areEqual) { + UtcDateTime K2 = message.K(); + long j = 0; + long f = K2 != null ? K2.f() : 0; + int i2 = 0; + if (list.size() > 0 && (K = list.get(0).K()) != null) { + j = K.f(); } - list.add(i, modelMessage); - this.updatedChannelIds.add(Long.valueOf(channelId)); + while (i2 < list.size() && f < j) { + i2++; + } + list.add(i2, message); + this.updatedChannelIds.add(Long.valueOf(i)); markChanged(); } } } - public final Observable> observeForChannel(long j) { + public final Observable> observeForChannel(long j) { loadPinnedMessages(j); return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePinnedMessages$observeForChannel$1(this, j), 14, null); } - public final Observable observePinnedMessage(long j, long j2) { - Observable s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePinnedMessages$observePinnedMessage$1(this, j, j2), 14, null).s(); + public final Observable observePinnedMessage(long j, long j2) { + Observable s2 = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StorePinnedMessages$observePinnedMessage$1(this, j, j2), 14, null).s(); m.checkNotNullExpressionValue(s2, "observationDeck.connectR… }.distinctUntilChanged()"); return s2; } diff --git a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java index ab03d7986c..c1ebb01a41 100644 --- a/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java +++ b/app/src/main/java/com/discord/stores/StoreReadStates$computeUnreadMarker$4.java @@ -1,7 +1,7 @@ package com.discord.stores; +import com.discord.api.message.Message; import com.discord.models.application.Unread; -import com.discord.models.domain.ModelMessage; import d0.z.d.m; import j0.k.a; import j0.k.b; @@ -15,18 +15,25 @@ public final class StoreReadStates$computeUnreadMarker$4 implements b implements b, Unread> { + public static final class AnonymousClass1 implements b, Unread> { public final /* synthetic */ Unread.Marker $marker; public AnonymousClass1(Unread.Marker marker) { this.$marker = marker; } - public final Unread call(List list) { + public final Unread call(List list) { Unread.Marker marker = this.$marker; m.checkNotNullExpressionValue(list, "messages"); return new Unread(marker, list); } + + /* 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 // j0.k.b + public /* bridge */ /* synthetic */ Unread call(List list) { + return call((List) list); + } } /* compiled from: StoreReadStates.kt */ diff --git a/app/src/main/java/com/discord/stores/StoreReadStates.java b/app/src/main/java/com/discord/stores/StoreReadStates.java index 1ea3d7aeb9..85130e7f07 100644 --- a/app/src/main/java/com/discord/stores/StoreReadStates.java +++ b/app/src/main/java/com/discord/stores/StoreReadStates.java @@ -7,11 +7,11 @@ import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.models.application.Unread; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelNotificationSettings; import com.discord.stores.StoreMessageAck; import com.discord.stores.StoreStream; import com.discord.stores.StoreThreadsActiveJoined; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.persister.Persister; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -110,7 +110,7 @@ public final class StoreReadStates extends Store { Long l = (Long) a.c(channel, map3); j = ((l != null ? l.longValue() : this.clock.currentTimeMillis()) - 1420070400000L) << 22; } - if (ModelMessage.isNewer(Long.valueOf(j), Long.valueOf(longValue2))) { + if (MessageUtils.isNewer(Long.valueOf(j), Long.valueOf(longValue2))) { hashSet.add(Long.valueOf(longValue)); Channel channel2 = map2.get(Long.valueOf(channel.q())); boolean isChannelMuted = isChannelMuted(channel2, map4); diff --git a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels$enqueueStageChannelFetch$1.java b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels$enqueueStageChannelFetch$1.java index c8a917c63a..3f94a78eb2 100644 --- a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels$enqueueStageChannelFetch$1.java +++ b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels$enqueueStageChannelFetch$1.java @@ -43,7 +43,7 @@ public final class StoreRequestedStageChannels$enqueueStageChannelFetch$1 extend if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(22, this) == coroutine_suspended) { + if (a.n(22, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java index 9a1209c1d4..d6c58b5a63 100644 --- a/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java +++ b/app/src/main/java/com/discord/stores/StoreRequestedStageChannels.java @@ -16,11 +16,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.Job; import rx.Observable; +import s.a.a.n; import s.a.j0; -import s.a.u0; -import s.a.z; +import s.a.w0; /* compiled from: StoreRequestedStageChannels.kt */ public final class StoreRequestedStageChannels extends StoreV2 { public static final Companion Companion = new Companion(null); @@ -215,9 +216,9 @@ public final class StoreRequestedStageChannels extends StoreV2 { this.enqueuedChannelFetches.add(Long.valueOf(j)); Job job = this.enqueuedChannelFetchJob; if (job == null || !job.a()) { - u0 u0Var = u0.i; - z zVar = j0.a; - this.enqueuedChannelFetchJob = c.q.a.k.a.F(u0Var, s.a.a.m.b, null, new StoreRequestedStageChannels$enqueueStageChannelFetch$1(this, null), 2, null); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher = j0.a; + this.enqueuedChannelFetchJob = c.q.a.k.a.G(w0Var, n.b, null, new StoreRequestedStageChannels$enqueueStageChannelFetch$1(this, null), 2, null); } } } diff --git a/app/src/main/java/com/discord/stores/StoreRtcConnection.java b/app/src/main/java/com/discord/stores/StoreRtcConnection.java index 338072f673..85c729b6de 100644 --- a/app/src/main/java/com/discord/stores/StoreRtcConnection.java +++ b/app/src/main/java/com/discord/stores/StoreRtcConnection.java @@ -3,7 +3,7 @@ package com.discord.stores; import a0.a.a.b; import android.content.Context; import android.util.Log; -import c.a.r.v; +import c.a.r.w; import c.d.b.a.a; import co.discord.media_engine.VideoInputDeviceDescription; import com.discord.api.channel.Channel; @@ -342,7 +342,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr sSLSocketFactory = SecureSocketsLayerUtils.createSocketFactory$default(null, 1, null); } recordBreadcrumb(a.u("Voice server update, connect to server w/ endpoint: ", str)); - rtcConnection.s(new v(rtcConnection, str, voiceServer.d(), sSLSocketFactory)); + rtcConnection.s(new w(rtcConnection, str, voiceServer.d(), sSLSocketFactory)); } } } @@ -816,7 +816,7 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c public void onStateChange(RtcConnection.StateChange stateChange) { - m.checkNotNullParameter(stateChange, "state"); + m.checkNotNullParameter(stateChange, "stateChange"); recordBreadcrumb("connection state change: " + stateChange); this.connectionStateSubject.j.onNext(stateChange); } diff --git a/app/src/main/java/com/discord/stores/StoreSearchQuery.java b/app/src/main/java/com/discord/stores/StoreSearchQuery.java index b771029fe8..965765a032 100644 --- a/app/src/main/java/com/discord/stores/StoreSearchQuery.java +++ b/app/src/main/java/com/discord/stores/StoreSearchQuery.java @@ -2,7 +2,7 @@ package com.discord.stores; import android.content.Context; import c.a.d.q; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.domain.ModelSearchResponse; import com.discord.stores.StoreSearch; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -88,7 +88,7 @@ public final class StoreSearchQuery { arrayList = new ArrayList(); } else { totalResults = this.currentSearchState.getTotalResults(); - List hits = this.currentSearchState.getHits(); + List hits = this.currentSearchState.getHits(); if (hits == null || (arrayList = u.toMutableList((Collection) hits)) == null) { arrayList = new ArrayList(); } diff --git a/app/src/main/java/com/discord/stores/StoreStageInstances$getGuildIdsWithStageInstances$1.java b/app/src/main/java/com/discord/stores/StoreStageInstances$getGuildIdsWithStageInstances$1.java deleted file mode 100644 index 22f92957cb..0000000000 --- a/app/src/main/java/com/discord/stores/StoreStageInstances$getGuildIdsWithStageInstances$1.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.discord.stores; - -import com.discord.api.stageinstance.StageInstance; -import d0.z.d.m; -import d0.z.d.o; -import java.util.Map; -import kotlin.jvm.functions.Function1; -/* compiled from: StoreStageInstances.kt */ -public final class StoreStageInstances$getGuildIdsWithStageInstances$1 extends o implements Function1>, Boolean> { - public static final StoreStageInstances$getGuildIdsWithStageInstances$1 INSTANCE = new StoreStageInstances$getGuildIdsWithStageInstances$1(); - - public StoreStageInstances$getGuildIdsWithStageInstances$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 */ Boolean invoke(Map.Entry> entry) { - return Boolean.valueOf(invoke((Map.Entry>) entry)); - } - - public final boolean invoke(Map.Entry> entry) { - m.checkNotNullParameter(entry, "entry"); - return !((Map) entry.getValue()).isEmpty(); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreStageInstances$observeGuildIdsWithStageInstances$1.java b/app/src/main/java/com/discord/stores/StoreStageInstances$observeGuildIdsWithStageInstances$1.java deleted file mode 100644 index 53a970c67c..0000000000 --- a/app/src/main/java/com/discord/stores/StoreStageInstances$observeGuildIdsWithStageInstances$1.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.discord.stores; - -import d0.z.d.o; -import java.util.Set; -import kotlin.jvm.functions.Function0; -/* compiled from: StoreStageInstances.kt */ -public final class StoreStageInstances$observeGuildIdsWithStageInstances$1 extends o implements Function0> { - public final /* synthetic */ StoreStageInstances this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreStageInstances$observeGuildIdsWithStageInstances$1(StoreStageInstances storeStageInstances) { - super(0); - this.this$0 = storeStageInstances; - } - - /* Return type fixed from 'java.util.Set' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final Set mo1invoke() { - return this.this$0.getGuildIdsWithStageInstances(); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreStageInstances.java b/app/src/main/java/com/discord/stores/StoreStageInstances.java index 8199c914be..396bacb4a3 100644 --- a/app/src/main/java/com/discord/stores/StoreStageInstances.java +++ b/app/src/main/java/com/discord/stores/StoreStageInstances.java @@ -6,10 +6,8 @@ import com.discord.api.stageinstance.StageInstance; import com.discord.models.domain.ModelPayload; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; -import d0.f0.q; import d0.t.h0; import d0.t.n0; -import d0.t.u; import d0.z.d.m; import java.util.HashMap; import java.util.LinkedHashMap; @@ -66,10 +64,6 @@ public final class StoreStageInstances extends StoreV2 { markChanged(); } - public final Set getGuildIdsWithStageInstances() { - return q.toSet(q.map(q.filter(u.asSequence(this.stageInstancesByGuildSnapshot.entrySet()), StoreStageInstances$getGuildIdsWithStageInstances$1.INSTANCE), StoreStageInstances$getGuildIdsWithStageInstances$2.INSTANCE)); - } - public final StageInstance getStageInstanceForChannel(long j) { return this.stageInstancesByChannelSnapshot.get(Long.valueOf(j)); } @@ -82,6 +76,11 @@ public final class StoreStageInstances extends StoreV2 { return this.stageInstancesByChannelSnapshot; } + /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map>, java.util.Map> */ + public final Map> getStageInstancesByGuild() { + return this.stageInstancesByGuildSnapshot; + } + public final Map getStageInstancesForGuild(long j) { Map map = (Map) this.stageInstancesByGuildSnapshot.get(Long.valueOf(j)); return map != null ? map : h0.emptyMap(); @@ -155,10 +154,6 @@ public final class StoreStageInstances extends StoreV2 { handleStageInstanceCreateOrUpdate(stageInstance); } - public final Observable> observeGuildIdsWithStageInstances() { - return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreStageInstances$observeGuildIdsWithStageInstances$1(this), 14, null); - } - public final Observable observeStageInstanceForChannel(long j) { return ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreStageInstances$observeStageInstanceForChannel$1(this, j), 14, null); } diff --git a/app/src/main/java/com/discord/stores/StoreStickers.java b/app/src/main/java/com/discord/stores/StoreStickers.java index ab46cf71b5..4b8ab05524 100644 --- a/app/src/main/java/com/discord/stores/StoreStickers.java +++ b/app/src/main/java/com/discord/stores/StoreStickers.java @@ -222,10 +222,10 @@ public final class StoreStickers extends StoreV2 { } public final void handleFetchedSticker(Sticker sticker) { - if (sticker != null && sticker.i() == StickerType.STANDARD) { - Long g = sticker.g(); - m.checkNotNull(g); - fetchStickerPack(g.longValue()); + if (sticker != null && sticker.j() == StickerType.STANDARD) { + Long h = sticker.h(); + m.checkNotNull(h); + fetchStickerPack(h.longValue()); } } diff --git a/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java b/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java index d7d101535d..091213f164 100644 --- a/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java +++ b/app/src/main/java/com/discord/stores/StoreStream$deferredInit$1.java @@ -305,7 +305,7 @@ public final class StoreStream$deferredInit$1 extends o implements Function0, Unit> { + public final /* synthetic */ Function1 $onNext; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreStream$dispatchSubscribe$2(Function1 function1) { + super(1); + this.$onNext = function1; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Object obj) { + invoke((List) obj); + return Unit.a; + } + + public final void invoke(List list) { + m.checkNotNullParameter(list, "batch"); + Iterator it = list.iterator(); + while (it.hasNext()) { + this.$onNext.invoke(it.next()); + } + } +} diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java index 5b5eb843a9..e5d7a6a4cd 100644 --- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java +++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$30.java @@ -1,26 +1,26 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.k; import d0.z.d.m; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: StoreStream.kt */ -public final /* synthetic */ class StoreStream$initGatewaySocketListeners$30 extends k implements Function1 { +public final /* synthetic */ class StoreStream$initGatewaySocketListeners$30 extends k implements Function1 { public StoreStream$initGatewaySocketListeners$30(StoreStream storeStream) { - super(1, storeStream, StoreStream.class, "handleMessageUpdate", "handleMessageUpdate(Lcom/discord/models/domain/ModelMessage;)V", 0); + super(1, storeStream, StoreStream.class, "handleMessageUpdate", "handleMessageUpdate(Lcom/discord/api/message/Message;)V", 0); } /* 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(ModelMessage modelMessage) { - invoke(modelMessage); + public /* bridge */ /* synthetic */ Unit invoke(Message message) { + invoke(message); return Unit.a; } - public final void invoke(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "p1"); - StoreStream.access$handleMessageUpdate((StoreStream) this.receiver, modelMessage); + public final void invoke(Message message) { + m.checkNotNullParameter(message, "p1"); + StoreStream.access$handleMessageUpdate((StoreStream) this.receiver, message); } } diff --git a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java index 0f83aed2c9..1cddf70ebc 100644 --- a/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java +++ b/app/src/main/java/com/discord/stores/StoreStream$initGatewaySocketListeners$31.java @@ -1,26 +1,26 @@ package com.discord.stores; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.k; import d0.z.d.m; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: StoreStream.kt */ -public final /* synthetic */ class StoreStream$initGatewaySocketListeners$31 extends k implements Function1 { +public final /* synthetic */ class StoreStream$initGatewaySocketListeners$31 extends k implements Function1 { public StoreStream$initGatewaySocketListeners$31(StoreStream storeStream) { - super(1, storeStream, StoreStream.class, "handleMessageCreate", "handleMessageCreate(Lcom/discord/models/domain/ModelMessage;)V", 0); + super(1, storeStream, StoreStream.class, "handleMessageCreate", "handleMessageCreate(Lcom/discord/api/message/Message;)V", 0); } /* 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(ModelMessage modelMessage) { - invoke(modelMessage); + public /* bridge */ /* synthetic */ Unit invoke(Message message) { + invoke(message); return Unit.a; } - public final void invoke(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "p1"); - StoreStream.access$handleMessageCreate((StoreStream) this.receiver, modelMessage); + public final void invoke(Message message) { + m.checkNotNullParameter(message, "p1"); + StoreStream.access$handleMessageCreate((StoreStream) this.receiver, message); } } diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java index 9297205823..26f1487951 100644 --- a/app/src/main/java/com/discord/stores/StoreStream.java +++ b/app/src/main/java/com/discord/stores/StoreStream.java @@ -18,6 +18,7 @@ import com.discord.api.guildmember.GuildMember; import com.discord.api.guildmember.GuildMemberRemove; import com.discord.api.guildmember.GuildMembersChunk; import com.discord.api.interaction.InteractionStateUpdate; +import com.discord.api.message.Message; import com.discord.api.message.reaction.MessageReactionUpdate; import com.discord.api.presence.Presence; import com.discord.api.requiredaction.UserRequiredActionUpdate; @@ -41,7 +42,6 @@ import com.discord.models.domain.ModelChannelUnreadUpdate; import com.discord.models.domain.ModelConnectedAccount; import com.discord.models.domain.ModelGuildIntegration; import com.discord.models.domain.ModelGuildMemberListUpdate; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelMessageDelete; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelPayload; @@ -64,6 +64,7 @@ import com.discord.stores.StoreNavigation; import com.discord.stores.StoreRtcConnection; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.stores.utilities.Batched; import com.discord.utilities.StoreUIEventHandler; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.cache.SharedPreferencesProvider; @@ -138,6 +139,7 @@ public final class StoreStream { private final StoreConnectivity connectivity; private final StoreContactSync contactSync; private final StoreEmojiCustom customEmojis; + private final StoreDirectories directories; private final Dispatcher dispatcher; private final StoreEmoji emojis; private final StoreEntitlements entitlements; @@ -363,6 +365,14 @@ public final class StoreStream { return StoreStream.access$getCustomEmojis$p(getCollector()); } + public final StoreDirectories getDirectories() { + return getCollector().getDirectories$app_productionGoogleRelease(); + } + + public final Dispatcher getDispatcherYesThisIsIntentional() { + return StoreStream.access$getDispatcher$p(getCollector()); + } + public final StoreDynamicLink getDynamicLinkCache() { return getCollector().getStoreDynamicLink$app_productionGoogleRelease(); } @@ -853,7 +863,7 @@ public final class StoreStream { this.videoUseDetector = videoUseDetector; StoreAudioDevices storeAudioDevices = new StoreAudioDevices(this.dispatcher, AudioOutputMonitor.Companion.getINSTANCE(), videoUseDetector, storeVoiceChannelSelected, this.channels, null, null, 96, null); this.audioDevices = storeAudioDevices; - this.gatewaySocket = new StoreGatewayConnection(this, this.clock, null, AppGatewaySocketLogger.Companion.getINSTANCE(), 4, null); + this.gatewaySocket = new StoreGatewayConnection(this, this.clock, null, null, AppGatewaySocketLogger.Companion.getINSTANCE(), 12, null); this.connectivity = new StoreConnectivity(this, this.dispatcher, this.clock); this.connectionOpen = new StoreConnectionOpen(); this.calls = new StoreCalls(this); @@ -896,8 +906,7 @@ public final class StoreStream { this.messageReactions = new StoreMessageReactions(this.dispatcher, this.users, null, 4, null); this.application = new StoreApplication(this.dispatcher, ObservationDeckProvider.get()); this.paymentSources = new StorePaymentSources(this.dispatcher, null, null, 6, null); - StoreSubscriptions storeSubscriptions = new StoreSubscriptions(ObservationDeckProvider.get(), this.dispatcher, companion.getApi()); - this.subscriptions = storeSubscriptions; + this.subscriptions = new StoreSubscriptions(ObservationDeckProvider.get(), this.dispatcher, companion.getApi()); StoreMFA storeMFA = new StoreMFA(this, this.dispatcher, ObservationDeckProvider.get()); this.mfa = storeMFA; StoreStreamRtcConnection storeStreamRtcConnection = new StoreStreamRtcConnection(storeMediaEngine, this.users, this, this.dispatcher, this.clock, this.analytics, storeRtcConnection, null, null, null, 896, null); @@ -974,11 +983,13 @@ public final class StoreStream { this.contactSync = storeContactSync; StoreFriendSuggestions storeFriendSuggestions = new StoreFriendSuggestions(new FriendSuggestionsFetcher(this.dispatcher, companion.getApi(), new StoreStream$friendSuggestions$1(this), new StoreStream$friendSuggestions$2(this))); this.friendSuggestions = storeFriendSuggestions; + StoreDirectories storeDirectories = new StoreDirectories(this.dispatcher, ObservationDeckProvider.get(), null, 4, null); + this.directories = storeDirectories; StoreGuildStickers storeGuildStickers = new StoreGuildStickers(this.dispatcher); this.guildStickers = storeGuildStickers; StoreOutboundPromotions storeOutboundPromotions = new StoreOutboundPromotions(this.dispatcher, null, null, false, 14, null); this.outboundPromotions = storeOutboundPromotions; - List listOf = n.listOf((Object[]) new StoreV2[]{this.bans, this.users, this.guilds, this.channels, this.channelConversions, this.presences, this.permissions, this.voiceChannelSelected, this.voiceSpeaking, this.accessibility, this.callsIncoming, this.connectivity, this.connectionOpen, storeGuildWelcomeScreens, storeGuildVoiceRegions, this.videoStreams, storeClientDataState, storeGifPicker, storeStickers, this.guildMemberCounts, this.guildJoinRequests, this.experiments, this.messageReplies, storeChannelFollowerStats, storePendingReplies, storeGuildProfiles, this.application, storeApplicationCommands, this.guildSelected, this.channelsSelected, this.pinnedMessages, storeGuildMemberVerificationForm, this.userRequiredAction, this.userSurvey, storePhone, storeThreadsActive, this.threadsJoined, storeThreadsActiveJoined, storeThreadMessages, archivedThreadsStore, storeThreadDraft, storeExpressionPickerNavigation, storePremiumGuildSubscription, this.collapsedChannelCategories, this.messageUploads, storeExpressionSuggestions, this.applicationStreaming, storeApplicationInteractions, storeLocalActionComponentState, this.stageInstances, this.requestedStageChannels, storeStageChannels, storeStageChannelSelfPresence, storeAutocomplete, this.messageReactions, this.library, this.userRelationships, this.userSettingsSystem, this.tabsNavigation, this.voiceStates, this.mentions, storeUserAffinities, this.userProfile, this.audioDevices, this.userConnections, this.messagesMostRecent, this.usersTyping, this.instantInvites, this.guildSettings, this.customEmojis, storeEntitlements, storeMediaFavorites, storeSubscriptions, storeGooglePlayPurchases, storeGooglePlaySkuDetails, this.guildTemplates, this.userNotes, storeMFA, this.messageAck, this.guildSubscriptions, this.lazyChannelMembersStore, this.guildEmojis, storeGuildsSorted, this.auditLog, storeExpandedGuildFolders, this.maskedLinks, storeStreamRtcConnection, this.paymentSources, storeContactSync, storeApplicationStreamPreviews, this.guildsNsfw, this.gameParty, storeFriendSuggestions, this.chat, storeAudioManagerV2, storeGuildStickers, storeOutboundPromotions}); + List listOf = n.listOf((Object[]) new StoreV2[]{this.bans, this.users, this.guilds, this.channels, this.channelConversions, this.presences, this.permissions, this.voiceChannelSelected, this.voiceSpeaking, this.accessibility, this.callsIncoming, this.connectivity, this.connectionOpen, storeGuildWelcomeScreens, storeGuildVoiceRegions, this.videoStreams, storeClientDataState, storeGifPicker, storeStickers, this.guildMemberCounts, this.guildJoinRequests, this.experiments, this.messageReplies, storeChannelFollowerStats, storePendingReplies, storeGuildProfiles, this.application, storeApplicationCommands, this.guildSelected, this.channelsSelected, this.pinnedMessages, storeGuildMemberVerificationForm, this.userRequiredAction, this.userSurvey, storePhone, storeThreadsActive, this.threadsJoined, storeThreadsActiveJoined, storeThreadMessages, archivedThreadsStore, storeThreadDraft, storeExpressionPickerNavigation, storePremiumGuildSubscription, this.collapsedChannelCategories, this.messageUploads, storeExpressionSuggestions, this.applicationStreaming, storeApplicationInteractions, storeLocalActionComponentState, this.stageInstances, this.requestedStageChannels, storeStageChannels, storeStageChannelSelfPresence, storeAutocomplete, this.messageReactions, this.library, this.userRelationships, this.userSettingsSystem, this.tabsNavigation, this.voiceStates, this.mentions, storeUserAffinities, this.userProfile, this.audioDevices, this.userConnections, this.messagesMostRecent, this.usersTyping, this.instantInvites, this.guildSettings, this.customEmojis, storeEntitlements, storeMediaFavorites, this.subscriptions, storeGooglePlayPurchases, storeGooglePlaySkuDetails, this.guildTemplates, this.userNotes, storeMFA, this.messageAck, this.guildSubscriptions, this.lazyChannelMembersStore, this.guildEmojis, storeGuildsSorted, this.auditLog, storeExpandedGuildFolders, this.maskedLinks, storeStreamRtcConnection, this.paymentSources, storeContactSync, storeApplicationStreamPreviews, this.guildsNsfw, this.gameParty, storeFriendSuggestions, this.chat, storeAudioManagerV2, storeGuildStickers, storeOutboundPromotions, storeDirectories}); this.storesV2 = listOf; StoreV2DispatchHandler storeV2DispatchHandler = new StoreV2DispatchHandler(listOf, null, 2, null); this.storeV2DispatchHandler = storeV2DispatchHandler; @@ -1157,16 +1168,16 @@ public final class StoreStream { storeStream.handleMessageAck(modelReadState); } - public static final /* synthetic */ void access$handleMessageCreate(StoreStream storeStream, ModelMessage modelMessage) { - storeStream.handleMessageCreate(modelMessage); + public static final /* synthetic */ void access$handleMessageCreate(StoreStream storeStream, Message message) { + storeStream.handleMessageCreate(message); } public static final /* synthetic */ void access$handleMessageDelete(StoreStream storeStream, ModelMessageDelete modelMessageDelete) { storeStream.handleMessageDelete(modelMessageDelete); } - public static final /* synthetic */ void access$handleMessageUpdate(StoreStream storeStream, ModelMessage modelMessage) { - storeStream.handleMessageUpdate(modelMessage); + public static final /* synthetic */ void access$handleMessageUpdate(StoreStream storeStream, Message message) { + storeStream.handleMessageUpdate(message); } public static final /* synthetic */ void access$handleMessagesLoaded(StoreStream storeStream, StoreMessagesLoader.ChannelChunk channelChunk) { @@ -1321,6 +1332,12 @@ public final class StoreStream { this.dispatcher.schedule(new StoreStream$deferredInit$1(this, application)); } + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: com.discord.stores.utilities.Batched */ + /* JADX WARN: Multi-variable type inference failed */ + private final void dispatchSubscribe(Batched batched, String str, Function1 function1) { + dispatchSubscribe(batched.observe(), str, new StoreStream$dispatchSubscribe$2(function1)); + } + private final void dispatchSubscribe(Observable observable, String str, Function1 function1) { Observable K = observable.K(); m.checkNotNullExpressionValue(K, "onBackpressureBuffer()"); @@ -1395,6 +1412,10 @@ public final class StoreStream { return Companion.getConnectivity(); } + public static final Dispatcher getDispatcherYesThisIsIntentional() { + return Companion.getDispatcherYesThisIsIntentional(); + } + public static final StoreDynamicLink getDynamicLinkCache() { return Companion.getDynamicLinkCache(); } @@ -2109,19 +2130,19 @@ public final class StoreStream { } @StoreThread - private final void handleMessageCreate(ModelMessage modelMessage) { - processMessageUsers(modelMessage); - this.mentions.handleMessageCreateOrUpdate(modelMessage); - this.users.handleMessageCreateOrUpdate(modelMessage); - this.usersTyping.handleMessageCreate(modelMessage); - this.applicationInteractions.handleMessageCreate(modelMessage); - this.messages.handleMessageCreate(d0.t.m.listOf(modelMessage)); - this.messagesMostRecent.handleMessageCreate(modelMessage); - this.messageAck.handleMessageCreate(modelMessage); - this.messageReplies.handleMessageCreate(modelMessage); - this.notifications.handleMessageCreate(modelMessage); - this.clientDataState.handleMessageCreate(modelMessage); - this.threadMessages.handleMessageCreate(modelMessage); + private final void handleMessageCreate(Message message) { + processMessageUsers(message); + this.mentions.handleMessageCreateOrUpdate(message); + this.users.handleMessageCreateOrUpdate(message); + this.usersTyping.handleMessageCreate(message); + this.applicationInteractions.handleMessageCreate(message); + this.messages.handleMessageCreate(d0.t.m.listOf(message)); + this.messagesMostRecent.handleMessageCreate(message); + this.messageAck.handleMessageCreate(message); + this.messageReplies.handleMessageCreate(message); + this.notifications.handleMessageCreate(message); + this.clientDataState.handleMessageCreate(message); + this.threadMessages.handleMessageCreate(message); } @StoreThread @@ -2140,16 +2161,16 @@ public final class StoreStream { } @StoreThread - private final void handleMessageUpdate(ModelMessage modelMessage) { - processMessageUsers(modelMessage); - this.mentions.handleMessageCreateOrUpdate(modelMessage); - this.users.handleMessageCreateOrUpdate(modelMessage); - this.messages.handleMessageUpdate(modelMessage); - this.messageReplies.handleMessageUpdate(modelMessage); - this.pinnedMessages.handleMessageUpdate(modelMessage); - this.messageStates.handleMessageUpdate(modelMessage); - this.threadMessages.handleMessageUpdate(modelMessage); - this.applicationInteractions.handleMessageUpdate(modelMessage); + private final void handleMessageUpdate(Message message) { + processMessageUsers(message); + this.mentions.handleMessageCreateOrUpdate(message); + this.users.handleMessageCreateOrUpdate(message); + this.messages.handleMessageUpdate(message); + this.messageReplies.handleMessageUpdate(message); + this.pinnedMessages.handleMessageUpdate(message); + this.messageStates.handleMessageUpdate(message); + this.threadMessages.handleMessageUpdate(message); + this.applicationInteractions.handleMessageUpdate(message); } @StoreThread @@ -2473,10 +2494,13 @@ public final class StoreStream { } @StoreThread - private final void processMessageUsers(ModelMessage modelMessage) { - synthesizeGuildMemberAdd(modelMessage.getGuildId(), modelMessage.getAuthor(), modelMessage.getMember()); - for (User user : modelMessage.getMentions()) { - synthesizeGuildMemberAdd(modelMessage.getGuildId(), user, user.j()); + private final void processMessageUsers(Message message) { + synthesizeGuildMemberAdd(message.o(), message.g(), message.w()); + List z2 = message.z(); + if (z2 != null) { + for (User user : z2) { + synthesizeGuildMemberAdd(message.o(), user, user.j()); + } } } @@ -2622,6 +2646,10 @@ public final class StoreStream { return this.contactSync; } + public final StoreDirectories getDirectories$app_productionGoogleRelease() { + return this.directories; + } + public final StoreEmoji getEmojis$app_productionGoogleRelease() { return this.emojis; } @@ -3089,9 +3117,9 @@ public final class StoreStream { } @StoreThread - public final void handleLocalMessageDelete(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - this.applicationInteractions.handleLocalMessageDelete(modelMessage); + public final void handleLocalMessageDelete(Message message) { + m.checkNotNullParameter(message, "message"); + this.applicationInteractions.handleLocalMessageDelete(message); } @StoreThread diff --git a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java index e3c3c14a50..1d6934d38e 100644 --- a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java +++ b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java @@ -1,7 +1,7 @@ package com.discord.stores; -import c.a.r.i; -import c.a.r.v; +import c.a.r.j; +import c.a.r.w; import c.d.b.a.a; import com.discord.app.App; import com.discord.app.AppLog; @@ -509,7 +509,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin if (rtcConnection == null) { loge$default(this, "handleStreamServerUpdate() rtcConnection is null.", null, null, 6, null); } else { - rtcConnection.s(new v(rtcConnection, streamServerUpdate.getEndpoint(), streamServerUpdate.getToken(), sSLSocketFactory)); + rtcConnection.s(new w(rtcConnection, streamServerUpdate.getEndpoint(), streamServerUpdate.getToken(), sSLSocketFactory)); } } @@ -534,7 +534,7 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin MediaSinkWantsManager mediaSinkWantsManager; RtcConnection rtcConnection = this.rtcConnection; if (rtcConnection != null && (mediaSinkWantsManager = rtcConnection.v) != null) { - mediaSinkWantsManager.b(new i(mediaSinkWantsManager, l)); + mediaSinkWantsManager.b(new j(mediaSinkWantsManager, l)); } } diff --git a/app/src/main/java/com/discord/stores/StoreThreadMessages.java b/app/src/main/java/com/discord/stores/StoreThreadMessages.java index c021b96e4a..ae02c1b04a 100644 --- a/app/src/main/java/com/discord/stores/StoreThreadMessages.java +++ b/app/src/main/java/com/discord/stores/StoreThreadMessages.java @@ -5,13 +5,14 @@ import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.guild.Guild; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.domain.ModelMessageDelete; import com.discord.models.domain.ModelPayload; import com.discord.models.thread.dto.ModelThreadListSync; import com.discord.stores.StoreMessagesLoader; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.utilities.message.MessageUtils; import d0.d0.f; import d0.t.h0; import d0.t.r; @@ -47,20 +48,20 @@ public final class StoreThreadMessages extends StoreV2 { public static final class ThreadState { private int count; private final long guildId; - private ModelMessage mostRecentMessage; + private Message mostRecentMessage; private final long parentId; private final long threadId; - public ThreadState(long j, long j2, long j3, int i, ModelMessage modelMessage) { + public ThreadState(long j, long j2, long j3, int i, Message message) { this.threadId = j; this.guildId = j2; this.parentId = j3; this.count = i; - this.mostRecentMessage = modelMessage; + this.mostRecentMessage = message; } - public static /* synthetic */ ThreadState copy$default(ThreadState threadState, long j, long j2, long j3, int i, ModelMessage modelMessage, int i2, Object obj) { - return threadState.copy((i2 & 1) != 0 ? threadState.threadId : j, (i2 & 2) != 0 ? threadState.guildId : j2, (i2 & 4) != 0 ? threadState.parentId : j3, (i2 & 8) != 0 ? threadState.count : i, (i2 & 16) != 0 ? threadState.mostRecentMessage : modelMessage); + public static /* synthetic */ ThreadState copy$default(ThreadState threadState, long j, long j2, long j3, int i, Message message, int i2, Object obj) { + return threadState.copy((i2 & 1) != 0 ? threadState.threadId : j, (i2 & 2) != 0 ? threadState.guildId : j2, (i2 & 4) != 0 ? threadState.parentId : j3, (i2 & 8) != 0 ? threadState.count : i, (i2 & 16) != 0 ? threadState.mostRecentMessage : message); } public final long component1() { @@ -79,12 +80,12 @@ public final class StoreThreadMessages extends StoreV2 { return this.count; } - public final ModelMessage component5() { + public final Message component5() { return this.mostRecentMessage; } - public final ThreadState copy(long j, long j2, long j3, int i, ModelMessage modelMessage) { - return new ThreadState(j, j2, j3, i, modelMessage); + public final ThreadState copy(long j, long j2, long j3, int i, Message message) { + return new ThreadState(j, j2, j3, i, message); } public boolean equals(Object obj) { @@ -106,7 +107,7 @@ public final class StoreThreadMessages extends StoreV2 { return this.guildId; } - public final ModelMessage getMostRecentMessage() { + public final Message getMostRecentMessage() { return this.mostRecentMessage; } @@ -120,16 +121,16 @@ public final class StoreThreadMessages extends StoreV2 { public int hashCode() { int a = (((b.a(this.parentId) + ((b.a(this.guildId) + (b.a(this.threadId) * 31)) * 31)) * 31) + this.count) * 31; - ModelMessage modelMessage = this.mostRecentMessage; - return a + (modelMessage != null ? modelMessage.hashCode() : 0); + Message message = this.mostRecentMessage; + return a + (message != null ? message.hashCode() : 0); } public final void setCount(int i) { this.count = i; } - public final void setMostRecentMessage(ModelMessage modelMessage) { - this.mostRecentMessage = modelMessage; + public final void setMostRecentMessage(Message message) { + this.mostRecentMessage = message; } public String toString() { @@ -220,8 +221,8 @@ public final class StoreThreadMessages extends StoreV2 { markChanged(); } if (channel.h() != 0) { - ModelMessage mostRecentMessage = orAddState.getMostRecentMessage(); - if (mostRecentMessage == null || mostRecentMessage.getId() != channel.h()) { + Message mostRecentMessage = orAddState.getMostRecentMessage(); + if (mostRecentMessage == null || mostRecentMessage.r() != channel.h()) { this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, 0, null, 15, null)); markChanged(); } @@ -264,22 +265,22 @@ public final class StoreThreadMessages extends StoreV2 { } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - Channel channel = this.storeChannels.getChannel(modelMessage.getChannelId()); + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + Channel channel = this.storeChannels.getChannel(message.i()); if (channel != null && AnimatableValueParser.y1(channel)) { ThreadState orAddState = getOrAddState(channel); - this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(orAddState.getCount() + 1, 50), modelMessage, 7, null)); + this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(orAddState.getCount() + 1, 50), message, 7, null)); markChanged(); } } @StoreThread public final void handleMessageDelete(ModelMessageDelete modelMessageDelete) { - ModelMessage mostRecentMessage; + Message mostRecentMessage; m.checkNotNullParameter(modelMessageDelete, "messageDeleteBulk"); ThreadState threadState = this.threads.get(Long.valueOf(modelMessageDelete.getChannelId())); - Long valueOf = (threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null) ? null : Long.valueOf(mostRecentMessage.getId()); + Long valueOf = (threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null) ? null : Long.valueOf(mostRecentMessage.r()); if (valueOf != null) { valueOf.longValue(); for (Long l : modelMessageDelete.getMessageIds()) { @@ -293,12 +294,12 @@ public final class StoreThreadMessages extends StoreV2 { } @StoreThread - public final void handleMessageUpdate(ModelMessage modelMessage) { - ModelMessage mostRecentMessage; - m.checkNotNullParameter(modelMessage, "message"); - ThreadState threadState = this.threads.get(Long.valueOf(modelMessage.getChannelId())); - if (threadState != null && (mostRecentMessage = threadState.getMostRecentMessage()) != null && mostRecentMessage.getId() == modelMessage.getId()) { - this.threads.put(Long.valueOf(modelMessage.getChannelId()), ThreadState.copy$default(threadState, 0, 0, 0, 0, this.storeMessages.getMessage(modelMessage.getChannelId(), modelMessage.getId()), 15, null)); + public final void handleMessageUpdate(Message message) { + Message mostRecentMessage; + m.checkNotNullParameter(message, "message"); + ThreadState threadState = this.threads.get(Long.valueOf(message.i())); + if (threadState != null && (mostRecentMessage = threadState.getMostRecentMessage()) != null && mostRecentMessage.r() == message.r()) { + this.threads.put(Long.valueOf(message.i()), ThreadState.copy$default(threadState, 0, 0, 0, 0, this.storeMessages.getMessage(message.i(), message.r()), 15, null)); markChanged(); } } @@ -311,8 +312,8 @@ public final class StoreThreadMessages extends StoreV2 { m.checkNotNullParameter(channelChunk, "chunk"); boolean z3 = false; boolean z4 = false; - for (ModelMessage modelMessage : channelChunk.getMessages()) { - if (modelMessage.hasThread() && !this.threads.containsKey(Long.valueOf(modelMessage.getId())) && (channel2 = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(modelMessage.getId()))) != null) { + for (Message message : channelChunk.getMessages()) { + if (MessageUtils.INSTANCE.hasThread(message) && !this.threads.containsKey(Long.valueOf(message.r())) && (channel2 = this.storeChannels.getThreadsByIdInternal$app_productionGoogleRelease().get(Long.valueOf(message.r()))) != null) { updateFromThread(channel2); z4 = true; } @@ -325,16 +326,17 @@ public final class StoreThreadMessages extends StoreV2 { if (channelChunk.getMessages().isEmpty()) { this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, 0, null, 7, null)); } else { - ModelMessage message = this.storeMessages.getMessage(channelChunk.getChannelId(), channelChunk.getMessages().get(0).getId()); + Message message2 = this.storeMessages.getMessage(channelChunk.getChannelId(), channelChunk.getMessages().get(0).r()); int size = channelChunk.getMessages().size(); - List messages = channelChunk.getMessages(); + List messages = channelChunk.getMessages(); if (!(messages instanceof Collection) || !messages.isEmpty()) { Iterator it = messages.iterator(); while (true) { if (!it.hasNext()) { break; } - if (((ModelMessage) it.next()).getType() == 21) { + Integer M = ((Message) it.next()).M(); + if (M != null && M.intValue() == 21) { z2 = true; continue; } else { @@ -350,7 +352,8 @@ public final class StoreThreadMessages extends StoreV2 { if (z3) { size--; } - this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(size, 50), (message == null || message.getType() != 21) ? message : null, 7, null)); + Integer M2 = message2 != null ? message2.M() : null; + this.threads.put(Long.valueOf(channel.g()), ThreadState.copy$default(orAddState, 0, 0, 0, f.coerceAtMost(size, 50), (M2 != null && M2.intValue() == 21) ? null : message2, 7, null)); } markChanged(); } @@ -377,12 +380,12 @@ public final class StoreThreadMessages extends StoreV2 { for (Channel channel : modelThreadListSync.getThreads()) { updateFromThread(channel); } - List mostRecentMessages = modelThreadListSync.getMostRecentMessages(); + List mostRecentMessages = modelThreadListSync.getMostRecentMessages(); if (mostRecentMessages != null) { - for (ModelMessage modelMessage : mostRecentMessages) { - ThreadState threadState = this.threads.get(Long.valueOf(modelMessage.getChannelId())); + for (Message message : mostRecentMessages) { + ThreadState threadState = this.threads.get(Long.valueOf(message.i())); if (threadState != null) { - this.threads.put(Long.valueOf(modelMessage.getChannelId()), ThreadState.copy$default(threadState, 0, 0, 0, 0, modelMessage, 15, null)); + this.threads.put(Long.valueOf(message.i()), ThreadState.copy$default(threadState, 0, 0, 0, 0, message, 15, null)); } } } diff --git a/app/src/main/java/com/discord/stores/StoreUser.java b/app/src/main/java/com/discord/stores/StoreUser.java index 9e61a33a51..56e9ed70a7 100644 --- a/app/src/main/java/com/discord/stores/StoreUser.java +++ b/app/src/main/java/com/discord/stores/StoreUser.java @@ -8,12 +8,12 @@ import com.discord.api.channel.Channel; import com.discord.api.guild.Guild; import com.discord.api.guildmember.GuildMember; import com.discord.api.guildmember.GuildMembersChunk; +import com.discord.api.message.Message; import com.discord.api.premium.PremiumTier; import com.discord.api.presence.Presence; import com.discord.api.user.NsfwAllowance; import com.discord.api.user.User; import com.discord.app.AppLog; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelPayload; import com.discord.models.domain.ModelUserRelationship; import com.discord.models.user.CoreUser; @@ -22,6 +22,7 @@ import com.discord.stores.StoreMessagesLoader; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; import com.discord.utilities.collections.SnowflakePartitionMap; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.persister.Persister; import com.discord.utilities.user.UserRequestManager; import com.discord.utilities.user.UserUtils; @@ -293,13 +294,15 @@ public final class StoreUser extends StoreV2 { } @StoreThread - public final void handleMessageCreateOrUpdate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - for (User user : modelMessage.getMentions()) { - m.checkNotNullExpressionValue(user, "user"); - updateUser(user); + public final void handleMessageCreateOrUpdate(Message message) { + m.checkNotNullParameter(message, "message"); + List z2 = message.z(); + if (z2 != null) { + for (User user : z2) { + updateUser(user); + } } - if (modelMessage.isUrgent()) { + if (MessageUtils.INSTANCE.isUrgent(message)) { this.f2100me = MeUser.copy$default(this.f2100me, 0, null, null, null, false, false, 0, null, null, false, false, null, this.f2100me.getFlags() | 8192, 0, null, null, null, null, 258047, null); markChanged(MeUpdate); } @@ -308,13 +311,16 @@ public final class StoreUser extends StoreV2 { @StoreThread public final void handleMessagesLoaded(StoreMessagesLoader.ChannelChunk channelChunk) { m.checkNotNullParameter(channelChunk, "chunk"); - for (ModelMessage modelMessage : channelChunk.getMessages()) { - User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - updateUser(author); - for (User user : modelMessage.getMentions()) { - m.checkNotNullExpressionValue(user, "user"); - updateUser(user); + for (Message message : channelChunk.getMessages()) { + User g = message.g(); + if (g != null) { + updateUser(g); + } + List z2 = message.z(); + if (z2 != null) { + for (User user : z2) { + updateUser(user); + } } } } diff --git a/app/src/main/java/com/discord/stores/StoreUserNotes$saveNote$1.java b/app/src/main/java/com/discord/stores/StoreUserNotes$saveNote$1.java new file mode 100644 index 0000000000..dc43a23030 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreUserNotes$saveNote$1.java @@ -0,0 +1,51 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreUserNotes.kt */ +public final class StoreUserNotes$saveNote$1 extends o implements Function1 { + public final /* synthetic */ String $note; + public final /* synthetic */ long $userId; + public final /* synthetic */ StoreUserNotes this$0; + + /* compiled from: StoreUserNotes.kt */ + /* renamed from: com.discord.stores.StoreUserNotes$saveNote$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ StoreUserNotes$saveNote$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreUserNotes$saveNote$1 storeUserNotes$saveNote$1) { + super(0); + this.this$0 = storeUserNotes$saveNote$1; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreUserNotes$saveNote$1 storeUserNotes$saveNote$1 = this.this$0; + StoreUserNotes.access$updateNoteInternal(storeUserNotes$saveNote$1.this$0, storeUserNotes$saveNote$1.$userId, storeUserNotes$saveNote$1.$note); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreUserNotes$saveNote$1(StoreUserNotes storeUserNotes, long j, String str) { + super(1); + this.this$0 = storeUserNotes; + this.$userId = j; + this.$note = str; + } + + /* 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(Void r1) { + invoke(r1); + return Unit.a; + } + + public final void invoke(Void r2) { + StoreUserNotes.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreUserNotes.java b/app/src/main/java/com/discord/stores/StoreUserNotes.java index ebe0714228..b8e2ed416c 100644 --- a/app/src/main/java/com/discord/stores/StoreUserNotes.java +++ b/app/src/main/java/com/discord/stores/StoreUserNotes.java @@ -1,15 +1,20 @@ package com.discord.stores; +import android.content.Context; import c.d.b.a.a; import com.discord.models.domain.ModelUserNote; +import com.discord.restapi.RestAPIParams; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; import com.discord.utilities.rest.RestAPI; +import com.discord.utilities.rx.ObservableExtensionsKt; import d0.g0.t; import d0.t.h0; import d0.z.d.m; import java.util.HashMap; import java.util.Map; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; import rx.Observable; /* compiled from: StoreUserNotes.kt */ @@ -139,6 +144,10 @@ public final class StoreUserNotes extends StoreV2 { storeUserNotes.handleRequestUserNoteSuccess(modelUserNote); } + public static final /* synthetic */ void access$updateNoteInternal(StoreUserNotes storeUserNotes, long j, String str) { + storeUserNotes.updateNoteInternal(j, str); + } + @StoreThread private final void handleRequestUserNoteError(long j) { this.notesByUserId.put(Long.valueOf(j), UserNoteState.Empty.INSTANCE); @@ -147,10 +156,11 @@ public final class StoreUserNotes extends StoreV2 { @StoreThread private final void handleRequestUserNoteSuccess(ModelUserNote modelUserNote) { - updateNote(modelUserNote.getNoteUserId(), modelUserNote.getNote()); + updateNoteInternal(modelUserNote.getNoteUserId(), modelUserNote.getNote()); } - private final void updateNote(long j, String str) { + @StoreThread + private final void updateNoteInternal(long j, String str) { if (t.isBlank(str)) { this.notesByUserId.put(Long.valueOf(j), UserNoteState.Empty.INSTANCE); } else { @@ -173,7 +183,7 @@ public final class StoreUserNotes extends StoreV2 { @StoreThread public final void handleNoteUpdate(ModelUserNote.Update update) { m.checkNotNullParameter(update, "update"); - updateNote(update.getId(), update.getNote()); + updateNoteInternal(update.getId(), update.getNote()); } public final void loadNote(long j) { @@ -186,6 +196,11 @@ public final class StoreUserNotes extends StoreV2 { return s2; } + public final void saveNote(Context context, long j, String str) { + m.checkNotNullParameter(str, "note"); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.updateUserNotes(j, new RestAPIParams.UserNoteUpdate(str)), false, 1, null), StoreUserNotes.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreUserNotes$saveNote$1(this, j, str), 60, (Object) null); + } + @Override // com.discord.stores.StoreV2 public void snapshotData() { super.snapshotData(); diff --git a/app/src/main/java/com/discord/stores/StoreUserSettings.java b/app/src/main/java/com/discord/stores/StoreUserSettings.java index ffcae02068..35cdb4d572 100644 --- a/app/src/main/java/com/discord/stores/StoreUserSettings.java +++ b/app/src/main/java/com/discord/stores/StoreUserSettings.java @@ -470,7 +470,7 @@ public final class StoreUserSettings extends Store { public final void setIsDeveloperMode(AppActivity appActivity, boolean z2) { if (getIsDeveloperMode() != z2) { if (appActivity != null) { - Companion.access$updateUserSettings(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithDeveloperMode(z2), 2131893804); + Companion.access$updateUserSettings(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithDeveloperMode(z2), 2131893844); } setDeveloperModeInternal(z2); } diff --git a/app/src/main/java/com/discord/stores/StoreUserTyping.java b/app/src/main/java/com/discord/stores/StoreUserTyping.java index 456b3dfdb8..ac0df205e0 100644 --- a/app/src/main/java/com/discord/stores/StoreUserTyping.java +++ b/app/src/main/java/com/discord/stores/StoreUserTyping.java @@ -1,8 +1,9 @@ package com.discord.stores; import android.content.Context; +import com.discord.api.message.Message; import com.discord.api.user.TypingUser; -import com.discord.models.domain.ModelMessage; +import com.discord.api.user.User; import com.discord.restapi.RestAPIParams; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; @@ -21,7 +22,6 @@ import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; import rx.Observable; import rx.Subscription; -import rx.subjects.BehaviorSubject; /* compiled from: StoreUserTyping.kt */ public final class StoreUserTyping extends StoreV2 { private final Dispatcher dispatcher; @@ -29,7 +29,6 @@ public final class StoreUserTyping extends StoreV2 { private final RestAPI restAPI; private final StoreStream stream; private final HashMap> typingUsers; - private final BehaviorSubject>> typingUsersPublisher; private final HashMap> typingUsersRemoveCallbacks; private Map> typingUsersSnapshot; @@ -45,7 +44,6 @@ public final class StoreUserTyping extends StoreV2 { this.typingUsersRemoveCallbacks = new HashMap<>(); this.typingUsers = new HashMap<>(); this.typingUsersSnapshot = h0.emptyMap(); - this.typingUsersPublisher = BehaviorSubject.m0(new HashMap()); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ @@ -86,14 +84,17 @@ public final class StoreUserTyping extends StoreV2 { } @StoreThread - public final void handleMessageCreate(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - long i = modelMessage.getAuthor().i(); - Set set = this.typingUsers.get(Long.valueOf(modelMessage.getChannelId())); - if (set != null) { - m.checkNotNullExpressionValue(set, "typingUsers[message.channelId] ?: return"); - if (set.remove(Long.valueOf(i))) { - markChanged(); + public final void handleMessageCreate(Message message) { + m.checkNotNullParameter(message, "message"); + User g = message.g(); + if (g != null) { + long i = g.i(); + Set set = this.typingUsers.get(Long.valueOf(message.i())); + if (set != null) { + m.checkNotNullExpressionValue(set, "typingUsers[message.channelId] ?: return"); + if (set.remove(Long.valueOf(i))) { + markChanged(); + } } } } diff --git a/app/src/main/java/com/discord/stores/utilities/BatchManager.java b/app/src/main/java/com/discord/stores/utilities/BatchManager.java new file mode 100644 index 0000000000..2c8f96b481 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/BatchManager.java @@ -0,0 +1,60 @@ +package com.discord.stores.utilities; + +import c.q.a.k.a; +import com.discord.utilities.time.Clock; +import com.discord.utilities.time.ClockFactory; +import d0.z.d.m; +import java.util.LinkedHashMap; +import java.util.Map; +import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: BatchManager.kt */ +public final class BatchManager { + private final Map> batches; + private final Clock clock; + private final CoroutineScope scope; + + public BatchManager(CoroutineDispatcher coroutineDispatcher, Clock clock) { + m.checkNotNullParameter(coroutineDispatcher, "dispatcher"); + m.checkNotNullParameter(clock, "clock"); + this.clock = clock; + this.scope = a.a(coroutineDispatcher); + this.batches = new LinkedHashMap(); + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ BatchManager(CoroutineDispatcher coroutineDispatcher, Clock clock, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(coroutineDispatcher, (i & 2) != 0 ? ClockFactory.get() : clock); + } + + public static /* synthetic */ Batched createBatched$default(BatchManager batchManager, String str, long j, long j2, int i, Object obj) { + if ((i & 2) != 0) { + j = 100; + } + if ((i & 4) != 0) { + j2 = 300; + } + return batchManager.createBatched(str, j, j2); + } + + public final Batched createBatched(String str, long j, long j2) { + m.checkNotNullParameter(str, "type"); + Batched batched = new Batched<>(str, j, j2, this.scope, this.clock); + this.batches.put(str, batched); + return batched; + } + + public final void dispose() { + a.i(this.scope, null); + } + + public final void flushBatches(String str) { + for (Map.Entry> entry : this.batches.entrySet()) { + Batched value = entry.getValue(); + if (!m.areEqual(entry.getKey(), str)) { + value.flush(); + } + } + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java b/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java new file mode 100644 index 0000000000..c5da8637d6 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java @@ -0,0 +1,56 @@ +package com.discord.stores.utilities; + +import c.q.a.k.a; +import d0.l; +import d0.w.g.c; +import d0.w.h.a.e; +import d0.w.h.a.k; +import d0.z.d.m; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: Batched.kt */ +@e(c = "com.discord.stores.utilities.Batched$onNext$1", f = "Batched.kt", l = {70}, m = "invokeSuspend") +public final class Batched$onNext$1 extends k implements Function2, Object> { + public int label; + public final /* synthetic */ Batched this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public Batched$onNext$1(Batched batched, Continuation continuation) { + super(2, continuation); + this.this$0 = batched; + } + + @Override // d0.w.h.a.a + public final Continuation create(Object obj, Continuation continuation) { + m.checkNotNullParameter(continuation, "completion"); + return new Batched$onNext$1(this.this$0, continuation); + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public final Object invoke(CoroutineScope coroutineScope, Continuation continuation) { + return ((Batched$onNext$1) create(coroutineScope, continuation)).invokeSuspend(Unit.a); + } + + @Override // d0.w.h.a.a + public final Object invokeSuspend(Object obj) { + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + int i = this.label; + if (i == 0) { + l.throwOnFailure(obj); + long access$getDebounceDelayMs$p = Batched.access$getDebounceDelayMs$p(this.this$0); + this.label = 1; + if (a.n(access$getDebounceDelayMs$p, this) == coroutine_suspended) { + return coroutine_suspended; + } + } else if (i == 1) { + l.throwOnFailure(obj); + } else { + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); + } + this.this$0.flush(); + return Unit.a; + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/Batched.java b/app/src/main/java/com/discord/stores/utilities/Batched.java new file mode 100644 index 0000000000..f930f76745 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/Batched.java @@ -0,0 +1,107 @@ +package com.discord.stores.utilities; + +import c.q.a.k.a; +import com.discord.utilities.time.Clock; +import com.discord.utilities.time.ClockFactory; +import d0.z.d.m; +import java.util.ArrayList; +import java.util.List; +import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineScope; +import kotlinx.coroutines.Job; +import rx.Observable; +import rx.subjects.BehaviorSubject; +import rx.subjects.SerializedSubject; +/* compiled from: Batched.kt */ +public final class Batched { + public static final Companion Companion = new Companion(null); + public static final long DEFAULT_DEBOUNCE_DELAY_MS = 100; + public static final long DEFAULT_MAX_DEBOUNCE_DELAY_MS = 300; + private static final long QUEUE_NOT_STARTED = -1; + private final Clock clock; + private final long debounceDelayMs; + private Job debounceJob; + private final long maxDebounceDelayMs; + private List queue; + private long queueStartTime; + private final CoroutineScope scope; + private final SerializedSubject, List> subject; + private final String type; + + /* compiled from: Batched.kt */ + public static final class Companion { + private Companion() { + } + + public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + } + + public Batched(String str, long j, long j2, CoroutineScope coroutineScope, Clock clock) { + m.checkNotNullParameter(str, "type"); + m.checkNotNullParameter(coroutineScope, "scope"); + m.checkNotNullParameter(clock, "clock"); + this.type = str; + this.debounceDelayMs = j; + this.maxDebounceDelayMs = j2; + this.scope = coroutineScope; + this.clock = clock; + this.subject = new SerializedSubject<>(BehaviorSubject.l0()); + this.queue = new ArrayList(); + this.queueStartTime = -1; + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ Batched(String str, long j, long j2, CoroutineScope coroutineScope, Clock clock, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(str, (i & 2) != 0 ? 100 : j, (i & 4) != 0 ? 300 : j2, coroutineScope, (i & 16) != 0 ? ClockFactory.get() : clock); + } + + public static final /* synthetic */ long access$getDebounceDelayMs$p(Batched batched) { + return batched.debounceDelayMs; + } + + public final void flush() { + Job job = this.debounceJob; + if (job != null) { + a.k(job, null, 1, null); + } + this.debounceJob = null; + this.queueStartTime = -1; + List list = this.queue; + this.queue = new ArrayList(); + this.subject.j.onNext(list); + } + + public final String getType() { + return this.type; + } + + public final Observable> observe() { + return this.subject; + } + + public final void onNext(T t) { + this.queue.add(t); + long currentTimeMillis = this.clock.currentTimeMillis(); + if (this.queueStartTime == -1) { + this.queueStartTime = currentTimeMillis; + } + if (currentTimeMillis - this.queueStartTime >= this.maxDebounceDelayMs) { + flush(); + return; + } + Job job = this.debounceJob; + if (job != null) { + a.k(job, null, 1, null); + } + this.debounceJob = a.G(this.scope, null, null, new Batched$onNext$1(this, null), 3, null); + } + + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.lang.Object */ + /* JADX WARN: Multi-variable type inference failed */ + public final void onNextAny(Object obj) { + m.checkNotNullParameter(obj, "value"); + onNext(obj); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/Default.java b/app/src/main/java/com/discord/stores/utilities/Default.java new file mode 100644 index 0000000000..e56566b450 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/Default.java @@ -0,0 +1,9 @@ +package com.discord.stores.utilities; +/* compiled from: RestCallState.kt */ +public final class Default extends RestCallState { + public static final Default INSTANCE = new Default(); + + private Default() { + super(null); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/Failure.java b/app/src/main/java/com/discord/stores/utilities/Failure.java new file mode 100644 index 0000000000..ce68082ab1 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/Failure.java @@ -0,0 +1,58 @@ +package com.discord.stores.utilities; + +import c.d.b.a.a; +import com.discord.utilities.error.Error; +import d0.z.d.m; +/* compiled from: RestCallState.kt */ +public final class Failure extends RestCallState { + private final Error error; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public Failure(Error error) { + super(null); + m.checkNotNullParameter(error, "error"); + this.error = error; + } + + public static /* synthetic */ Failure copy$default(Failure failure, Error error, int i, Object obj) { + if ((i & 1) != 0) { + error = failure.error; + } + return failure.copy(error); + } + + public final Error component1() { + return this.error; + } + + public final Failure copy(Error error) { + m.checkNotNullParameter(error, "error"); + return new Failure<>(error); + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof Failure) && m.areEqual(this.error, ((Failure) obj).error); + } + return true; + } + + public final Error getError() { + return this.error; + } + + public int hashCode() { + Error error = this.error; + if (error != null) { + return error.hashCode(); + } + return 0; + } + + public String toString() { + StringBuilder L = a.L("Failure(error="); + L.append(this.error); + L.append(")"); + return L.toString(); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/Loading.java b/app/src/main/java/com/discord/stores/utilities/Loading.java new file mode 100644 index 0000000000..c208090669 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/Loading.java @@ -0,0 +1,9 @@ +package com.discord.stores.utilities; +/* compiled from: RestCallState.kt */ +public final class Loading extends RestCallState { + public static final Loading INSTANCE = new Loading(); + + private Loading() { + super(null); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallState.java b/app/src/main/java/com/discord/stores/utilities/RestCallState.java new file mode 100644 index 0000000000..021933248c --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/RestCallState.java @@ -0,0 +1,16 @@ +package com.discord.stores.utilities; + +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: RestCallState.kt */ +public abstract class RestCallState { + private RestCallState() { + } + + public /* synthetic */ RestCallState(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + + public Response invoke() { + return null; + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$executeRequest$1.java b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$executeRequest$1.java new file mode 100644 index 0000000000..3737b91176 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$executeRequest$1.java @@ -0,0 +1,20 @@ +package com.discord.stores.utilities; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: RestCallState.kt */ +public final class RestCallStateKt$executeRequest$1 extends o implements Function1 { + public final /* synthetic */ Function1 $callback; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public RestCallStateKt$executeRequest$1(Function1 function1) { + super(1); + this.$callback = function1; + } + + @Override // kotlin.jvm.functions.Function1 + public final void invoke(T t) { + this.$callback.invoke(new Success(t)); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$executeRequest$2.java b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$executeRequest$2.java new file mode 100644 index 0000000000..9ad887b573 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt$executeRequest$2.java @@ -0,0 +1,30 @@ +package com.discord.stores.utilities; + +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: RestCallState.kt */ +public final class RestCallStateKt$executeRequest$2 extends o implements Function1 { + public final /* synthetic */ Function1 $callback; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public RestCallStateKt$executeRequest$2(Function1 function1) { + super(1); + this.$callback = function1; + } + + /* 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(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "error"); + this.$callback.invoke(new Failure(error)); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java new file mode 100644 index 0000000000..73d50886e9 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/RestCallStateKt.java @@ -0,0 +1,18 @@ +package com.discord.stores.utilities; + +import android.content.Context; +import com.discord.utilities.rx.ObservableExtensionsKt; +import d0.z.d.m; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +import rx.Observable; +/* compiled from: RestCallState.kt */ +public final class RestCallStateKt { + public static final void executeRequest(Observable observable, Function1, Unit> function1) { + m.checkNotNullParameter(observable, "$this$executeRequest"); + m.checkNotNullParameter(function1, "callback"); + function1.invoke(Loading.INSTANCE); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(observable, false, 1, null), observable.getClass(), (Context) null, (Function1) null, new RestCallStateKt$executeRequest$2(function1), (Function0) null, (Function0) null, new RestCallStateKt$executeRequest$1(function1), 54, (Object) null); + } +} diff --git a/app/src/main/java/com/discord/stores/utilities/Success.java b/app/src/main/java/com/discord/stores/utilities/Success.java new file mode 100644 index 0000000000..ee9b0be628 --- /dev/null +++ b/app/src/main/java/com/discord/stores/utilities/Success.java @@ -0,0 +1,61 @@ +package com.discord.stores.utilities; + +import c.d.b.a.a; +import d0.z.d.m; +/* compiled from: RestCallState.kt */ +public final class Success extends RestCallState { + private final T response; + + public Success(T t) { + super(null); + this.response = t; + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.stores.utilities.Success */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ Success copy$default(Success success, Object obj, int i, Object obj2) { + if ((i & 1) != 0) { + obj = success.response; + } + return success.copy(obj); + } + + public final T component1() { + return this.response; + } + + public final Success copy(T t) { + return new Success<>(t); + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof Success) && m.areEqual(this.response, ((Success) obj).response); + } + return true; + } + + public final T getResponse() { + return this.response; + } + + public int hashCode() { + T t = this.response; + if (t != null) { + return t.hashCode(); + } + return 0; + } + + @Override // com.discord.stores.utilities.RestCallState + public T invoke() { + return this.response; + } + + public String toString() { + StringBuilder L = a.L("Success(response="); + L.append((Object) this.response); + L.append(")"); + return L.toString(); + } +} diff --git a/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java b/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java index b39af23be6..08e3b2ae17 100644 --- a/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java +++ b/app/src/main/java/com/discord/utilities/StoreUIEventHandler.java @@ -79,11 +79,11 @@ public final class StoreUIEventHandler { if (status != KrispOveruseDetector.Status.FAILED || (channel = this.channelsStore.getChannel(this.voiceChannelSelectedStore.getSelectedVoiceChannelId())) == null || !AnimatableValueParser.u1(channel) || (r0 = this.stageChannelsStore.m10getMyRolesvisDeB4(channel.g())) == null || !StageRoles.m23isAudienceimpl(r0.m28unboximpl())) { int ordinal = status.ordinal(); if (ordinal == 0) { - i = 2131891185; + i = 2131891217; } else if (ordinal == 1) { - i = 2131891186; + i = 2131891218; } else if (ordinal == 2) { - i = 2131891181; + i = 2131891212; } else { throw new NoWhenBranchMatchedException(); } @@ -97,11 +97,11 @@ public final class StoreUIEventHandler { if (event instanceof StoreUserGuildSettings.Event.SettingsUpdated) { int ordinal = ((StoreUserGuildSettings.Event.SettingsUpdated) event).getType().ordinal(); if (ordinal == 0) { - i = 2131893144; + i = 2131893186; } else if (ordinal == 1) { - i = 2131887325; + i = 2131887327; } else if (ordinal == 2) { - i = 2131887208; + i = 2131887209; } else { throw new NoWhenBranchMatchedException(); } diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java index a20f578bb2..77cc0bf0f5 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java @@ -77,7 +77,7 @@ public final class AnalyticSuperProperties { private final void setBaselineProperties() { String 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/80011"), o.to("client_build_number", 80011), o.to("client_version", "80.11 - Stable"), 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/81014"), o.to("client_build_number", 81014), o.to("client_version", "81.14 - Stable"), 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 map) { diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java index 7d5b0fab1d..0e48205ecf 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java @@ -50,6 +50,7 @@ import com.discord.utilities.fcm.NotificationClient; import com.discord.utilities.intent.RouteHandlers; import com.discord.utilities.logging.Logger; import com.discord.utilities.permissions.PermissionUtils; +import com.discord.utilities.persister.Persister; import com.discord.utilities.platform.Platform; import com.discord.utilities.rest.FileUploadAlertType; 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))); } + 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) { tracker.track("application_command_browser_jumped", g0.mapOf(o.to("target_application_id", Long.valueOf(j)))); } @@ -1255,7 +1264,7 @@ public final class AnalyticsTracker { m.checkNotNullParameter(buildInfo, "buildInfo"); m.checkNotNullParameter(memoryInfo, "memoryInfo"); m.checkNotNullParameter(decoderCountInfo, "decoderCountInfo"); - tracker.track("android_hardware_survey", h0.mapOf(o.to("device_board", buildInfo.a), o.to("device_brand", buildInfo.b), o.to("device_manufacturer", buildInfo.f2006c), o.to("device_model", buildInfo.d), o.to("device_product", buildInfo.e), o.to("device_supported_abis", buildInfo.f), o.to("device_is_64_bit", Boolean.valueOf(buildInfo.g)), o.to("is_low_ram_device", Boolean.valueOf(memoryInfo.b)), o.to("memory_class", Integer.valueOf(memoryInfo.f2008c)), o.to("large_memory_class", Integer.valueOf(memoryInfo.d)), o.to("hardware_decoders_1080", Integer.valueOf(decoderCountInfo.a)), o.to("hardware_decoders_720", Integer.valueOf(decoderCountInfo.b)), o.to("hardware_decoders_480", Integer.valueOf(decoderCountInfo.f2007c)), o.to("decoders_1080", Integer.valueOf(decoderCountInfo.d)), o.to("decoders_720", Integer.valueOf(decoderCountInfo.e)), o.to("decoders_480", Integer.valueOf(decoderCountInfo.f)), o.to("test_duration_ms", Integer.valueOf(decoderCountInfo.g)))); + tracker.track("android_hardware_survey", h0.mapOf(o.to("device_board", buildInfo.a), o.to("device_brand", buildInfo.b), o.to("device_manufacturer", buildInfo.f2008c), o.to("device_model", buildInfo.d), o.to("device_product", buildInfo.e), o.to("device_supported_abis", buildInfo.f), o.to("device_is_64_bit", Boolean.valueOf(buildInfo.g)), o.to("is_low_ram_device", Boolean.valueOf(memoryInfo.b)), o.to("memory_class", Integer.valueOf(memoryInfo.f2010c)), o.to("large_memory_class", Integer.valueOf(memoryInfo.d)), o.to("hardware_decoders_1080", Integer.valueOf(decoderCountInfo.a)), o.to("hardware_decoders_720", Integer.valueOf(decoderCountInfo.b)), o.to("hardware_decoders_480", Integer.valueOf(decoderCountInfo.f2009c)), o.to("decoders_1080", Integer.valueOf(decoderCountInfo.d)), o.to("decoders_720", Integer.valueOf(decoderCountInfo.e)), o.to("decoders_480", Integer.valueOf(decoderCountInfo.f)), o.to("test_duration_ms", Integer.valueOf(decoderCountInfo.g)))); } public final void inviteCopied(GuildInvite guildInvite, Channel channel, String str) { @@ -1907,14 +1916,6 @@ public final class AnalyticsTracker { AnalyticsUtils.Tracker.track$default(tracker, "smart_lock_login_credentials_failed", null, 2, null); } - public final void stickerNudgeDisplayed(long j) { - tracker.track("nudge_displayed", g0.mapOf(o.to("sticker_id", Long.valueOf(j)))); - } - - public final void stickerNudgeOpened(long j) { - tracker.track("nudge_opened", g0.mapOf(o.to("sticker_id", Long.valueOf(j)))); - } - public final void stickerPackCategorySelected(long j) { expressionPickerCategorySelected$default(this, Long.valueOf(j), null, "sticker", 2, null); } @@ -1923,9 +1924,9 @@ public final class AnalyticsTracker { m.checkNotNullParameter(sticker, "sticker"); m.checkNotNullParameter(str, "type"); m.checkNotNullParameter(location, "locationTrait"); - Long g = sticker.g(); - m.checkNotNull(g); - Map mutableMapOf = h0.mutableMapOf(o.to("sticker_id", Long.valueOf(sticker.getId())), o.to("sticker_pack_id", g), o.to("type", str)); + Long h = sticker.h(); + m.checkNotNull(h); + Map mutableMapOf = h0.mutableMapOf(o.to("sticker_id", Long.valueOf(sticker.getId())), o.to("sticker_pack_id", h), o.to("type", str)); if (str2 != null) { mutableMapOf.put("location", str2); } diff --git a/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java index 28f11f27b4..60cb6a3bb6 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java +++ b/app/src/main/java/com/discord/utilities/analytics/AppStartAnalyticsTracker.java @@ -3,9 +3,11 @@ package com.discord.utilities.analytics; import android.net.Uri; import com.discord.stores.StoreUserSettingsSystem; import com.discord.utilities.analytics.AnalyticsUtils; +import com.discord.utilities.persister.Persister; import com.discord.utilities.time.Clock; import d0.g; import d0.o; +import d0.t.g0; import d0.t.h0; import d0.z.d.m; import java.util.Map; @@ -14,6 +16,7 @@ import kotlin.Lazy; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: AppStartAnalyticsTracker.kt */ public final class AppStartAnalyticsTracker { + private static final String APP_FIRST_LAUNCHED = "app_first_launched"; public static final Companion Companion = new Companion(null); private static final Lazy instance$delegate = g.lazy(AppStartAnalyticsTracker$Companion$instance$2.INSTANCE); private Long appOpenTimestamp; @@ -103,6 +106,11 @@ public final class AppStartAnalyticsTracker { public final void appOpen(Uri uri, boolean z2, boolean z3) { m.checkNotNullParameter(uri, "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) { diff --git a/app/src/main/java/com/discord/utilities/animations/AnimationCoroutineUtilsKt.java b/app/src/main/java/com/discord/utilities/animations/AnimationCoroutineUtilsKt.java index 25e1d254cb..988f88ae6c 100644 --- a/app/src/main/java/com/discord/utilities/animations/AnimationCoroutineUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/animations/AnimationCoroutineUtilsKt.java @@ -6,16 +6,16 @@ import d0.w.g.c; import d0.w.h.a.g; import kotlin.Unit; import kotlin.coroutines.Continuation; -import s.a.j; +import s.a.k; /* compiled from: AnimationCoroutineUtils.kt */ public final class AnimationCoroutineUtilsKt { public static final Object await(ViewPropertyAnimator viewPropertyAnimator, Continuation continuation) { - j jVar = new j(b.intercepted(continuation), 1); - jVar.A(); - jVar.e(new AnimationCoroutineUtilsKt$await$$inlined$suspendCancellableCoroutine$lambda$1(viewPropertyAnimator)); - viewPropertyAnimator.setListener(new AnimationCoroutineUtilsKt$await$$inlined$suspendCancellableCoroutine$lambda$2(jVar, viewPropertyAnimator)); + k kVar = new k(b.intercepted(continuation), 1); + kVar.A(); + kVar.e(new AnimationCoroutineUtilsKt$await$$inlined$suspendCancellableCoroutine$lambda$1(viewPropertyAnimator)); + viewPropertyAnimator.setListener(new AnimationCoroutineUtilsKt$await$$inlined$suspendCancellableCoroutine$lambda$2(kVar, viewPropertyAnimator)); viewPropertyAnimator.start(); - Object u = jVar.u(); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } diff --git a/app/src/main/java/com/discord/utilities/apng/ApngUtils$renderApngFromFile$3.java b/app/src/main/java/com/discord/utilities/apng/ApngUtils$renderApngFromFile$3.java index 9dbaad99a5..a124154614 100644 --- a/app/src/main/java/com/discord/utilities/apng/ApngUtils$renderApngFromFile$3.java +++ b/app/src/main/java/com/discord/utilities/apng/ApngUtils$renderApngFromFile$3.java @@ -15,10 +15,11 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.Ref$ObjectRef; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; -import s.a.i1; +import s.a.a.n; import s.a.j0; -import s.a.z; +import s.a.k1; /* compiled from: ApngUtils.kt */ @e(c = "com.discord.utilities.apng.ApngUtils$renderApngFromFile$3", f = "ApngUtils.kt", l = {31}, m = "invokeSuspend") public final class ApngUtils$renderApngFromFile$3 extends k implements Function2, Object> { @@ -124,11 +125,11 @@ public final class ApngUtils$renderApngFromFile$3 extends k implements Function2 ?? a = a.a(bufferedInputStream, num2, num); b.closeFinally(bufferedInputStream, null); ref$ObjectRef.element = a; - z zVar = j0.a; - i1 i1Var = s.a.a.m.b; + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 k1Var = n.b; AnonymousClass1 r4 = new AnonymousClass1(this, ref$ObjectRef, null); this.label = 1; - if (c.q.a.k.a.h0(i1Var, r4, this) == coroutine_suspended) { + if (c.q.a.k.a.i0(k1Var, r4, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/utilities/apng/ApngUtils.java b/app/src/main/java/com/discord/utilities/apng/ApngUtils.java index 6bb6b02e90..5f7a183c05 100644 --- a/app/src/main/java/com/discord/utilities/apng/ApngUtils.java +++ b/app/src/main/java/com/discord/utilities/apng/ApngUtils.java @@ -9,7 +9,7 @@ import java.lang.ref.WeakReference; import kotlin.jvm.internal.Ref$ObjectRef; import kotlinx.coroutines.Job; import s.a.j0; -import s.a.u0; +import s.a.w0; /* compiled from: ApngUtils.kt */ public final class ApngUtils { public static final ApngUtils INSTANCE = new ApngUtils(); @@ -53,6 +53,6 @@ public final class ApngUtils { imageView3.setMaxWidth(intValue2); } } - return c.q.a.k.a.F(u0.i, j0.b, null, new ApngUtils$renderApngFromFile$3(file, num2, num, ref$ObjectRef, z2, null), 2, null); + return c.q.a.k.a.G(w0.i, j0.b, null, new ApngUtils$renderApngFromFile$3(file, num2, num, ref$ObjectRef, z2, null), 2, null); } } diff --git a/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java b/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java index 788d3b20c6..293fe64f6e 100644 --- a/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/attachments/AttachmentUtilsKt.java @@ -5,7 +5,7 @@ import android.content.ContentResolver; import android.graphics.Bitmap; import android.net.Uri; import androidx.core.view.inputmethod.InputContentInfoCompat; -import com.discord.models.messages.LocalAttachment; +import com.discord.api.message.LocalAttachment; import com.discord.utilities.string.StringUtilsKt; import com.lytefast.flexinput.model.Attachment; import d0.g; @@ -130,6 +130,11 @@ public final class AttachmentUtilsKt { return toHumanReadableAscii(StringUtilsKt.stripAccents(str)); } + public static final boolean isGif(Attachment attachment, ContentResolver contentResolver) { + m.checkNotNullParameter(attachment, "$this$isGif"); + return m.areEqual(getMimeType(attachment, contentResolver), "image/gif"); + } + public static final boolean isImage(ContentResolver contentResolver, Uri uri, String str) { m.checkNotNullParameter(uri, "uri"); return t.startsWith$default(getMimeType(contentResolver, uri, str), "image", false, 2, null); @@ -150,9 +155,9 @@ public final class AttachmentUtilsKt { public static final boolean isImageAttachment(LocalAttachment localAttachment, ContentResolver contentResolver) { m.checkNotNullParameter(localAttachment, "$this$isImageAttachment"); m.checkNotNullParameter(contentResolver, "contentResolver"); - Uri parse = Uri.parse(localAttachment.getUriString()); + Uri parse = Uri.parse(localAttachment.c()); m.checkNotNullExpressionValue(parse, "Uri.parse(uriString)"); - return isImage(contentResolver, parse, localAttachment.getDisplayName()); + return isImage(contentResolver, parse, localAttachment.a()); } public static final boolean isVideo(ContentResolver contentResolver, Uri uri, String str) { @@ -175,17 +180,17 @@ public final class AttachmentUtilsKt { public static final boolean isVideoAttachment(LocalAttachment localAttachment, ContentResolver contentResolver) { m.checkNotNullParameter(localAttachment, "$this$isVideoAttachment"); m.checkNotNullParameter(contentResolver, "contentResolver"); - Uri parse = Uri.parse(localAttachment.getUriString()); + Uri parse = Uri.parse(localAttachment.c()); m.checkNotNullExpressionValue(parse, "Uri.parse(uriString)"); - return isVideo(contentResolver, parse, localAttachment.getDisplayName()); + return isVideo(contentResolver, parse, localAttachment.a()); } public static final Attachment toAttachment(LocalAttachment localAttachment) { m.checkNotNullParameter(localAttachment, "$this$toAttachment"); - long id2 = localAttachment.getId(); - Uri parse = Uri.parse(localAttachment.getUriString()); + long b = localAttachment.b(); + Uri parse = Uri.parse(localAttachment.c()); m.checkNotNullExpressionValue(parse, "Uri.parse(uriString)"); - return new Attachment(id2, parse, localAttachment.getDisplayName(), null); + return new Attachment(b, parse, localAttachment.a(), null); } private static final String toHumanReadableAscii(String str) { diff --git a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java index 8d69187201..54775e4545 100644 --- a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java +++ b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogChangeUtils.java @@ -165,7 +165,7 @@ public final class AuditLogChangeUtils { (wrap: java.lang.CharSequence : 0x0283: INVOKE (r1v31 java.lang.CharSequence) = (r2v9 android.content.res.Resources) (r11v0 android.content.Context) - (2131755141 int) + (2131755142 int) (r3v12 int) (r6v3 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getQuantityString(android.content.res.Resources, android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) @@ -190,7 +190,7 @@ public final class AuditLogChangeUtils { (wrap: java.lang.CharSequence : 0x02f9: INVOKE (r1v22 java.lang.CharSequence) = (r2v8 android.content.res.Resources) (r11v0 android.content.Context) - (2131755147 int) + (2131755148 int) (r3v7 int) (r6v2 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getQuantityString(android.content.res.Resources, android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) @@ -305,7 +305,7 @@ public final class AuditLogChangeUtils { Object newValue6 = change.getNewValue(); if (newValue6 != null) { objArr8[0] = Integer.valueOf((int) ((Long) newValue6).longValue()); - objArr7[0] = StringResourceUtilsKt.getQuantityString(resources, context, 2131755141, longValue, objArr8); + objArr7[0] = StringResourceUtilsKt.getQuantityString(resources, context, 2131755142, longValue, objArr8); return b.g(context, i, objArr7, null, 4); } throw new NullPointerException("null cannot be cast to non-null type kotlin.Long"); @@ -330,7 +330,7 @@ public final class AuditLogChangeUtils { Object newValue9 = change.getNewValue(); if (newValue9 != null) { objArr11[0] = (Integer) newValue9; - objArr10[0] = StringResourceUtilsKt.getQuantityString(resources2, context, 2131755147, intValue, objArr11); + objArr10[0] = StringResourceUtilsKt.getQuantityString(resources2, context, 2131755148, intValue, objArr11); return b.g(context, i, objArr10, null, 4); } throw new NullPointerException("null cannot be cast to non-null type kotlin.Int"); @@ -377,32 +377,32 @@ public final class AuditLogChangeUtils { switch (key.hashCode()) { case -1920783726: if (key.equals("rtc_region")) { - return getNullableNewOrOldValueString$default(this, change, 2131889408, 2131889409, 2131889410, null, 8, null); + return getNullableNewOrOldValueString$default(this, change, 2131889418, 2131889419, 2131889420, null, 8, null); } break; case -1451708889: if (key.equals("video_quality_mode")) { - return getNullableOldValueString(change, 2131889422, 2131889421); + return getNullableOldValueString(change, 2131889432, 2131889431); } break; case -934964668: if (key.equals("reason")) { - return 2131889424; + return 2131889434; } break; case -102270099: if (key.equals("bitrate")) { - return getNullableOldValueString(change, 2131889389, 2131889388); + return getNullableOldValueString(change, 2131889399, 2131889398); } break; case 3079692: if (key.equals("deny")) { - return 2131889401; + return 2131889411; } break; case 3373707: if (key.equals("name")) { - return getNullableOldValueString(change, 2131889395, 2131889394); + return getNullableOldValueString(change, 2131889405, 2131889404); } break; case 3390806: @@ -411,42 +411,42 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue = ((Boolean) value).booleanValue(); if (!booleanValue) { - return 2131889396; + return 2131889406; } if (booleanValue) { - return 2131889397; + return 2131889407; } throw new NoWhenBranchMatchedException(); } break; case 3575610: if (key.equals("type")) { - return getNullableOldValueString(change, 2131889417, 2131889416); + return getNullableOldValueString(change, 2131889427, 2131889426); } break; case 92906313: if (key.equals("allow")) { - return 2131889402; + return 2131889412; } break; case 108404047: if (key.equals("reset")) { - return 2131889403; + return 2131889413; } break; case 110546223: if (key.equals("topic")) { - return getNullableNewOrOldValueString$default(this, change, 2131889413, 2131889415, 2131889414, null, 8, null); + return getNullableNewOrOldValueString$default(this, change, 2131889423, 2131889425, 2131889424, null, 8, null); } break; case 747804969: if (key.equals("position")) { - return getNullableOldValueString(change, 2131889405, 2131889404); + return getNullableOldValueString(change, 2131889415, 2131889414); } break; case 987155184: if (key.equals("rate_limit_per_user")) { - return getNullableOldValueString(change, 2131889407, 2131889406); + return getNullableOldValueString(change, 2131889417, 2131889416); } break; } @@ -457,30 +457,30 @@ public final class AuditLogChangeUtils { @StringRes private final int getChannelTypeStringResIdFromValue(Integer num) { if (num != null && num.intValue() == 1) { - return 2131888161; + return 2131888171; } if (num != null && num.intValue() == 3) { - return 2131889126; + return 2131889136; } if (num != null && num.intValue() == 0) { - return 2131893787; + return 2131893827; } if (num != null && num.intValue() == 2) { - return 2131894468; + return 2131894515; } if (num != null && num.intValue() == 5) { - return 2131891323; + return 2131891356; } if (num != null && num.intValue() == 6) { - return 2131893554; + return 2131893594; } if (num != null && num.intValue() == 13) { - return 2131893285; + return 2131893327; } if ((num != null && num.intValue() == 10) || ((num != null && num.intValue() == 11) || (num != null && num.intValue() == 12))) { - return 2131893807; + return 2131893847; } - return (num != null && num.intValue() == 4) ? 2131887199 : 0; + return (num != null && num.intValue() == 4) ? 2131887200 : 0; } @StringRes @@ -490,10 +490,10 @@ public final class AuditLogChangeUtils { int hashCode = key.hashCode(); if (hashCode != -934964668) { if (hashCode == 3373707 && key.equals("name")) { - return getNullableOldValueString(change, 2131889428, 2131889427); + return getNullableOldValueString(change, 2131889438, 2131889437); } } else if (key.equals("reason")) { - return 2131889424; + return 2131889434; } } return 0; @@ -501,34 +501,34 @@ public final class AuditLogChangeUtils { private final CharSequence getExpireAfterString(int i, Context context) { if (i == 0) { - return b.g(context, 2131891392, new Object[0], null, 4); + return b.g(context, 2131891425, new Object[0], null, 4); } if (i == 1800) { Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources, context, 2131755066, 30, 30); + return StringResourceUtilsKt.getQuantityString(resources, context, 2131755067, 30, 30); } else if (i == 3600) { Resources resources2 = context.getResources(); m.checkNotNullExpressionValue(resources2, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755064, 1, 1); + return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755065, 1, 1); } else if (i == 21600) { Resources resources3 = context.getResources(); m.checkNotNullExpressionValue(resources3, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755064, 6, 6); + return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755065, 6, 6); } else if (i == 43200) { Resources resources4 = context.getResources(); m.checkNotNullExpressionValue(resources4, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755064, 12, 12); + return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755065, 12, 12); } else if (i == 86400) { Resources resources5 = context.getResources(); m.checkNotNullExpressionValue(resources5, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755062, 1, 1); + return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755063, 1, 1); } else if (i != 604800) { return ""; } else { Resources resources6 = context.getResources(); m.checkNotNullExpressionValue(resources6, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources6, context, 2131755062, 7, 7); + return StringResourceUtilsKt.getQuantityString(resources6, context, 2131755063, 7, 7); } } @@ -540,10 +540,10 @@ public final class AuditLogChangeUtils { } switch (key.hashCode()) { case -1907190207: - return key.equals("banner_hash") ? 2131889433 : 0; + return key.equals("banner_hash") ? 2131889443 : 0; case -1724546052: if (key.equals("description")) { - return getNullableNewValueString(change, 2131889437, 2131889436); + return getNullableNewValueString(change, 2131889447, 2131889446); } return 0; case -1705139351: @@ -554,28 +554,28 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long"); int longValue = (int) ((Long) value).longValue(); if (longValue == GuildExplicitContentFilter.NONE.getApiValue()) { - return 2131889440; + return 2131889450; } if (longValue == GuildExplicitContentFilter.SOME.getApiValue()) { - return 2131889441; + return 2131889451; } - return longValue == GuildExplicitContentFilter.ALL.getApiValue() ? 2131889439 : 0; + return longValue == GuildExplicitContentFilter.ALL.getApiValue() ? 2131889449 : 0; case -1572429104: if (key.equals("afk_channel_id")) { - return getNullableNewValueString(change, 2131889431, 2131889430); + return getNullableNewValueString(change, 2131889441, 2131889440); } return 0; case -1390796524: - return key.equals("icon_hash") ? 2131889442 : 0; + return key.equals("icon_hash") ? 2131889452 : 0; case -1100074521: if (key.equals("system_channel_id")) { - return getNullableNewValueString(change, 2131889453, 2131889452); + return getNullableNewValueString(change, 2131889463, 2131889462); } return 0; case -934964668: - return key.equals("reason") ? 2131889424 : 0; + return key.equals("reason") ? 2131889434 : 0; case -934795532: - return key.equals("region") ? 2131889448 : 0; + return key.equals("region") ? 2131889458 : 0; case -506227616: if (!key.equals("verification_level")) { return 0; @@ -584,29 +584,29 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long"); int longValue2 = (int) ((Long) value2).longValue(); if (longValue2 == GuildVerificationLevel.NONE.getApiValue()) { - return 2131889462; + return 2131889472; } if (longValue2 == GuildVerificationLevel.LOW.getApiValue()) { - return 2131889460; + return 2131889470; } if (longValue2 == GuildVerificationLevel.MEDIUM.getApiValue()) { - return 2131889461; + return 2131889471; } if (longValue2 == GuildVerificationLevel.HIGH.getApiValue()) { - return 2131889459; + return 2131889469; } - return longValue2 == GuildVerificationLevel.HIGHEST.getApiValue() ? 2131889463 : 0; + return longValue2 == GuildVerificationLevel.HIGHEST.getApiValue() ? 2131889473 : 0; case -154917112: - return key.equals("afk_timeout") ? 2131889432 : 0; + return key.equals("afk_timeout") ? 2131889442 : 0; case 3373707: - return key.equals("name") ? 2131889445 : 0; + return key.equals("name") ? 2131889455 : 0; case 226923479: - return key.equals("discovery_splash_hash") ? 2131889438 : 0; + return key.equals("discovery_splash_hash") ? 2131889448 : 0; case 643741670: - return key.equals("splash_hash") ? 2131889451 : 0; + return key.equals("splash_hash") ? 2131889461 : 0; case 706006559: if (key.equals("rules_channel_id")) { - return getNullableNewValueString(change, 2131889450, 2131889449); + return getNullableNewValueString(change, 2131889460, 2131889459); } return 0; case 945133165: @@ -617,12 +617,12 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Long"); int longValue3 = (int) ((Long) value3).longValue(); if (longValue3 != 0) { - return longValue3 != 1 ? 0 : 2131889444; + return longValue3 != 1 ? 0 : 2131889454; } - return 2131889443; + return 2131889453; case 950953474: if (key.equals("public_updates_channel_id")) { - return getNullableNewValueString(change, 2131889456, 2131889455); + return getNullableNewValueString(change, 2131889466, 2131889465); } return 0; case 1207357234: @@ -633,23 +633,23 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value4, "null cannot be cast to non-null type kotlin.Long"); int longValue4 = (int) ((Long) value4).longValue(); if (longValue4 != 0) { - return longValue4 != 1 ? 0 : 2131889435; + return longValue4 != 1 ? 0 : 2131889445; } - return 2131889434; + return 2131889444; case 1580684753: if (key.equals("vanity_url_code")) { - return getNullableNewValueString(change, 2131889458, 2131889457); + return getNullableNewValueString(change, 2131889468, 2131889467); } return 0; case 1639242418: if (key.equals("widget_channel_id")) { - return getNullableNewValueString(change, 2131889465, 2131889464); + return getNullableNewValueString(change, 2131889475, 2131889474); } return 0; case 1663147559: - return key.equals("owner_id") ? 2131889446 : 0; + return key.equals("owner_id") ? 2131889456 : 0; case 1792613336: - return key.equals("preferred_locale") ? 2131889447 : 0; + return key.equals("preferred_locale") ? 2131889457 : 0; case 2010777670: if (!key.equals("widget_enabled")) { return 0; @@ -658,10 +658,10 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value5, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue = ((Boolean) value5).booleanValue(); if (booleanValue) { - return 2131889467; + return 2131889477; } if (!booleanValue) { - return 2131889466; + return 2131889476; } throw new NoWhenBranchMatchedException(); default: @@ -677,9 +677,9 @@ public final class AuditLogChangeUtils { } switch (key.hashCode()) { case -2136953706: - return key.equals("sku_ids") ? 2131889530 : 0; + return key.equals("sku_ids") ? 2131889540 : 0; case -1724546052: - return key.equals("description") ? 2131889526 : 0; + return key.equals("description") ? 2131889536 : 0; case -892481550: if (!key.equals("status")) { return 0; @@ -688,17 +688,17 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long"); int longValue = (int) ((Long) value).longValue(); if (longValue == GuildScheduledEventStatus.SCHEDULED.getApiValue()) { - return 2131889534; + return 2131889544; } if (longValue == GuildScheduledEventStatus.ACTIVE.getApiValue()) { - return 2131889531; + return 2131889541; } if (longValue == GuildScheduledEventStatus.COMPLETED.getApiValue()) { - return 2131889533; + return 2131889543; } - return longValue == GuildScheduledEventStatus.CANCELED.getApiValue() ? 2131889532 : 0; + return longValue == GuildScheduledEventStatus.CANCELED.getApiValue() ? 2131889542 : 0; case 3373707: - return key.equals("name") ? 2131889529 : 0; + return key.equals("name") ? 2131889539 : 0; case 1281710614: if (!key.equals("entity_type")) { return 0; @@ -707,9 +707,9 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long"); int longValue2 = (int) ((Long) value2).longValue(); if (longValue2 == GuildScheduledEventEntityType.NONE.getApiValue()) { - return 2131889527; + return 2131889537; } - return longValue2 == GuildScheduledEventEntityType.STAGE_INSTANCE.getApiValue() ? 2131889528 : 0; + return longValue2 == GuildScheduledEventEntityType.STAGE_INSTANCE.getApiValue() ? 2131889538 : 0; case 1965579277: if (!key.equals("privacy_level")) { return 0; @@ -718,9 +718,9 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Long"); int longValue3 = (int) ((Long) value3).longValue(); if (longValue3 == StageInstancePrivacyLevel.GUILD_ONLY.getApiValue()) { - return 2131889539; + return 2131889549; } - return longValue3 == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889540 : 0; + return longValue3 == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889550 : 0; default: return 0; } @@ -735,7 +735,7 @@ public final class AuditLogChangeUtils { int hashCode = key.hashCode(); if (hashCode != -1743820047) { if (hashCode != -486786702) { - return (hashCode == 1767574344 && key.equals("expire_grace_period")) ? 2131889474 : 0; + return (hashCode == 1767574344 && key.equals("expire_grace_period")) ? 2131889484 : 0; } if (!key.equals("expire_behavior")) { return 0; @@ -744,9 +744,9 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long"); int longValue = (int) ((Long) value).longValue(); if (longValue != 0) { - return longValue != 1 ? 0 : 2131889472; + return longValue != 1 ? 0 : 2131889482; } - return 2131889473; + return 2131889483; } else if (!key.equals("enable_emoticons")) { return 0; } else { @@ -754,10 +754,10 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue = ((Boolean) value2).booleanValue(); if (booleanValue) { - return 2131889471; + return 2131889481; } if (!booleanValue) { - return 2131889470; + return 2131889480; } throw new NoWhenBranchMatchedException(); } @@ -770,31 +770,31 @@ public final class AuditLogChangeUtils { switch (key.hashCode()) { case -1930808873: if (key.equals("channel_id")) { - return 2131889476; + return 2131889486; } break; case -934964668: if (key.equals("reason")) { - return 2131889424; + return 2131889434; } break; case 3059181: if (key.equals("code")) { - return 2131889477; + return 2131889487; } break; case 408141255: if (key.equals("max_uses")) { Object value = change.getValue(); Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long"); - return ((int) ((Long) value).longValue()) != 0 ? 2131889482 : 2131889483; + return ((int) ((Long) value).longValue()) != 0 ? 2131889492 : 2131889493; } break; case 844430244: if (key.equals("max_age")) { Object value2 = change.getValue(); Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long"); - return ((int) ((Long) value2).longValue()) != 0 ? 2131889480 : 2131889481; + return ((int) ((Long) value2).longValue()) != 0 ? 2131889490 : 2131889491; } break; case 1984986705: @@ -803,10 +803,10 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue = ((Boolean) value3).booleanValue(); if (booleanValue) { - return 2131889485; + return 2131889495; } if (!booleanValue) { - return 2131889484; + return 2131889494; } throw new NoWhenBranchMatchedException(); } @@ -861,17 +861,17 @@ public final class AuditLogChangeUtils { if (hashCode == 108404047 && key.equals("reset")) { Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "context.resources"); - obj2 = b.g(context, 2131889403, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755140, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4); + obj2 = b.g(context, 2131889413, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755141, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4); } } else if (key.equals("allow")) { Resources resources2 = context.getResources(); m.checkNotNullExpressionValue(resources2, "context.resources"); - obj2 = b.g(context, 2131889402, new Object[]{StringResourceUtilsKt.getQuantityString(resources2, context, 2131755139, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4); + obj2 = b.g(context, 2131889412, new Object[]{StringResourceUtilsKt.getQuantityString(resources2, context, 2131755140, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4); } } else if (key.equals("deny")) { Resources resources3 = context.getResources(); m.checkNotNullExpressionValue(resources3, "context.resources"); - obj2 = b.g(context, 2131889401, new Object[]{StringResourceUtilsKt.getQuantityString(resources3, context, 2131755138, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4); + obj2 = b.g(context, 2131889411, new Object[]{StringResourceUtilsKt.getQuantityString(resources3, context, 2131755139, collection.size(), Integer.valueOf(collection.size())), obj}, null, 4); } } return obj2.toString(); @@ -910,28 +910,28 @@ public final class AuditLogChangeUtils { if (key.equals("$add")) { Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources, context, 2131755148, collection.size(), Integer.valueOf(collection.size())); + return StringResourceUtilsKt.getQuantityString(resources, context, 2131755149, collection.size(), Integer.valueOf(collection.size())); } break; case 3079692: if (key.equals("deny")) { Resources resources2 = context.getResources(); m.checkNotNullExpressionValue(resources2, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755138, collection.size(), Integer.valueOf(collection.size())); + return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755139, collection.size(), Integer.valueOf(collection.size())); } break; case 92906313: if (key.equals("allow")) { Resources resources3 = context.getResources(); m.checkNotNullExpressionValue(resources3, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755139, collection.size(), Integer.valueOf(collection.size())); + return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755140, collection.size(), Integer.valueOf(collection.size())); } break; case 950750632: if (key.equals("$remove")) { Resources resources4 = context.getResources(); m.checkNotNullExpressionValue(resources4, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755149, collection.size(), Integer.valueOf(collection.size())); + return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755150, collection.size(), Integer.valueOf(collection.size())); } break; } @@ -946,17 +946,17 @@ public final class AuditLogChangeUtils { switch (key.hashCode()) { case -934964668: if (key.equals("reason")) { - return 2131889424; + return 2131889434; } break; case 3079692: if (key.equals("deny")) { - return 2131889521; + return 2131889531; } break; case 3373707: if (key.equals("name")) { - return getNullableOldValueString(change, 2131889520, 2131889519); + return getNullableOldValueString(change, 2131889530, 2131889529); } break; case 64859716: @@ -965,24 +965,24 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue = ((Boolean) value).booleanValue(); if (booleanValue) { - return 2131889518; + return 2131889528; } if (!booleanValue) { - return 2131889517; + return 2131889527; } throw new NoWhenBranchMatchedException(); } break; case 92906313: if (key.equals("allow")) { - return 2131889522; + return 2131889532; } break; case 94842723: if (key.equals("color")) { Object value2 = change.getValue(); Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Long"); - return ((Long) value2).longValue() == 0 ? 2131889512 : 2131889510; + return ((Long) value2).longValue() == 0 ? 2131889522 : 2131889520; } break; case 99457571: @@ -991,10 +991,10 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value3, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue2 = ((Boolean) value3).booleanValue(); if (booleanValue2) { - return 2131889516; + return 2131889526; } if (!booleanValue2) { - return 2131889515; + return 2131889525; } throw new NoWhenBranchMatchedException(); } @@ -1019,11 +1019,11 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Long"); int longValue = (int) ((Long) value).longValue(); if (longValue == StageInstancePrivacyLevel.GUILD_ONLY.getApiValue()) { - return 2131889539; + return 2131889549; } - return longValue == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889540 : 0; + return longValue == StageInstancePrivacyLevel.PUBLIC.getApiValue() ? 2131889550 : 0; } else if (key.equals("topic")) { - return getNullableOldValueString(change, 2131889415, 2131889413); + return getNullableOldValueString(change, 2131889425, 2131889423); } else { return 0; } @@ -1032,10 +1032,10 @@ public final class AuditLogChangeUtils { @StringRes private final int getStringForPermission(long j, ModelAuditLogEntry modelAuditLogEntry) { if (j == 1) { - return 2131887912; + return 2131887913; } if (j == 2) { - return 2131890729; + return 2131890759; } if (j == 4) { return 2131886816; @@ -1044,102 +1044,102 @@ public final class AuditLogChangeUtils { return 2131886301; } if (j == 16) { - return (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) ? 2131890877 : 2131890879; + return (modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL || modelAuditLogEntry.getTargetType() == ModelAuditLogEntry.TargetType.CHANNEL_OVERWRITE) ? 2131890907 : 2131890909; } if (j == 32) { - return 2131890893; + return 2131890923; } if (j == 524288) { - return 2131894454; + return 2131894501; } if (j == 67108864) { - return 2131887245; + return 2131887246; } if (j == 134217728) { - return 2131890887; + return 2131890917; } if (j == 268435456) { - return 2131890891; + return 2131890921; } if (j == 536870912) { - return 2131890898; + return 2131890928; } if (j == 1073741824) { - return 2131890881; + return 2131890911; } if (j == 8589934592L) { - return 2131890883; + return 2131890913; } if (j == 128) { - return 2131894450; + return 2131894497; } if (j == 1024) { - return 2131892481; + return 2131892523; } if (j == 2048) { - return 2131893118; + return 2131893160; } if (j == 4096) { - return 2131893120; + return 2131893162; } if (j == 8192) { - return 2131890884; + return 2131890914; } if (j == 16384) { - return 2131888216; + return 2131888226; } if (j == 32768) { return 2131886721; } if (j == 65536) { - return 2131892480; + return 2131892522; } if (j == 131072) { - return 2131891112; + return 2131891143; } if (j == 262144) { - return 2131894117; + return 2131894156; } if (j == 64) { return 2131886291; } if (j == 1048576) { - return 2131887499; + return 2131887501; } if (j == 2097152) { - return 2131893253; + return 2131893295; } if (j == 4194304) { - return 2131891272; + return 2131891305; } if (j == 8388608) { - return 2131888041; + return 2131888042; } if (j == 16777216) { - return 2131891220; + return 2131891253; } if (j == 33554432) { - return 2131894124; + return 2131894163; } if (j == 256) { - return 2131892333; + return 2131892371; } if (j == 512) { - return 2131894425; + return 2131894472; } if (j == 2147483648L) { - return 2131894113; + return 2131894152; } - return j == 4294967296L ? 2131892575 : 0; + return j == 4294967296L ? 2131892617 : 0; } private final CharSequence getStringForVideoQualityMode(MediaSinkWantsManager.VideoQualityMode videoQualityMode, Context context) { int ordinal = videoQualityMode.ordinal(); if (ordinal == 0) { - return b.g(context, 2131894435, new Object[0], null, 4); + return b.g(context, 2131894482, new Object[0], null, 4); } if (ordinal == 1) { - return b.g(context, 2131894436, new Object[0], null, 4); + return b.g(context, 2131894483, new Object[0], null, 4); } throw new NoWhenBranchMatchedException(); } @@ -1168,17 +1168,17 @@ public final class AuditLogChangeUtils { switch (key.hashCode()) { case -1919744682: if (key.equals("prune_delete_days")) { - return 2131889501; + return 2131889511; } break; case -934964668: if (key.equals("reason")) { - return 2131889424; + return 2131889434; } break; case 1168893: if (key.equals("$add")) { - return 2131889503; + return 2131889513; } break; case 3079270: @@ -1187,10 +1187,10 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue = ((Boolean) value).booleanValue(); if (booleanValue) { - return 2131889491; + return 2131889501; } if (!booleanValue) { - return 2131889490; + return 2131889500; } throw new NoWhenBranchMatchedException(); } @@ -1201,22 +1201,22 @@ public final class AuditLogChangeUtils { Objects.requireNonNull(value2, "null cannot be cast to non-null type kotlin.Boolean"); boolean booleanValue2 = ((Boolean) value2).booleanValue(); if (booleanValue2) { - return 2131889496; + return 2131889506; } if (!booleanValue2) { - return 2131889495; + return 2131889505; } throw new NoWhenBranchMatchedException(); } break; case 3381091: if (key.equals("nick")) { - return getNullableNewOrOldValueString$default(this, change, 2131889497, 2131889498, 2131889499, null, 8, null); + return getNullableNewOrOldValueString$default(this, change, 2131889507, 2131889508, 2131889509, null, 8, null); } break; case 950750632: if (key.equals("$remove")) { - return 2131889504; + return 2131889514; } break; } @@ -1231,22 +1231,22 @@ public final class AuditLogChangeUtils { switch (key.hashCode()) { case -1930808873: if (key.equals("channel_id")) { - return getNullableOldValueString(change, 2131889546, 2131889545); + return getNullableOldValueString(change, 2131889556, 2131889555); } break; case -934964668: if (key.equals("reason")) { - return 2131889424; + return 2131889434; } break; case 3373707: if (key.equals("name")) { - return getNullableOldValueString(change, 2131889550, 2131889549); + return getNullableOldValueString(change, 2131889560, 2131889559); } break; case 396929076: if (key.equals("avatar_hash")) { - return 2131889544; + return 2131889554; } break; } diff --git a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java index b96dc9d813..9f80e80433 100644 --- a/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java +++ b/app/src/main/java/com/discord/utilities/auditlogs/AuditLogUtils.java @@ -81,7 +81,7 @@ public final class AuditLogUtils { private final int getEntryTitle(ModelAuditLogEntry modelAuditLogEntry) { int actionTypeId = modelAuditLogEntry.getActionTypeId(); if (actionTypeId == 1) { - return 2131889454; + return 2131889464; } switch (actionTypeId) { case 10: @@ -108,112 +108,112 @@ public final class AuditLogUtils { Objects.requireNonNull(newValue, "null cannot be cast to non-null type kotlin.Long"); int longValue = (int) ((Long) newValue).longValue(); if (longValue == 2) { - return 2131889423; + return 2131889433; } if (longValue != 4) { - return longValue != 13 ? 2131889412 : 2131889411; + return longValue != 13 ? 2131889422 : 2131889421; } - return 2131889390; - case 11: - return 2131889418; - case 12: - return 2131889393; - case 13: - return 2131889398; - case 14: return 2131889400; + case 11: + return 2131889428; + case 12: + return 2131889403; + case 13: + return 2131889408; + case 14: + return 2131889410; case 15: - return 2131889399; + return 2131889409; default: switch (actionTypeId) { case 20: - return 2131889493; + return 2131889503; case 21: - return 2131889500; + return 2131889510; case 22: - return 2131889488; + return 2131889498; case 23: - return 2131889489; + return 2131889499; case 24: - return 2131889505; + return 2131889515; case 25: - return 2131889502; + return 2131889512; case 26: - return 2131889494; + return 2131889504; case 27: - return 2131889492; + return 2131889502; case 28: - return 2131889387; + return 2131889397; default: switch (actionTypeId) { case 30: - return 2131889513; - case 31: return 2131889523; + case 31: + return 2131889533; case 32: - return 2131889514; + return 2131889524; default: switch (actionTypeId) { case 40: - return 2131889478; + return 2131889488; case 41: - return 2131889486; + return 2131889496; case 42: - return 2131889479; + return 2131889489; default: switch (actionTypeId) { case 50: - return 2131889547; + return 2131889557; case 51: - return 2131889551; + return 2131889561; case 52: - return 2131889548; + return 2131889558; default: switch (actionTypeId) { case 60: - return 2131889425; + return 2131889435; case 61: - return 2131889429; + return 2131889439; case 62: - return 2131889426; + return 2131889436; default: switch (actionTypeId) { case 72: - return 2131889507; + return 2131889517; case 73: - return 2131889506; + return 2131889516; case 74: - return 2131889508; + return 2131889518; case 75: - return 2131889509; + return 2131889519; default: switch (actionTypeId) { case 80: - return 2131889468; + return 2131889478; case 81: - return 2131889475; + return 2131889485; case 82: - return 2131889469; + return 2131889479; case 83: - return 2131889536; + return 2131889546; case 84: - return 2131889541; + return 2131889551; case 85: - return modelAuditLogEntry.getUserId() == 0 ? 2131889538 : 2131889537; + return modelAuditLogEntry.getUserId() == 0 ? 2131889548 : 2131889547; default: switch (actionTypeId) { case 100: - return 2131889524; + return 2131889534; case 101: - return 2131889535; + return 2131889545; case 102: - return 2131889525; + return 2131889535; default: AppLog appLog = AppLog.g; StringBuilder L = a.L("Unknown audit log action type: "); L.append(modelAuditLogEntry.getActionTypeId()); Logger.e$default(appLog, L.toString(), null, null, 6, null); - return 2131889543; + return 2131889553; } } } @@ -304,7 +304,7 @@ public final class AuditLogUtils { Clock clock = ClockFactory.get(); CharSequence relativeTimeSpanString = DateUtils.getRelativeTimeSpanString(j, clock.currentTimeMillis(), 86400000, 131092); if (TimeUnit.MILLISECONDS.toDays(clock.currentTimeMillis() - j) < ((long) 7)) { - return b.g(context, 2131889542, new Object[]{relativeTimeSpanString, DateUtils.formatDateTime(context, j, 1)}, null, 4); + return b.g(context, 2131889552, new Object[]{relativeTimeSpanString, DateUtils.formatDateTime(context, j, 1)}, null, 4); } m.checkNotNullExpressionValue(relativeTimeSpanString, "timeString"); return relativeTimeSpanString; @@ -317,108 +317,108 @@ public final class AuditLogUtils { @StringRes public final int getActionName(int i) { if (i == 0) { - return 2131889673; + return 2131889683; } if (i == 1) { - return 2131889359; + return 2131889369; } switch (i) { case 10: - return 2131889347; + return 2131889357; case 11: - return 2131889352; + return 2131889362; case 12: - return 2131889348; + return 2131889358; case 13: - return 2131889349; + return 2131889359; case 14: - return 2131889351; + return 2131889361; case 15: - return 2131889350; + return 2131889360; default: switch (i) { case 20: - return 2131889369; + return 2131889379; case 21: - return 2131889371; + return 2131889381; case 22: - return 2131889366; + return 2131889376; case 23: - return 2131889367; + return 2131889377; case 24: - return 2131889373; + return 2131889383; case 25: - return 2131889372; + return 2131889382; case 26: - return 2131889370; + return 2131889380; case 27: - return 2131889368; + return 2131889378; case 28: - return 2131889346; + return 2131889356; default: switch (i) { case 30: - return 2131889378; + return 2131889388; case 31: - return 2131889380; + return 2131889390; case 32: - return 2131889379; + return 2131889389; default: switch (i) { case 40: - return 2131889363; + return 2131889373; case 41: - return 2131889365; + return 2131889375; case 42: - return 2131889364; + return 2131889374; default: switch (i) { case 50: - return 2131889384; + return 2131889394; case 51: - return 2131889386; + return 2131889396; case 52: - return 2131889385; + return 2131889395; default: switch (i) { case 60: - return 2131889353; + return 2131889363; case 61: - return 2131889355; + return 2131889365; case 62: - return 2131889354; + return 2131889364; default: switch (i) { case 72: - return 2131889375; + return 2131889385; case 73: - return 2131889374; + return 2131889384; case 74: - return 2131889376; + return 2131889386; case 75: - return 2131889377; + return 2131889387; default: switch (i) { case 80: - return 2131889360; + return 2131889370; case 81: - return 2131889362; + return 2131889372; case 82: - return 2131889361; + return 2131889371; case 83: - return 2131889381; + return 2131889391; case 84: - return 2131889383; + return 2131889393; case 85: - return 2131889382; + return 2131889392; default: switch (i) { case 100: - return 2131889356; + return 2131889366; case 101: - return 2131889358; + return 2131889368; case 102: - return 2131889357; + return 2131889367; default: return 0; } @@ -454,7 +454,7 @@ public final class AuditLogUtils { /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x012e: APUT (r7v13 java.lang.Object[]) (1 ??[boolean, int, float, short, byte, char]) - (wrap: java.lang.CharSequence : 0x012a: INVOKE (r2v13 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755150 int), (r13v4 int), (r14v5 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) + (wrap: java.lang.CharSequence : 0x012a: INVOKE (r2v13 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755151 int), (r13v4 int), (r14v5 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) */ /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0128: APUT (r14v5 java.lang.Object[]) @@ -464,7 +464,7 @@ public final class AuditLogUtils { /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x017c: APUT (r13v2 java.lang.Object[]) (1 ??[boolean, int, float, short, byte, char]) - (wrap: java.lang.CharSequence : 0x0178: INVOKE (r2v11 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755151 int), (r14v2 int), (r9v5 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) + (wrap: java.lang.CharSequence : 0x0178: INVOKE (r2v11 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755152 int), (r14v2 int), (r9v5 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) */ /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0176: APUT (r9v5 java.lang.Object[]) @@ -479,7 +479,7 @@ public final class AuditLogUtils { /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0224: APUT (r5v8 java.lang.Object[]) (1 ??[boolean, int, float, short, byte, char]) - (wrap: java.lang.CharSequence : 0x0220: INVOKE (r1v38 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755144 int), (r6v12 int), (r7v10 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) + (wrap: java.lang.CharSequence : 0x0220: INVOKE (r1v38 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755145 int), (r6v12 int), (r7v10 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) */ /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x021e: APUT (r7v10 java.lang.Object[]) @@ -489,7 +489,7 @@ public final class AuditLogUtils { /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x026c: APUT (r7v8 java.lang.Object[]) (1 ??[boolean, int, float, short, byte, char]) - (wrap: java.lang.CharSequence : 0x0268: INVOKE (r1v21 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755145 int), (r9v2 int), (r13v1 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) + (wrap: java.lang.CharSequence : 0x0268: INVOKE (r1v21 java.lang.CharSequence) = (r20v0 android.content.Context), (2131755146 int), (r9v2 int), (r13v1 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getI18nPluralString(android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) */ /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0266: APUT (r13v1 java.lang.Object[]) @@ -507,7 +507,7 @@ public final class AuditLogUtils { (wrap: java.lang.CharSequence : 0x0311: INVOKE (r1v4 java.lang.CharSequence) = (r2v1 android.content.res.Resources) (r20v0 android.content.Context) - (2131755146 int) + (2131755147 int) (r7v2 int) (r8v1 java.lang.Object[]) type: STATIC call: com.discord.utilities.resources.StringResourceUtilsKt.getQuantityString(android.content.res.Resources, android.content.Context, int, int, java.lang.Object[]):java.lang.CharSequence) @@ -541,7 +541,7 @@ public final class AuditLogUtils { Object[] objArr2 = new Object[1]; ModelAuditLogEntry.Options options2 = modelAuditLogEntry.getOptions(); objArr2[0] = Integer.valueOf(options2 != null ? options2.getMembersRemoved() : 0); - objArr[1] = StringResourceUtilsKt.getQuantityString(resources, context, 2131755146, membersRemoved, objArr2); + objArr[1] = StringResourceUtilsKt.getQuantityString(resources, context, 2131755147, membersRemoved, objArr2); return b.g(context, entryTitle, objArr, null, 4); } else if (actionTypeId == 42) { int entryTitle2 = getEntryTitle(modelAuditLogEntry); @@ -575,7 +575,7 @@ public final class AuditLogUtils { Object[] objArr5 = new Object[1]; ModelAuditLogEntry.Options options5 = modelAuditLogEntry.getOptions(); objArr5[0] = Integer.valueOf(options5 != null ? options5.getCount() : 0); - objArr4[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755145, count, objArr5); + objArr4[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755146, count, objArr5); Map map2 = (Map) map.get(ModelAuditLogEntry.TargetType.CHANNEL); if (map2 == null || (obj2 = (CharSequence) map2.get(valueOf)) == null) { obj2 = valueOf != null ? String.valueOf(valueOf.longValue()) : null; @@ -620,7 +620,7 @@ public final class AuditLogUtils { Object[] objArr8 = new Object[1]; ModelAuditLogEntry.Options options8 = modelAuditLogEntry.getOptions(); objArr8[0] = Integer.valueOf(options8 != null ? options8.getCount() : 0); - objArr7[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755151, count2, objArr8); + objArr7[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755152, count2, objArr8); objArr7[2] = getTargetText(modelAuditLogEntry, map, str); Map map3 = (Map) map.get(ModelAuditLogEntry.TargetType.CHANNEL); if (map3 == null || (obj4 = (CharSequence) map3.get(valueOf2)) == null) { @@ -637,7 +637,7 @@ public final class AuditLogUtils { Object[] objArr10 = new Object[1]; ModelAuditLogEntry.Options options10 = modelAuditLogEntry.getOptions(); objArr10[0] = Integer.valueOf(options10 != null ? options10.getCount() : 0); - objArr9[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755150, count3, objArr10); + objArr9[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755151, count3, objArr10); objArr9[2] = getTargetText(modelAuditLogEntry, map, str); return b.g(context, entryTitle6, objArr9, null, 4); case 74: @@ -680,7 +680,7 @@ public final class AuditLogUtils { Object[] objArr13 = new Object[1]; ModelAuditLogEntry.Options options14 = modelAuditLogEntry.getOptions(); objArr13[0] = Integer.valueOf(options14 != null ? options14.getCount() : 0); - objArr12[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755144, count4, objArr13); + objArr12[1] = StringResourceUtilsKt.getI18nPluralString(context, 2131755145, count4, objArr13); return b.g(context, entryTitle8, objArr12, null, 4); } } diff --git a/app/src/main/java/com/discord/utilities/auth/AuthUtils.java b/app/src/main/java/com/discord/utilities/auth/AuthUtils.java index fec2ffcd12..1056d4e96b 100644 --- a/app/src/main/java/com/discord/utilities/auth/AuthUtils.java +++ b/app/src/main/java/com/discord/utilities/auth/AuthUtils.java @@ -49,7 +49,7 @@ public final class AuthUtils { public final ValidationManager createEmailValidationManager(TextInputLayout textInputLayout) { m.checkNotNullParameter(textInputLayout, "emailInput"); - return new ValidationManager(new Input.TextInputLayoutInput("email", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131888213), createEmailInputValidator(2131888212))); + return new ValidationManager(new Input.TextInputLayoutInput("email", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131888223), createEmailInputValidator(2131888222))); } public final BasicTextInputValidator createPasswordInputValidator(@StringRes int i) { diff --git a/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java b/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java index 212e50691a..324d33f9e8 100644 --- a/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java +++ b/app/src/main/java/com/discord/utilities/billing/GooglePlaySku.java @@ -33,25 +33,25 @@ import kotlin.jvm.internal.DefaultConstructorMarker; /* JADX WARN: Init of enum PREMIUM_GUILD_1_MONTHLY can be incorrect */ /* JADX WARN: Init of enum PREMIUM_GUILD_2_MONTHLY can be incorrect */ public enum GooglePlaySku { - PREMIUM_TIER_2_YEARLY("premium_tier_2_yearly", 2131231842, r14, null, 2, r15, 8, null), - PREMIUM_TIER_2_MONTHLY("premium_tier_2_monthly", 2131231842, r14, r13, 2, r18), - PREMIUM_TIER_1_YEARLY("premium_tier_1_yearly", 2131231839, r14, null, 0, r15, 8, null), - PREMIUM_TIER_1_MONTHLY("premium_tier_1_monthly", 2131231839, r14, r13, 0, r18), - PREMIUM_TIER_2_PREMIUM_GUILD_1_YEARLY("premium_tier_2_premium_guild_1_yearly", 2131231830, r14, null, 3, r15, 8, null), - PREMIUM_TIER_2_PREMIUM_GUILD_1_MONTHLY("premium_tier_2_premium_guild_1_monthly", 2131231830, r14, r13, 3, r18), - PREMIUM_TIER_2_PREMIUM_GUILD_2_YEARLY("premium_tier_2_premium_guild_2_yearly", 2131231833, r14, null, 4, r15, 8, null), - PREMIUM_TIER_2_PREMIUM_GUILD_2_MONTHLY("premium_tier_2_premium_guild_2_monthly", 2131231833, r14, r13, 4, r18), - PREMIUM_TIER_2_PREMIUM_GUILD_3_YEARLY("premium_tier_2_premium_guild_3_yearly", 2131231835, r14, null, 5, r15, 8, null), - PREMIUM_TIER_2_PREMIUM_GUILD_3_MONTHLY("premium_tier_2_premium_guild_3_monthly", 2131231835, r14, r13, 5, r18), - PREMIUM_TIER_2_PREMIUM_GUILD_5_YEARLY("premium_tier_2_premium_guild_5_yearly", 2131231836, r14, null, 7, r15, 8, null), - PREMIUM_TIER_2_PREMIUM_GUILD_5_MONTHLY("premium_tier_2_premium_guild_5_monthly", 2131231836, r14, r13, 7, r18), - PREMIUM_TIER_2_PREMIUM_GUILD_10_MONTHLY("premium_tier_2_premium_guild_10_monthly", 2131231831, r14, null, 12, r18, 8, null), - PREMIUM_TIER_2_PREMIUM_GUILD_13_MONTHLY("premium_tier_2_premium_guild_13_monthly", 2131231832, r14, null, 15, r18, 8, null), - PREMIUM_TIER_2_PREMIUM_GUILD_28_MONTHLY("premium_tier_2_premium_guild_28_monthly", 2131231834, r14, null, 30, r18, 8, null), - PREMIUM_TIER_1_PREMIUM_GUILD_1_YEARLY("premium_tier_1_premium_guild_1_yearly", 2131231840, r14, null, 1, r15, 8, null), - PREMIUM_TIER_1_PREMIUM_GUILD_1_MONTHLY("premium_tier_1_premium_guild_1_monthly", 2131231840, r14, r13, 1, r18), - PREMIUM_GUILD_1_MONTHLY("premium_guild_1_monthly", 2131231837, r13, r17, 1, r18), - PREMIUM_GUILD_2_MONTHLY("premium_guild_2_monthly", 2131231838, r13, r17, 2, r18); + PREMIUM_TIER_2_YEARLY("premium_tier_2_yearly", 2131231845, r14, null, 2, r15, 8, null), + PREMIUM_TIER_2_MONTHLY("premium_tier_2_monthly", 2131231845, r14, r13, 2, r18), + PREMIUM_TIER_1_YEARLY("premium_tier_1_yearly", 2131231842, r14, null, 0, r15, 8, null), + PREMIUM_TIER_1_MONTHLY("premium_tier_1_monthly", 2131231842, r14, r13, 0, r18), + PREMIUM_TIER_2_PREMIUM_GUILD_1_YEARLY("premium_tier_2_premium_guild_1_yearly", 2131231833, r14, null, 3, r15, 8, null), + PREMIUM_TIER_2_PREMIUM_GUILD_1_MONTHLY("premium_tier_2_premium_guild_1_monthly", 2131231833, r14, r13, 3, r18), + PREMIUM_TIER_2_PREMIUM_GUILD_2_YEARLY("premium_tier_2_premium_guild_2_yearly", 2131231836, r14, null, 4, r15, 8, null), + PREMIUM_TIER_2_PREMIUM_GUILD_2_MONTHLY("premium_tier_2_premium_guild_2_monthly", 2131231836, r14, r13, 4, r18), + PREMIUM_TIER_2_PREMIUM_GUILD_3_YEARLY("premium_tier_2_premium_guild_3_yearly", 2131231838, r14, null, 5, r15, 8, null), + PREMIUM_TIER_2_PREMIUM_GUILD_3_MONTHLY("premium_tier_2_premium_guild_3_monthly", 2131231838, r14, r13, 5, r18), + PREMIUM_TIER_2_PREMIUM_GUILD_5_YEARLY("premium_tier_2_premium_guild_5_yearly", 2131231839, r14, null, 7, r15, 8, null), + PREMIUM_TIER_2_PREMIUM_GUILD_5_MONTHLY("premium_tier_2_premium_guild_5_monthly", 2131231839, r14, r13, 7, r18), + PREMIUM_TIER_2_PREMIUM_GUILD_10_MONTHLY("premium_tier_2_premium_guild_10_monthly", 2131231834, r14, null, 12, r18, 8, null), + PREMIUM_TIER_2_PREMIUM_GUILD_13_MONTHLY("premium_tier_2_premium_guild_13_monthly", 2131231835, r14, null, 15, r18, 8, null), + PREMIUM_TIER_2_PREMIUM_GUILD_28_MONTHLY("premium_tier_2_premium_guild_28_monthly", 2131231837, r14, null, 30, r18, 8, null), + PREMIUM_TIER_1_PREMIUM_GUILD_1_YEARLY("premium_tier_1_premium_guild_1_yearly", 2131231843, r14, null, 1, r15, 8, null), + PREMIUM_TIER_1_PREMIUM_GUILD_1_MONTHLY("premium_tier_1_premium_guild_1_monthly", 2131231843, r14, r13, 1, r18), + PREMIUM_GUILD_1_MONTHLY("premium_guild_1_monthly", 2131231840, r13, r17, 1, r18), + PREMIUM_GUILD_2_MONTHLY("premium_guild_2_monthly", 2131231841, r13, r17, 2, r18); private static final List ALL_SKU_NAMES; public static final Companion Companion = new Companion(null); @@ -177,13 +177,13 @@ public enum GooglePlaySku { m.checkNotNullParameter(section, "section"); int ordinal = section.ordinal(); if (ordinal == 0) { - return 2131886943; + return 2131886944; } if (ordinal == 1) { - return 2131886939; + return 2131886940; } if (ordinal == 2) { - return 2131886942; + return 2131886943; } throw new NoWhenBranchMatchedException(); } diff --git a/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java b/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java index cb981f699d..0defeaafdc 100644 --- a/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/billing/PremiumUtilsKt.java @@ -85,10 +85,10 @@ public final class PremiumUtilsKt { public static final int getPaymentSourceIcon(ModelPaymentSource modelPaymentSource) { m.checkNotNullParameter(modelPaymentSource, "paymentSource"); if (modelPaymentSource instanceof ModelPaymentSource.ModelPaymentSourcePaypal) { - return 2131231540; + return 2131231541; } if (!(modelPaymentSource instanceof ModelPaymentSource.ModelPaymentSourceCard)) { - return 2131231538; + return 2131231539; } String brand = ((ModelPaymentSource.ModelPaymentSourceCard) modelPaymentSource).getBrand(); Objects.requireNonNull(brand, "null cannot be cast to non-null type java.lang.String"); @@ -96,25 +96,25 @@ public final class PremiumUtilsKt { m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase()"); switch (lowerCase.hashCode()) { case -2038717326: - return lowerCase.equals("mastercard") ? 2131231539 : 2131231538; + return lowerCase.equals("mastercard") ? 2131231540 : 2131231539; case 2997727: - return lowerCase.equals("amex") ? 2131231536 : 2131231538; + return lowerCase.equals("amex") ? 2131231537 : 2131231539; case 3619905: - return lowerCase.equals("visa") ? 2131231541 : 2131231538; + return lowerCase.equals("visa") ? 2131231542 : 2131231539; case 61060803: if (!lowerCase.equals("american-express")) { - return 2131231538; + return 2131231539; } break; case 273184745: - return lowerCase.equals("discover") ? 2131231537 : 2131231538; + return lowerCase.equals("discover") ? 2131231538 : 2131231539; case 1174445979: if (!lowerCase.equals("master-card")) { - return 2131231538; + return 2131231539; } break; default: - return 2131231538; + return 2131231539; } } diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java index dbe1770cf4..2939d59718 100644 --- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java +++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.java @@ -15,6 +15,6 @@ public final class CaptchaHelper$ensurePlayServicesAvailable$2 implements d { @Override // c.i.a.f.n.d public final void onFailure(Exception exc) { m.checkNotNullParameter(exc, "it"); - this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887192, "missing_dependencies")); + this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887193, "missing_dependencies")); } } diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java index c5c0e03e1a..6bacf36c57 100644 --- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java +++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.java @@ -15,6 +15,6 @@ public final class CaptchaHelper$showCaptcha$2 implements d { @Override // c.i.a.f.n.d public final void onFailure(Exception exc) { m.checkNotNullParameter(exc, "it"); - this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887191, "expired")); + this.$errorHandler.invoke(new CaptchaHelper.Failure(2131887192, "expired")); } } diff --git a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java index fa0d475624..5c075ee616 100644 --- a/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java +++ b/app/src/main/java/com/discord/utilities/captcha/CaptchaHelper$tryShowCaptcha$1.java @@ -71,7 +71,7 @@ public final class CaptchaHelper$tryShowCaptcha$1 implements Action1 function0) { FragmentManager supportFragmentManager; if (appActivity != null && (supportFragmentManager = appActivity.getSupportFragmentManager()) != null) { - WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(appActivity).setTitle(2131887196).setMessage(2131887197).setPositiveButton(2131887195, new CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1(appActivity, function0)), 2131887177, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(appActivity).setTitle(2131887197).setMessage(2131887198).setPositiveButton(2131887196, new CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1(appActivity, function0)), 2131887178, (Function1) null, 2, (Object) null); m.checkNotNullExpressionValue(supportFragmentManager, "it"); negativeButton$default.show(supportFragmentManager); } diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java b/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java index 9ed98d789c..8f9c4c7ef8 100644 --- a/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/channel/ChannelPermissionUtilsKt.java @@ -13,63 +13,63 @@ import java.util.Map; public final class ChannelPermissionUtilsKt { public static final Map getCategoryLabels(Context context) { m.checkNotNullParameter(context, "context"); - String string = context.getString(2131892848); - String string2 = context.getString(2131892850); + String string = context.getString(2131892890); + String string2 = context.getString(2131892892); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…nel_description_category)"); - String string3 = context.getString(2131890879); - String string4 = context.getString(2131892755); + String string3 = context.getString(2131890909); + String string4 = context.getString(2131892797); m.checkNotNullExpressionValue(string4, "context.getString(R.stri…nel_description_category)"); - String string5 = context.getString(2131892769); + String string5 = context.getString(2131892811); m.checkNotNullExpressionValue(string5, "context.getString(R.stri…les_description_category)"); - String string6 = context.getString(2131892777); + String string6 = context.getString(2131892819); m.checkNotNullExpressionValue(string6, "context.getString(R.stri…oks_description_category)"); - String string7 = context.getString(2131892815); + String string7 = context.getString(2131892857); m.checkNotNullExpressionValue(string7, "context.getString(R.stri…ges_description_category)"); f fVar = f.a; Object[] objArr = {fVar.a(360032008192L, null)}; - String string8 = context.getString(2131892744); + String string8 = context.getString(2131892786); m.checkNotNullExpressionValue(string8, "context.getString(R.stri…ite_description_category)"); - String string9 = context.getString(2131892751); + String string9 = context.getString(2131892793); m.checkNotNullExpressionValue(string9, "context.getString(R.stri…nks_description_category)"); - String string10 = context.getString(2131892731); + String string10 = context.getString(2131892773); m.checkNotNullExpressionValue(string10, "context.getString(R.stri…les_description_category)"); - String string11 = context.getString(2131892727); + String string11 = context.getString(2131892769); m.checkNotNullExpressionValue(string11, "context.getString(R.stri…ons_description_category)"); - String string12 = context.getString(2131892835); + String string12 = context.getString(2131892877); m.checkNotNullExpressionValue(string12, "context.getString(R.stri…jis_description_category)"); - String string13 = context.getString(2131892780); + String string13 = context.getString(2131892822); m.checkNotNullExpressionValue(string13, "context.getString(R.stri…one_description_category)"); - String string14 = context.getString(2131892765); + String string14 = context.getString(2131892807); m.checkNotNullExpressionValue(string14, "context.getString(R.stri…ges_description_category)"); Object[] objArr2 = {fVar.a(360032008192L, null)}; - String string15 = context.getString(2131892798); + String string15 = context.getString(2131892840); m.checkNotNullExpressionValue(string15, "context.getString(R.stri…ory_description_category)"); - String string16 = context.getString(2131892819); + String string16 = context.getString(2131892861); m.checkNotNullExpressionValue(string16, "context.getString(R.stri…ges_description_category)"); - String string17 = context.getString(2131892737); + String string17 = context.getString(2131892779); m.checkNotNullExpressionValue(string17, "context.getString(R.stri…ect_description_category)"); - String string18 = context.getString(2131892738); - String string19 = context.getString(2131892742); - String string20 = context.getString(2131892822); + String string18 = context.getString(2131892780); + String string19 = context.getString(2131892784); + String string20 = context.getString(2131892864); m.checkNotNullExpressionValue(string20, "context.getString(R.stri…eak_description_category)"); - String string21 = context.getString(2131892826); + String string21 = context.getString(2131892868); m.checkNotNullExpressionValue(string21, "context.getString(R.stri…eam_description_category)"); - String string22 = context.getString(2131892844); + String string22 = context.getString(2131892886); m.checkNotNullExpressionValue(string22, "context.getString(R.stri…vad_description_category)"); - CharSequence g = b.g(context, 2131892793, new Object[]{b.g(context, 2131890709, new Object[0], null, 4)}, null, 4); - Object[] objArr3 = {b.g(context, 2131890709, new Object[0], null, 4)}; - String string23 = context.getString(2131892748); + CharSequence g = b.g(context, 2131892835, new Object[]{b.g(context, 2131890739, new Object[0], null, 4)}, null, 4); + Object[] objArr3 = {b.g(context, 2131890739, new Object[0], null, 4)}; + String string23 = context.getString(2131892790); m.checkNotNullExpressionValue(string23, "context.getString(R.stri…ers_description_category)"); - String string24 = context.getString(2131892783); + String string24 = context.getString(2131892825); m.checkNotNullExpressionValue(string24, "context.getString(R.stri…ers_description_category)"); - String string25 = context.getString(2131892801); + String string25 = context.getString(2131892843); m.checkNotNullExpressionValue(string25, "context.getString(R.stri…eak_description_category)"); - return h0.hashMapOf(o.to(2131362297, new PermissionLabelOverrides(string2, string, null, null, context.getString(2131892853), context.getString(2131892854), null, context.getString(2131892851), null, 332, null)), o.to(2131362286, new PermissionLabelOverrides(string4, string3, context.getString(2131892758), context.getString(2131892756), null, null, null, null, null, 496, null)), o.to(2131362287, new PermissionLabelOverrides(string5, null, null, context.getString(2131892771), null, null, null, null, null, 502, null)), o.to(2131362288, new PermissionLabelOverrides(string6, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362298, new PermissionLabelOverrides(string7, null, null, null, null, null, null, null, b.g(context, 2131892814, objArr, null, 4), 254, null)), o.to(2131362285, new PermissionLabelOverrides(string8, null, context.getString(2131892746), null, null, null, null, null, null, 506, null)), o.to(2131362293, new PermissionLabelOverrides(string9, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362292, new PermissionLabelOverrides(string10, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362291, new PermissionLabelOverrides(string11, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362300, new PermissionLabelOverrides(string12, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362295, new PermissionLabelOverrides(string13, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362294, new PermissionLabelOverrides(string14, null, null, null, null, null, null, null, b.g(context, 2131892764, objArr2, null, 4), 254, null)), o.to(2131362296, new PermissionLabelOverrides(string15, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362299, new PermissionLabelOverrides(string16, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362302, new PermissionLabelOverrides(string17, null, null, context.getString(2131892739), null, string19, context.getString(2131892740), string18, null, 278, null)), o.to(2131362307, new PermissionLabelOverrides(string20, null, null, context.getString(2131892823), null, null, null, null, null, 502, null)), o.to(2131362309, new PermissionLabelOverrides(string21, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362308, new PermissionLabelOverrides(string22, null, null, context.getString(2131892845), null, null, null, null, null, 502, null)), o.to(2131362306, new PermissionLabelOverrides(g, null, null, null, null, null, null, b.g(context, 2131892793, objArr3, null, 4), null, 382, null)), o.to(2131362305, new PermissionLabelOverrides(b.g(context, 2131892787, new Object[0], null, 4), null, null, b.g(context, 2131892788, new Object[0], null, 4), null, null, null, null, null, 502, null)), o.to(2131362303, new PermissionLabelOverrides(string23, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362304, new PermissionLabelOverrides(string24, null, null, context.getString(2131892784), null, null, null, null, null, 502, null)), o.to(2131362290, new PermissionLabelOverrides(string25, null, null, null, null, null, null, null, null, 510, null))); + return h0.hashMapOf(o.to(2131362297, new PermissionLabelOverrides(string2, string, null, null, context.getString(2131892895), context.getString(2131892896), null, context.getString(2131892893), null, 332, null)), o.to(2131362286, new PermissionLabelOverrides(string4, string3, context.getString(2131892800), context.getString(2131892798), null, null, null, null, null, 496, null)), o.to(2131362287, new PermissionLabelOverrides(string5, null, null, context.getString(2131892813), null, null, null, null, null, 502, null)), o.to(2131362288, new PermissionLabelOverrides(string6, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362298, new PermissionLabelOverrides(string7, null, null, null, null, null, null, null, b.g(context, 2131892856, objArr, null, 4), 254, null)), o.to(2131362285, new PermissionLabelOverrides(string8, null, context.getString(2131892788), null, null, null, null, null, null, 506, null)), o.to(2131362293, new PermissionLabelOverrides(string9, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362292, new PermissionLabelOverrides(string10, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362291, new PermissionLabelOverrides(string11, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362300, new PermissionLabelOverrides(string12, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362295, new PermissionLabelOverrides(string13, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362294, new PermissionLabelOverrides(string14, null, null, null, null, null, null, null, b.g(context, 2131892806, objArr2, null, 4), 254, null)), o.to(2131362296, new PermissionLabelOverrides(string15, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362299, new PermissionLabelOverrides(string16, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362302, new PermissionLabelOverrides(string17, null, null, context.getString(2131892781), null, string19, context.getString(2131892782), string18, null, 278, null)), o.to(2131362307, new PermissionLabelOverrides(string20, null, null, context.getString(2131892865), null, null, null, null, null, 502, null)), o.to(2131362309, new PermissionLabelOverrides(string21, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362308, new PermissionLabelOverrides(string22, null, null, context.getString(2131892887), null, null, null, null, null, 502, null)), o.to(2131362306, new PermissionLabelOverrides(g, null, null, null, null, null, null, b.g(context, 2131892835, objArr3, null, 4), null, 382, null)), o.to(2131362305, new PermissionLabelOverrides(b.g(context, 2131892829, new Object[0], null, 4), null, null, b.g(context, 2131892830, new Object[0], null, 4), null, null, null, null, null, 502, null)), o.to(2131362303, new PermissionLabelOverrides(string23, null, null, null, null, null, null, null, null, 510, null)), o.to(2131362304, new PermissionLabelOverrides(string24, null, null, context.getString(2131892826), null, null, null, null, null, 502, null)), o.to(2131362290, new PermissionLabelOverrides(string25, null, null, null, null, null, null, null, null, 510, null))); } @StringRes public static final int getChannelPermissionOwnerRoleLabel(GuildRole guildRole) { m.checkNotNullParameter(guildRole, "role"); - return (guildRole.g() & 8) == 8 ? 2131892353 : 2131892356; + return (guildRole.g() & 8) == 8 ? 2131892391 : 2131892394; } } diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java index b5e4074d22..eb10e0c304 100644 --- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java +++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java @@ -31,7 +31,7 @@ public final class ChannelSelector$findAndSet$1 extends o implements Function0> sortedCategories = getSortedCategories(map); ArrayList arrayList = new ArrayList(); for (Map.Entry> entry : sortedCategories.entrySet()) { - ArrayList arrayList2 = new ArrayList(); + List arrayList2 = new ArrayList(); for (Object obj : entry.getValue()) { Channel channel = (Channel) obj; if (PermissionUtils.INSTANCE.hasAccess(channel, (Long) a.d(channel, this.channelPermissions))) { arrayList2.add(obj); } } + if (arrayList2.size() == 1) { + arrayList2 = n.emptyList(); + } r.addAll(arrayList, arrayList2); } return arrayList; diff --git a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java index 70c95fa08a..a683774dee 100644 --- a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java +++ b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors.java @@ -13,11 +13,12 @@ import java.util.List; import java.util.Map; import kotlin.coroutines.Continuation; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import rx.Observable; import rx.subjects.BehaviorSubject; +import s.a.a.n; import s.a.j0; -import s.a.u0; -import s.a.z; +import s.a.w0; /* compiled from: RepresentativeColors.kt */ public final class RepresentativeColors { private static final int BLURPLE = Color.parseColor("#5865f2"); @@ -201,14 +202,14 @@ public final class RepresentativeColors { } public final Object getRepresentativeColorAsync(Bitmap bitmap, Continuation continuation) { - return c.q.a.k.a.h0(j0.a, new RepresentativeColors$getRepresentativeColorAsync$2(this, bitmap, null), continuation); + return c.q.a.k.a.i0(j0.a, new RepresentativeColors$getRepresentativeColorAsync$2(this, bitmap, null), continuation); } public final void handleBitmap(T t, Bitmap bitmap) { m.checkNotNullParameter(bitmap, "bitmap"); - u0 u0Var = u0.i; - z zVar = j0.a; - c.q.a.k.a.F(u0Var, s.a.a.m.b, null, new RepresentativeColors$handleBitmap$1(this, t, bitmap, null), 2, null); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher = j0.a; + c.q.a.k.a.G(w0Var, n.b, null, new RepresentativeColors$handleBitmap$1(this, t, bitmap, null), 2, null); } public final Observable observeRepresentativeColor(T t) { diff --git a/app/src/main/java/com/discord/utilities/coroutines/AppCoroutineScopeKt.java b/app/src/main/java/com/discord/utilities/coroutines/AppCoroutineScopeKt.java index 888b8b2502..f5e00f2606 100644 --- a/app/src/main/java/com/discord/utilities/coroutines/AppCoroutineScopeKt.java +++ b/app/src/main/java/com/discord/utilities/coroutines/AppCoroutineScopeKt.java @@ -7,11 +7,12 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; import kotlinx.coroutines.CoroutineStart; import kotlinx.coroutines.Job; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: AppCoroutineScope.kt */ public final class AppCoroutineScopeKt { public static final Job appLaunch(CoroutineScope coroutineScope, Class cls, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2, ? extends Object> function2) { @@ -31,8 +32,8 @@ public final class AppCoroutineScopeKt { m.checkNotNullParameter(coroutineContext, "context"); m.checkNotNullParameter(coroutineStart, "start"); m.checkNotNullParameter(function2, "block"); - z zVar = j0.a; - return a.E(coroutineScope, s.a.a.m.b.plus(new AppErrorTag(str)).plus(coroutineContext), coroutineStart, function2); + CoroutineDispatcher coroutineDispatcher = j0.a; + return a.F(coroutineScope, n.b.plus(new AppErrorTag(str)).plus(coroutineContext), coroutineStart, function2); } public static /* synthetic */ Job appLaunch$default(CoroutineScope coroutineScope, Class cls, CoroutineContext coroutineContext, CoroutineStart coroutineStart, Function2 function2, int i, Object obj) { diff --git a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt$appAwaitSingle$2.java b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt$appAwaitSingle$2.java index a02481b07e..1d5e37fdd8 100644 --- a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt$appAwaitSingle$2.java +++ b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt$appAwaitSingle$2.java @@ -16,11 +16,12 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.Ref$ObjectRef; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; import rx.Observable; -import s.a.i1; +import s.a.a.n; import s.a.j0; -import s.a.z; +import s.a.k1; /* compiled from: RxCoroutineExtensions.kt */ @e(c = "com.discord.utilities.coroutines.RxCoroutineExtensionsKt$appAwaitSingle$2", f = "RxCoroutineExtensions.kt", l = {34, 38}, m = "invokeSuspend") public final class RxCoroutineExtensionsKt$appAwaitSingle$2 extends k implements Function2, Object> { @@ -135,13 +136,13 @@ public final class RxCoroutineExtensionsKt$appAwaitSingle$2 extends k implements th2 = th3; ref$ObjectRef = ref$ObjectRef3; ref$ObjectRef2 = ref$ObjectRef4; - z zVar = j0.a; - i1 i1Var = s.a.a.m.b; + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 k1Var = n.b; AnonymousClass1 r5 = new AnonymousClass1(th2, ref$ObjectRef2, ref$ObjectRef, null); this.L$0 = th2; this.L$1 = null; this.label = 2; - if (a.h0(i1Var, r5, this) == coroutine_suspended) { + if (a.i0(k1Var, r5, this) == coroutine_suspended) { return coroutine_suspended; } th = th2; diff --git a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java index c4c2193dc2..4e592c46f6 100644 --- a/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java +++ b/app/src/main/java/com/discord/utilities/coroutines/RxCoroutineExtensionsKt.java @@ -7,7 +7,7 @@ import d0.w.h.a.g; import d0.z.d.m; import kotlin.coroutines.Continuation; import rx.Observable; -import s.a.a.q; +import s.a.a.r; /* compiled from: RxCoroutineExtensions.kt */ public final class RxCoroutineExtensionsKt { public static final Object appAwaitFirst(Observable observable, Context context, Continuation continuation) { @@ -25,12 +25,12 @@ public final class RxCoroutineExtensionsKt { public static final Object appAwaitSingle(Observable observable, Context context, Continuation continuation) { RxCoroutineExtensionsKt$appAwaitSingle$2 rxCoroutineExtensionsKt$appAwaitSingle$2 = new RxCoroutineExtensionsKt$appAwaitSingle$2(observable, context, null); - q qVar = new q(continuation.getContext(), continuation); - Object S = a.S(qVar, qVar, rxCoroutineExtensionsKt$appAwaitSingle$2); - if (S == c.getCOROUTINE_SUSPENDED()) { + r rVar = new r(continuation.getContext(), continuation); + Object T = a.T(rVar, rVar, rxCoroutineExtensionsKt$appAwaitSingle$2); + if (T == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } - return S; + return T; } public static /* synthetic */ Object appAwaitSingle$default(Observable observable, Context context, Continuation continuation, int i, Object obj) { diff --git a/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$1.java b/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$1.java index f282d0fbdd..c66be93702 100644 --- a/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$1.java +++ b/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$1.java @@ -27,6 +27,6 @@ public final class StickerUtils$getStickerPackPremiumPriceLabel$1 extends o impl public final void invoke(RenderContext renderContext) { m.checkNotNullParameter(renderContext, "$receiver"); - renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, 2131100427)); + renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, 2131100428)); } } diff --git a/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$2.java b/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$2.java index 692ab29a73..1cc8e3f1c2 100644 --- a/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$2.java +++ b/app/src/main/java/com/discord/utilities/dsti/StickerUtils$getStickerPackPremiumPriceLabel$2.java @@ -27,6 +27,6 @@ public final class StickerUtils$getStickerPackPremiumPriceLabel$2 extends o impl public final void invoke(RenderContext renderContext) { m.checkNotNullParameter(renderContext, "$receiver"); - renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, 2131100427)); + renderContext.e = Integer.valueOf(ColorCompat.getColor(this.$context, 2131100428)); } } diff --git a/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java b/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java index 180df04d46..8fec065fd1 100644 --- a/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java +++ b/app/src/main/java/com/discord/utilities/dsti/StickerUtils.java @@ -161,12 +161,12 @@ public final class StickerUtils { } for (String str2 : queriesFromSearchText) { for (Sticker sticker : list) { - if (t.equals(sticker.f(), str2, true)) { + if (t.equals(sticker.g(), str2, true)) { linkedHashSet2.add(sticker); - } else if (z2 && t.startsWith(sticker.f(), str2, true)) { + } else if (z2 && t.startsWith(sticker.g(), str2, true)) { linkedHashSet3.add(sticker); } - List split$default = w.split$default((CharSequence) sticker.h(), new String[]{","}, false, 0, 6, (Object) null); + List split$default = w.split$default((CharSequence) sticker.i(), new String[]{","}, false, 0, 6, (Object) null); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(split$default, 10)); for (String str3 : split$default) { Objects.requireNonNull(str3, "null cannot be cast to non-null type kotlin.CharSequence"); @@ -281,13 +281,13 @@ public final class StickerUtils { TimeUtils timeUtils = TimeUtils.INSTANCE; int daysFromMillis = timeUtils.getDaysFromMillis(unpublishedAtDate); if (daysFromMillis > 0) { - return StringResourceUtilsKt.getI18nPluralString(context, 2131755062, daysFromMillis, Integer.valueOf(daysFromMillis)); + return StringResourceUtilsKt.getI18nPluralString(context, 2131755063, daysFromMillis, Integer.valueOf(daysFromMillis)); } int hoursFromMillis = timeUtils.getHoursFromMillis(unpublishedAtDate); long j = unpublishedAtDate - (((long) hoursFromMillis) * 3600000); int minutesFromMillis = timeUtils.getMinutesFromMillis(j); int secondsFromMillis = timeUtils.getSecondsFromMillis(j - (((long) minutesFromMillis) * 60000)); - return (hoursFromMillis < 0 || minutesFromMillis < 0 || secondsFromMillis < 0) ? b.g(context, 2131893504, new Object[0], null, 4) : b.g(context, 2131888180, new Object[]{a.H(new Object[]{Integer.valueOf(hoursFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(minutesFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(secondsFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)")}, null, 4); + return (hoursFromMillis < 0 || minutesFromMillis < 0 || secondsFromMillis < 0) ? b.g(context, 2131893544, new Object[0], null, 4) : b.g(context, 2131888190, new Object[]{a.H(new Object[]{Integer.valueOf(hoursFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(minutesFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)"), a.H(new Object[]{Integer.valueOf(secondsFromMillis)}, 1, "%02d", "java.lang.String.format(format, *args)")}, null, 4); } public final CharSequence getStickerPackPremiumPriceLabel(Context context, ModelStickerPack modelStickerPack, PremiumTier premiumTier, boolean z2) { @@ -295,7 +295,7 @@ public final class StickerUtils { m.checkNotNullParameter(modelStickerPack, "stickerPack"); m.checkNotNullParameter(premiumTier, "currentPremiumTier"); if (z2 && premiumTier != PremiumTier.TIER_2) { - return b.g(context, 2131893486, new Object[0], null, 4); + return b.g(context, 2131893526, new Object[0], null, 4); } PremiumTier premiumTier2 = PremiumTier.PREMIUM_GUILD_SUBSCRIPTION_ONLY; if (premiumTier != premiumTier2) { @@ -303,22 +303,22 @@ public final class StickerUtils { Integer stickerPackPriceForPremiumTier2 = getStickerPackPriceForPremiumTier(modelStickerPack, premiumTier); if (!(stickerPackPriceForPremiumTier == null || stickerPackPriceForPremiumTier2 == null || !(!m.areEqual(stickerPackPriceForPremiumTier, stickerPackPriceForPremiumTier2)))) { CharSequence formattedPriceUsd = PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier.intValue(), context); - return stickerPackPriceForPremiumTier2.intValue() == 0 ? b.a(context, 2131893493, new Object[]{formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$1(context)) : b.a(context, 2131893494, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier2.intValue(), context), formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$2(context)); + return stickerPackPriceForPremiumTier2.intValue() == 0 ? b.a(context, 2131893533, new Object[]{formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$1(context)) : b.a(context, 2131893534, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(stickerPackPriceForPremiumTier2.intValue(), context), formattedPriceUsd}, new StickerUtils$getStickerPackPremiumPriceLabel$2(context)); } } if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier)) { - return b.g(context, 2131893487, new Object[0], null, 4); + return b.g(context, 2131893527, new Object[0], null, 4); } PremiumTier premiumTier3 = PremiumTier.TIER_1; if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier3) && !PremiumUtils.INSTANCE.isPremiumTierAtLeast(premiumTier, premiumTier3)) { - return b.g(context, 2131893488, new Object[0], null, 4); + return b.g(context, 2131893528, new Object[0], null, 4); } PremiumTier premiumTier4 = PremiumTier.TIER_2; if (isStickerPackFreeForPremiumTier(modelStickerPack, premiumTier4) && !PremiumUtils.INSTANCE.isPremiumTierAtLeast(premiumTier, premiumTier4)) { - return b.g(context, 2131893489, new Object[0], null, 4); + return b.g(context, 2131893529, new Object[0], null, 4); } CharSequence formattedPriceUsd2 = PremiumUtilsKt.getFormattedPriceUsd(getStickerPackPrice(premiumTier4), context); - return premiumTier == premiumTier4 ? formattedPriceUsd2 : b.g(context, 2131893508, new Object[]{formattedPriceUsd2}, null, 4); + return premiumTier == premiumTier4 ? formattedPriceUsd2 : b.g(context, 2131893548, new Object[]{formattedPriceUsd2}, null, 4); } public final boolean isStickerPackFreeForPremiumTier(ModelStickerPack modelStickerPack, PremiumTier premiumTier) { diff --git a/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java b/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java index 6febf13772..577527e8a2 100644 --- a/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/duration/DurationUtilsKt.java @@ -12,44 +12,44 @@ public final class DurationUtilsKt { public static final CharSequence humanizeDuration(Context context, long j) { m.checkNotNullParameter(context, "context"); if (j <= 30000) { - String string = context.getString(2131890157); + String string = context.getString(2131890187); m.checkNotNullExpressionValue(string, "context.getString(\n …ation_a_few_seconds\n )"); return string; } else if (j <= 60000) { int i = (int) (j / 1000); - return b.g(context, 2131890161, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, i, Integer.valueOf(i))}, null, 4); + return b.g(context, 2131890191, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755190, i, Integer.valueOf(i))}, null, 4); } else if (j <= 3600000) { int i2 = (int) (j / 60000); - return b.g(context, 2131890160, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, i2, Integer.valueOf(i2))}, null, 4); + return b.g(context, 2131890190, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, i2, Integer.valueOf(i2))}, null, 4); } else if (j <= 86400000) { int i3 = (int) (j / 3600000); - return b.g(context, 2131890159, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, i3, Integer.valueOf(i3))}, null, 4); + return b.g(context, 2131890189, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, i3, Integer.valueOf(i3))}, null, 4); } else { int i4 = (int) (j / 86400000); - return b.g(context, 2131890158, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755186, i4, Integer.valueOf(i4))}, null, 4); + return b.g(context, 2131890188, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, i4, Integer.valueOf(i4))}, null, 4); } } public static final CharSequence humanizeDurationRounded(Context context, long j) { m.checkNotNullParameter(context, "context"); if (j <= 30000) { - String string = context.getString(2131890157); + String string = context.getString(2131890187); m.checkNotNullExpressionValue(string, "context.getString(\n …ation_a_few_seconds\n )"); return string; } double d = (double) j; if (d <= 54000.0d) { float f = ((float) j) / ((float) 1000); - return b.g(context, 2131890161, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, a.roundToInt(f), Integer.valueOf(a.roundToInt(f)))}, null, 4); + return b.g(context, 2131890191, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755190, a.roundToInt(f), Integer.valueOf(a.roundToInt(f)))}, null, 4); } else if (d <= 3240000.0d) { float f2 = ((float) j) / ((float) 60000); - return b.g(context, 2131890160, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, a.roundToInt(f2), Integer.valueOf(a.roundToInt(f2)))}, null, 4); + return b.g(context, 2131890190, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755189, a.roundToInt(f2), Integer.valueOf(a.roundToInt(f2)))}, null, 4); } else if (d <= 7.776E7d) { float f3 = ((float) j) / ((float) 3600000); - return b.g(context, 2131890159, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, a.roundToInt(f3), Integer.valueOf(a.roundToInt(f3)))}, null, 4); + return b.g(context, 2131890189, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755188, a.roundToInt(f3), Integer.valueOf(a.roundToInt(f3)))}, null, 4); } else { float f4 = ((float) j) / ((float) 86400000); - return b.g(context, 2131890158, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755186, a.roundToInt(f4), Integer.valueOf(a.roundToInt(f4)))}, null, 4); + return b.g(context, 2131890188, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755187, a.roundToInt(f4), Integer.valueOf(a.roundToInt(f4)))}, null, 4); } } } diff --git a/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java b/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java index dde4e2cd3a..550b779def 100644 --- a/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java +++ b/app/src/main/java/com/discord/utilities/embed/EmbedResourceUtils.java @@ -207,7 +207,7 @@ public final class EmbedResourceUtils { if (fromExtension != null) { return fromExtension.getFileDrawable(); } - return 2131231620; + return 2131231623; } public final int getMAX_IMAGE_VIEW_HEIGHT_PX() { diff --git a/app/src/main/java/com/discord/utilities/embed/FileType.java b/app/src/main/java/com/discord/utilities/embed/FileType.java index 65ebc63002..ffae23c71d 100644 --- a/app/src/main/java/com/discord/utilities/embed/FileType.java +++ b/app/src/main/java/com/discord/utilities/embed/FileType.java @@ -117,25 +117,25 @@ public enum FileType { public final int getFileDrawable() { switch (ordinal()) { case 0: - return 2131231622; + return 2131231625; case 1: - return 2131231605; - case 2: - return 2131231606; - case 3: - return 2131231618; - case 4: - return 2131231607; - case 5: return 2131231608; - case 6: + case 2: + return 2131231609; + case 3: + return 2131231621; + case 4: return 2131231610; - case 7: + case 5: return 2131231611; + case 6: + return 2131231613; + case 7: + return 2131231614; case 8: - return 2131231619; + return 2131231622; case 9: - return 2131231623; + return 2131231626; default: throw new NoWhenBranchMatchedException(); } diff --git a/app/src/main/java/com/discord/utilities/error/Error.java b/app/src/main/java/com/discord/utilities/error/Error.java index 341a8b2051..698d8eae8a 100644 --- a/app/src/main/java/com/discord/utilities/error/Error.java +++ b/app/src/main/java/com/discord/utilities/error/Error.java @@ -671,33 +671,33 @@ public class Error { private List getToastMessages(@NonNull Context context) { switch (this.type.ordinal()) { case 0: - return Collections.singletonList(context.getString(2131891289)); + return Collections.singletonList(context.getString(2131891322)); case 1: - return Collections.singletonList(Response.access$100(this.response, context, 2131891291)); + return Collections.singletonList(Response.access$100(this.response, context, 2131891324)); case 2: - return Collections.singletonList(context.getString(2131891288)); + return Collections.singletonList(context.getString(2131891321)); case 3: case 9: - return Collections.singletonList(Response.access$100(this.response, context, 2131891293)); + return Collections.singletonList(Response.access$100(this.response, context, 2131891326)); case 4: default: - return Collections.singletonList(context.getString(2131891296)); + return Collections.singletonList(context.getString(2131891329)); case 5: - return Collections.singletonList(Response.access$100(this.response, context, 2131891287)); + return Collections.singletonList(Response.access$100(this.response, context, 2131891320)); case 6: - return Collections.singletonList(context.getString(2131890433)); + return Collections.singletonList(context.getString(2131890463)); case 7: - return Collections.singletonList(context.getString(2131891292)); + return Collections.singletonList(context.getString(2131891325)); case 8: - return Collections.singletonList(context.getString(2131891295)); + return Collections.singletonList(context.getString(2131891328)); case 10: - return Collections.singletonList(context.getString(2131892467)); + return Collections.singletonList(context.getString(2131892509)); case 11: - return Collections.singletonList(context.getString(2131891290)); + return Collections.singletonList(context.getString(2131891323)); case 12: - return Collections.singletonList(context.getString(2131891294)); + return Collections.singletonList(context.getString(2131891327)); case 13: - return Collections.singletonList(context.getString(2131893855)); + return Collections.singletonList(context.getString(2131893894)); } } diff --git a/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java b/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java index 8ec9bb8009..23ded2af77 100644 --- a/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java +++ b/app/src/main/java/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.java @@ -18,14 +18,14 @@ public final class SimpleDraweeViewExtensionsKt { CharSequence charSequence; m.checkNotNullParameter(simpleDraweeView, "$this$setGuildIcon"); String forGuild = IconUtils.getForGuild(guild, "asset://asset/images/default_icon_selected.jpg", z3, num); - if (!m.areEqual(forGuild, simpleDraweeView.getTag(2131365324))) { - simpleDraweeView.setTag(2131365324, forGuild); + if (!m.areEqual(forGuild, simpleDraweeView.getTag(2131365329))) { + simpleDraweeView.setTag(2131365329, forGuild); IconUtils.setIcon$default(simpleDraweeView, forGuild, 0, function1, (MGImages.ChangeDetector) null, 20, (Object) null); } MGImages.setRoundingParams(simpleDraweeView, f, !z2, num2, num3, f2); if (guild == null || (charSequence = guild.getName()) == null) { Context context = simpleDraweeView.getContext(); - charSequence = context != null ? context.getString(2131890143) : null; + charSequence = context != null ? context.getString(2131890156) : null; } simpleDraweeView.setContentDescription(charSequence); } @@ -49,8 +49,8 @@ public final class SimpleDraweeViewExtensionsKt { m.checkNotNullParameter(simpleDraweeView, "$this$setUserIcon"); int dimensionPixelSize = simpleDraweeView.getResources().getDimensionPixelSize(i); String forUser = dimensionPixelSize > 0 ? IconUtils.getForUser(l, str, num, z2, Integer.valueOf(IconUtils.getMediaProxySize(dimensionPixelSize))) : IconUtils.getForUser$default(l, str, num, z2, null, 16, null); - if (!m.areEqual(forUser, simpleDraweeView.getTag(2131365324))) { - simpleDraweeView.setTag(2131365324, forUser); + if (!m.areEqual(forUser, simpleDraweeView.getTag(2131365329))) { + simpleDraweeView.setTag(2131365329, forUser); IconUtils.setIcon$default(simpleDraweeView, forUser, i, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); } } diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java b/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java index b494c58e25..a8096eb331 100644 --- a/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java +++ b/app/src/main/java/com/discord/utilities/fcm/NotificationActions.java @@ -17,7 +17,6 @@ import androidx.work.WorkManager; import c.d.b.a.a; import com.discord.app.AppLog; import com.discord.app.DiscordConnectService; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.logging.Logger; import com.discord.workers.CallActionWorker; import com.discord.workers.MessageAckWorker; @@ -136,7 +135,7 @@ public final class NotificationActions extends BroadcastReceiver { Pair[] pairArr = new Pair[5]; pairArr[0] = o.to("com.discord.intent.extra.EXTRA_CHANNEL_ID", Long.valueOf(longValue)); pairArr[1] = o.to("com.discord.intent.extra.EXTRA_CHANNEL_NAME", charSequenceExtra != null ? charSequenceExtra.toString() : null); - pairArr[2] = o.to("com.discord.intent.extra.EXTRA_MESSAGE_ID", new ModelMessage().getNonce()); + pairArr[2] = o.to("com.discord.intent.extra.EXTRA_MESSAGE_ID", null); pairArr[3] = o.to("MESSAGE_CONTENT", obj); pairArr[4] = o.to("com.discord.intent.extra.EXTRA_STICKER_ID", null); Data build = builder.putAll(h0.mapOf(pairArr)).build(); diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java index e84bf95da8..c3946b424b 100644 --- a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java +++ b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java @@ -16,18 +16,19 @@ import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.application.Application; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivity; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.sticker.Sticker; +import com.discord.api.user.User; import com.discord.app.AppActivity; -import com.discord.models.domain.ModelMessage; import com.discord.nullserializable.NullSerializable; import com.discord.utilities.dsti.StickerUtils; import com.discord.utilities.extensions.PendingIntentExtensionsKt; import com.discord.utilities.icon.IconUtils; import com.discord.utilities.intent.IntentUtils; import com.discord.utilities.media.AppSound; -import com.discord.utilities.textprocessing.MessageUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.time.Clock; import d0.g0.s; import d0.g0.t; @@ -415,26 +416,36 @@ public final class NotificationData { return IconUtils.getForGuild$default(Long.valueOf(this.guildId), this.guildIcon, "", false, null, 24, null); } - public final NotificationData copyForDirectReply(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - long id2 = modelMessage.getId(); - MessageActivity activity = modelMessage.getActivity(); - MessageActivityType b = activity != null ? activity.b() : null; - Application application = modelMessage.getApplication(); - String g = application != null ? application.g() : null; - int type = modelMessage.getType(); - String content = modelMessage.getContent(); - Channel a = Channel.a(this.channel, null, 0, 0, null, 0, modelMessage.getChannelId(), 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435423); + public final NotificationData copyForDirectReply(Message message) { + NullSerializable a; + String a2; + String r; + m.checkNotNullParameter(message, "message"); + long r2 = message.r(); + MessageActivity b = message.b(); + MessageActivityType b2 = b != null ? b.b() : null; + Application d = message.d(); + String g = d != null ? d.g() : null; + Integer M = message.M(); + m.checkNotNull(M); + int intValue = M.intValue(); + String k = message.k(); + Channel a3 = Channel.a(this.channel, null, 0, 0, null, 0, message.i(), 0, null, null, 0, null, 0, 0, null, 0, 0, null, false, 0, null, 0, null, null, null, null, null, null, null, 268435423); List emptyList = n.emptyList(); - long i = modelMessage.getAuthor().i(); - String r = modelMessage.getAuthor().r(); - NullSerializable a2 = modelMessage.getAuthor().a(); - String a3 = a2 != null ? a2.a() : null; + User g2 = message.g(); + long i = g2 != null ? g2.i() : 0; + User g3 = message.g(); + String str = ""; + String str2 = (g3 == null || (r = g3.r()) == null) ? str : r; + User g4 = message.g(); + if (!(g4 == null || (a = g4.a()) == null || (a2 = a.a()) == null)) { + str = a2; + } long j = this.guildId; - String str = this.guildName; - String str2 = this.guildIcon; - List stickers = modelMessage.getStickers(); - return new NotificationData("MESSAGE_CREATE", id2, b, g, type, content, a, emptyList, i, r, a3, -1, j, str, str2, -1, null, -1, null, null, stickers != null ? (Sticker) u.firstOrNull((List) stickers) : null, null); + String str3 = this.guildName; + String str4 = this.guildIcon; + List I = message.I(); + return new NotificationData("MESSAGE_CREATE", r2, b2, g, intValue, k, a3, emptyList, i, str2, str, -1, j, str3, str4, -1, null, -1, null, null, I != null ? (Sticker) u.firstOrNull((List) I) : null, null); } public final List getAckChannelIds() { @@ -449,7 +460,7 @@ public final class NotificationData { return null; } PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.callAction(context, this.channel.g(), this.messageId, z2)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null)); - Pair pair = z2 ? d0.o.to(2131890614, 2131100249) : d0.o.to(2131888046, 2131100324); + Pair pair = z2 ? d0.o.to(2131890644, 2131100249) : d0.o.to(2131888047, 2131100324); int intValue = ((Number) pair.component1()).intValue(); int intValue2 = ((Number) pair.component2()).intValue(); StringBuilder L = a.L("**"); @@ -472,11 +483,11 @@ public final class NotificationData { return ""; } int i = this.relationshipType; - return i != 1 ? i != 3 ? "" : b.g(context, 2131891497, new Object[0], null, 4) : b.g(context, 2131891484, new Object[0], null, 4); + return i != 1 ? i != 3 ? "" : b.g(context, 2131891530, new Object[0], null, 4) : b.g(context, 2131891517, new Object[0], null, 4); case -1237752112: - return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888907, new Object[]{this.applicationName}, null, 4) : ""; + return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888917, new Object[]{this.applicationName}, null, 4) : ""; case 974015250: - return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891486, new Object[]{this.userUsername, this.activityName}, null, 4); + return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891519, new Object[]{this.userUsername, this.activityName}, null, 4); case 998188116: if (!str.equals("MESSAGE_CREATE")) { return ""; @@ -485,11 +496,11 @@ public final class NotificationData { if (z2 != 0) { if (z2 == 1 || z2 == 3) { if (this.messageActivityType == MessageActivityType.JOIN) { - return b.g(context, 2131891488, new Object[]{this.userUsername, this.messageApplicationName}, null, 4); + return b.g(context, 2131891521, new Object[]{this.userUsername, this.messageApplicationName}, null, 4); } Sticker sticker = this.sticker; if (sticker != null) { - return b.g(context, 2131893483, new Object[]{sticker.f()}, null, 4); + return b.g(context, 2131893523, new Object[]{sticker.g()}, null, 4); } String str2 = this.messageContent; if (str2 != null) { @@ -512,11 +523,11 @@ public final class NotificationData { return b.g(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(context, this.messageId), new Object[]{this.userUsername}, null, 4); } if (this.messageActivityType == MessageActivityType.JOIN) { - return b.g(context, 2131891493, new Object[]{this.userUsername, this.messageApplicationName}, null, 4); + return b.g(context, 2131891526, new Object[]{this.userUsername, this.messageApplicationName}, null, 4); } Sticker sticker2 = this.sticker; if (sticker2 != null) { - return b.g(context, 2131893483, new Object[]{sticker2.f()}, null, 4); + return b.g(context, 2131893523, new Object[]{sticker2.g()}, null, 4); } String str3 = this.messageContent; if (str3 != null) { @@ -525,7 +536,7 @@ public final class NotificationData { } return null; case 1770025841: - return str.equals("CALL_RING") ? b.k(b.g(context, 2131891680, new Object[]{a.D(a.L("**"), this.userUsername, "**")}, null, 4), new Object[0], null, 2) : ""; + return str.equals("CALL_RING") ? b.k(b.g(context, 2131891717, new Object[]{a.D(a.L("**"), this.userUsername, "**")}, null, 4), new Object[0], null, 2) : ""; default: return ""; } @@ -594,9 +605,9 @@ public final class NotificationData { if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || set.contains(Long.valueOf(this.channel.g()))) { return null; } - RemoteInput build = new RemoteInput.Builder("discord_notif_text_input").setLabel(b.g(context, 2131893116, new Object[0], null, 4)).build(); + RemoteInput build = new RemoteInput.Builder("discord_notif_text_input").setLabel(b.g(context, 2131893158, new Object[0], null, 4)).build(); m.checkNotNullExpressionValue(build, "RemoteInput.Builder(Inte…essage))\n .build()"); - return new NotificationCompat.Action.Builder(2131231904, b.g(context, 2131891498, new Object[0], null, 4), PendingIntent.getBroadcast(context, (int) this.channel.g(), addTrackingData(NotificationActions.Companion.directReply(context, this.channel.g(), getTitle(context))), PendingIntentExtensionsKt.mutablePendingIntentFlag(134217728))).addRemoteInput(build).setAllowGeneratedReplies(true).build(); + return new NotificationCompat.Action.Builder(2131231907, b.g(context, 2131891531, new Object[0], null, 4), PendingIntent.getBroadcast(context, (int) this.channel.g(), addTrackingData(NotificationActions.Companion.directReply(context, this.channel.g(), getTitle(context))), PendingIntentExtensionsKt.mutablePendingIntentFlag(134217728))).addRemoteInput(build).setAllowGeneratedReplies(true).build(); } @SuppressLint({"UnspecifiedImmutableFlag"}) @@ -715,7 +726,7 @@ public final class NotificationData { if (!m.areEqual(this.type, "MESSAGE_CREATE")) { return null; } - return new NotificationCompat.Action.Builder(2131231505, b.g(context, 2131890903, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.markAsRead(context, this.channel.g(), this.messageId)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build(); + return new NotificationCompat.Action.Builder(2131231505, b.g(context, 2131890933, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.markAsRead(context, this.channel.g(), this.messageId)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build(); } public final long getMessageId() { @@ -813,7 +824,7 @@ public final class NotificationData { m.checkNotNullParameter(context, "context"); IconCompat iconCompat = null; boolean z2 = false; - CharSequence g = (!m.areEqual(this.type, "MESSAGE_CREATE") || this.messageType == 7 || (messageActivityType = this.messageActivityType) == MessageActivityType.SPECTATE || messageActivityType == MessageActivityType.JOIN) ? b.g(context, 2131888138, new Object[0], null, 4) : this.userUsername; + CharSequence g = (!m.areEqual(this.type, "MESSAGE_CREATE") || this.messageType == 7 || (messageActivityType = this.messageActivityType) == MessageActivityType.SPECTATE || messageActivityType == MessageActivityType.JOIN) ? b.g(context, 2131888148, new Object[0], null, 4) : this.userUsername; String valueOf = String.valueOf(this.userId); String str = this.subtitle; if (!(str == null || g == null)) { @@ -878,15 +889,15 @@ public final class NotificationData { if (hashCode != -1327124998) { if (hashCode != 998188116) { if (hashCode == 1770025841 && str.equals("CALL_RING")) { - return 2131231789; + return 2131231792; } } else if (str.equals("MESSAGE_CREATE")) { - return 2131231791; + return 2131231794; } } else if (str.equals("RELATIONSHIP_ADD")) { - return 2131231790; + return 2131231793; } - return 2131231788; + return 2131231791; } public final Sticker getSticker() { @@ -901,7 +912,7 @@ public final class NotificationData { if ((!m.areEqual(this.type, "MESSAGE_CREATE")) || i < 2) { return null; } - return new NotificationCompat.Action.Builder(2131231794, b.g(context, 2131891495, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.timedMute(context, this.guildId, this.channel.g(), clock.currentTimeMillis() + 3600000)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build(); + return new NotificationCompat.Action.Builder(2131231797, b.g(context, 2131891528, new Object[0], null, 4), PendingIntent.getBroadcast(context, 0, addTrackingData(NotificationActions.Companion.timedMute(context, this.guildId, this.channel.g(), clock.currentTimeMillis() + 3600000)), PendingIntentExtensionsKt.immutablePendingIntentFlag$default(0, 1, null))).build(); } public final CharSequence getTitle(Context context) { @@ -911,9 +922,9 @@ public final class NotificationData { case -1327124998: return str.equals("RELATIONSHIP_ADD") ? this.userUsername : ""; case -1237752112: - return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888908, new Object[0], null, 4) : ""; + return str.equals("APPLICATION_LIBRARY_INSTALL_COMPLETE") ? b.g(context, 2131888918, new Object[0], null, 4) : ""; case 974015250: - return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891503, new Object[0], null, 4); + return (!str.equals("ACTIVITY_START") || this.activityType != 0) ? "" : b.g(context, 2131891536, new Object[0], null, 4); case 998188116: if (!str.equals("MESSAGE_CREATE")) { return ""; @@ -939,7 +950,7 @@ public final class NotificationData { } return b.k(this.guildName + " _" + AnimatableValueParser.A0(this.channel, context, false, 2) + '_', new Object[0], null, 2); case 1770025841: - return str.equals("CALL_RING") ? this.channel.z() != 1 ? AnimatableValueParser.y0(this.channel) : b.g(context, 2131890303, new Object[0], null, 4) : ""; + return str.equals("CALL_RING") ? this.channel.z() != 1 ? AnimatableValueParser.y0(this.channel) : b.g(context, 2131890333, new Object[0], null, 4) : ""; default: return ""; } diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java index a3b9013af4..20c9022560 100644 --- a/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java +++ b/app/src/main/java/com/discord/utilities/fcm/NotificationRenderer.java @@ -211,7 +211,7 @@ public final class NotificationRenderer { } private final NotificationCompat.MessagingStyle getMessageStyle(Context context, NotificationData notificationData, List list, Map map) { - Person build = new Person.Builder().setName(context.getString(2131890975)).setKey("me").build(); + Person build = new Person.Builder().setName(context.getString(2131891006)).setKey("me").build(); m.checkNotNullExpressionValue(build, "Person.Builder()\n …ey(\"me\")\n .build()"); NotificationCompat.MessagingStyle groupConversation = new NotificationCompat.MessagingStyle(build).setConversationTitle(notificationData.getConversationTitle(context)).setGroupConversation(notificationData.isGroupConversation()); for (NotificationData notificationData2 : list) { @@ -265,27 +265,27 @@ public final class NotificationRenderer { public final void displaySent(Context context, long j, CharSequence charSequence, boolean z2, int i) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(charSequence, "channelName"); - int i2 = z2 ? 2131891500 : 2131891499; + int i2 = z2 ? 2131891533 : 2131891532; PendingIntent broadcast = PendingIntent.getBroadcast(context, 0, NotificationActions.Companion.delete(context, j), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728)); Intent selectChannel$default = IntentUtils.RouteBuilders.selectChannel$default(j, 0, null, 6, null); selectChannel$default.setClass(context, AppActivity.Main.class); - NotificationManagerCompat.from(context).notify(i, new NotificationCompat.Builder(context, "Messages").setAutoCancel(true).setSmallIcon(2131231791).setCategory("msg").setContentText(b.g(context, i2, new Object[]{charSequence}, null, 4)).setDeleteIntent(broadcast).setContentIntent(PendingIntent.getActivity(context, 0, selectChannel$default, PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build()); + NotificationManagerCompat.from(context).notify(i, new NotificationCompat.Builder(context, "Messages").setAutoCancel(true).setSmallIcon(2131231794).setCategory("msg").setContentText(b.g(context, i2, new Object[]{charSequence}, null, 4)).setDeleteIntent(broadcast).setContentIntent(PendingIntent.getActivity(context, 0, selectChannel$default, PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build()); autoDismissNotification(context, i); } @RequiresApi(26) public final void initNotificationChannels(Application application) { m.checkNotNullParameter(application, "context"); - NotificationChannel notificationChannel = new NotificationChannel("Calls", application.getString(2131887112), 4); - NotificationChannel notificationChannel2 = new NotificationChannel("Media Connections", application.getString(2131894464), 2); - List listOf = n.listOf((Object[]) new NotificationChannel[]{notificationChannel, notificationChannel2, new NotificationChannel("Messages", application.getString(2131891153), 4), new NotificationChannel("DirectMessages", application.getString(2131888111), 4), new NotificationChannel("Social", application.getString(2131888800), 2), new NotificationChannel("Game Detection", application.getString(2131888874), 1)}); + NotificationChannel notificationChannel = new NotificationChannel("Calls", application.getString(2131887113), 4); + NotificationChannel notificationChannel2 = new NotificationChannel("Media Connections", application.getString(2131894511), 2); + List listOf = n.listOf((Object[]) new NotificationChannel[]{notificationChannel, notificationChannel2, new NotificationChannel("Messages", application.getString(2131891184), 4), new NotificationChannel("DirectMessages", application.getString(2131888116), 4), new NotificationChannel("Social", application.getString(2131888810), 2), new NotificationChannel("Game Detection", application.getString(2131888884), 1)}); for (NotificationChannel notificationChannel3 : listOf) { notificationChannel3.setShowBadge(true); notificationChannel3.enableVibration(true); notificationChannel3.enableLights(true); notificationChannel3.setLightColor(ColorCompat.getThemedColor(application, 2130968994)); } - notificationChannel.setDescription(application.getString(2131887112)); + notificationChannel.setDescription(application.getString(2131887113)); notificationChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400}); notificationChannel.setShowBadge(false); StringBuilder sb = new StringBuilder(); diff --git a/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java b/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java new file mode 100644 index 0000000000..ea0fe965de --- /dev/null +++ b/app/src/main/java/com/discord/utilities/features/GrowthTeamFeatures.java @@ -0,0 +1,16 @@ +package com.discord.utilities.features; + +import com.discord.models.experiments.domain.Experiment; +import com.discord.stores.StoreStream; +/* compiled from: GrowthTeamFeatures.kt */ +public final class GrowthTeamFeatures { + public static final GrowthTeamFeatures INSTANCE = new GrowthTeamFeatures(); + + private GrowthTeamFeatures() { + } + + public final boolean isDiscordUEnabled() { + Experiment userExperiment = StoreStream.Companion.getExperiments().getUserExperiment("2021-06_discord_u_android", true); + return userExperiment != null && userExperiment.getBucket() == 1; + } +} diff --git a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java index af9e470a74..8c34e73e1b 100644 --- a/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java +++ b/app/src/main/java/com/discord/utilities/gifting/GiftingUtils.java @@ -108,10 +108,10 @@ public final class GiftingUtils { WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion; FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager(); m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager"); - String string = fragmentActivity.getString(2131888107); - String string2 = fragmentActivity.getString(2131889087); + String string = fragmentActivity.getString(2131888112); + String string2 = fragmentActivity.getString(2131889097); m.checkNotNullExpressionValue(string2, "activity.getString(R.str…gle_play_notice_extended)"); - WidgetNoticeDialog.Companion.show$default(companion2, supportFragmentManager, string, string2, fragmentActivity.getString(2131886440), fragmentActivity.getString(2131891300), h0.mapOf(o.to(2131364030, new GiftingUtils$buyGift$2(googlePlayInAppSku, giftingUtils$buyGift$1)), o.to(2131364025, new GiftingUtils$buyGift$3(function0))), null, null, null, null, null, null, 0, new GiftingUtils$buyGift$4(function0), 8128, null); + WidgetNoticeDialog.Companion.show$default(companion2, supportFragmentManager, string, string2, fragmentActivity.getString(2131886440), fragmentActivity.getString(2131891333), h0.mapOf(o.to(2131364032, new GiftingUtils$buyGift$2(googlePlayInAppSku, giftingUtils$buyGift$1)), o.to(2131364027, new GiftingUtils$buyGift$3(function0))), null, null, null, null, null, null, 0, new GiftingUtils$buyGift$4(function0), 8128, null); companion.getGooglePlayPurchases().markViewedGiftingWarning(); return; } @@ -130,15 +130,15 @@ public final class GiftingUtils { public final Integer getIconForSku(GooglePlayInAppSku googlePlayInAppSku) { m.checkNotNullParameter(googlePlayInAppSku, "inAppSku"); if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Month())) { - return 2131231839; - } - if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Year())) { - return 2131231841; - } - if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Month())) { return 2131231842; } - return m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Year()) ? 2131231843 : null; + if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier1Year())) { + return 2131231844; + } + if (m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Month())) { + return 2131231845; + } + return m.areEqual(googlePlayInAppSku, GooglePlayInAppSkuKt.getPremiumTier2Year()) ? 2131231846 : null; } public final PremiumTier getTierForSku(Long l) { @@ -158,9 +158,9 @@ public final class GiftingUtils { TimeUtils timeUtils = TimeUtils.INSTANCE; int hoursFromMillis = timeUtils.getHoursFromMillis(j); if (hoursFromMillis > 0) { - return StringResourceUtilsKt.getI18nPluralString(context, 2131755064, hoursFromMillis, Integer.valueOf(hoursFromMillis)); + return StringResourceUtilsKt.getI18nPluralString(context, 2131755065, hoursFromMillis, Integer.valueOf(hoursFromMillis)); } int minutesFromMillis = timeUtils.getMinutesFromMillis(j); - return StringResourceUtilsKt.getI18nPluralString(context, 2131755066, minutesFromMillis, Integer.valueOf(minutesFromMillis)); + return StringResourceUtilsKt.getI18nPluralString(context, 2131755067, minutesFromMillis, Integer.valueOf(minutesFromMillis)); } } diff --git a/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java b/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java index f2fdb9805d..681bafc5d4 100644 --- a/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java +++ b/app/src/main/java/com/discord/utilities/guilds/PublicGuildUtils.java @@ -1,8 +1,8 @@ package com.discord.utilities.guilds; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; import d0.z.d.m; /* compiled from: PublicGuildUtils.kt */ public final class PublicGuildUtils { @@ -13,11 +13,11 @@ public final class PublicGuildUtils { private PublicGuildUtils() { } - public static final boolean isPublicGuildSystemMessage(ModelMessage modelMessage) { - User author; - m.checkNotNullParameter(modelMessage, "message"); - MessageReference messageReference = modelMessage.getMessageReference(); - Long b = messageReference != null ? messageReference.b() : null; - return (b != null && b.longValue() == 667560445975986187L) || ((author = modelMessage.getAuthor()) != null && author.i() == 669627189624307712L); + public static final boolean isPublicGuildSystemMessage(Message message) { + User g; + m.checkNotNullParameter(message, "message"); + MessageReference A = message.A(); + Long b = A != null ? A.b() : null; + return (b != null && b.longValue() == 667560445975986187L) || ((g = message.g()) != null && g.i() == 669627189624307712L); } } diff --git a/app/src/main/java/com/discord/utilities/icon/IconUtils.java b/app/src/main/java/com/discord/utilities/icon/IconUtils.java index fc2affcf30..20a1f0cc91 100644 --- a/app/src/main/java/com/discord/utilities/icon/IconUtils.java +++ b/app/src/main/java/com/discord/utilities/icon/IconUtils.java @@ -296,7 +296,7 @@ public final class IconUtils { i = num.intValue() % 5; } } - RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1593c; + RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c; return RebrandFeatureFlag.b ? a.n("asset://asset/images/default_avatar_new_", i, ".png") : a.n("asset://asset/images/default_avatar_", i, ".jpg"); } @@ -765,17 +765,17 @@ public final class IconUtils { switch (str.hashCode()) { case -1904464552: if (str.equals("eu-central")) { - return 2131232069; + return 2131232072; } break; case -1867973154: if (str.equals("us-south")) { - return 2131232067; + return 2131232070; } break; case -1504353500: if (str.equals("singapore")) { - return 2131232087; + return 2131232090; } break; case -1456593748: @@ -788,27 +788,27 @@ public final class IconUtils { break; case -1381018772: if (str.equals("brazil")) { - return 2131232084; + return 2131232087; } break; case -1097131496: if (str.equals("london")) { - return 2131232072; + return 2131232075; } break; case -919652293: if (str.equals("russia")) { - return 2131232086; + return 2131232089; } break; case -887780828: if (str.equals("sydney")) { - return 2131232060; + return 2131232063; } break; case -455031011: if (str.equals("hongkong")) { - return 2131232074; + return 2131232077; } break; case -199235124: @@ -821,22 +821,22 @@ public final class IconUtils { break; case -135164842: if (str.equals("amsterdam")) { - return 2131232081; + return 2131232084; } break; case 100893702: if (str.equals("japan")) { - return 2131232078; + return 2131232081; } break; case 579843043: if (str.equals("frankfurt")) { - return 2131232064; + return 2131232067; } break; } } - return 2131232092; + return 2131232095; } public final boolean isImageHashAnimated(String str) { diff --git a/app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java b/app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java index ea237b2e51..4f015748af 100644 --- a/app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java +++ b/app/src/main/java/com/discord/utilities/images/MGImages$requestAvatarCrop$1.java @@ -27,6 +27,6 @@ public final class MGImages$requestAvatarCrop$1 extends o implements Function1 list) { + m.checkNotNullParameter(user, "author"); + m.checkNotNullParameter(clock, "clock"); + m.checkNotNullParameter(list, "localAttachments"); + long computeNonce = NonceGenerator.Companion.computeNonce(clock); + UtcDateTime utcDateTime = new UtcDateTime(clock.currentTimeMillis()); + Boolean bool = Boolean.FALSE; + return new Message(computeNonce, j, user, "", utcDateTime, null, bool, bool, n.emptyList(), n.emptyList(), n.emptyList(), n.emptyList(), n.emptyList(), String.valueOf(computeNonce), bool, null, -3, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, true, null, null, null, null, list, 0, 30); + } + + public static final Message createLocalApplicationCommandMessage(long j, String str, long j2, User user, User user2, boolean z2, boolean z3, Long l, Clock clock) { + m.checkNotNullParameter(user2, "application"); + m.checkNotNullParameter(clock, "clock"); + int i = z2 ? -4 : -5; + return new Message(j, j2, user2, "", new UtcDateTime(clock.currentTimeMillis()), null, null, null, null, null, null, null, null, String.valueOf(j), null, null, Integer.valueOf(i), null, null, null, null, z3 ? 128L : null, null, null, null, new Interaction(l, 2, str, user, null), null, null, null, null, null, null, false, null, null, null, null, null, -35725344, 63); + } + + public static final Message createLocalApplicationCommandMessage(Message message, Long l, boolean z2, boolean z3, Clock clock) { + m.checkNotNullParameter(message, "other"); + m.checkNotNullParameter(clock, "clock"); + Interaction t = message.t(); + String b = t != null ? t.b() : null; + Interaction t2 = message.t(); + User c2 = t2 != null ? t2.c() : null; + long r = message.r(); + long i = message.i(); + User g = message.g(); + m.checkNotNull(g); + return createLocalApplicationCommandMessage(r, b, i, c2, g, z2, z3, l, clock); + } + + public static final Message createLocalMessage(String str, long j, User user, List list, boolean z2, boolean z3, Application application, MessageActivity messageActivity, Clock clock, List list2, Long l, Long l2, Integer num, List list3, MessageReference messageReference, MessageAllowedMentions messageAllowedMentions) { + ArrayList arrayList; + m.checkNotNullParameter(str, "content"); + m.checkNotNullParameter(user, "author"); + m.checkNotNullParameter(clock, "clock"); + long computeNonce = NonceGenerator.Companion.computeNonce(clock); + int i = z2 ? -2 : -1; + UtcDateTime utcDateTime = new UtcDateTime(clock.currentTimeMillis()); + Boolean bool = Boolean.FALSE; + List emptyList = n.emptyList(); + List emptyList2 = n.emptyList(); + List emptyList3 = n.emptyList(); + List emptyList4 = n.emptyList(); + String valueOf = String.valueOf(computeNonce); + Integer valueOf2 = Integer.valueOf(i); + if (list3 != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(list3, 10)); + for (Sticker sticker : list3) { + arrayList.add(sticker.d()); + } + } else { + arrayList = null; + } + return new Message(computeNonce, j, user, str, utcDateTime, null, bool, bool, list, emptyList, emptyList2, emptyList3, emptyList4, valueOf, bool, null, valueOf2, messageActivity, application, null, messageReference, null, list3, arrayList, null, null, null, null, null, null, null, Boolean.FALSE, z3, messageAllowedMentions, num, l, l2, list2); + } + + public static final Message createThreadStarterMessageNotFoundMessage(long j, User user, Clock clock) { + m.checkNotNullParameter(user, "author"); + m.checkNotNullParameter(clock, "clock"); + long computeNonce = NonceGenerator.Companion.computeNonce(clock); + return new Message(computeNonce, j, user, "", new UtcDateTime(clock.currentTimeMillis()), null, null, null, null, null, null, null, null, String.valueOf(computeNonce), null, null, 23, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null, null, null, null, null, -73760, 63); + } + + public static final Message createWithReactions(Message message, LinkedHashMap linkedHashMap) { + List list; + Collection values; + m.checkNotNullParameter(message, "other"); + if (linkedHashMap == null || (values = linkedHashMap.values()) == null || (list = u.toList(values)) == null) { + list = n.emptyList(); + } + return Message.a(message, 0, 0, null, null, null, null, null, null, null, null, null, null, list, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null, null, null, null, null, -4097, 63); + } +} diff --git a/app/src/main/java/com/discord/utilities/message/MessageUtils$SORT_BY_IDS_COMPARATOR$1.java b/app/src/main/java/com/discord/utilities/message/MessageUtils$SORT_BY_IDS_COMPARATOR$1.java new file mode 100644 index 0000000000..3012eee8c1 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/message/MessageUtils$SORT_BY_IDS_COMPARATOR$1.java @@ -0,0 +1,11 @@ +package com.discord.utilities.message; + +import java.util.Comparator; +/* compiled from: MessageUtils.kt */ +public final class MessageUtils$SORT_BY_IDS_COMPARATOR$1 implements Comparator { + public static final MessageUtils$SORT_BY_IDS_COMPARATOR$1 INSTANCE = new MessageUtils$SORT_BY_IDS_COMPARATOR$1(); + + public final int compare(Long l, Long l2) { + return MessageUtils.compareMessages(l, l2); + } +} diff --git a/app/src/main/java/com/discord/utilities/message/MessageUtils.java b/app/src/main/java/com/discord/utilities/message/MessageUtils.java new file mode 100644 index 0000000000..6e0e353018 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/message/MessageUtils.java @@ -0,0 +1,421 @@ +package com.discord.utilities.message; + +import android.content.Context; +import android.content.res.Configuration; +import android.content.res.Resources; +import android.os.Build; +import android.os.LocaleList; +import com.discord.api.application.Application; +import com.discord.api.botuikit.Component; +import com.discord.api.channel.Channel; +import com.discord.api.channel.ChannelRecipientNick; +import com.discord.api.interaction.Interaction; +import com.discord.api.message.LocalAttachment; +import com.discord.api.message.Message; +import com.discord.api.message.MessageReference; +import com.discord.api.message.activity.MessageActivity; +import com.discord.api.message.activity.MessageActivityType; +import com.discord.api.message.allowedmentions.MessageAllowedMentions; +import com.discord.api.message.attachment.MessageAttachment; +import com.discord.api.message.call.MessageCall; +import com.discord.api.message.embed.MessageEmbed; +import com.discord.api.message.reaction.MessageReaction; +import com.discord.api.sticker.Sticker; +import com.discord.api.sticker.StickerPartial; +import com.discord.api.user.User; +import com.discord.api.utcdatetime.UtcDateTime; +import com.discord.models.member.GuildMember; +import com.discord.models.user.CoreUser; +import com.discord.utilities.time.TimeUtils; +import d0.g0.w; +import d0.z.d.m; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +/* compiled from: MessageUtils.kt */ +public final class MessageUtils { + public static final MessageUtils INSTANCE = new MessageUtils(); + private static final Comparator SORT_BY_IDS_COMPARATOR = MessageUtils$SORT_BY_IDS_COMPARATOR$1.INSTANCE; + private static final int[] WELCOME_MESSAGES = {2131893749, 2131893750, 2131893751, 2131893752, 2131893753, 2131893754, 2131893755, 2131893756, 2131893757, 2131893758, 2131893759, 2131893760, 2131893761}; + + private MessageUtils() { + } + + public static final int compareMessages(Long l, Long l2) { + long j = 0; + long longValue = l != null ? l.longValue() : 0; + if (l2 != null) { + j = l2.longValue(); + } + int i = (longValue > j ? 1 : (longValue == j ? 0 : -1)); + if (i == 0) { + return 0; + } + return i < 0 ? -1 : 1; + } + + public static final Map getNickOrUsernames(Message message, Channel channel, Map map, List list) { + m.checkNotNullParameter(message, "message"); + m.checkNotNullParameter(map, "channelMembers"); + List z2 = message.z(); + HashMap hashMap = new HashMap((z2 != null ? z2.size() : 0) + 1); + List z3 = message.z(); + if (z3 != null) { + for (User user : z3) { + hashMap.put(Long.valueOf(user.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(user), map.get(Long.valueOf(user.i())), channel, list)); + } + } + User g = message.g(); + if (g != null) { + hashMap.put(Long.valueOf(g.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(g), map.get(Long.valueOf(g.i())), channel, list)); + } + Interaction t = message.t(); + User c2 = t != null ? t.c() : null; + if (c2 != null) { + hashMap.put(Long.valueOf(c2.i()), GuildMember.Companion.getNickOrUsername(new CoreUser(c2), map.get(Long.valueOf(c2.i())), channel, list)); + } + return hashMap; + } + + public static /* synthetic */ Map getNickOrUsernames$default(Message message, Channel channel, Map map, List list, int i, Object obj) { + if ((i & 8) != 0) { + list = null; + } + return getNickOrUsernames(message, channel, map, list); + } + + public static final Comparator getSORT_BY_IDS_COMPARATOR() { + return SORT_BY_IDS_COMPARATOR; + } + + public static /* synthetic */ void getSORT_BY_IDS_COMPARATOR$annotations() { + } + + public static final boolean isLocal(Message message) { + Integer M; + Integer M2; + m.checkNotNullParameter(message, "$this$isLocal"); + Integer M3 = message.M(); + return (M3 != null && M3.intValue() == -1) || ((M = message.M()) != null && M.intValue() == -2) || (((M2 = message.M()) != null && M2.intValue() == -3) || INSTANCE.isLocalApplicationCommand(message)); + } + + public static final boolean isNewer(Long l, Long l2) { + return compareMessages(l, l2) < 0; + } + + public static final Message merge(Message message, Message message2) { + m.checkNotNullParameter(message, "old"); + m.checkNotNullParameter(message2, "new"); + long r = message2.r(); + long i = message2.i() != 0 ? message2.i() : message.i(); + User g = message2.g(); + if (g == null) { + g = message.g(); + } + String k = message2.k(); + if (k == null) { + k = message.k(); + } + UtcDateTime K = message2.K(); + if (K == null) { + K = message.K(); + } + UtcDateTime l = message2.l(); + if (l == null) { + l = message.l(); + } + List f = message2.f(); + if (f == null) { + f = message.f(); + } + List m = message2.m(); + if (m == null) { + m = message.m(); + } + Boolean L = message2.L(); + if (L == null) { + L = message.L(); + } + Boolean x2 = message2.x(); + List z2 = message2.z(); + if (z2 == null) { + z2 = message.z(); + } + List y2 = message2.y(); + if (y2 == null) { + y2 = message.y(); + } + List E = message2.E(); + if (E == null) { + E = message.E(); + } + String B = message2.B(); + if (B == null) { + B = message.B(); + } + Boolean D = message2.D(); + if (D == null) { + D = message.D(); + } + Long N = message2.N(); + if (N == null) { + N = message.N(); + } + Integer M = message2.M(); + if (M == null) { + M = message.M(); + } + MessageActivity b = message2.b(); + if (b == null) { + b = message.b(); + } + Application d = message2.d(); + if (d == null) { + d = message.d(); + } + Long e = message2.e(); + if (e == null) { + e = message.e(); + } + MessageReference A = message2.A(); + if (A == null) { + A = message.A(); + } + Long n = message2.n(); + if (n == null) { + n = message.n(); + } + List I = message2.I(); + if (I == null) { + I = message.I(); + } + List H = message2.H(); + if (H == null) { + H = message.H(); + } + Message G = message2.G(); + if (G == null) { + G = message.G(); + } + Interaction t = message2.t(); + if (t == null) { + t = message.t(); + } + Channel J = message2.J(); + if (J == null) { + J = message.J(); + } + List j = message2.j(); + if (j == null) { + j = message.j(); + } + MessageCall h = message2.h(); + if (h == null) { + h = message.h(); + } + boolean p = message2.p(); + MessageAllowedMentions c2 = message2.c(); + if (c2 == null) { + c2 = message.c(); + } + List v = message2.v(); + if (v == null) { + v = message.v(); + } + Long u = message2.u(); + if (u == null) { + u = message.u(); + } + Long s2 = message2.s(); + if (s2 == null) { + s2 = message.s(); + } + Integer C = message2.C(); + if (C == null) { + C = message.C(); + } + return Message.a(message, r, i, g, k, K, l, L, x2, z2, y2, f, m, E, B, D, N, M, b, d, e, A, n, I, H, G, t, J, j, h, null, null, null, p, c2, C, u, s2, v, -536870912, 0); + } + + public final boolean canResend(Message message) { + m.checkNotNullParameter(message, "$this$canResend"); + Integer M = message.M(); + return M != null && M.intValue() == -2; + } + + public final long getCallDuration(Message message) { + UtcDateTime a; + UtcDateTime K; + m.checkNotNullParameter(message, "$this$getCallDuration"); + MessageCall h = message.h(); + if (h == null || (a = h.a()) == null || (K = message.K()) == null) { + return 0; + } + return a.f() - K.f(); + } + + public final long getEditedTimestampMillis(Message message) { + m.checkNotNullParameter(message, "$this$getEditedTimestampMillis"); + UtcDateTime l = message.l(); + if (l != null) { + return l.f(); + } + return 0; + } + + /* JADX WARNING: Removed duplicated region for block: B:17:0x003d */ + /* JADX WARNING: Removed duplicated region for block: B:20:0x004d */ + /* JADX WARNING: Removed duplicated region for block: B:21:0x0050 */ + public final int getSystemMessageUserJoin(Context context, long j) { + Locale locale; + Configuration configuration; + Configuration configuration2; + LocaleList locales; + m.checkNotNullParameter(context, "context"); + String str = null; + if (Build.VERSION.SDK_INT >= 24) { + Resources resources = context.getResources(); + if (!(resources == null || (configuration2 = resources.getConfiguration()) == null || (locales = configuration2.getLocales()) == null)) { + locale = locales.get(0); + Locale locale2 = new Locale("en"); + if (locale != null) { + str = locale.getLanguage(); + } + return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))]; + } + } else { + Resources resources2 = context.getResources(); + if (!(resources2 == null || (configuration = resources2.getConfiguration()) == null)) { + locale = configuration.locale; + Locale locale2 = new Locale("en"); + if (locale != null) { + } + return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))]; + } + } + locale = null; + Locale locale2 = new Locale("en"); + if (locale != null) { + } + return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))]; + } + + public final boolean hasAttachments(Message message) { + m.checkNotNullParameter(message, "$this$hasAttachments"); + List f = message.f(); + return !(f == null || f.isEmpty()); + } + + public final boolean hasEmbeds(Message message) { + m.checkNotNullParameter(message, "$this$hasEmbeds"); + List m = message.m(); + return !(m == null || m.isEmpty()); + } + + public final boolean hasFlag(Message message, long j) { + m.checkNotNullParameter(message, "$this$hasFlag"); + Long n = message.n(); + return ((n != null ? n.longValue() : 0) & j) == j; + } + + public final boolean hasStickerItems(Message message) { + m.checkNotNullParameter(message, "$this$hasStickerItems"); + List H = message.H(); + return !(H == null || H.isEmpty()); + } + + public final boolean hasStickers(Message message) { + m.checkNotNullParameter(message, "$this$hasStickers"); + List I = message.I(); + return !(I == null || I.isEmpty()); + } + + public final boolean hasThread(Message message) { + m.checkNotNullParameter(message, "$this$hasThread"); + return hasFlag(message, 32); + } + + public final boolean isCrosspost(Message message) { + m.checkNotNullParameter(message, "$this$isCrosspost"); + return hasFlag(message, 2); + } + + public final boolean isCrossposted(Message message) { + m.checkNotNullParameter(message, "$this$isCrossposted"); + return hasFlag(message, 1); + } + + public final boolean isEmbeddedMessageType(Message message) { + Integer M; + m.checkNotNullParameter(message, "$this$isEmbeddedMessageType"); + Integer M2 = message.M(); + return (M2 != null && M2.intValue() == 19) || ((M = message.M()) != null && M.intValue() == 21); + } + + public final boolean isEphemeralMessage(Message message) { + m.checkNotNullParameter(message, "$this$isEphemeralMessage"); + return hasFlag(message, 64); + } + + public final boolean isFailed(Message message) { + Integer M; + Integer M2; + m.checkNotNullParameter(message, "$this$isFailed"); + Integer M3 = message.M(); + return (M3 != null && M3.intValue() == -3) || ((M = message.M()) != null && M.intValue() == -2) || ((M2 = message.M()) != null && M2.intValue() == -4); + } + + public final boolean isInteraction(Message message) { + Integer M; + m.checkNotNullParameter(message, "$this$isInteraction"); + Integer M2 = message.M(); + return (M2 != null && M2.intValue() == -5) || ((M = message.M()) != null && M.intValue() == -4) || message.t() != null; + } + + public final boolean isLoading(Message message) { + m.checkNotNullParameter(message, "$this$isLoading"); + return hasFlag(message, 128); + } + + public final boolean isLocalApplicationCommand(Message message) { + Integer M; + m.checkNotNullParameter(message, "$this$isLocalApplicationCommand"); + Integer M2 = message.M(); + return (M2 != null && M2.intValue() == -5) || ((M = message.M()) != null && M.intValue() == -4); + } + + public final boolean isSourceDeleted(Message message) { + m.checkNotNullParameter(message, "$this$isSourceDeleted"); + return hasFlag(message, 8); + } + + public final boolean isSpotifyListeningActivity(Message message) { + m.checkNotNullParameter(message, "$this$isSpotifyListeningActivity"); + MessageActivity b = message.b(); + return b != null && b.b() == MessageActivityType.LISTEN && w.contains$default(b.a(), "spotify", false, 2, null); + } + + public final boolean isSystemMessage(Message message) { + m.checkNotNullParameter(message, "$this$isSystemMessage"); + return !isUserMessage(message); + } + + public final boolean isUrgent(Message message) { + m.checkNotNullParameter(message, "$this$isUrgent"); + return hasFlag(message, 16); + } + + public final boolean isUserMessage(Message message) { + Integer M; + m.checkNotNullParameter(message, "$this$isUserMessage"); + Integer M2 = message.M(); + return (M2 != null && M2.intValue() == 0) || ((M = message.M()) != null && M.intValue() == 19); + } + + public final boolean isWebhook(Message message) { + m.checkNotNullParameter(message, "$this$isWebhook"); + return message.N() != null; + } +} diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$2.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$2.java index 250f03a409..232772373e 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$2.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doEdit$2.java @@ -1,13 +1,13 @@ package com.discord.utilities.messagesend; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.utilities.messagesend.MessageQueue; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: MessageQueue.kt */ -public final class MessageQueue$doEdit$2 extends o implements Function1 { +public final class MessageQueue$doEdit$2 extends o implements Function1 { public final /* synthetic */ MessageQueue.DrainListener $drainListener; public final /* synthetic */ MessageQueue this$0; @@ -21,13 +21,13 @@ public final class MessageQueue$doEdit$2 extends o implements Function1 implements b> { - public final /* synthetic */ ModelMessage $message; +public final class MessageQueue$doSend$2 implements b> { + public final /* synthetic */ Message $message; - public MessageQueue$doSend$2(ModelMessage modelMessage) { - this.$message = modelMessage; + public MessageQueue$doSend$2(Message message) { + this.$message = message; } /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: java.util.ArrayList */ /* JADX WARN: Multi-variable type inference failed */ - public final Observable call(SendUtils.SendPayload.ReadyToSend readyToSend) { + public final Observable call(SendUtils.SendPayload.ReadyToSend readyToSend) { List uploads = readyToSend.getUploads(); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(uploads, 10)); Iterator it = uploads.iterator(); @@ -31,13 +31,13 @@ public final class MessageQueue$doSend$2 implements b payloadJSON = new PayloadJSON<>(readyToSend.getMessage()); Object[] array = arrayList.toArray(new MultipartBody.Part[0]); Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array"); - return api.sendMessage(channelId, payloadJSON, (MultipartBody.Part[]) array); + return api.sendMessage(i, payloadJSON, (MultipartBody.Part[]) array); } } diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$3.java b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$3.java index 30098ae5ab..ff5ec289ba 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$3.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageQueue$doSend$3.java @@ -1,13 +1,13 @@ package com.discord.utilities.messagesend; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.utilities.messagesend.MessageQueue; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: MessageQueue.kt */ -public final class MessageQueue$doSend$3 extends o implements Function1 { +public final class MessageQueue$doSend$3 extends o implements Function1 { public final /* synthetic */ MessageQueue.DrainListener $drainListener; public final /* synthetic */ MessageQueue this$0; @@ -21,14 +21,14 @@ public final class MessageQueue$doSend$3 extends o implements Function1 stickerItems = message.getStickerItems(); - if (stickerItems != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(stickerItems, 10)); - for (StickerPartial stickerPartial : stickerItems) { + MessageAllowedMentions c2 = message.c(); + RestAPIParams.Message.AllowedMentions create = c2 != null ? RestAPIParams.Message.AllowedMentions.Companion.create(c2) : null; + String k2 = message.k(); + String B = message.B(); + Application d = message.d(); + Long valueOf = d != null ? Long.valueOf(d.f()) : null; + List H = message.H(); + if (H != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(H, 10)); + for (StickerPartial stickerPartial : H) { arrayList.add(Long.valueOf(stickerPartial.getId())); } } else { - List stickers = message.getStickers(); - if (stickers != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(stickers, 10)); - for (Sticker sticker : stickers) { + List I = message.I(); + if (I != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(I, 10)); + for (Sticker sticker : I) { arrayList.add(Long.valueOf(sticker.getId())); } } } - Observable u = SendUtils.INSTANCE.getSendPayload(this.contentResolver, new RestAPIParams.Message(content, nonce, valueOf, activity, arrayList, messageReference, allowedMentions), send.getAttachments()).u(new MessageQueue$doSend$1(send)); + Observable u = SendUtils.INSTANCE.getSendPayload(this.contentResolver, new RestAPIParams.Message(k2, B, valueOf, activity, arrayList, messageReference, create), send.getAttachments()).u(new MessageQueue$doSend$1(send)); m.checkNotNullExpressionValue(u, "SendUtils\n .getSe… }\n }\n }"); Observable G = u.y(MessageQueue$doSend$$inlined$filterIs$1.INSTANCE).G(MessageQueue$doSend$$inlined$filterIs$2.INSTANCE); m.checkNotNullExpressionValue(G, "filter { it is T }.map { it as T }"); - Observable A = G.a0(1).A(new MessageQueue$doSend$2(message)); - m.checkNotNullExpressionValue(A, "SendUtils\n .getSe…ge)\n }\n }"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn(A, z2), MessageQueue.class, (Context) null, new MessageQueue$doSend$5(this, send, drainListener), new MessageQueue$doSend$4(this, drainListener), (Function0) null, (Function0) null, new MessageQueue$doSend$3(this, drainListener), 50, (Object) null); + Observable A2 = G.a0(1).A(new MessageQueue$doSend$2(message)); + m.checkNotNullExpressionValue(A2, "SendUtils\n .getSe…ge)\n }\n }"); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn(A2, z2), MessageQueue.class, (Context) null, new MessageQueue$doSend$5(this, send, drainListener), new MessageQueue$doSend$4(this, drainListener), (Function0) null, (Function0) null, new MessageQueue$doSend$3(this, drainListener), 50, (Object) null); } private final void doSendApplicationCommand(MessageRequest.SendApplicationCommand sendApplicationCommand, DrainListener drainListener) { @@ -273,8 +263,8 @@ public final class MessageQueue { drainListener.complete(messageResult); } - private final void handleSuccess(ModelMessage modelMessage, DrainListener drainListener) { - drainListener.complete(new MessageResult.Success(modelMessage)); + private final void handleSuccess(Message message, DrainListener drainListener) { + drainListener.complete(new MessageResult.Success(message)); } private final void onDrainingCompleted() { diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java b/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java index 1a6c97db79..e3a39c6333 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageRequest.java @@ -1,9 +1,9 @@ package com.discord.utilities.messagesend; import com.discord.api.activity.Activity; +import com.discord.api.message.Message; +import com.discord.api.message.allowedmentions.MessageAllowedMentions; import com.discord.models.commands.ApplicationCommandLocalSendData; -import com.discord.models.domain.ModelAllowedMentions; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.messagesend.MessageResult; import com.discord.utilities.rest.SendUtils; import com.lytefast.flexinput.model.Attachment; @@ -22,7 +22,7 @@ public abstract class MessageRequest { /* compiled from: MessageQueue.kt */ public static final class Edit extends MessageRequest { - private final ModelAllowedMentions allowedMentions; + private final MessageAllowedMentions allowedMentions; private final long channelId; private final String content; private final long messageId; @@ -50,16 +50,16 @@ public abstract class MessageRequest { } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Edit(long j, String str, long j2, ModelAllowedMentions modelAllowedMentions, long j3) { + public Edit(long j, String str, long j2, MessageAllowedMentions messageAllowedMentions, long j3) { super(String.valueOf(j2), AnonymousClass1.INSTANCE, j3, null); m.checkNotNullParameter(str, "content"); this.channelId = j; this.content = str; this.messageId = j2; - this.allowedMentions = modelAllowedMentions; + this.allowedMentions = messageAllowedMentions; } - public final ModelAllowedMentions getAllowedMentions() { + public final MessageAllowedMentions getAllowedMentions() { return this.allowedMentions; } @@ -80,7 +80,7 @@ public abstract class MessageRequest { public static final class Send extends MessageRequest { private final Activity activity; private final List> attachments; - private final ModelMessage message; + private final Message message; private final Function1 onPreprocessing; private final Function1, Unit> onProgress; @@ -89,16 +89,15 @@ public abstract class MessageRequest { /* JADX DEBUG: Multi-variable search result rejected for r13v0, resolved type: kotlin.jvm.functions.Function1, kotlin.Unit> */ /* JADX WARN: Multi-variable type inference failed */ /* JADX WARNING: Illegal instructions before constructor call */ - public Send(ModelMessage modelMessage, Activity activity, List> list, Function2 function2, Function1 function1, Function1, Unit> function12, long j) { + public Send(Message message, Activity activity, List> list, Function2 function2, Function1 function1, Function1, Unit> function12, long j) { super(r2, function2, j, null); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(function2, "onCompleted"); m.checkNotNullParameter(function1, "onPreprocessing"); m.checkNotNullParameter(function12, "onProgress"); - String nonce = modelMessage.getNonce(); - m.checkNotNull(nonce); - m.checkNotNullExpressionValue(nonce, "message.nonce!!"); - this.message = modelMessage; + String B = message.B(); + m.checkNotNull(B); + this.message = message; this.activity = activity; this.attachments = list; this.onPreprocessing = function1; @@ -113,7 +112,7 @@ public abstract class MessageRequest { return this.attachments; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -126,7 +125,7 @@ public abstract class MessageRequest { } public final MessageResult.ValidationError validateMessage() { - if (this.message.getActivity() != null) { + if (this.message.b() != null) { List> list = this.attachments; if (!(list == null || list.isEmpty())) { return new MessageResult.ValidationError("Cannot send attachments with activity action"); @@ -139,18 +138,16 @@ public abstract class MessageRequest { /* compiled from: MessageQueue.kt */ public static final class SendApplicationCommand extends MessageRequest { private final ApplicationCommandLocalSendData applicationCommandSendData; - private final ModelMessage message; + private final Message message; /* JADX WARNING: Illegal instructions before constructor call */ - public SendApplicationCommand(ModelMessage modelMessage, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function2 function2, long j) { - super(r0, function2, j, null); - m.checkNotNullParameter(modelMessage, "message"); + public SendApplicationCommand(Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, Function2 function2, long j) { + super(r0 == null ? String.valueOf(applicationCommandLocalSendData.getNonce()) : r0, function2, j, null); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(applicationCommandLocalSendData, "applicationCommandSendData"); m.checkNotNullParameter(function2, "onCompleted"); - String nonce = modelMessage.getNonce(); - nonce = nonce == null ? String.valueOf(applicationCommandLocalSendData.getNonce()) : nonce; - m.checkNotNullExpressionValue(nonce, "message.nonce ?: applica…SendData.nonce.toString()"); - this.message = modelMessage; + String B = message.B(); + this.message = message; this.applicationCommandSendData = applicationCommandLocalSendData; } @@ -158,7 +155,7 @@ public abstract class MessageRequest { return this.applicationCommandSendData; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } } diff --git a/app/src/main/java/com/discord/utilities/messagesend/MessageResult.java b/app/src/main/java/com/discord/utilities/messagesend/MessageResult.java index 8b763f936c..fcaa9f284e 100644 --- a/app/src/main/java/com/discord/utilities/messagesend/MessageResult.java +++ b/app/src/main/java/com/discord/utilities/messagesend/MessageResult.java @@ -1,6 +1,6 @@ package com.discord.utilities.messagesend; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.utilities.error.Error; import d0.z.d.m; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -55,16 +55,16 @@ public abstract class MessageResult { /* compiled from: MessageQueue.kt */ public static final class Success extends MessageResult { - private final ModelMessage message; + private final Message message; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Success(ModelMessage modelMessage) { + public Success(Message message) { super(null); - m.checkNotNullParameter(modelMessage, "message"); - this.message = modelMessage; + m.checkNotNullParameter(message, "message"); + this.message = message; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } } diff --git a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java index db3e87c717..8664610e72 100644 --- a/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java +++ b/app/src/main/java/com/discord/utilities/notices/NoticeBuilders.java @@ -196,11 +196,11 @@ public final class NoticeBuilders { Object[] objArr = new Object[1]; Map metadata = dialog.getMetadata(); objArr[0] = metadata != null ? metadata.get("platform_title") : null; - return new DialogData(b.a(context, 2131888133, objArr, NoticeBuilders$deleteConnectionModalBuilder$1.INSTANCE), b.g(context, 2131888132, new Object[0], null, 4), b.g(context, 2131893151, new Object[0], null, 4), b.g(context, 2131887177, new Object[0], null, 4), g0.mapOf(o.to(2131364030, new NoticeBuilders$deleteConnectionModalBuilder$2(dialog))), null, 32, null); + return new DialogData(b.a(context, 2131888143, objArr, NoticeBuilders$deleteConnectionModalBuilder$1.INSTANCE), b.g(context, 2131888142, new Object[0], null, 4), b.g(context, 2131893193, new Object[0], null, 4), b.g(context, 2131887178, new Object[0], null, 4), g0.mapOf(o.to(2131364032, new NoticeBuilders$deleteConnectionModalBuilder$2(dialog))), null, 32, null); } private final DialogData requestRatingModalBuilder(Context context, StoreNotices.Dialog dialog) { - return new DialogData(b.g(context, 2131892469, new Object[0], null, 4), b.g(context, 2131892468, new Object[0], null, 4), b.g(context, 2131891633, new Object[0], null, 4), b.g(context, 2131891390, new Object[0], null, 4), h0.mapOf(o.to(0, NoticeBuilders$requestRatingModalBuilder$1.INSTANCE), o.to(2131364030, NoticeBuilders$requestRatingModalBuilder$2.INSTANCE), o.to(2131364025, NoticeBuilders$requestRatingModalBuilder$3.INSTANCE)), 2131558791); + return new DialogData(b.g(context, 2131892511, new Object[0], null, 4), b.g(context, 2131892510, new Object[0], null, 4), b.g(context, 2131891666, new Object[0], null, 4), b.g(context, 2131891423, new Object[0], null, 4), h0.mapOf(o.to(0, NoticeBuilders$requestRatingModalBuilder$1.INSTANCE), o.to(2131364032, NoticeBuilders$requestRatingModalBuilder$2.INSTANCE), o.to(2131364027, NoticeBuilders$requestRatingModalBuilder$3.INSTANCE)), 2131558791); } public final void showNotice(Context context, FragmentManager fragmentManager, StoreNotices.Dialog dialog) { diff --git a/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java b/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java index 52d189ecc6..afa9b2db1d 100644 --- a/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java +++ b/app/src/main/java/com/discord/utilities/permissions/ManageMessageContext.java @@ -1,10 +1,12 @@ package com.discord.utilities.permissions; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.sticker.Sticker; import com.discord.api.sticker.StickerPartial; -import com.discord.models.domain.ModelMessage; +import com.discord.api.user.User; import com.discord.models.user.MeUser; +import com.discord.utilities.message.MessageUtils; import d0.z.d.m; import java.util.List; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -27,25 +29,26 @@ public final class ManageMessageContext { this(); } - public final ManageMessageContext from(ModelMessage modelMessage, Long l, MeUser meUser, Integer num, boolean z2, boolean z3, boolean z4) { + public final ManageMessageContext from(Message message, Long l, MeUser meUser, Integer num, boolean z2, boolean z3, boolean z4) { boolean z5; - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(meUser, "meUser"); - boolean isUserMessage = modelMessage.isUserMessage(); + boolean isUserMessage = MessageUtils.INSTANCE.isUserMessage(message); + User g = message.g(); boolean z6 = false; - boolean z7 = modelMessage.getAuthor().i() == meUser.getId(); + boolean z7 = g != null && g.i() == meUser.getId(); boolean z8 = z2 && !z3; boolean z9 = num != null && PermissionUtils.canAndIsElevated(8192, l, meUser.getMfaEnabled(), num.intValue()) && !z4; boolean z10 = z9 || z8; boolean z11 = z9 || z7; if (z7 && isUserMessage) { - List stickers = modelMessage.getStickers(); - if (stickers == null || stickers.isEmpty()) { - List stickerItems = modelMessage.getStickerItems(); - if ((stickerItems == null || stickerItems.isEmpty()) && !z4) { + List I = message.I(); + if (I == null || I.isEmpty()) { + List H = message.H(); + if ((H == null || H.isEmpty()) && !z4) { z5 = true; - boolean z12 = !z11 && !z4 && PermissionsContextsKt.isDeleteable(modelMessage); - boolean z13 = modelMessage.isLocal() && (z8 || PermissionUtils.can(64, l)) && !z4; + boolean z12 = !z11 && !z4 && PermissionsContextsKt.isDeleteable(message); + boolean z13 = MessageUtils.isLocal(message) && (z8 || PermissionUtils.can(64, l)) && !z4; if (z10 && isUserMessage && !z3 && !z4) { z6 = true; } @@ -56,7 +59,7 @@ public final class ManageMessageContext { z5 = false; if (!z11) { } - if (modelMessage.isLocal()) { + if (MessageUtils.isLocal(message)) { } z6 = true; return new ManageMessageContext(z9, z5, z12, z13, z6, !z4); @@ -94,8 +97,8 @@ public final class ManageMessageContext { return manageMessageContext.copy(z2, z3, z4, z5, z6, z7); } - public static final ManageMessageContext from(ModelMessage modelMessage, Long l, MeUser meUser, Integer num, boolean z2, boolean z3, boolean z4) { - return Companion.from(modelMessage, l, meUser, num, z2, z3, z4); + public static final ManageMessageContext from(Message message, Long l, MeUser meUser, Integer num, boolean z2, boolean z3, boolean z4) { + return Companion.from(message, l, meUser, num, z2, z3, z4); } public final boolean component1() { diff --git a/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java b/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java index 4b52e9cb9b..f15e33b50f 100644 --- a/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java +++ b/app/src/main/java/com/discord/utilities/permissions/PermissionsContextsKt.java @@ -1,7 +1,9 @@ package com.discord.utilities.permissions; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; +import com.discord.utilities.message.MessageUtils; import d0.t.n0; +import d0.t.u; import d0.z.d.m; import java.util.Set; /* compiled from: PermissionsContexts.kt */ @@ -12,8 +14,8 @@ public final class PermissionsContextsKt { return DELETEABLE_MESSAGE_TYPES; } - public static final boolean isDeleteable(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "$this$isDeleteable"); - return DELETEABLE_MESSAGE_TYPES.contains(Integer.valueOf(modelMessage.getType())) || modelMessage.isLocal(); + public static final boolean isDeleteable(Message message) { + m.checkNotNullParameter(message, "$this$isDeleteable"); + return u.contains(DELETEABLE_MESSAGE_TYPES, message.M()) || MessageUtils.isLocal(message); } } diff --git a/app/src/main/java/com/discord/utilities/platform/Platform.java b/app/src/main/java/com/discord/utilities/platform/Platform.java index 3fb950649c..ae8a5d2e16 100644 --- a/app/src/main/java/com/discord/utilities/platform/Platform.java +++ b/app/src/main/java/com/discord/utilities/platform/Platform.java @@ -12,23 +12,23 @@ import java.util.Objects; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: Platform.kt */ public enum Platform { - XBOX("Xbox Live", 2131100467, 2131231365, 2131232057, false, true, true, 16, null), + XBOX("Xbox Live", 2131100468, 2131231365, 2131232060, false, true, true, 16, null), BATTLENET("Battle.Net", 2131099687, 2131231347, 2131231440, false, false, false, 112, null), - FACEBOOK("Facebook", 2131099868, 2131231352, 2131231595, true, false, true, 32, null), - GOOGLE("Google", 2131099905, 2131231354, 2131231652, false, false, false, 112, null), - LEAGUEOFLEGENDS("League of Legends", 2131099922, 2131231355, 2131231725, false, false, false, 112, null), + FACEBOOK("Facebook", 2131099868, 2131231352, 2131231598, true, false, true, 32, null), + GOOGLE("Google", 2131099905, 2131231354, 2131231655, false, false, false, 112, null), + LEAGUEOFLEGENDS("League of Legends", 2131099922, 2131231355, 2131231728, false, false, false, 112, null), OBS("OBS", null, 2131231357, null, false, false, false, 122, null), PATREON("Patreon", null, 2131231358, null, false, false, false, 122, null), - REDDIT("Reddit", 2131100216, 2131231359, 2131231882, false, false, true, 48, null), + REDDIT("Reddit", 2131100216, 2131231359, 2131231885, false, false, true, 48, null), SAMSUNG("Samsung Galaxy", null, null, null, false, true, false, 94, null), - SKYPE("Skype", 2131100226, 2131231360, 2131231925, false, false, false, 112, null), - SPOTIFY("Spotify", 2131100228, 2131231361, 2131231942, false, true, true, 16, null), - STEAM("Steam", 2131100365, 2131231362, 2131231961, false, false, true, 48, null), - TWITCH("Twitch", 2131100380, 2131231363, 2131231998, false, false, true, 48, null), - TWITTER("Twitter", 2131100382, 2131231364, 2131232000, false, false, true, 48, null), + SKYPE("Skype", 2131100226, 2131231360, 2131231928, false, false, false, 112, null), + SPOTIFY("Spotify", 2131100228, 2131231361, 2131231945, false, true, true, 16, null), + STEAM("Steam", 2131100365, 2131231362, 2131231964, false, false, true, 48, null), + TWITCH("Twitch", 2131100380, 2131231363, 2131232001, false, false, true, 48, null), + TWITTER("Twitter", 2131100382, 2131231364, 2131232003, false, false, true, 48, null), XSPLIT("XSplit", null, 2131231366, null, false, false, false, 122, null), - YOUTUBE("Youtube", 2131100469, 2131231367, 2131232058, false, false, true, 48, null), - GITHUB("Github", 2131099901, 2131231353, 2131231648, false, false, true, 48, null), + YOUTUBE("Youtube", 2131100470, 2131231367, 2131232061, false, false, true, 48, null), + GITHUB("Github", 2131099901, 2131231353, 2131231651, false, false, true, 48, null), NONE(null, null, null, null, false, false, false, 127, null); public static final Companion Companion = new Companion(null); diff --git a/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java b/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java index 2b5aa6f1ab..c263eb0773 100644 --- a/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java +++ b/app/src/main/java/com/discord/utilities/premium/PremiumUtils.java @@ -109,6 +109,19 @@ public final class PremiumUtils { return i != 2 ? 100 : 50; } + public final int getGuildStickerMaxCount(int i, boolean z2) { + if (z2 && i <= 2) { + return 60; + } + if (i == 1) { + return 15; + } + if (i != 2) { + return i != 3 ? 0 : 60; + } + return 30; + } + public final int getMaxFileSizeMB(User user) { if (user != null && UserUtils.INSTANCE.isStaff(user)) { return 200; @@ -150,10 +163,10 @@ public final class PremiumUtils { int hashCode = optString.hashCode(); if (hashCode != 78476) { if (hashCode == 78488 && optString.equals("P1Y")) { - return b.g(context, 2131886953, new Object[]{skuDetails.b()}, null, 4); + return b.g(context, 2131886954, new Object[]{skuDetails.b()}, null, 4); } } else if (optString.equals("P1M")) { - return b.g(context, 2131886947, new Object[]{skuDetails.b()}, null, 4); + return b.g(context, 2131886948, new Object[]{skuDetails.b()}, null, 4); } return ""; } diff --git a/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java b/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java index a144a5cf02..b3960c7cb8 100644 --- a/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java +++ b/app/src/main/java/com/discord/utilities/presence/PresenceUtils.java @@ -71,7 +71,7 @@ public final class PresenceUtils { m.checkNotNullParameter(activity, "activity"); int ordinal = activity.p().ordinal(); if (ordinal != 0) { - return ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? ordinal != 5 ? b.g(context, 2131894145, new Object[0], null, 4) : b.g(context, 2131894142, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894149, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894143, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894144, new Object[]{activity.h()}, null, 4); + return ordinal != 1 ? ordinal != 2 ? ordinal != 3 ? ordinal != 5 ? b.g(context, 2131894184, new Object[0], null, 4) : b.g(context, 2131894181, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894188, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894182, new Object[]{activity.h()}, null, 4) : b.g(context, 2131894183, new Object[]{activity.h()}, null, 4); } ActivityPlatform j = activity.j(); if (j != null) { @@ -81,10 +81,10 @@ public final class PresenceUtils { str = from.getProperName(); } if (str != null) { - return b.g(context, 2131894146, new Object[]{str}, null, 4); + return b.g(context, 2131894185, new Object[]{str}, null, 4); } } - return b.g(context, 2131894145, new Object[0], null, 4); + return b.g(context, 2131894184, new Object[0], null, 4); } /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0042: APUT (r4v4 java.lang.Object[]), (0 ??[int, short, byte, char]), (r5v6 java.lang.String) */ @@ -96,7 +96,7 @@ public final class PresenceUtils { } int ordinal = p.ordinal(); if (ordinal == 0) { - return b.g(context, 2131891874, new Object[]{activity.h()}, null, 4); + return b.g(context, 2131891911, new Object[]{activity.h()}, null, 4); } if (ordinal == 1) { Object[] objArr = new Object[1]; @@ -105,9 +105,9 @@ public final class PresenceUtils { e = activity.h(); } objArr[0] = e; - return b.g(context, 2131893632, objArr, null, 4); + return b.g(context, 2131893672, objArr, null, 4); } else if (ordinal == 2) { - return b.g(context, 2131890779, new Object[]{activity.h()}, null, 4); + return b.g(context, 2131890809, new Object[]{activity.h()}, null, 4); } else { if (ordinal == 3) { Object[] objArr2 = new Object[1]; @@ -116,18 +116,18 @@ public final class PresenceUtils { e2 = activity.h(); } objArr2[0] = e2; - return b.g(context, 2131894507, objArr2, null, 4); + return b.g(context, 2131894554, objArr2, null, 4); } else if (ordinal != 5) { return null; } else { - return b.g(context, 2131887484, new Object[]{activity.h()}, null, 4); + return b.g(context, 2131887486, new Object[]{activity.h()}, null, 4); } } } private final CharSequence getApplicationStreamingString(Context context, Presence presence) { Activity playingActivity; - return (presence == null || (playingActivity = getPlayingActivity(presence)) == null) ? b.g(context, 2131893633, new Object[0], null, 4) : b.g(context, 2131893632, new Object[]{playingActivity.h()}, null, 4); + return (presence == null || (playingActivity = getPlayingActivity(presence)) == null) ? b.g(context, 2131893673, new Object[0], null, 4) : b.g(context, 2131893672, new Object[]{playingActivity.h()}, null, 4); } private final Activity getSpotifyListeningActivity(List list) { @@ -162,19 +162,19 @@ public final class PresenceUtils { return (Activity) obj; } - private final DraweeSpanStringBuilder getStatusDraweeSpanStringBuilder(Context context, Presence presence, boolean z2, boolean z3, boolean z4) { + private final DraweeSpanStringBuilder getStatusDraweeSpanStringBuilder(Context context, Presence presence, boolean z2, boolean z3, boolean z4, boolean z5) { Activity customStatusActivity; ActivityEmoji f; DraweeSpanStringBuilder draweeSpanStringBuilder = new DraweeSpanStringBuilder(); EmojiNode emojiNode = null; - if (!(presence == null || (customStatusActivity = getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null)) { + if (!(z3 || presence == null || (customStatusActivity = getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null)) { EmojiNode.Companion companion = EmojiNode.Companion; emojiNode = EmojiNode.Companion.from$default(companion, 0, companion.generateEmojiIdAndType(f), 1, (Object) null); } if (emojiNode != null) { - emojiNode.render((SpannableStringBuilder) draweeSpanStringBuilder, (DraweeSpanStringBuilder) new PresenceUtils$getStatusDraweeSpanStringBuilder$1(context, z4)); + emojiNode.render((SpannableStringBuilder) draweeSpanStringBuilder, (DraweeSpanStringBuilder) new PresenceUtils$getStatusDraweeSpanStringBuilder$1(context, z5)); } - CharSequence statusText = getStatusText(context, presence, z2, z3); + CharSequence statusText = getStatusText(context, presence, z2, z4); if (statusText != null) { if (emojiNode != null) { draweeSpanStringBuilder.append((char) 8194); @@ -184,8 +184,8 @@ public final class PresenceUtils { return draweeSpanStringBuilder; } - public static /* synthetic */ DraweeSpanStringBuilder getStatusDraweeSpanStringBuilder$default(PresenceUtils presenceUtils, Context context, Presence presence, boolean z2, boolean z3, boolean z4, int i, Object obj) { - return presenceUtils.getStatusDraweeSpanStringBuilder(context, presence, z2, (i & 8) != 0 ? false : z3, (i & 16) != 0 ? false : z4); + public static /* synthetic */ DraweeSpanStringBuilder getStatusDraweeSpanStringBuilder$default(PresenceUtils presenceUtils, Context context, Presence presence, boolean z2, boolean z3, boolean z4, boolean z5, int i, Object obj) { + return presenceUtils.getStatusDraweeSpanStringBuilder(context, presence, z2, z3, (i & 16) != 0 ? false : z4, (i & 32) != 0 ? false : z5); } private final int getStatusText(Presence presence) { @@ -193,16 +193,16 @@ public final class PresenceUtils { if (status != null) { int ordinal = status.ordinal(); if (ordinal == 0) { - return 2131893471; + return 2131893511; } if (ordinal == 1) { - return 2131893467; + return 2131893507; } if (ordinal == 2) { - return 2131893465; + return 2131893505; } } - return 2131893470; + return 2131893510; } private final CharSequence getStatusText(Context context, Presence presence, boolean z2, boolean z3) { @@ -231,12 +231,12 @@ public final class PresenceUtils { return presenceUtils.getStatusText(context, presence, z2, z3); } - public static final void setPresenceText(Presence presence, boolean z2, SimpleDraweeSpanTextView simpleDraweeSpanTextView, boolean z3) { + public static final void setPresenceText(Presence presence, boolean z2, SimpleDraweeSpanTextView simpleDraweeSpanTextView, boolean z3, boolean z4) { m.checkNotNullParameter(simpleDraweeSpanTextView, "textView"); PresenceUtils presenceUtils = INSTANCE; Context context = simpleDraweeSpanTextView.getContext(); m.checkNotNullExpressionValue(context, "textView.context"); - DraweeSpanStringBuilder statusDraweeSpanStringBuilder$default = getStatusDraweeSpanStringBuilder$default(presenceUtils, context, presence, z2, z3, false, 16, null); + DraweeSpanStringBuilder statusDraweeSpanStringBuilder$default = getStatusDraweeSpanStringBuilder$default(presenceUtils, context, presence, z2, z4, z3, false, 32, null); simpleDraweeSpanTextView.setDraweeSpanStringBuilder(statusDraweeSpanStringBuilder$default); int i = 0; if (!(statusDraweeSpanStringBuilder$default.length() > 0)) { @@ -245,11 +245,14 @@ public final class PresenceUtils { simpleDraweeSpanTextView.setVisibility(i); } - public static /* synthetic */ void setPresenceText$default(Presence presence, boolean z2, SimpleDraweeSpanTextView simpleDraweeSpanTextView, boolean z3, int i, Object obj) { + public static /* synthetic */ void setPresenceText$default(Presence presence, boolean z2, SimpleDraweeSpanTextView simpleDraweeSpanTextView, boolean z3, boolean z4, int i, Object obj) { if ((i & 8) != 0) { z3 = false; } - setPresenceText(presence, z2, simpleDraweeSpanTextView, z3); + if ((i & 16) != 0) { + z4 = false; + } + setPresenceText(presence, z2, simpleDraweeSpanTextView, z3, z4); } public final Comparator getACTIVITY_COMPARATOR$app_productionGoogleRelease() { diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI.java b/app/src/main/java/com/discord/utilities/rest/RestAPI.java index b299a0a828..9d484698c3 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -14,6 +14,7 @@ import com.discord.api.auth.mfa.GetBackupCodesResponse; import com.discord.api.channel.Channel; import com.discord.api.commands.ApplicationCommand; import com.discord.api.commands.ApplicationCommandData; +import com.discord.api.directory.DirectoryEntry; import com.discord.api.fingerprint.FingerprintResponse; import com.discord.api.friendsuggestions.BulkAddFriendsResponse; import com.discord.api.friendsuggestions.BulkFriendSuggestions; @@ -23,6 +24,7 @@ import com.discord.api.guild.PruneCountResponse; import com.discord.api.guild.VanityUrlResponse; import com.discord.api.guild.preview.GuildPreview; import com.discord.api.guild.welcome.GuildWelcomeScreen; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.premium.ClaimedOutboundPromotion; import com.discord.api.premium.OutboundPromotion; @@ -57,7 +59,6 @@ import com.discord.models.domain.ModelLibraryApplication; import com.discord.models.domain.ModelLocationMetadata; import com.discord.models.domain.ModelMemberVerificationForm; import com.discord.models.domain.ModelMemberVerificationFormResponse; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.domain.ModelOAuth2Token; import com.discord.models.domain.ModelPhoneVerificationToken; @@ -175,7 +176,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider public String getUserAgent() { - return "Discord-Android/80011"; + return "Discord-Android/81014"; } } @@ -887,7 +888,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @i0.g0.n("channels/{channel_id}/messages/{message_id}") - public Observable editMessage(@s("channel_id") long j, @s("message_id") long j2, @i0.g0.a RestAPIParams.Message message) { + public Observable editMessage(@s("channel_id") long j, @s("message_id") long j2, @i0.g0.a RestAPIParams.Message message) { m.checkNotNullParameter(message, "message"); return this._api.editMessage(j, j2, message); } @@ -1047,19 +1048,19 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @f("channels/{channelId}/messages") - public Observable> getChannelMessages(@s("channelId") long j, @t("before") Long l, @t("after") Long l2, @t("limit") Integer num) { + public Observable> getChannelMessages(@s("channelId") long j, @t("before") Long l, @t("after") Long l2, @t("limit") Integer num) { return this._api.getChannelMessages(j, l, l2, num); } @Override // com.discord.restapi.RestAPIInterface @f("channels/{channelId}/messages") - public Observable> getChannelMessagesAround(@s("channelId") long j, @t("limit") int i, @t("around") long j2) { + public Observable> getChannelMessagesAround(@s("channelId") long j, @t("limit") int i, @t("around") long j2) { return this._api.getChannelMessagesAround(j, i, j2); } @Override // com.discord.restapi.RestAPIInterface @f("channels/{channelId}/pins") - public Observable> getChannelPins(@s("channelId") long j) { + public Observable> getChannelPins(@s("channelId") long j) { return this._api.getChannelPins(j); } @@ -1107,6 +1108,12 @@ public final class RestAPI implements RestAPIInterface { return this._api.getConsents(); } + @Override // com.discord.restapi.RestAPIInterface + @f("channels/{channelId}/directory-entries") + public Observable> getDirectoryEntries(@s("channelId") long j) { + return this._api.getDirectoryEntries(j); + } + @Override // com.discord.restapi.RestAPIInterface @f("emojis/{emojiId}/guild") public Observable getEmojiGuild(@s("emojiId") long j) { @@ -1251,7 +1258,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @f("users/@me/mentions") - public Observable> getMentions(@t("limit") int i, @t("roles") boolean z2, @t("everyone") boolean z3, @t("guild_id") Long l, @t("before") Long l2) { + public Observable> getMentions(@t("limit") int i, @t("roles") boolean z2, @t("everyone") boolean z3, @t("guild_id") Long l, @t("before") Long l2) { return this._api.getMentions(i, z2, z3, l, l2); } @@ -1819,7 +1826,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("channels/{channelId}/greet") - public Observable sendGreetMessage(@s("channelId") long j, @i0.g0.a RestAPIParams.GreetMessage greetMessage) { + public Observable sendGreetMessage(@s("channelId") long j, @i0.g0.a RestAPIParams.GreetMessage greetMessage) { m.checkNotNullParameter(greetMessage, "body"); return this._api.sendGreetMessage(j, greetMessage); } @@ -1827,7 +1834,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @l @o("channels/{channelId}/messages") - public Observable sendMessage(@s("channelId") long j, @q("payload_json") PayloadJSON payloadJSON, @q MultipartBody.Part[] partArr) { + public Observable sendMessage(@s("channelId") long j, @q("payload_json") PayloadJSON payloadJSON, @q MultipartBody.Part[] partArr) { m.checkNotNullParameter(payloadJSON, "payloadJson"); m.checkNotNullParameter(partArr, "files"); return this._api.sendMessage(j, payloadJSON, partArr); @@ -1835,7 +1842,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("channels/{channelId}/messages") - public Observable sendMessage(@s("channelId") long j, @i0.g0.a RestAPIParams.Message message) { + public Observable sendMessage(@s("channelId") long j, @i0.g0.a RestAPIParams.Message message) { m.checkNotNullParameter(message, "message"); return this._api.sendMessage(j, message); } diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java b/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java index 6ca9008a99..107df68e28 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPIAbortMessages.java @@ -12,7 +12,7 @@ import kotlin.jvm.functions.Function0; /* compiled from: RestAPIAbortMessages.kt */ public final class RestAPIAbortMessages { public static final RestAPIAbortMessages INSTANCE = new RestAPIAbortMessages(); - private static final Map MESSAGES = h0.mapOf(o.to(80000, 2131887048), o.to(50007, 2131887040), o.to(40003, 2131887039), o.to(40004, 2131887043), o.to(80000, 2131886258), o.to(30002, 2131886261), o.to(80001, 2131886260), o.to(80003, 2131886260), o.to(80002, 2131886260), o.to(80004, 2131886260), o.to(80007, 2131886256), o.to(160006, 2131893910), o.to(160007, 2131893905)); + private static final Map MESSAGES = h0.mapOf(o.to(80000, 2131887049), o.to(50007, 2131887041), o.to(40003, 2131887040), o.to(40004, 2131887044), o.to(80000, 2131886258), o.to(30002, 2131886261), o.to(80001, 2131886260), o.to(80003, 2131886260), o.to(80002, 2131886260), o.to(80004, 2131886260), o.to(80007, 2131886256), o.to(160006, 2131893949), o.to(160007, 2131893944)); /* compiled from: RestAPIAbortMessages.kt */ public static final class ResponseResolver { diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java b/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java index 8cda784aac..a549ef9714 100644 --- a/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java +++ b/app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java @@ -25,7 +25,7 @@ import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import s.a.j0; /* compiled from: SendUtils.kt */ -@e(c = "com.discord.utilities.rest.SendUtils$compressImageAttachments$1", f = "SendUtils.kt", l = {206}, m = "invokeSuspend") +@e(c = "com.discord.utilities.rest.SendUtils$compressImageAttachments$1", f = "SendUtils.kt", l = {207}, m = "invokeSuspend") public final class SendUtils$compressImageAttachments$1 extends k implements Function2, Object> { public final /* synthetic */ List $attachments; public final /* synthetic */ Context $context; @@ -56,7 +56,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun return ((SendUtils$compressImageAttachments$1) create(coroutineScope, continuation)).invokeSuspend(Unit.a); } - /* JADX WARNING: Removed duplicated region for block: B:14:0x004c */ + /* JADX WARNING: Removed duplicated region for block: B:14:0x004d */ @Override // d0.w.h.a.a public final Object invokeSuspend(Object obj) { SendUtils$compressImageAttachments$1 sendUtils$compressImageAttachments$1; @@ -73,7 +73,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun Attachment attachment3; Object obj2; SendUtils$compressImageAttachments$1 sendUtils$compressImageAttachments$12; - Object h02; + Object i02; Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); int i = this.label; if (i == 0) { @@ -106,7 +106,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun collection2.add(attachment); collection2 = collection; it2 = it; - if (!it2.hasNext()) { + if (it2.hasNext()) { } sendUtils$compressImageAttachments$1.$onCompressed.invoke((List) collection2); return Unit.a; @@ -133,7 +133,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun collection2.add(attachment); collection2 = collection; it2 = it; - if (!it2.hasNext()) { + if (it2.hasNext()) { } sendUtils$compressImageAttachments$1.$onCompressed.invoke((List) collection2); return Unit.a; @@ -150,9 +150,18 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun } else { throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } - if (!it2.hasNext()) { + if (it2.hasNext()) { attachment2 = (Attachment) it2.next(); - if (AttachmentUtilsKt.isImage(attachment2, sendUtils$compressImageAttachments$1.$context.getContentResolver())) { + if (!AttachmentUtilsKt.isImage(attachment2, sendUtils$compressImageAttachments$1.$context.getContentResolver()) || AttachmentUtilsKt.isGif(attachment2, sendUtils$compressImageAttachments$1.$context.getContentResolver())) { + it = it2; + attachment = attachment2; + collection = collection2; + collection2.add(attachment); + collection2 = collection; + it2 = it; + if (it2.hasNext()) { + } + } else { try { Context context = sendUtils$compressImageAttachments$1.$context; Uri uri = attachment2.getUri(); @@ -161,7 +170,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun sendUtils$compressImageAttachments$1.L$2 = attachment2; sendUtils$compressImageAttachments$1.L$3 = collection2; sendUtils$compressImageAttachments$1.label = 1; - h02 = a.h0(j0.b, new b(b0.a.a.a.i, context, uri, null), sendUtils$compressImageAttachments$1); + i02 = a.i0(j0.b, new b(b0.a.a.a.i, context, uri, null), sendUtils$compressImageAttachments$1); } catch (Exception unused3) { collection5 = collection2; collection3 = collection2; @@ -173,16 +182,16 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun collection2.add(attachment); collection2 = collection; it2 = it; - if (!it2.hasNext()) { + if (it2.hasNext()) { } sendUtils$compressImageAttachments$1.$onCompressed.invoke((List) collection2); return Unit.a; } - if (h02 != coroutine_suspended) { + if (i02 != coroutine_suspended) { collection6 = collection2; obj2 = coroutine_suspended; sendUtils$compressImageAttachments$12 = sendUtils$compressImageAttachments$1; - obj = h02; + obj = i02; it = it2; attachment3 = attachment2; collection3 = collection6; @@ -200,7 +209,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun collection2.add(attachment); collection2 = collection; it2 = it; - if (!it2.hasNext()) { + if (it2.hasNext()) { } } return coroutine_suspended; @@ -211,7 +220,7 @@ public final class SendUtils$compressImageAttachments$1 extends k implements Fun collection2.add(attachment); collection2 = collection; it2 = it; - if (!it2.hasNext()) { + if (it2.hasNext()) { } } sendUtils$compressImageAttachments$1.$onCompressed.invoke((List) collection2); diff --git a/app/src/main/java/com/discord/utilities/rest/SendUtils.java b/app/src/main/java/com/discord/utilities/rest/SendUtils.java index ea8b60c329..1ce4757a7b 100644 --- a/app/src/main/java/com/discord/utilities/rest/SendUtils.java +++ b/app/src/main/java/com/discord/utilities/rest/SendUtils.java @@ -9,7 +9,6 @@ import com.discord.restapi.RestAPIParams; import com.discord.utilities.attachments.AttachmentUtilsKt; import com.discord.utilities.error.Error; import com.lytefast.flexinput.model.Attachment; -import d0.t.n; import d0.t.o; import d0.t.u; import d0.z.d.m; @@ -21,12 +20,13 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import okhttp3.MultipartBody; import rx.Emitter; import rx.Observable; +import s.a.a.n; import s.a.j0; -import s.a.u0; -import s.a.z; +import s.a.w0; /* compiled from: SendUtils.kt */ public final class SendUtils { public static final SendUtils INSTANCE = new SendUtils(); @@ -375,9 +375,9 @@ public final class SendUtils { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(list, "attachments"); m.checkNotNullParameter(function1, "onCompressed"); - u0 u0Var = u0.i; - z zVar = j0.a; - c.q.a.k.a.F(u0Var, s.a.a.m.b, null, new SendUtils$compressImageAttachments$1(list, context, function1, null), 2, null); + w0 w0Var = w0.i; + CoroutineDispatcher coroutineDispatcher = j0.a; + c.q.a.k.a.G(w0Var, n.b, null, new SendUtils$compressImageAttachments$1(list, context, function1, null), 2, null); } public final Observable getSendPayload(ContentResolver contentResolver, RestAPIParams.Message message, List> list) { @@ -386,7 +386,7 @@ public final class SendUtils { m.checkNotNullParameter(contentResolver, "contentResolver"); m.checkNotNullParameter(message2, "apiParamMessage"); if (list == null) { - j jVar = new j(new SendPayload.ReadyToSend(message2, n.emptyList())); + j jVar = new j(new SendPayload.ReadyToSend(message2, d0.t.n.emptyList())); m.checkNotNullExpressionValue(jVar, "Observable.just(SendPayl…ramMessage, emptyList()))"); return jVar; } @@ -413,7 +413,7 @@ public final class SendUtils { for (Object obj : minus) { int i2 = i + 1; if (i < 0) { - n.throwIndexOverflow(); + d0.t.n.throwIndexOverflow(); } arrayList.add(INSTANCE.getPart((Attachment) obj, contentResolver, a.l("file", i))); i = i2; @@ -422,7 +422,7 @@ public final class SendUtils { m.checkNotNullExpressionValue(m, "Observable.concat(\n …)\n }\n )"); return m; } - j jVar3 = new j(new SendPayload.ReadyToSend(message2, n.emptyList())); + j jVar3 = new j(new SendPayload.ReadyToSend(message2, d0.t.n.emptyList())); m.checkNotNullExpressionValue(jVar3, "Observable.just(SendPayl…ramMessage, emptyList()))"); return jVar3; } @@ -447,7 +447,7 @@ public final class SendUtils { if (response2.isKnownResponse() || error.getType() == Error.Type.NETWORK) { error.setShowErrorToasts(true); } else { - c.a.d.o.g(context, 2131891287, 0, null, 12); + c.a.d.o.g(context, 2131891320, 0, null, 12); } } else if (function02 != null) { function02.mo1invoke(); diff --git a/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java b/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java index 659ea2cdb8..0655123114 100644 --- a/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java +++ b/app/src/main/java/com/discord/utilities/rx/LeadingEdgeThrottle.java @@ -113,7 +113,7 @@ public class LeadingEdgeThrottle implements Observable.b { } } } catch (Throwable th) { - a.a0(th, subscriber2, t); + a.b0(th, subscriber2, t); } } @@ -135,7 +135,7 @@ public class LeadingEdgeThrottle implements Observable.b { try { subscriber.onNext(t); } catch (Throwable th) { - a.a0(th, subscriber2, t); + a.b0(th, subscriber2, t); return; } } diff --git a/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java b/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java index fd9fc3905d..de1d49571a 100644 --- a/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java +++ b/app/src/main/java/com/discord/utilities/rx/OperatorBufferedDelay.java @@ -86,7 +86,7 @@ public final class OperatorBufferedDelay implements Observable.b Object awaitFirst(Observable observable, Continuation continuation) { @@ -16,10 +16,10 @@ public final class RxCoroutineUtilsKt { } public static final Object awaitSingle(Observable observable, Continuation continuation) { - j jVar = new j(b.intercepted(continuation), 1); - jVar.A(); - jVar.e(new RxCoroutineUtilsKt$awaitSingle$2$1(observable.S().X(new RxCoroutineUtilsKt$awaitSingle$2$subscription$1(jVar), new RxCoroutineUtilsKt$awaitSingle$2$subscription$2(jVar)))); - Object u = jVar.u(); + k kVar = new k(b.intercepted(continuation), 1); + kVar.A(); + kVar.e(new RxCoroutineUtilsKt$awaitSingle$2$1(observable.S().X(new RxCoroutineUtilsKt$awaitSingle$2$subscription$1(kVar), new RxCoroutineUtilsKt$awaitSingle$2$subscription$2(kVar)))); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } diff --git a/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java b/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java index 8294d2dd3f..44934eac25 100644 --- a/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java +++ b/app/src/main/java/com/discord/utilities/search/network/state/SearchState.java @@ -2,8 +2,8 @@ package com.discord.utilities.search.network.state; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.thread.ThreadMember; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.search.network.SearchQuery; import d0.z.d.m; import java.util.List; @@ -11,16 +11,14 @@ import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: SearchState.kt */ public final class SearchState { private final boolean hasMore; - private final List hits; + private final List hits; private final QueryFetchState queryFetchState; private final SearchQuery searchQuery; private final List threadMembers; private final List threads; private final int totalResults; - /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public SearchState(QueryFetchState queryFetchState, SearchQuery searchQuery, List list, List list2, List list3, boolean z2, int i) { + public SearchState(QueryFetchState queryFetchState, SearchQuery searchQuery, List list, List list2, List list3, boolean z2, int i) { m.checkNotNullParameter(queryFetchState, "queryFetchState"); this.queryFetchState = queryFetchState; this.searchQuery = searchQuery; @@ -79,7 +77,7 @@ public final class SearchState { return this.threadMembers; } - public final List component5() { + public final List component5() { return this.hits; } @@ -91,7 +89,7 @@ public final class SearchState { return this.totalResults; } - public final SearchState copy(QueryFetchState queryFetchState, SearchQuery searchQuery, List list, List list2, List list3, boolean z2, int i) { + public final SearchState copy(QueryFetchState queryFetchState, SearchQuery searchQuery, List list, List list2, List list3, boolean z2, int i) { m.checkNotNullParameter(queryFetchState, "queryFetchState"); return new SearchState(queryFetchState, searchQuery, list, list2, list3, z2, i); } @@ -111,7 +109,7 @@ public final class SearchState { return this.hasMore; } - public final List getHits() { + public final List getHits() { return this.hits; } @@ -145,7 +143,7 @@ public final class SearchState { int hashCode3 = (hashCode2 + (list != null ? list.hashCode() : 0)) * 31; List list2 = this.threadMembers; int hashCode4 = (hashCode3 + (list2 != null ? list2.hashCode() : 0)) * 31; - List list3 = this.hits; + List list3 = this.hits; if (list3 != null) { i = list3.hashCode(); } diff --git a/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java b/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java index df755b2ae7..7d696271fb 100644 --- a/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java +++ b/app/src/main/java/com/discord/utilities/search/strings/ContextSearchStringProvider.java @@ -17,34 +17,34 @@ public final class ContextSearchStringProvider implements SearchStringProvider { public ContextSearchStringProvider(Context context) { m.checkNotNullParameter(context, "context"); - String string = context.getString(2131893036); + String string = context.getString(2131893078); m.checkNotNullExpressionValue(string, "context.getString(R.string.search_filter_from)"); this.fromFilterString = string; - String string2 = context.getString(2131893038); + String string2 = context.getString(2131893080); m.checkNotNullExpressionValue(string2, "context.getString(R.string.search_filter_in)"); this.inFilterString = string2; - String string3 = context.getString(2131893040); + String string3 = context.getString(2131893082); m.checkNotNullExpressionValue(string3, "context.getString(R.string.search_filter_mentions)"); this.mentionsFilterString = string3; - String string4 = context.getString(2131893037); + String string4 = context.getString(2131893079); m.checkNotNullExpressionValue(string4, "context.getString(R.string.search_filter_has)"); this.hasFilterString = string4; - String string5 = context.getString(2131893015); + String string5 = context.getString(2131893057); m.checkNotNullExpressionValue(string5, "context.getString(R.string.search_answer_has_link)"); this.linkAnswerString = string5; - String string6 = context.getString(2131893013); + String string6 = context.getString(2131893055); m.checkNotNullExpressionValue(string6, "context.getString(R.stri….search_answer_has_embed)"); this.embedAnswerString = string6; - String string7 = context.getString(2131893012); + String string7 = context.getString(2131893054); m.checkNotNullExpressionValue(string7, "context.getString(R.stri…ch_answer_has_attachment)"); this.fileAnswerString = string7; - String string8 = context.getString(2131893017); + String string8 = context.getString(2131893059); m.checkNotNullExpressionValue(string8, "context.getString(R.stri….search_answer_has_video)"); this.videoAnswerString = string8; - String string9 = context.getString(2131893014); + String string9 = context.getString(2131893056); m.checkNotNullExpressionValue(string9, "context.getString(R.stri….search_answer_has_image)"); this.imageAnswerString = string9; - String string10 = context.getString(2131893016); + String string10 = context.getString(2131893058); m.checkNotNullExpressionValue(string10, "context.getString(R.stri….search_answer_has_sound)"); this.soundAnswerString = string10; } diff --git a/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java b/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java index 6abaa50551..2e2b32daaa 100644 --- a/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java +++ b/app/src/main/java/com/discord/utilities/stateful/StatefulViews.java @@ -64,11 +64,11 @@ public final class StatefulViews { m.checkNotNullExpressionValue(a, "ViewDialogConfirmationBi…tInflater.from(activity))"); AlertDialog create = new AlertDialog.Builder(this.activity).setView(a.a).create(); m.checkNotNullExpressionValue(create, "AlertDialog.Builder(acti…logBinding.root).create()"); - a.d.setText(2131888127); - a.e.setText(2131888128); + a.d.setText(2131888137); + a.e.setText(2131888138); a.b.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$1(create)); - a.f1647c.setText(2131891633); - a.f1647c.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2(this, create)); + a.f1649c.setText(2131891666); + a.f1649c.setOnClickListener(new StatefulViews$FragmentOnBackPressedHandler$onBackPressed$2(this, create)); create.show(); return true; } diff --git a/app/src/main/java/com/discord/utilities/textprocessing/DiscordParser.java b/app/src/main/java/com/discord/utilities/textprocessing/DiscordParser.java index 1c3caaea94..2d467b7f18 100644 --- a/app/src/main/java/com/discord/utilities/textprocessing/DiscordParser.java +++ b/app/src/main/java/com/discord/utilities/textprocessing/DiscordParser.java @@ -70,6 +70,7 @@ public final class DiscordParser { parser.addRule(rules.createUserMentionRule()); } parser.addRule(rules.createUnicodeEmojiRule()); + parser.addRule(rules.createTimestampRule()); parser.addRules(e.a(false, false)); parser.addRule(rules.createTextReplacementRule()); return parser; diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java index 3dc5e40df0..868ba1ad42 100644 --- a/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java +++ b/app/src/main/java/com/discord/utilities/textprocessing/MessageRenderContext.java @@ -10,6 +10,7 @@ import com.discord.utilities.textprocessing.node.ChannelMentionNode; import com.discord.utilities.textprocessing.node.EmojiNode; import com.discord.utilities.textprocessing.node.RoleMentionNode; import com.discord.utilities.textprocessing.node.SpoilerNode; +import com.discord.utilities.textprocessing.node.TimestampNode; import com.discord.utilities.textprocessing.node.UrlNode; import com.discord.utilities.textprocessing.node.UserMentionNode; import com.discord.utilities.uri.UriHandler; @@ -22,7 +23,7 @@ import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function3; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: MessageRenderContext.kt */ -public final class MessageRenderContext implements BasicRenderContext, UserMentionNode.RenderContext, EmojiNode.RenderContext, ChannelMentionNode.RenderContext, RoleMentionNode.RenderContext, UrlNode.RenderContext, SpoilerNode.RenderContext { +public final class MessageRenderContext implements BasicRenderContext, UserMentionNode.RenderContext, EmojiNode.RenderContext, ChannelMentionNode.RenderContext, RoleMentionNode.RenderContext, UrlNode.RenderContext, SpoilerNode.RenderContext, TimestampNode.RenderContext { private final Function1 channelMentionOnClick; private final Map channelNames; private final Context context; @@ -346,6 +347,12 @@ public final class MessageRenderContext implements BasicRenderContext, UserMenti WidgetEmojiSheet.Companion.enqueueNotice(emojiIdAndType); } + @Override // com.discord.utilities.textprocessing.node.TimestampNode.RenderContext + public void onTimestampClicked(CharSequence charSequence) { + m.checkNotNullParameter(charSequence, "full"); + c.a.d.o.h(getContext(), charSequence, 0, null, 12); + } + public String toString() { StringBuilder L = a.L("MessageRenderContext(context="); L.append(getContext()); diff --git a/app/src/main/java/com/discord/utilities/textprocessing/MessageUtils.java b/app/src/main/java/com/discord/utilities/textprocessing/MessageUtils.java deleted file mode 100644 index 0df480843a..0000000000 --- a/app/src/main/java/com/discord/utilities/textprocessing/MessageUtils.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.discord.utilities.textprocessing; - -import android.content.Context; -import android.content.res.Configuration; -import android.content.res.Resources; -import android.os.Build; -import android.os.LocaleList; -import com.discord.api.channel.Channel; -import com.discord.api.channel.ChannelRecipientNick; -import com.discord.api.interaction.Interaction; -import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; -import com.discord.models.member.GuildMember; -import com.discord.models.user.CoreUser; -import com.discord.utilities.time.TimeUtils; -import d0.z.d.m; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -/* compiled from: MessageUtils.kt */ -public final class MessageUtils { - public static final MessageUtils INSTANCE = new MessageUtils(); - private static final int[] WELCOME_MESSAGES = {2131893709, 2131893710, 2131893711, 2131893712, 2131893713, 2131893714, 2131893715, 2131893716, 2131893717, 2131893718, 2131893719, 2131893720, 2131893721}; - - private MessageUtils() { - } - - public static final Map getNickOrUsernames(ModelMessage modelMessage, Channel channel, Map map, List list) { - m.checkNotNullParameter(modelMessage, "message"); - m.checkNotNullParameter(map, "channelMembers"); - HashMap hashMap = new HashMap(modelMessage.getMentions().size() + 1); - List mentions = modelMessage.getMentions(); - m.checkNotNullExpressionValue(mentions, "message.mentions"); - for (User user : mentions) { - Long valueOf = Long.valueOf(user.i()); - GuildMember.Companion companion = GuildMember.Companion; - m.checkNotNullExpressionValue(user, "user"); - hashMap.put(valueOf, companion.getNickOrUsername(new CoreUser(user), map.get(Long.valueOf(user.i())), channel, list)); - } - Long valueOf2 = Long.valueOf(modelMessage.getAuthor().i()); - GuildMember.Companion companion2 = GuildMember.Companion; - User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - hashMap.put(valueOf2, companion2.getNickOrUsername(new CoreUser(author), map.get(Long.valueOf(modelMessage.getAuthor().i())), channel, list)); - Interaction interaction = modelMessage.getInteraction(); - User c2 = interaction != null ? interaction.c() : null; - if (c2 != null) { - hashMap.put(Long.valueOf(c2.i()), companion2.getNickOrUsername(new CoreUser(c2), map.get(Long.valueOf(c2.i())), channel, list)); - } - return hashMap; - } - - public static /* synthetic */ Map getNickOrUsernames$default(ModelMessage modelMessage, Channel channel, Map map, List list, int i, Object obj) { - if ((i & 8) != 0) { - list = null; - } - return getNickOrUsernames(modelMessage, channel, map, list); - } - - /* JADX WARNING: Removed duplicated region for block: B:17:0x003d */ - /* JADX WARNING: Removed duplicated region for block: B:20:0x004d */ - /* JADX WARNING: Removed duplicated region for block: B:21:0x0050 */ - public final int getSystemMessageUserJoin(Context context, long j) { - Locale locale; - Configuration configuration; - Configuration configuration2; - LocaleList locales; - m.checkNotNullParameter(context, "context"); - String str = null; - if (Build.VERSION.SDK_INT >= 24) { - Resources resources = context.getResources(); - if (!(resources == null || (configuration2 = resources.getConfiguration()) == null || (locales = configuration2.getLocales()) == null)) { - locale = locales.get(0); - Locale locale2 = new Locale("en"); - if (locale != null) { - str = locale.getLanguage(); - } - return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))]; - } - } else { - Resources resources2 = context.getResources(); - if (!(resources2 == null || (configuration = resources2.getConfiguration()) == null)) { - locale = configuration.locale; - Locale locale2 = new Locale("en"); - if (locale != null) { - } - return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))]; - } - } - locale = null; - Locale locale2 = new Locale("en"); - if (locale != null) { - } - return WELCOME_MESSAGES[(int) (m.areEqual(str, locale2.getLanguage()) ^ true ? 0 : TimeUtils.parseSnowflake(Long.valueOf(j)) % ((long) WELCOME_MESSAGES.length))]; - } -} diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTimestampRule$1.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTimestampRule$1.java new file mode 100644 index 0000000000..67c37b58db --- /dev/null +++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules$createTimestampRule$1.java @@ -0,0 +1,30 @@ +package com.discord.utilities.textprocessing; + +import com.discord.simpleast.core.parser.ParseSpec; +import com.discord.simpleast.core.parser.Parser; +import com.discord.simpleast.core.parser.Rule; +import com.discord.utilities.textprocessing.node.TimestampNode; +import d0.z.d.m; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +/* compiled from: Rules.kt */ +public final class Rules$createTimestampRule$1 extends Rule, S> { + public final /* synthetic */ Rules this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public Rules$createTimestampRule$1(Rules rules, Pattern pattern) { + super(pattern); + this.this$0 = rules; + } + + @Override // com.discord.simpleast.core.parser.Rule + public ParseSpec parse(Matcher matcher, Parser, S> parser, S s2) { + m.checkNotNullParameter(matcher, "matcher"); + m.checkNotNullParameter(parser, "parser"); + String group = matcher.group(1); + m.checkNotNull(group); + TimestampNode timestampNode = new TimestampNode(group, matcher.group(2)); + m.checkNotNullParameter(timestampNode, "node"); + return new ParseSpec<>(timestampNode, s2); + } +} diff --git a/app/src/main/java/com/discord/utilities/textprocessing/Rules.java b/app/src/main/java/com/discord/utilities/textprocessing/Rules.java index 1b5860620b..5544c0aa50 100644 --- a/app/src/main/java/com/discord/utilities/textprocessing/Rules.java +++ b/app/src/main/java/com/discord/utilities/textprocessing/Rules.java @@ -24,6 +24,7 @@ import com.discord.utilities.textprocessing.node.ChannelMentionNode; import com.discord.utilities.textprocessing.node.EmojiNode; import com.discord.utilities.textprocessing.node.RoleMentionNode; import com.discord.utilities.textprocessing.node.SpoilerNode; +import com.discord.utilities.textprocessing.node.TimestampNode; import com.discord.utilities.textprocessing.node.UrlNode; import com.discord.utilities.textprocessing.node.UserMentionNode; import d0.g; @@ -58,6 +59,7 @@ public final class Rules { private static final Pattern PATTERN_ROLE_MENTION = Pattern.compile("^<@&(\\d+)>"); private static final Pattern PATTERN_SOFT_HYPHEN = Pattern.compile("^\\u00AD"); private static final Pattern PATTERN_SPOILER = Pattern.compile("^\\|\\|([\\s\\S]+?)\\|\\|"); + private static final Pattern PATTERN_TIMESTAMP = Pattern.compile("^"); private static final Pattern PATTERN_UNESCAPE_EMOTICON = Pattern.compile("^(¯\\\\_\\(ツ\\)_/¯)"); private static final Lazy PATTERN_UNICODE_EMOJI$delegate = g.lazy(Rules$PATTERN_UNICODE_EMOJI$2.INSTANCE); private static final Pattern PATTERN_URL = Pattern.compile("^(https?://[^\\s<]+[^<.,:;\"')\\]\\s])"); @@ -368,6 +370,12 @@ public final class Rules { return new Rules$createTextReplacementRule$1(this, pattern); } + public final Rule, S> createTimestampRule() { + Pattern pattern = PATTERN_TIMESTAMP; + m.checkNotNullExpressionValue(pattern, "PATTERN_TIMESTAMP"); + return new Rules$createTimestampRule$1(this, pattern); + } + public final Rule, S> createUnescapeEmoticonRule() { Pattern pattern = PATTERN_UNESCAPE_EMOTICON; m.checkNotNullExpressionValue(pattern, "PATTERN_UNESCAPE_EMOTICON"); diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java index 14322b8c27..7d8990d0d2 100644 --- a/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java +++ b/app/src/main/java/com/discord/utilities/textprocessing/node/EditedMessageNode.java @@ -44,7 +44,7 @@ public final class EditedMessageNode extends StyleNode { public final String getEditedString(Context context) { m.checkNotNullParameter(context, "context"); - String string = context.getString(2131891131); + String string = context.getString(2131891162); m.checkNotNullExpressionValue(string, "context.getString(R.string.message_edited)"); return " (" + string + ')'; } diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode$render$styles$1.java b/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode$render$styles$1.java new file mode 100644 index 0000000000..27c3551b62 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode$render$styles$1.java @@ -0,0 +1,33 @@ +package com.discord.utilities.textprocessing.node; + +import android.view.View; +import com.discord.utilities.textprocessing.node.TimestampNode; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: TimestampNode.kt */ +public final class TimestampNode$render$styles$1 extends o implements Function1 { + public final /* synthetic */ TimestampNode.RenderContext $renderContext; + public final /* synthetic */ TimestampNode this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public TimestampNode$render$styles$1(TimestampNode timestampNode, TimestampNode.RenderContext renderContext) { + super(1); + this.this$0 = timestampNode; + this.$renderContext = renderContext; + } + + /* 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(View view) { + invoke(view); + return Unit.a; + } + + public final void invoke(View view) { + m.checkNotNullParameter(view, "it"); + this.$renderContext.onTimestampClicked(this.this$0.getFull()); + } +} diff --git a/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java b/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java new file mode 100644 index 0000000000..7411283e0b --- /dev/null +++ b/app/src/main/java/com/discord/utilities/textprocessing/node/TimestampNode.java @@ -0,0 +1,117 @@ +package com.discord.utilities.textprocessing.node; + +import android.text.SpannableStringBuilder; +import android.text.format.DateUtils; +import android.text.style.BackgroundColorSpan; +import com.discord.simpleast.core.node.Node; +import com.discord.utilities.color.ColorCompat; +import com.discord.utilities.spans.ClickableSpan; +import com.discord.utilities.textprocessing.node.TimestampNode.RenderContext; +import d0.t.n; +import d0.z.d.m; +import java.text.DateFormat; +import java.util.Date; +import java.util.List; +/* compiled from: TimestampNode.kt */ +public final class TimestampNode extends Node { + private final CharSequence formatted; + private final CharSequence full; + + /* compiled from: TimestampNode.kt */ + public interface RenderContext extends BasicRenderContext { + + /* compiled from: TimestampNode.kt */ + public static final class DefaultImpls { + public static void onTimestampClicked(RenderContext renderContext, CharSequence charSequence) { + m.checkNotNullParameter(charSequence, "full"); + } + } + + void onTimestampClicked(CharSequence charSequence); + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public TimestampNode(String str, String str2) { + super(null, 1, null); + CharSequence charSequence; + DateFormat dateFormat; + m.checkNotNullParameter(str, "timestampString"); + Date date = new Date(Long.parseLong(str) * ((long) 1000)); + String format = DateFormat.getDateTimeInstance(0, 3).format(date); + m.checkNotNullExpressionValue(format, "DateFormat.getDateTimeIn…ormat.SHORT).format(date)"); + this.full = format; + if (m.areEqual(str2, "R")) { + charSequence = DateUtils.getRelativeTimeSpanString(date.getTime()); + m.checkNotNullExpressionValue(charSequence, "DateUtils.getRelativeTimeSpanString(date.time)"); + } else { + if (str2 != null) { + int hashCode = str2.hashCode(); + if (hashCode != 68) { + if (hashCode != 70) { + if (hashCode != 84) { + if (hashCode != 100) { + if (hashCode != 102) { + if (hashCode == 116 && str2.equals("t")) { + dateFormat = DateFormat.getTimeInstance(3); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + } else if (str2.equals("f")) { + dateFormat = DateFormat.getDateTimeInstance(1, 3); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + } else if (str2.equals("d")) { + dateFormat = DateFormat.getDateInstance(3); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + } else if (str2.equals("T")) { + dateFormat = DateFormat.getTimeInstance(2); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + } else if (str2.equals("F")) { + dateFormat = DateFormat.getDateTimeInstance(0, 3); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + } else if (str2.equals("D")) { + dateFormat = DateFormat.getDateInstance(1); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + } + dateFormat = DateFormat.getDateTimeInstance(1, 3); + charSequence = dateFormat.format(date); + m.checkNotNullExpressionValue(charSequence, "when (formatString) {\n …ORT)\n }.format(date)"); + } + this.formatted = charSequence; + } + + public final CharSequence getFormatted() { + return this.formatted; + } + + public final CharSequence getFull() { + return this.full; + } + + public void render(SpannableStringBuilder spannableStringBuilder, T t) { + m.checkNotNullParameter(spannableStringBuilder, "builder"); + m.checkNotNullParameter(t, "renderContext"); + List listOf = n.listOf(new ClickableSpan(null, false, null, new TimestampNode$render$styles$1(this, t), 4, null), new BackgroundColorSpan(ColorCompat.getThemedColor(t.getContext(), 2130968900))); + int length = spannableStringBuilder.length(); + spannableStringBuilder.append(this.formatted); + for (Object obj : listOf) { + spannableStringBuilder.setSpan(obj, length, spannableStringBuilder.length(), 33); + } + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.utilities.textprocessing.node.TimestampNode */ + /* JADX WARN: Multi-variable type inference failed */ + @Override // com.discord.simpleast.core.node.Node + public /* bridge */ /* synthetic */ void render(SpannableStringBuilder spannableStringBuilder, Object obj) { + render(spannableStringBuilder, (SpannableStringBuilder) ((RenderContext) obj)); + } +} diff --git a/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java b/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java index 2390aa51ff..eddca5e9f8 100644 --- a/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java +++ b/app/src/main/java/com/discord/utilities/threads/ThreadUtils.java @@ -3,12 +3,13 @@ package com.discord.utilities.threads; import android.content.Context; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.thread.ThreadMetadata; -import com.discord.models.domain.ModelMessage; import com.discord.models.user.User; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreThreadsActiveJoined; import com.discord.stores.StoreThreadsJoined; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.time.Clock; @@ -130,7 +131,7 @@ public final class ThreadUtils { m.checkNotNullExpressionValue(string3, "context.getString(R.stri…_archive_duration_3_days)"); return string3; } else if (i != 10080) { - String quantityString = context.getResources().getQuantityString(2131755064, i / 60); + String quantityString = context.getResources().getQuantityString(2131755065, i / 60); m.checkNotNullExpressionValue(quantityString, "context.resources.getQua…ours_hours, minutes / 60)"); return quantityString; } else { @@ -144,12 +145,12 @@ public final class ThreadUtils { return ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(j) && ((channel != null && PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) && PermissionUtils.can(68719476736L, l) && PermissionUtils.can(65536, l)) && (channel != null && !AnimatableValueParser.y1(channel)); } - public final boolean canCreatePublicThread(Long l, Channel channel, ModelMessage modelMessage, long j) { - return ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(j) && ((channel != null && PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) && PermissionUtils.can(34359738368L, l)) && ((modelMessage == null || !modelMessage.isSystemMessage()) && channel != null && !AnimatableValueParser.y1(channel) && (modelMessage == null || !modelMessage.hasThread())); + public final boolean canCreatePublicThread(Long l, Channel channel, Message message, long j) { + return ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(j) && ((channel != null && PermissionUtils.INSTANCE.hasAccessWrite(channel, l)) && PermissionUtils.can(34359738368L, l)) && ((message == null || !MessageUtils.INSTANCE.isSystemMessage(message)) && channel != null && !AnimatableValueParser.y1(channel) && (message == null || !MessageUtils.INSTANCE.hasThread(message))); } - public final boolean canCreateThread(Long l, Channel channel, ModelMessage modelMessage, long j) { - return canCreatePublicThread(l, channel, modelMessage, j) || canCreatePrivateThread(l, channel, j); + public final boolean canCreateThread(Long l, Channel channel, Message message, long j) { + return canCreatePublicThread(l, channel, message, j) || canCreatePrivateThread(l, channel, j); } public final boolean canManageThread(User user, Channel channel, Long l) { diff --git a/app/src/main/java/com/discord/utilities/uri/UriHandler.java b/app/src/main/java/com/discord/utilities/uri/UriHandler.java index d8dc0328bf..114feab424 100644 --- a/app/src/main/java/com/discord/utilities/uri/UriHandler.java +++ b/app/src/main/java/com/discord/utilities/uri/UriHandler.java @@ -126,11 +126,11 @@ public final class UriHandler { private final void showUnhandledUrlDialog(Context context, String str) { AnalyticsTracker.INSTANCE.unhandledUrl(str); View inflate = LayoutInflater.from(context).inflate(2131558544, (ViewGroup) null, false); - int i = 2131365330; - TextView textView = (TextView) inflate.findViewById(2131365330); + int i = 2131365335; + TextView textView = (TextView) inflate.findViewById(2131365335); if (textView != null) { - i = 2131365331; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365331); + i = 2131365336; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365336); if (materialButton != null) { LinearLayout linearLayout = (LinearLayout) inflate; LayoutUnhandledUriBinding layoutUnhandledUriBinding = new LayoutUnhandledUriBinding(linearLayout, textView, materialButton); diff --git a/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.java b/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.java index 1bce936340..a61cd6437f 100644 --- a/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.java +++ b/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1.java @@ -13,9 +13,10 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.Ref$ObjectRef; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: LinkifiedTextView.kt */ @e(c = "com.discord.utilities.view.text.LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1", f = "LinkifiedTextView.kt", l = {142}, m = "invokeSuspend") public final class LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1 extends k implements Function2, Object> { @@ -59,7 +60,7 @@ public final class LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob long access$getLongPressDelayInMs$p = LinkifiedTextView.ClickableSpanOnTouchListener.access$getLongPressDelayInMs$p(this.this$0); this.L$0 = coroutineScope2; this.label = 1; - if (a.m(access$getLongPressDelayInMs$p, this) == coroutine_suspended) { + if (a.n(access$getLongPressDelayInMs$p, this) == coroutine_suspended) { return coroutine_suspended; } coroutineScope = coroutineScope2; @@ -69,9 +70,9 @@ public final class LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob } else { throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } - if (!LinkifiedTextView.ClickableSpanOnTouchListener.access$isClickHandled$p(this.this$0).getAndSet(true) && a.z(coroutineScope) && (view = (View) this.$weakView.get()) != null) { - z zVar = j0.a; - a.F(coroutineScope, s.a.a.m.b, null, new LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1(view, null, this, coroutineScope), 2, null); + if (!LinkifiedTextView.ClickableSpanOnTouchListener.access$isClickHandled$p(this.this$0).getAndSet(true) && a.A(coroutineScope) && (view = (View) this.$weakView.get()) != null) { + CoroutineDispatcher coroutineDispatcher = j0.a; + a.G(coroutineScope, n.b, null, new LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1$invokeSuspend$$inlined$also$lambda$1(view, null, this, coroutineScope), 2, null); } return Unit.a; } diff --git a/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java b/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java index 616a32bc15..bed9af3c26 100644 --- a/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java +++ b/app/src/main/java/com/discord/utilities/view/text/LinkifiedTextView.java @@ -32,9 +32,9 @@ import kotlin.jvm.internal.DefaultConstructorMarker; import kotlin.jvm.internal.Ref$ObjectRef; import kotlin.ranges.IntRange; import kotlinx.coroutines.Job; -import s.a.e1; +import s.a.g1; import s.a.j0; -import s.a.u0; +import s.a.w0; /* compiled from: LinkifiedTextView.kt */ public final class LinkifiedTextView extends SimpleDraweeSpanTextView { public static final Companion Companion = new Companion(null); @@ -102,7 +102,13 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView { if (layout2 == null) { return new ClickableSpan[0]; } - int offsetForHorizontal = layout2.getOffsetForHorizontal(lineForVertical, (float) scrollX); + float f = (float) scrollX; + int offsetForHorizontal = layout2.getOffsetForHorizontal(lineForVertical, f); + float lineRight = textView.getLayout().getLineRight(lineForVertical); + float lineLeft = textView.getLayout().getLineLeft(lineForVertical); + if (f > lineRight || (scrollX >= 0 && f < lineLeft)) { + return new ClickableSpan[0]; + } Object[] spans = spanned.getSpans(offsetForHorizontal, offsetForHorizontal, ClickableSpan.class); m.checkNotNullExpressionValue(spans, "spanned.getSpans(off, of…lickableSpan::class.java)"); return (ClickableSpan[]) spans; @@ -142,7 +148,7 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView { if (ref$ObjectRef.element != null) { Job job = this.job.get(); if (job != null) { - a.j(job, null, 1, null); + a.k(job, null, 1, null); } return false; } @@ -151,20 +157,20 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView { this.isClickHandled.set(false); Job job2 = this.job.get(); if (job2 != null) { - a.j(job2, null, 1, null); + a.k(job2, null, 1, null); } if (ref$ObjectRef.element instanceof com.discord.utilities.spans.ClickableSpan) { - Job F = a.F(u0.i, j0.a, null, new LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1(this, new WeakReference(view), ref$ObjectRef, null), 2, null); - ((e1) F).f(false, true, new LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1(F, this)); - Job andSet = this.job.getAndSet(F); + Job G = a.G(w0.i, j0.a, null, new LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$newJob$1(this, new WeakReference(view), ref$ObjectRef, null), 2, null); + ((g1) G).f(false, true, new LinkifiedTextView$ClickableSpanOnTouchListener$onTouch$$inlined$apply$lambda$1(G, this)); + Job andSet = this.job.getAndSet(G); if (andSet != null) { - a.j(andSet, null, 1, null); + a.k(andSet, null, 1, null); } } } else if (action == 1) { Job job3 = this.job.get(); if (job3 != null) { - a.j(job3, null, 1, null); + a.k(job3, null, 1, null); } if (!this.isClickHandled.getAndSet(true)) { ClickableSpan clickableSpan = ref$ObjectRef.element; @@ -184,7 +190,7 @@ public final class LinkifiedTextView extends SimpleDraweeSpanTextView { } else { Job job4 = this.job.get(); if (job4 != null) { - a.j(job4, null, 1, null); + a.k(job4, null, 1, null); } } return true; diff --git a/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java b/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java index dd0d5ba6dc..cce11de3c8 100644 --- a/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java +++ b/app/src/main/java/com/discord/utilities/views/FloatingButtonMenuInitializer.java @@ -55,7 +55,7 @@ public final class FloatingButtonMenuInitializer { } private final Animator createDefaultMenuRowAnimation(ViewGroup viewGroup, View view) { - return viewGroup.getId() == 2131363155 ? this.animatorFactoryFadeIn.createAnimator(viewGroup) : createMenuRowAnimation(viewGroup, this.animatorFactoryFadeIn, getAnimatorFactoryScaleUp(view), this.animatorFactorySlideUp); + return viewGroup.getId() == 2131363157 ? this.animatorFactoryFadeIn.createAnimator(viewGroup) : createMenuRowAnimation(viewGroup, this.animatorFactoryFadeIn, getAnimatorFactoryScaleUp(view), this.animatorFactorySlideUp); } private final Animator createMenuRowAnimation(ViewGroup viewGroup, AnimatorFactory... animatorFactoryArr) { diff --git a/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt$coroutineScope$1.java b/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt$coroutineScope$1.java index 6c12f13705..fbb22376e2 100644 --- a/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt$coroutineScope$1.java +++ b/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt$coroutineScope$1.java @@ -1,10 +1,9 @@ package com.discord.utilities.views; import android.view.ViewTreeObserver; +import c.q.a.k.a; import java.util.concurrent.CancellationException; import kotlin.jvm.internal.Ref$ObjectRef; -import kotlinx.coroutines.CoroutineScope; -import kotlinx.coroutines.Job; /* compiled from: ViewCoroutineScope.kt */ public final class ViewCoroutineScopeKt$coroutineScope$1 implements ViewTreeObserver.OnWindowAttachListener { public final /* synthetic */ Ref$ObjectRef $scope; @@ -19,13 +18,6 @@ public final class ViewCoroutineScopeKt$coroutineScope$1 implements ViewTreeObse @Override // android.view.ViewTreeObserver.OnWindowAttachListener public void onWindowDetached() { - CoroutineScope coroutineScope = this.$scope.element; - CancellationException cancellationException = new CancellationException("view detached from window"); - Job job = (Job) coroutineScope.getCoroutineContext().get(Job.h); - if (job != null) { - job.B(cancellationException); - return; - } - throw new IllegalStateException(("Scope cannot be cancelled because it does not have a job: " + coroutineScope).toString()); + a.i(this.$scope.element, new CancellationException("view detached from window")); } } diff --git a/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt.java b/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt.java index 538f48f53d..556ba5f6d3 100644 --- a/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt.java +++ b/app/src/main/java/com/discord/utilities/views/ViewCoroutineScopeKt.java @@ -5,11 +5,12 @@ import c.q.a.k.a; import d0.z.d.m; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.internal.Ref$ObjectRef; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; -import s.a.e1; +import s.a.a.n; +import s.a.g1; import s.a.j0; -import s.a.s; -import s.a.z; +import s.a.t; /* compiled from: ViewCoroutineScope.kt */ public final class ViewCoroutineScopeKt { private static final int SCOPE_TAG_KEY = -53661613; @@ -31,9 +32,9 @@ public final class ViewCoroutineScopeKt { if (((CoroutineScope) r3) != null) { return (CoroutineScope) r3; } - s b = a.b(null, 1); - z zVar = j0.a; - ref$ObjectRef.element = a.a(CoroutineContext.Element.a.plus((e1) b, s.a.a.m.b.H())); + t b = a.b(null, 1); + CoroutineDispatcher coroutineDispatcher = j0.a; + ref$ObjectRef.element = a.a(CoroutineContext.Element.a.plus((g1) b, n.b.H())); view.getViewTreeObserver().addOnWindowAttachListener(new ViewCoroutineScopeKt$coroutineScope$1(ref$ObjectRef)); view.setTag(i, ref$ObjectRef.element); return ref$ObjectRef.element; diff --git a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService$onStartCommand$1.java b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService$onStartCommand$1.java new file mode 100644 index 0000000000..98bc28e1cf --- /dev/null +++ b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService$onStartCommand$1.java @@ -0,0 +1,12 @@ +package com.discord.utilities.voice; + +import d0.z.d.m; +import j0.k.b; +/* compiled from: DiscordOverlayService.kt */ +public final class DiscordOverlayService$onStartCommand$1 implements b { + public static final DiscordOverlayService$onStartCommand$1 INSTANCE = new DiscordOverlayService$onStartCommand$1(); + + public final Boolean call(Boolean bool) { + return Boolean.valueOf(m.areEqual(bool, Boolean.TRUE)); + } +} diff --git a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService$onStartCommand$2.java b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService$onStartCommand$2.java new file mode 100644 index 0000000000..fe1cd3fe63 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService$onStartCommand$2.java @@ -0,0 +1,46 @@ +package com.discord.utilities.voice; + +import android.content.Intent; +import com.discord.app.AppLog; +import com.discord.stores.StoreStream; +import com.discord.utilities.logging.Logger; +import com.discord.utilities.voice.DiscordOverlayService; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: DiscordOverlayService.kt */ +public final class DiscordOverlayService$onStartCommand$2 extends o implements Function1 { + public final /* synthetic */ Intent $intent; + public final /* synthetic */ int $startId; + public final /* synthetic */ DiscordOverlayService this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public DiscordOverlayService$onStartCommand$2(DiscordOverlayService discordOverlayService, int i, Intent intent) { + super(1); + this.this$0 = discordOverlayService; + this.$startId = i; + this.$intent = intent; + } + + /* 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(Boolean bool) { + invoke(bool); + return Unit.a; + } + + public final void invoke(Boolean bool) { + if (!StoreStream.Companion.getUserSettings().getIsMobileOverlayEnabled()) { + this.this$0.stopForeground(true); + this.this$0.stopSelf(this.$startId); + return; + } + try { + DiscordOverlayService.access$handleStart$s1927314545(this.this$0, this.$intent); + } catch (Exception e) { + Logger.e$default(AppLog.g, "OverlayService", "Overlay failed to handle a request.", e, null, 8, null); + DiscordOverlayService.Companion.tryStartOverlayService$default(DiscordOverlayService.Companion, this.this$0, "com.discord.actions.OVERLAY_CLOSE", false, 4, null); + } + } +} diff --git a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java index d1f7df4578..59a8d44831 100644 --- a/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java +++ b/app/src/main/java/com/discord/utilities/voice/DiscordOverlayService.java @@ -91,7 +91,7 @@ public final class DiscordOverlayService extends OverlayService { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(G), DiscordOverlayService.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$Companion$launchForConnect$2(weakReference), 60, (Object) null); return; } - o.g(context, 2131891690, 1, null, 8); + o.g(context, 2131891727, 1, null, 8); } public final void launchForVoice(Context context) { @@ -113,6 +113,10 @@ public final class DiscordOverlayService extends OverlayService { return discordOverlayService.getOverlayManager(); } + public static final /* synthetic */ void access$handleStart$s1927314545(DiscordOverlayService discordOverlayService, Intent intent) { + super.handleStart(intent); + } + public static final /* synthetic */ void access$setOverlayManager$p(DiscordOverlayService discordOverlayService, OverlayManager overlayManager) { discordOverlayService.setOverlayManager(overlayManager); } @@ -159,7 +163,7 @@ public final class DiscordOverlayService extends OverlayService { @Override // com.discord.overlay.OverlayService public Notification createNotification(Intent intent) { PendingIntent service = PendingIntent.getService(this, 1010, Companion.access$createOverlayIntent(Companion, this, "com.discord.actions.OVERLAY_CLOSE"), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728)); - Notification build = new NotificationCompat.Builder(this, "Media Connections").setCategory("service").setPriority(-2).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231788).setColor(ColorCompat.getColor(this, 2131100249)).setContentTitle(getString(2131891673)).setContentText(getString(2131891691)).setOngoing(true).addAction(2131231524, getString(2131887391), service).addAction(2131231908, getString(2131893158), PendingIntent.getActivity(this, 1010, new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getSelectSettingsVoice()).setPackage(getPackageName()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build(); + Notification build = new NotificationCompat.Builder(this, "Media Connections").setCategory("service").setPriority(-2).setOnlyAlertOnce(true).setLocalOnly(true).setSmallIcon(2131231791).setColor(ColorCompat.getColor(this, 2131100249)).setContentTitle(getString(2131891710)).setContentText(getString(2131891728)).setOngoing(true).addAction(2131231524, getString(2131887393), service).addAction(2131231911, getString(2131893200), PendingIntent.getActivity(this, 1010, new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getSelectSettingsVoice()).setPackage(getPackageName()), PendingIntentExtensionsKt.immutablePendingIntentFlag(134217728))).build(); m.checkNotNullExpressionValue(build, "NotificationCompat.Build… )\n .build()"); return build; } @@ -241,7 +245,7 @@ public final class DiscordOverlayService extends OverlayService { overlayManager2.l = discordOverlayService$onCreate$2; } - @Override // com.discord.overlay.OverlayService, android.app.Service + @Override // android.app.Service public int onStartCommand(Intent intent, int i, int i2) { AppLog appLog = AppLog.g; StringBuilder L = a.L("onStartCommand: "); @@ -251,17 +255,14 @@ public final class DiscordOverlayService extends OverlayService { if (intent != null) { str = intent.getAction(); } - if (m.areEqual(str, "com.discord.actions.OVERLAY_CLOSE") || !DeviceUtils.INSTANCE.canDrawOverlays(this) || !StoreStream.Companion.getUserSettings().getIsMobileOverlayEnabled()) { + if (m.areEqual(str, "com.discord.actions.OVERLAY_CLOSE") || !DeviceUtils.INSTANCE.canDrawOverlays(this)) { stopForeground(true); stopSelf(i2); return 2; } - try { - return super.onStartCommand(intent, i, i2); - } catch (Exception e) { - Logger.e$default(AppLog.g, "OverlayService", "Overlay failed to handle a request.", e, null, 8, null); - Companion.tryStartOverlayService$default(Companion, this, "com.discord.actions.OVERLAY_CLOSE", false, 4, null); - return 2; - } + Observable a02 = StoreStream.Companion.isInitializedObservable().y(DiscordOverlayService$onStartCommand$1.INSTANCE).a0(1); + m.checkNotNullExpressionValue(a02, "StoreStream.isInitialize….takeFirst { it == true }"); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(a02), DiscordOverlayService.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new DiscordOverlayService$onStartCommand$2(this, i2, intent), 62, (Object) null); + return 3; } } diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java index a7aff74373..8f968b4a7a 100644 --- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java +++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineNotificationBuilder.java @@ -42,17 +42,17 @@ public final class VoiceEngineNotificationBuilder { m.checkNotNullParameter(cls, "notificationServiceClass"); m.checkNotNullParameter(str6, "notificationChannel"); m.checkNotNullParameter(cls2, "notificationClass"); - NotificationCompat.Builder ongoing = new NotificationCompat.Builder(context, str6).setContentTitle(charSequence).setContentText(charSequence2).setColor(ColorCompat.getThemedColor(context, 2130968994)).setColorized(true).setSmallIcon(2131231788).setContentIntent(getCallScreenNavigationIntent(context, j, str, cls2)).setOngoing(true); - String string = context.getResources().getString(2131888136); + NotificationCompat.Builder ongoing = new NotificationCompat.Builder(context, str6).setContentTitle(charSequence).setContentText(charSequence2).setColor(ColorCompat.getThemedColor(context, 2130968994)).setColorized(true).setSmallIcon(2131231791).setContentIntent(getCallScreenNavigationIntent(context, j, str, cls2)).setOngoing(true); + String string = context.getResources().getString(2131888146); VoiceEngineNotificationBuilder voiceEngineNotificationBuilder = INSTANCE; ongoing.addAction(new NotificationCompat.Action(2131231449, string, voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str2))); if (z2) { - ongoing.addAction(new NotificationCompat.Action(2131231755, context.getResources().getString(2131893550), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str3))); + ongoing.addAction(new NotificationCompat.Action(2131231758, context.getResources().getString(2131893590), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str3))); } else { if (str4 != null) { - ongoing.addAction(new NotificationCompat.Action(z3 ? 2131231750 : 2131231749, z3 ? context.getResources().getString(2131894024) : context.getResources().getString(2131891261), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str4))); + ongoing.addAction(new NotificationCompat.Action(z3 ? 2131231753 : 2131231752, z3 ? context.getResources().getString(2131894063) : context.getResources().getString(2131891294), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str4))); } - ongoing.addAction(new NotificationCompat.Action(z4 ? 2131231691 : 2131231690, z4 ? context.getResources().getString(2131894016) : context.getResources().getString(2131888040), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str5))); + ongoing.addAction(new NotificationCompat.Action(z4 ? 2131231694 : 2131231693, z4 ? context.getResources().getString(2131894055) : context.getResources().getString(2131888041), voiceEngineNotificationBuilder.getServiceActionIntent(context, cls, str5))); } Notification build = ongoing.build(); m.checkNotNullExpressionValue(build, "NotificationCompat.Build… }\n .build()"); diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java index 330002da88..98859cda0a 100644 --- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java +++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$3.java @@ -22,7 +22,7 @@ public final class VoiceEngineServiceController$init$3 extends o implements Func public final void mo1invoke() { StoreMediaSettings.SelfMuteFailure selfMuteFailure = VoiceEngineServiceController.access$getMediaSettingsStore$p(this.this$0).toggleSelfMuted(); if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) { - c.a.d.o.g(this.$context, 2131894368, 0, null, 12); + c.a.d.o.g(this.$context, 2131894415, 0, null, 12); } } } diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java index aaaa877e2f..65b0372863 100644 --- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java +++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController$init$4.java @@ -35,7 +35,7 @@ public final class VoiceEngineServiceController$init$4 extends o implements Func return; } Context context = this.$context; - VoiceEngineForegroundService.Companion.startForegroundAndBind(VoiceEngineServiceController.access$getServiceBinding$p(this.this$0), b.g(context, 2131887134, new Object[]{b.g(context, notificationData.getStateString(), new Object[0], null, 4)}, null, 4), notificationData.getChannelName(), notificationData.isSelfMuted(), notificationData.isSelfDeafened(), notificationData.isSelfStreaming(), notificationData.getChannelId(), notificationData.getGuildId(), notificationData.getProximityLockEnabled(), notificationData.getCanSpeak()); + VoiceEngineForegroundService.Companion.startForegroundAndBind(VoiceEngineServiceController.access$getServiceBinding$p(this.this$0), b.g(context, 2131887135, new Object[]{b.g(context, notificationData.getStateString(), new Object[0], null, 4)}, null, 4), notificationData.getChannelName(), notificationData.isSelfMuted(), notificationData.isSelfDeafened(), notificationData.isSelfStreaming(), notificationData.getChannelId(), notificationData.getGuildId(), notificationData.getProximityLockEnabled(), notificationData.getCanSpeak()); if (m.areEqual(notificationData.getRtcConnectionState(), RtcConnection.State.f.a)) { DiscordOverlayService.Companion.launchForVoice(this.$context); } diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java index 03be267ce7..5642abd838 100644 --- a/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java +++ b/app/src/main/java/com/discord/utilities/voice/VoiceEngineServiceController.java @@ -79,21 +79,21 @@ public final class VoiceEngineServiceController { this.proximityLockEnabled = z6; this.canSpeak = z7; if (state instanceof RtcConnection.State.d) { - i = 2131887532; - } else if (m.areEqual(state, RtcConnection.State.b.a)) { - i = 2131887529; - } else if (m.areEqual(state, RtcConnection.State.a.a)) { - i = 2131887528; - } else if (m.areEqual(state, RtcConnection.State.c.a)) { - i = 2131887531; - } else if (m.areEqual(state, RtcConnection.State.h.a)) { - i = 2131887536; - } else if (m.areEqual(state, RtcConnection.State.g.a)) { - i = 2131887535; - } else if (m.areEqual(state, RtcConnection.State.f.a)) { - i = z4 ? 2131887538 : z5 ? 2131887539 : 2131887540; - } else if (m.areEqual(state, RtcConnection.State.e.a)) { i = 2131887534; + } else if (m.areEqual(state, RtcConnection.State.b.a)) { + i = 2131887531; + } else if (m.areEqual(state, RtcConnection.State.a.a)) { + i = 2131887530; + } else if (m.areEqual(state, RtcConnection.State.c.a)) { + i = 2131887533; + } else if (m.areEqual(state, RtcConnection.State.h.a)) { + i = 2131887538; + } else if (m.areEqual(state, RtcConnection.State.g.a)) { + i = 2131887537; + } else if (m.areEqual(state, RtcConnection.State.f.a)) { + i = z4 ? 2131887540 : z5 ? 2131887541 : 2131887542; + } else if (m.areEqual(state, RtcConnection.State.e.a)) { + i = 2131887536; } else { throw new NoWhenBranchMatchedException(); } diff --git a/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java b/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java index fed0059ed0..be2275a1bb 100644 --- a/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java +++ b/app/src/main/java/com/discord/utilities/voice/VoiceViewUtils.java @@ -51,7 +51,7 @@ public final class VoiceViewUtils { } public final int getCallIndicatorIcon(boolean z2, StreamContext streamContext) { - return (streamContext == null || !streamContext.isCurrentUserParticipating()) ? z2 ? 2131232039 : 2131231452 : streamContext.isSelfStream() ? 2131231450 : 2131231451; + return (streamContext == null || !streamContext.isCurrentUserParticipating()) ? z2 ? 2131232042 : 2131231452 : streamContext.isSelfStream() ? 2131231450 : 2131231451; } /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0039: APUT (r2v1 java.lang.Object[]), (0 ??[int, short, byte, char]), (r3v1 java.lang.String) */ @@ -61,27 +61,27 @@ public final class VoiceViewUtils { RtcConnection.State.f fVar = RtcConnection.State.f.a; if (state != fVar || streamContext == null || !streamContext.isCurrentUserParticipating()) { if (m.areEqual(state, RtcConnection.State.c.a)) { - i = 2131887531; + i = 2131887533; } else if (m.areEqual(state, RtcConnection.State.e.a)) { - i = 2131887534; + i = 2131887536; } else if (m.areEqual(state, RtcConnection.State.b.a)) { - i = 2131887529; + i = 2131887531; } else if (m.areEqual(state, RtcConnection.State.a.a)) { - i = 2131887528; + i = 2131887530; } else if (m.areEqual(state, RtcConnection.State.g.a)) { - i = 2131887535; + i = 2131887537; } else if (m.areEqual(state, fVar)) { - i = z2 ? 2131887539 : 2131887540; + i = z2 ? 2131887541 : 2131887542; } else if (!(state instanceof RtcConnection.State.d) && !m.areEqual(state, RtcConnection.State.h.a) && state != null) { throw new NoWhenBranchMatchedException(); } else { - i = 2131887532; + i = 2131887534; } String string = context.getString(i); m.checkNotNullExpressionValue(string, "context.getString(resId)"); return string; } else if (streamContext.isSelfStream()) { - return b.g(context, 2131887538, new Object[0], null, 4); + return b.g(context, 2131887540, new Object[0], null, 4); } else { Object[] objArr = new Object[1]; String userNickname = streamContext.getUserNickname(); @@ -89,7 +89,7 @@ public final class VoiceViewUtils { userNickname = streamContext.getUser().getUsername(); } objArr[0] = userNickname; - return b.g(context, 2131887537, objArr, null, 4); + return b.g(context, 2131887539, objArr, null, 4); } } @@ -125,14 +125,14 @@ public final class VoiceViewUtils { public final int getQualityIndicator(RtcConnection.Quality quality) { int ordinal; if (quality == null || (ordinal = quality.ordinal()) == 0) { - return 2131232048; + return 2131232051; } if (ordinal == 1) { - return 2131232046; + return 2131232049; } if (ordinal != 2) { - return ordinal != 3 ? 2131232048 : 2131232047; + return ordinal != 3 ? 2131232051 : 2131232050; } - return 2131232045; + return 2131232048; } } diff --git a/app/src/main/java/com/discord/views/ActiveSubscriptionView.java b/app/src/main/java/com/discord/views/ActiveSubscriptionView.java index 24d2f39dc0..de0ac5cd56 100644 --- a/app/src/main/java/com/discord/views/ActiveSubscriptionView.java +++ b/app/src/main/java/com/discord/views/ActiveSubscriptionView.java @@ -30,10 +30,10 @@ public final class ActiveSubscriptionView extends FrameLayout { /* compiled from: ActiveSubscriptionView.kt */ public enum ActiveSubscriptionType { - PREMIUM_CLASSIC(2130969519, 2131232211, 2131232215, 2131232212, 2131230924, 2131230930, 2131230929), - PREMIUM(2130969521, 2131232223, 2131232227, 2131232224, 2131230928, 2131230930, 2131230929), - PREMIUM_GUILD(2130969520, 2131232216, 2131232219, 2131232217, 2131230925, 2131230927, 2131230926), - PREMIUM_AND_PREMIUM_GUILD(2130969508, 2131232210, 2131232210, 2131232210, 2131230923, 2131230930, 2131230929); + PREMIUM_CLASSIC(2130969519, 2131232214, 2131232218, 2131232215, 2131230924, 2131230930, 2131230929), + PREMIUM(2130969521, 2131232226, 2131232230, 2131232227, 2131230928, 2131230930, 2131230929), + PREMIUM_GUILD(2130969520, 2131232219, 2131232222, 2131232220, 2131230925, 2131230927, 2131230926), + PREMIUM_AND_PREMIUM_GUILD(2130969508, 2131232213, 2131232213, 2131232213, 2131230923, 2131230930, 2131230929); private final int headerBackground; private final int headerBackgroundError; @@ -251,14 +251,14 @@ public final class ActiveSubscriptionView extends FrameLayout { if (ordinal2 != 0) { if (ordinal2 != 1) { if (ordinal2 == 2) { - i5 = 2131892102; + i5 = 2131892140; } else if (ordinal2 != 3) { throw new NoWhenBranchMatchedException(); } } - i5 = 2131892263; + i5 = 2131892301; } else { - i5 = 2131892261; + i5 = 2131892299; } imageView3.setContentDescription(b.i(this, i5, new Object[0], null, 4)); TextView textView = this.j.f; @@ -266,19 +266,19 @@ public final class ActiveSubscriptionView extends FrameLayout { ordinal3 = activeSubscriptionType.ordinal(); if (ordinal3 == 0) { int ordinal5 = status.ordinal(); - charSequence2 = ordinal5 != 3 ? ordinal5 != 4 ? b.i(this, 2131892225, new Object[]{charSequence}, null, 4) : b.i(this, 2131892226, new Object[]{charSequence}, null, 4) : b.i(this, 2131892229, new Object[]{charSequence}, null, 4); + charSequence2 = ordinal5 != 3 ? ordinal5 != 4 ? b.i(this, 2131892263, new Object[]{charSequence}, null, 4) : b.i(this, 2131892264, new Object[]{charSequence}, null, 4) : b.i(this, 2131892267, new Object[]{charSequence}, null, 4); } else if (ordinal3 == 1) { int ordinal6 = status.ordinal(); - charSequence2 = ordinal6 != 3 ? ordinal6 != 4 ? b.i(this, 2131892231, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892232, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892235, new Object[]{2, charSequence}, null, 4); + charSequence2 = ordinal6 != 3 ? ordinal6 != 4 ? b.i(this, 2131892269, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892270, new Object[]{2, charSequence}, null, 4) : b.i(this, 2131892273, new Object[]{2, charSequence}, null, 4); } else if (ordinal3 == 2) { Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755278, i2, Integer.valueOf(i2)); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755279, i2, Integer.valueOf(i2)); int ordinal7 = status.ordinal(); - charSequence2 = ordinal7 != 3 ? ordinal7 != 4 ? b.i(this, 2131892110, new Object[]{String.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892108, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892113, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4); + charSequence2 = ordinal7 != 3 ? ordinal7 != 4 ? b.i(this, 2131892148, new Object[]{String.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892146, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4) : b.i(this, 2131892151, new Object[]{Integer.valueOf(i2), i18nPluralString, charSequence}, null, 4); } else if (ordinal3 == 3) { int ordinal8 = status.ordinal(); - charSequence2 = ordinal8 != 3 ? ordinal8 != 4 ? b.i(this, 2131892231, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892232, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892235, new Object[]{Integer.valueOf(i2), charSequence}, null, 4); + charSequence2 = ordinal8 != 3 ? ordinal8 != 4 ? b.i(this, 2131892269, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892270, new Object[]{Integer.valueOf(i2), charSequence}, null, 4) : b.i(this, 2131892273, new Object[]{Integer.valueOf(i2), charSequence}, null, 4); } else { throw new NoWhenBranchMatchedException(); } @@ -291,7 +291,7 @@ public final class ActiveSubscriptionView extends FrameLayout { textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8); MaterialButton materialButton2 = this.j.i; int ordinal9 = status.ordinal(); - materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892256 : 2131886912 : 2131892609); + materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892294 : 2131886912 : 2131892651); this.j.i.setOnClickListener(new a(0, function0)); MaterialButton materialButton3 = this.j.i; m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton"); @@ -335,7 +335,7 @@ public final class ActiveSubscriptionView extends FrameLayout { textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8); MaterialButton materialButton2 = this.j.i; int ordinal9 = status.ordinal(); - materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892256 : 2131886912 : 2131892609); + materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892294 : 2131886912 : 2131892651); this.j.i.setOnClickListener(new a(0, function0)); MaterialButton materialButton3 = this.j.i; m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton"); @@ -384,7 +384,7 @@ public final class ActiveSubscriptionView extends FrameLayout { textView2.setVisibility(function03 == null && !z3 && status != ModelSubscription.Status.CANCELED && !z4 ? 0 : 8); MaterialButton materialButton2 = this.j.i; int ordinal9 = status.ordinal(); - materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892256 : 2131886912 : 2131892609); + materialButton2.setText(ordinal9 != 3 ? ordinal9 != 4 ? 2131892294 : 2131886912 : 2131892651); this.j.i.setOnClickListener(new a(0, function0)); MaterialButton materialButton3 = this.j.i; m.checkNotNullExpressionValue(materialButton3, "binding.activeSubscriptionTopButton"); diff --git a/app/src/main/java/com/discord/views/CheckedSetting.java b/app/src/main/java/com/discord/views/CheckedSetting.java index 7fe1e0b69c..eb92cd9051 100644 --- a/app/src/main/java/com/discord/views/CheckedSetting.java +++ b/app/src/main/java/com/discord/views/CheckedSetting.java @@ -166,17 +166,17 @@ public final class CheckedSetting extends RelativeLayout implements Checkable { public c(ViewGroup viewGroup, e3 e3Var, int i) { e3 e3Var2; if ((i & 2) != 0) { - int i2 = 2131364725; - ImageView imageView = (ImageView) viewGroup.findViewById(2131364725); + int i2 = 2131364728; + ImageView imageView = (ImageView) viewGroup.findViewById(2131364728); if (imageView != null) { - i2 = 2131364726; - TextView textView = (TextView) viewGroup.findViewById(2131364726); + i2 = 2131364729; + TextView textView = (TextView) viewGroup.findViewById(2131364729); if (textView != null) { - i2 = 2131364727; - TextView textView2 = (TextView) viewGroup.findViewById(2131364727); + i2 = 2131364730; + TextView textView2 = (TextView) viewGroup.findViewById(2131364730); if (textView2 != null) { - i2 = 2131364728; - TextView textView3 = (TextView) viewGroup.findViewById(2131364728); + i2 = 2131364731; + TextView textView3 = (TextView) viewGroup.findViewById(2131364731); if (textView3 != null) { e3Var2 = new e3(viewGroup, imageView, textView, textView2, textView3); m.checkNotNullExpressionValue(e3Var2, "ViewSettingSharedBinding.bind(container)"); @@ -553,49 +553,49 @@ public final class CheckedSetting extends RelativeLayout implements Checkable { b bVar; LayoutInflater from = LayoutInflater.from(getContext()); int ordinal = viewType.ordinal(); - int i2 = 2131364722; + int i2 = 2131364725; if (ordinal == 0) { from.inflate(2131558803, this); - MaterialCheckBox materialCheckBox = (MaterialCheckBox) findViewById(2131364722); + MaterialCheckBox materialCheckBox = (MaterialCheckBox) findViewById(2131364725); if (materialCheckBox != null) { - ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364723); + ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364726); if (constraintLayout != null) { c3 c3Var = new c3(this, materialCheckBox, constraintLayout); m.checkNotNullExpressionValue(c3Var, "ViewSettingCheckBinding.…ate(layoutInflater, this)"); m.checkNotNullParameter(c3Var, "binding"); bVar = new b.a(c3Var); } else { - i2 = 2131364723; + i2 = 2131364726; } } throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2))); } else if (ordinal == 1) { from.inflate(2131558804, this); - MaterialRadioButton materialRadioButton = (MaterialRadioButton) findViewById(2131364722); + MaterialRadioButton materialRadioButton = (MaterialRadioButton) findViewById(2131364725); if (materialRadioButton != null) { - ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364723); + ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364726); if (constraintLayout2 != null) { d3 d3Var = new d3(this, materialRadioButton, constraintLayout2); m.checkNotNullExpressionValue(d3Var, "ViewSettingRadioBinding.…ate(layoutInflater, this)"); m.checkNotNullParameter(d3Var, "binding"); bVar = new b.C0179b(d3Var); } else { - i2 = 2131364723; + i2 = 2131364726; } } throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2))); } else if (ordinal == 2) { from.inflate(2131558806, this); - SwitchMaterial switchMaterial = (SwitchMaterial) findViewById(2131364722); + SwitchMaterial switchMaterial = (SwitchMaterial) findViewById(2131364725); if (switchMaterial != null) { - ConstraintLayout constraintLayout3 = (ConstraintLayout) findViewById(2131364723); + ConstraintLayout constraintLayout3 = (ConstraintLayout) findViewById(2131364726); if (constraintLayout3 != null) { f3 f3Var = new f3(this, switchMaterial, constraintLayout3); m.checkNotNullExpressionValue(f3Var, "ViewSettingSwitchBinding…ate(layoutInflater, this)"); m.checkNotNullParameter(f3Var, "binding"); bVar = new b.d(f3Var); } else { - i2 = 2131364723; + i2 = 2131364726; } } throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i2))); diff --git a/app/src/main/java/com/discord/views/CodeVerificationView.java b/app/src/main/java/com/discord/views/CodeVerificationView.java index d581bb4275..481d9a76ac 100644 --- a/app/src/main/java/com/discord/views/CodeVerificationView.java +++ b/app/src/main/java/com/discord/views/CodeVerificationView.java @@ -63,23 +63,23 @@ public final class CodeVerificationView extends LinearLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558737, (ViewGroup) this, false); addView(inflate); - int i2 = 2131365474; - TextView textView = (TextView) inflate.findViewById(2131365474); + int i2 = 2131365480; + TextView textView = (TextView) inflate.findViewById(2131365480); if (textView != null) { - i2 = 2131365475; - TextView textView2 = (TextView) inflate.findViewById(2131365475); + i2 = 2131365481; + TextView textView2 = (TextView) inflate.findViewById(2131365481); if (textView2 != null) { - i2 = 2131365476; - TextView textView3 = (TextView) inflate.findViewById(2131365476); + i2 = 2131365482; + TextView textView3 = (TextView) inflate.findViewById(2131365482); if (textView3 != null) { - i2 = 2131365477; - TextView textView4 = (TextView) inflate.findViewById(2131365477); + i2 = 2131365483; + TextView textView4 = (TextView) inflate.findViewById(2131365483); if (textView4 != null) { - i2 = 2131365478; - TextView textView5 = (TextView) inflate.findViewById(2131365478); + i2 = 2131365484; + TextView textView5 = (TextView) inflate.findViewById(2131365484); if (textView5 != null) { - i2 = 2131365479; - TextView textView6 = (TextView) inflate.findViewById(2131365479); + i2 = 2131365485; + TextView textView6 = (TextView) inflate.findViewById(2131365485); if (textView6 != null) { t1 t1Var = new t1((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6); m.checkNotNullExpressionValue(t1Var, "ViewCodeVerificationBind…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/FailedUploadList.java b/app/src/main/java/com/discord/views/FailedUploadList.java index 007c2ad107..358c9cb92d 100644 --- a/app/src/main/java/com/discord/views/FailedUploadList.java +++ b/app/src/main/java/com/discord/views/FailedUploadList.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import c.a.i.s1; -import com.discord.models.messages.LocalAttachment; +import com.discord.api.message.LocalAttachment; import com.discord.utilities.attachments.AttachmentUtilsKt; import com.discord.utilities.drawable.DrawableCompat; import com.discord.utilities.file.FileUtilsKt; @@ -246,7 +246,7 @@ public final class FailedUploadList extends LinearLayout { m.checkNotNullExpressionValue(resources, "resources"); Context context5 = failedUploadView3.getContext(); m.checkNotNullExpressionValue(context5, "context"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, context5, 2131755341, i2, Integer.valueOf(i2)); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, context5, 2131755342, i2, Integer.valueOf(i2)); Context context6 = failedUploadView3.getContext(); m.checkNotNullExpressionValue(context6, "context"); failedUploadView3.a(quantityString, DrawableCompat.getThemedDrawableRes$default(context6, 2130969464, 0, 2, (Object) null), FileUtilsKt.getSizeSubtitle(j2)); diff --git a/app/src/main/java/com/discord/views/FailedUploadView.java b/app/src/main/java/com/discord/views/FailedUploadView.java index 96aec4f975..5fdb65e563 100644 --- a/app/src/main/java/com/discord/views/FailedUploadView.java +++ b/app/src/main/java/com/discord/views/FailedUploadView.java @@ -22,17 +22,17 @@ public final class FailedUploadView extends ConstraintLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(getContext()).inflate(2131558730, (ViewGroup) this, false); addView(inflate); - int i = 2131362935; - TextView textView = (TextView) inflate.findViewById(2131362935); + int i = 2131362937; + TextView textView = (TextView) inflate.findViewById(2131362937); if (textView != null) { - i = 2131363159; - ImageView imageView = (ImageView) inflate.findViewById(2131363159); + i = 2131363161; + ImageView imageView = (ImageView) inflate.findViewById(2131363161); if (imageView != null) { - i = 2131363182; - ImageView imageView2 = (ImageView) inflate.findViewById(2131363182); + i = 2131363184; + ImageView imageView2 = (ImageView) inflate.findViewById(2131363184); if (imageView2 != null) { - i = 2131365130; - TextView textView2 = (TextView) inflate.findViewById(2131365130); + i = 2131365134; + TextView textView2 = (TextView) inflate.findViewById(2131365134); if (textView2 != null) { r1 r1Var = new r1((ConstraintLayout) inflate, textView, imageView, imageView2, textView2); m.checkNotNullExpressionValue(r1Var, "ViewChatUploadBinding.in…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/GuildView.java b/app/src/main/java/com/discord/views/GuildView.java index adc222a4e7..93f775701d 100644 --- a/app/src/main/java/com/discord/views/GuildView.java +++ b/app/src/main/java/com/discord/views/GuildView.java @@ -20,11 +20,11 @@ public final class GuildView extends ConstraintLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558753, this); - int i = 2131363341; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363341); + int i = 2131363343; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363343); if (simpleDraweeView != null) { - i = 2131363453; - TextView textView = (TextView) findViewById(2131363453); + i = 2131363455; + TextView textView = (TextView) findViewById(2131363455); if (textView != null) { z1 z1Var = new z1(this, simpleDraweeView, textView); m.checkNotNullExpressionValue(z1Var, "ViewGuildBinding.inflate…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java b/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java index e3fe17a7f6..f352e672cb 100644 --- a/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java +++ b/app/src/main/java/com/discord/views/JoinVoiceChannelButton.java @@ -30,7 +30,7 @@ public final class JoinVoiceChannelButton extends MaterialButton { public JoinVoiceChannelButton(Context context, AttributeSet attributeSet) { super(context, attributeSet); m.checkNotNullParameter(context, "context"); - setText(2131887503); + setText(2131887505); } public final void a(MaterialButton materialButton, @StringRes int i) { diff --git a/app/src/main/java/com/discord/views/LoadingButton.java b/app/src/main/java/com/discord/views/LoadingButton.java index 483b2915af..b3494aebc0 100644 --- a/app/src/main/java/com/discord/views/LoadingButton.java +++ b/app/src/main/java/com/discord/views/LoadingButton.java @@ -35,11 +35,11 @@ public final class LoadingButton extends FrameLayout { int i = 4; m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558760, this); - int i2 = 2131363764; - MaterialButton materialButton = (MaterialButton) findViewById(2131363764); + int i2 = 2131363767; + MaterialButton materialButton = (MaterialButton) findViewById(2131363767); if (materialButton != null) { - i2 = 2131363765; - ProgressBar progressBar = (ProgressBar) findViewById(2131363765); + i2 = 2131363768; + ProgressBar progressBar = (ProgressBar) findViewById(2131363768); if (progressBar != null) { b2 b2Var = new b2(this, materialButton, progressBar); m.checkNotNullExpressionValue(b2Var, "ViewLoadingButtonBinding…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java b/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java index 2453ee8feb..746c4645c7 100644 --- a/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java +++ b/app/src/main/java/com/discord/views/MemberVerificationAvatarView.java @@ -17,11 +17,11 @@ public final class MemberVerificationAvatarView extends FrameLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558563, this); - int i = 2131363824; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363824); + int i = 2131363827; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363827); if (simpleDraweeView != null) { - i = 2131363847; - TextView textView = (TextView) findViewById(2131363847); + i = 2131363850; + TextView textView = (TextView) findViewById(2131363850); if (textView != null) { m0 m0Var = new m0(this, simpleDraweeView, textView); m.checkNotNullExpressionValue(m0Var, "MemberVerificationAvatar…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/NumericBadgingView.java b/app/src/main/java/com/discord/views/NumericBadgingView.java index a6d6a2599f..1ea1ae46b0 100644 --- a/app/src/main/java/com/discord/views/NumericBadgingView.java +++ b/app/src/main/java/com/discord/views/NumericBadgingView.java @@ -109,7 +109,7 @@ public final class NumericBadgingView extends CutoutView { } paint2.setColor(obtainStyledAttributes.getColor(1, 0)); if (paint2.getColor() == 0) { - paint2.setColor(ContextCompat.getColor(context, 2131100427)); + paint2.setColor(ContextCompat.getColor(context, 2131100428)); } paint2.setTypeface(FontUtils.INSTANCE.getThemedFont(context, 2130969326)); obtainStyledAttributes.recycle(); diff --git a/app/src/main/java/com/discord/views/OAuthPermissionViews.java b/app/src/main/java/com/discord/views/OAuthPermissionViews.java index e98856cea6..46769ee5df 100644 --- a/app/src/main/java/com/discord/views/OAuthPermissionViews.java +++ b/app/src/main/java/com/discord/views/OAuthPermissionViews.java @@ -54,51 +54,51 @@ public final class OAuthPermissionViews { m.checkNotNullParameter(textView, "$this$setScopePermissionText"); m.checkNotNullParameter(oAuthScope, "scope"); if (m.areEqual(oAuthScope, OAuthScope.Identify.INSTANCE)) { - i = 2131892962; + i = 2131893004; } else if (m.areEqual(oAuthScope, OAuthScope.Email.INSTANCE)) { - i = 2131892954; + i = 2131892996; } else if (m.areEqual(oAuthScope, OAuthScope.Connections.INSTANCE)) { - i = 2131892952; + i = 2131892994; } else if (m.areEqual(oAuthScope, OAuthScope.Guilds.INSTANCE)) { - i = 2131892958; + i = 2131893000; } else if (m.areEqual(oAuthScope, OAuthScope.GuildsJoin.INSTANCE)) { - i = 2131892960; + i = 2131893002; } else if (m.areEqual(oAuthScope, OAuthScope.GdmJoin.INSTANCE)) { - i = 2131892956; + i = 2131892998; } else if (m.areEqual(oAuthScope, OAuthScope.Bot.INSTANCE)) { - i = 2131892949; + i = 2131892991; } else if (m.areEqual(oAuthScope, OAuthScope.WebhookIncoming.INSTANCE)) { - i = 2131892976; + i = 2131893018; } else if (m.areEqual(oAuthScope, OAuthScope.Rpc.INSTANCE)) { - i = 2131892967; + i = 2131893009; } else if (m.areEqual(oAuthScope, OAuthScope.RpcNotificationsRead.INSTANCE)) { - i = 2131892970; + i = 2131893012; } else if (m.areEqual(oAuthScope, OAuthScope.RpcVoiceRead.INSTANCE)) { - i = 2131892972; + i = 2131893014; } else if (m.areEqual(oAuthScope, OAuthScope.RpcVoiceWrite.INSTANCE)) { - i = 2131892973; + i = 2131893015; } else if (m.areEqual(oAuthScope, OAuthScope.RpcActivitiesWrite.INSTANCE)) { - i = 2131892968; + i = 2131893010; } else if (m.areEqual(oAuthScope, OAuthScope.MessagesRead.INSTANCE)) { - i = 2131892963; + i = 2131893005; } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsBuildsUpload.INSTANCE)) { - i = 2131892939; + i = 2131892981; } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsBuildsRead.INSTANCE)) { - i = 2131892937; + i = 2131892979; } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsCommands.INSTANCE)) { - i = 2131892941; + i = 2131892983; } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsCommandsUpdate.INSTANCE)) { - i = 2131892943; + i = 2131892985; } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsStoreUpdate.INSTANCE)) { - i = 2131892947; + i = 2131892989; } else if (m.areEqual(oAuthScope, OAuthScope.ApplicationsEntitlements.INSTANCE)) { - i = 2131892945; + i = 2131892987; } else if (m.areEqual(oAuthScope, OAuthScope.ActivitiesRead.INSTANCE)) { - i = 2131892933; + i = 2131892975; } else if (m.areEqual(oAuthScope, OAuthScope.ActivitiesWrite.INSTANCE)) { - i = 2131892935; + i = 2131892977; } else if (m.areEqual(oAuthScope, OAuthScope.RelationshipsRead.INSTANCE)) { - i = 2131892965; + i = 2131893007; } else if (oAuthScope instanceof OAuthScope.Invalid) { throw new InvalidScopeException(((OAuthScope.Invalid) oAuthScope).b()); } else { diff --git a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java index 91391b8b32..2cdeb24522 100644 --- a/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java +++ b/app/src/main/java/com/discord/views/OverlayMenuBubbleDialog.java @@ -138,20 +138,20 @@ public final class OverlayMenuBubbleDialog extends k implements AppComponent { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(getContext()).inflate(2131558610, (ViewGroup) this, false); addView(inflate); - int i = 2131364114; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364114); + int i = 2131364116; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131364116); if (linearLayout != null) { - i = 2131364116; - View findViewById = inflate.findViewById(2131364116); + i = 2131364118; + View findViewById = inflate.findViewById(2131364118); if (findViewById != null) { - i = 2131364117; - TextView textView = (TextView) inflate.findViewById(2131364117); + i = 2131364119; + TextView textView = (TextView) inflate.findViewById(2131364119); if (textView != null) { - i = 2131364118; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364118); + i = 2131364120; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364120); if (recyclerView != null) { - i = 2131364119; - OverlayMenuView overlayMenuView = (OverlayMenuView) inflate.findViewById(2131364119); + i = 2131364121; + OverlayMenuView overlayMenuView = (OverlayMenuView) inflate.findViewById(2131364121); if (overlayMenuView != null) { o0 o0Var = new o0((LinearLayout) inflate, linearLayout, findViewById, textView, recyclerView, overlayMenuView); m.checkNotNullExpressionValue(o0Var, "OverlayBubbleMenuBinding…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/OverlayMenuView.java b/app/src/main/java/com/discord/views/OverlayMenuView.java index 7b02793930..735f7c2029 100644 --- a/app/src/main/java/com/discord/views/OverlayMenuView.java +++ b/app/src/main/java/com/discord/views/OverlayMenuView.java @@ -120,33 +120,33 @@ public final class OverlayMenuView extends LinearLayout implements AppComponent int i2 = 2131362749; View findViewById = findViewById(2131362749); if (findViewById != null) { - int i3 = 2131364111; - TextView textView = (TextView) findViewById.findViewById(2131364111); + int i3 = 2131364113; + TextView textView = (TextView) findViewById.findViewById(2131364113); if (textView != null) { - i3 = 2131364113; - TextView textView2 = (TextView) findViewById.findViewById(2131364113); + i3 = 2131364115; + TextView textView2 = (TextView) findViewById.findViewById(2131364115); if (textView2 != null) { - i3 = 2131364115; - TextView textView3 = (TextView) findViewById.findViewById(2131364115); + i3 = 2131364117; + TextView textView3 = (TextView) findViewById.findViewById(2131364117); if (textView3 != null) { - i3 = 2131364120; - ImageView imageView = (ImageView) findViewById.findViewById(2131364120); + i3 = 2131364122; + ImageView imageView = (ImageView) findViewById.findViewById(2131364122); if (imageView != null) { - i3 = 2131364121; - TextView textView4 = (TextView) findViewById.findViewById(2131364121); + i3 = 2131364123; + TextView textView4 = (TextView) findViewById.findViewById(2131364123); if (textView4 != null) { - i3 = 2131364122; - TextView textView5 = (TextView) findViewById.findViewById(2131364122); + i3 = 2131364124; + TextView textView5 = (TextView) findViewById.findViewById(2131364124); if (textView5 != null) { h2 h2Var = new h2((CardView) findViewById, textView, textView2, textView3, imageView, textView4, textView5); - i2 = 2131362907; - ImageView imageView2 = (ImageView) findViewById(2131362907); + i2 = 2131362909; + ImageView imageView2 = (ImageView) findViewById(2131362909); if (imageView2 != null) { - i2 = 2131363985; - ImageView imageView3 = (ImageView) findViewById(2131363985); + i2 = 2131363987; + ImageView imageView3 = (ImageView) findViewById(2131363987); if (imageView3 != null) { - i2 = 2131364963; - ImageView imageView4 = (ImageView) findViewById(2131364963); + i2 = 2131364966; + ImageView imageView4 = (ImageView) findViewById(2131364966); if (imageView4 != null) { g2 g2Var = new g2(this, h2Var, imageView2, imageView3, imageView4); m.checkNotNullExpressionValue(g2Var, "ViewOverlayMenuBinding.i…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/PileView.java b/app/src/main/java/com/discord/views/PileView.java index 6ac2b6f515..7cc372841d 100644 --- a/app/src/main/java/com/discord/views/PileView.java +++ b/app/src/main/java/com/discord/views/PileView.java @@ -111,11 +111,11 @@ public final class PileView extends FrameLayout { int i4 = this.l * i2; int i5 = this.m * i2; View inflate = LayoutInflater.from(getContext()).inflate(2131558776, (ViewGroup) this, false); - int i6 = 2131364216; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364216); + int i6 = 2131364218; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364218); if (simpleDraweeView != null) { - i6 = 2131364217; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364217); + i6 = 2131364219; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131364219); if (simpleDraweeView2 != null) { CutoutView cutoutView = (CutoutView) inflate; m.checkNotNullExpressionValue(new j2(cutoutView, simpleDraweeView, simpleDraweeView2), "ViewPileItemBinding.infl…om(context), this, false)"); diff --git a/app/src/main/java/com/discord/views/ScreenTitleView.java b/app/src/main/java/com/discord/views/ScreenTitleView.java index e6f9ecad40..eef2433613 100644 --- a/app/src/main/java/com/discord/views/ScreenTitleView.java +++ b/app/src/main/java/com/discord/views/ScreenTitleView.java @@ -22,11 +22,11 @@ public final class ScreenTitleView extends LinearLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558792, (ViewGroup) this, false); addView(inflate); - int i = 2131364519; - TextView textView = (TextView) inflate.findViewById(2131364519); + int i = 2131364522; + TextView textView = (TextView) inflate.findViewById(2131364522); if (textView != null) { - i = 2131364520; - TextView textView2 = (TextView) inflate.findViewById(2131364520); + i = 2131364523; + TextView textView2 = (TextView) inflate.findViewById(2131364523); if (textView2 != null) { t2 t2Var = new t2((LinearLayout) inflate, textView, textView2); m.checkNotNullExpressionValue(t2Var, "ViewScreenTitleBinding.i…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/SearchInputView.java b/app/src/main/java/com/discord/views/SearchInputView.java index d2596d4c40..d68da08836 100644 --- a/app/src/main/java/com/discord/views/SearchInputView.java +++ b/app/src/main/java/com/discord/views/SearchInputView.java @@ -74,11 +74,11 @@ public final class SearchInputView extends ConstraintLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558650, this); - int i2 = 2131364531; - ImageView imageView = (ImageView) findViewById(2131364531); + int i2 = 2131364534; + ImageView imageView = (ImageView) findViewById(2131364534); if (imageView != null) { - i2 = 2131364538; - TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364538); + i2 = 2131364541; + TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364541); if (textInputEditText != null) { d1 d1Var = new d1(this, imageView, textInputEditText); m.checkNotNullExpressionValue(d1Var, "SearchInputViewBinding.i…ater.from(context), this)"); @@ -120,13 +120,13 @@ public final class SearchInputView extends ConstraintLayout { int i2 = 0; boolean z2 = str.length() == 0; d1 d1Var = this.j; - d1Var.b.setImageResource(z2 ? 2131231898 : 2131231519); + d1Var.b.setImageResource(z2 ? 2131231901 : 2131231519); ImageView imageView = d1Var.b; m.checkNotNullExpressionValue(imageView, "searchClear"); imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968988)) : ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968989))); ImageView imageView2 = d1Var.b; m.checkNotNullExpressionValue(imageView2, "searchClear"); - imageView2.setContentDescription(z2 ? this.k : getContext().getString(2131892599)); + imageView2.setContentDescription(z2 ? this.k : getContext().getString(2131892641)); ImageView imageView3 = d1Var.b; m.checkNotNullExpressionValue(imageView3, "searchClear"); if (z2) { diff --git a/app/src/main/java/com/discord/views/ServerFolderView.java b/app/src/main/java/com/discord/views/ServerFolderView.java index 4f1cf3d356..59bffc0e52 100644 --- a/app/src/main/java/com/discord/views/ServerFolderView.java +++ b/app/src/main/java/com/discord/views/ServerFolderView.java @@ -48,23 +48,23 @@ public final class ServerFolderView extends LinearLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558794, this); - int i2 = 2131363220; - ImageView imageView = (ImageView) findViewById(2131363220); + int i2 = 2131363222; + ImageView imageView = (ImageView) findViewById(2131363222); if (imageView != null) { - i2 = 2131363460; - GuildView guildView = (GuildView) findViewById(2131363460); + i2 = 2131363462; + GuildView guildView = (GuildView) findViewById(2131363462); if (guildView != null) { - i2 = 2131363461; - GuildView guildView2 = (GuildView) findViewById(2131363461); + i2 = 2131363463; + GuildView guildView2 = (GuildView) findViewById(2131363463); if (guildView2 != null) { - i2 = 2131363462; - GuildView guildView3 = (GuildView) findViewById(2131363462); + i2 = 2131363464; + GuildView guildView3 = (GuildView) findViewById(2131363464); if (guildView3 != null) { - i2 = 2131363463; - GuildView guildView4 = (GuildView) findViewById(2131363463); + i2 = 2131363465; + GuildView guildView4 = (GuildView) findViewById(2131363465); if (guildView4 != null) { - i2 = 2131363464; - GridLayout gridLayout = (GridLayout) findViewById(2131363464); + i2 = 2131363466; + GridLayout gridLayout = (GridLayout) findViewById(2131363466); if (gridLayout != null) { u2 u2Var = new u2(this, imageView, guildView, guildView2, guildView3, guildView4, gridLayout); m.checkNotNullExpressionValue(u2Var, "ViewServerFolderBinding.…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/StatusView.java b/app/src/main/java/com/discord/views/StatusView.java index aab1393061..88faedc188 100644 --- a/app/src/main/java/com/discord/views/StatusView.java +++ b/app/src/main/java/com/discord/views/StatusView.java @@ -94,7 +94,7 @@ public final class StatusView extends AppCompatImageView { if (!this.k || presence == null || (clientStatuses2 = presence.getClientStatuses()) == null || !PresenceUtils.INSTANCE.isMobile(clientStatuses2)) { ClientStatus clientStatus = null; if ((presence != null ? PresenceUtils.INSTANCE.getStreamingActivity(presence) : null) != null) { - i = 2131231960; + i = 2131231963; } else { if (presence != null) { clientStatus = presence.getStatus(); @@ -102,17 +102,17 @@ public final class StatusView extends AppCompatImageView { if (clientStatus != null) { int ordinal = clientStatus.ordinal(); if (ordinal == 0) { - i = 2131231959; + i = 2131231962; } else if (ordinal == 1) { - i = 2131231957; + i = 2131231960; } else if (ordinal == 2) { - i = 2131231956; + i = 2131231959; } } - i = 2131231958; + i = 2131231961; } } else { - i = 2131231753; + i = 2131231756; } setImageResource(i); this.l = !(this.k && presence != null && (clientStatuses = presence.getClientStatuses()) != null && PresenceUtils.INSTANCE.isMobile(clientStatuses)); diff --git a/app/src/main/java/com/discord/views/StreamPreviewView.java b/app/src/main/java/com/discord/views/StreamPreviewView.java index 90985bf0d5..041959ef7b 100644 --- a/app/src/main/java/com/discord/views/StreamPreviewView.java +++ b/app/src/main/java/com/discord/views/StreamPreviewView.java @@ -27,14 +27,14 @@ public final class StreamPreviewView extends FrameLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(getContext()).inflate(2131558817, (ViewGroup) this, false); addView(inflate); - int i = 2131365120; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365120); + int i = 2131365124; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365124); if (simpleDraweeView != null) { - i = 2131365121; - TextView textView = (TextView) inflate.findViewById(2131365121); + i = 2131365125; + TextView textView = (TextView) inflate.findViewById(2131365125); if (textView != null) { - i = 2131365122; - TextView textView2 = (TextView) inflate.findViewById(2131365122); + i = 2131365126; + TextView textView2 = (TextView) inflate.findViewById(2131365126); if (textView2 != null) { l3 l3Var = new l3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2); m.checkNotNullExpressionValue(l3Var, "ViewStreamPreviewBinding…rom(context), this, true)"); @@ -70,7 +70,7 @@ public final class StreamPreviewView extends FrameLayout { m.checkNotNullParameter(streamPreview, "preview"); m.checkNotNullParameter(joinability, "joinability"); if (streamPreview instanceof StoreApplicationStreamPreviews.StreamPreview.Fetching) { - setCaptionText(getContext().getString(2131893583)); + setCaptionText(getContext().getString(2131893623)); } else if (streamPreview instanceof StoreApplicationStreamPreviews.StreamPreview.Resolved) { StoreApplicationStreamPreviews.StreamPreview.Resolved resolved = (StoreApplicationStreamPreviews.StreamPreview.Resolved) streamPreview; if (resolved.getUrl() != null) { @@ -79,7 +79,7 @@ public final class StreamPreviewView extends FrameLayout { } else { setImage(null); if (joinability == StreamContext.Joinability.CAN_CONNECT) { - setCaptionText(getContext().getString(2131893571)); + setCaptionText(getContext().getString(2131893611)); } else { setCaptionText(null); } @@ -88,16 +88,16 @@ public final class StreamPreviewView extends FrameLayout { throw new NoWhenBranchMatchedException(); } if (z2) { - setOverlayCaptionText(b.i(this, 2131894505, new Object[0], null, 4)); + setOverlayCaptionText(b.i(this, 2131894552, new Object[0], null, 4)); return; } int ordinal = joinability.ordinal(); if (ordinal == 0) { - setOverlayCaptionText(b.i(this, 2131890633, new Object[0], null, 4)); + setOverlayCaptionText(b.i(this, 2131890663, new Object[0], null, 4)); } else if (ordinal == 1) { - setOverlayCaptionText(b.i(this, 2131894000, new Object[0], null, 4)); + setOverlayCaptionText(b.i(this, 2131894039, new Object[0], null, 4)); } else if (ordinal == 2) { - setOverlayCaptionText(b.i(this, 2131887273, new Object[0], null, 4)); + setOverlayCaptionText(b.i(this, 2131887274, new Object[0], null, 4)); } else { throw new NoWhenBranchMatchedException(); } diff --git a/app/src/main/java/com/discord/views/TernaryCheckBox.java b/app/src/main/java/com/discord/views/TernaryCheckBox.java index ff2c64f771..06e420932b 100644 --- a/app/src/main/java/com/discord/views/TernaryCheckBox.java +++ b/app/src/main/java/com/discord/views/TernaryCheckBox.java @@ -79,26 +79,26 @@ public final class TernaryCheckBox extends RelativeLayout { i2 = 2131362609; LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131362609); if (linearLayout != null) { - i2 = 2131364094; - View findViewById = inflate.findViewById(2131364094); + i2 = 2131364096; + View findViewById = inflate.findViewById(2131364096); if (findViewById != null) { - i2 = 2131364724; - View findViewById2 = inflate.findViewById(2131364724); + i2 = 2131364727; + View findViewById2 = inflate.findViewById(2131364727); if (findViewById2 != null) { - i2 = 2131364726; - TextView textView = (TextView) inflate.findViewById(2131364726); + i2 = 2131364729; + TextView textView = (TextView) inflate.findViewById(2131364729); if (textView != null) { - i2 = 2131364727; - TextView textView2 = (TextView) inflate.findViewById(2131364727); + i2 = 2131364730; + TextView textView2 = (TextView) inflate.findViewById(2131364730); if (textView2 != null) { - i2 = 2131365194; - CheckableImageView checkableImageView = (CheckableImageView) inflate.findViewById(2131365194); + i2 = 2131365198; + CheckableImageView checkableImageView = (CheckableImageView) inflate.findViewById(2131365198); if (checkableImageView != null) { - i2 = 2131365195; - CheckableImageView checkableImageView2 = (CheckableImageView) inflate.findViewById(2131365195); + i2 = 2131365199; + CheckableImageView checkableImageView2 = (CheckableImageView) inflate.findViewById(2131365199); if (checkableImageView2 != null) { - i2 = 2131365196; - CheckableImageView checkableImageView3 = (CheckableImageView) inflate.findViewById(2131365196); + i2 = 2131365200; + CheckableImageView checkableImageView3 = (CheckableImageView) inflate.findViewById(2131365200); if (checkableImageView3 != null) { m3 m3Var = new m3((LinearLayout) inflate, frameLayout, linearLayout, findViewById, findViewById2, textView, textView2, checkableImageView, checkableImageView2, checkableImageView3); m.checkNotNullExpressionValue(m3Var, "ViewTernaryCheckboxBindi…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/ToolbarTitleLayout.java b/app/src/main/java/com/discord/views/ToolbarTitleLayout.java index 695d116eda..8eb83aa98f 100644 --- a/app/src/main/java/com/discord/views/ToolbarTitleLayout.java +++ b/app/src/main/java/com/discord/views/ToolbarTitleLayout.java @@ -17,14 +17,14 @@ public final class ToolbarTitleLayout extends ConstraintLayout { super(context); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558819, this); - int i = 2131365290; - StatusView statusView = (StatusView) findViewById(2131365290); + int i = 2131365295; + StatusView statusView = (StatusView) findViewById(2131365295); if (statusView != null) { - i = 2131365291; - TextView textView = (TextView) findViewById(2131365291); + i = 2131365296; + TextView textView = (TextView) findViewById(2131365296); if (textView != null) { - i = 2131365292; - TextView textView2 = (TextView) findViewById(2131365292); + i = 2131365297; + TextView textView2 = (TextView) findViewById(2131365297); if (textView2 != null) { n3 n3Var = new n3(this, statusView, textView, textView2); m.checkNotNullExpressionValue(n3Var, "ViewToolbarTitleBinding.…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/UploadProgressView.java b/app/src/main/java/com/discord/views/UploadProgressView.java index 89c6709841..19edb8774d 100644 --- a/app/src/main/java/com/discord/views/UploadProgressView.java +++ b/app/src/main/java/com/discord/views/UploadProgressView.java @@ -31,17 +31,17 @@ public final class UploadProgressView extends ConstraintLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(getContext()).inflate(2131558820, (ViewGroup) this, false); addView(inflate); - int i2 = 2131364351; - ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364351); + int i2 = 2131364354; + ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364354); if (progressBar != null) { - i2 = 2131364355; - ImageView imageView = (ImageView) inflate.findViewById(2131364355); + i2 = 2131364358; + ImageView imageView = (ImageView) inflate.findViewById(2131364358); if (imageView != null) { - i2 = 2131364360; - TextView textView = (TextView) inflate.findViewById(2131364360); + i2 = 2131364363; + TextView textView = (TextView) inflate.findViewById(2131364363); if (textView != null) { - i2 = 2131364361; - TextView textView2 = (TextView) inflate.findViewById(2131364361); + i2 = 2131364364; + TextView textView2 = (TextView) inflate.findViewById(2131364364); if (textView2 != null) { o3 o3Var = new o3((ConstraintLayout) inflate, progressBar, imageView, textView, textView2); m.checkNotNullExpressionValue(o3Var, "ViewUploadProgressBindin…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/UserListItemView.java b/app/src/main/java/com/discord/views/UserListItemView.java index 177ad2a350..cd83023715 100644 --- a/app/src/main/java/com/discord/views/UserListItemView.java +++ b/app/src/main/java/com/discord/views/UserListItemView.java @@ -18,17 +18,17 @@ public final class UserListItemView extends RelativeLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558821, this); - int i2 = 2131365367; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365367); + int i2 = 2131365372; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365372); if (simpleDraweeView != null) { - i2 = 2131365368; - TextView textView = (TextView) findViewById(2131365368); + i2 = 2131365373; + TextView textView = (TextView) findViewById(2131365373); if (textView != null) { - i2 = 2131365369; - TextView textView2 = (TextView) findViewById(2131365369); + i2 = 2131365374; + TextView textView2 = (TextView) findViewById(2131365374); if (textView2 != null) { - i2 = 2131365370; - StatusView statusView = (StatusView) findViewById(2131365370); + i2 = 2131365375; + StatusView statusView = (StatusView) findViewById(2131365375); if (statusView != null) { p3 p3Var = new p3(this, simpleDraweeView, textView, textView2, statusView); m.checkNotNullExpressionValue(p3Var, "ViewUserListItemBinding.…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/UsernameView.java b/app/src/main/java/com/discord/views/UsernameView.java index 2c2fa62498..1e78093e47 100644 --- a/app/src/main/java/com/discord/views/UsernameView.java +++ b/app/src/main/java/com/discord/views/UsernameView.java @@ -24,11 +24,11 @@ public final class UsernameView extends ConstraintLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558825, this); - int i = 2131365466; - TextView textView = (TextView) findViewById(2131365466); + int i = 2131365472; + TextView textView = (TextView) findViewById(2131365472); if (textView != null) { - i = 2131365467; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365467); + i = 2131365473; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365473); if (simpleDraweeSpanTextView != null) { s3 s3Var = new s3(this, textView, simpleDraweeSpanTextView); m.checkNotNullExpressionValue(s3Var, "ViewUsernameBinding.infl…ater.from(context), this)"); @@ -69,7 +69,7 @@ public final class UsernameView extends ConstraintLayout { } private final void setIsVerified(boolean z2) { - this.i.b.setCompoundDrawablesWithIntrinsicBounds(z2 ? 2131232032 : 0, 0, 0, 0); + this.i.b.setCompoundDrawablesWithIntrinsicBounds(z2 ? 2131232035 : 0, 0, 0, 0); } public final void a(boolean z2, @StringRes int i, boolean z3) { diff --git a/app/src/main/java/com/discord/views/VoiceUserLimitView.java b/app/src/main/java/com/discord/views/VoiceUserLimitView.java index a27db2eccf..3cac0606da 100644 --- a/app/src/main/java/com/discord/views/VoiceUserLimitView.java +++ b/app/src/main/java/com/discord/views/VoiceUserLimitView.java @@ -35,11 +35,11 @@ public final class VoiceUserLimitView extends LinearLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558829, this); - int i = 2131365549; - TextView textView = (TextView) findViewById(2131365549); + int i = 2131365555; + TextView textView = (TextView) findViewById(2131365555); if (textView != null) { - i = 2131365550; - TextView textView2 = (TextView) findViewById(2131365550); + i = 2131365556; + TextView textView2 = (TextView) findViewById(2131365556); if (textView2 != null) { v3 v3Var = new v3(this, textView, textView2); m.checkNotNullExpressionValue(v3Var, "VoiceUserLimitViewBindin…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/VoiceUserView.java b/app/src/main/java/com/discord/views/VoiceUserView.java index 2727b2b9c4..36142f3cd3 100644 --- a/app/src/main/java/com/discord/views/VoiceUserView.java +++ b/app/src/main/java/com/discord/views/VoiceUserView.java @@ -117,11 +117,11 @@ public final class VoiceUserView extends FrameLayout { m.checkNotNullParameter(context, "context"); this.j = 17170445; LayoutInflater.from(context).inflate(2131558827, this); - int i4 = 2131365548; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365548); + int i4 = 2131365554; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365554); if (simpleDraweeView != null) { - i4 = 2131365561; - TextView textView = (TextView) findViewById(2131365561); + i4 = 2131365567; + TextView textView = (TextView) findViewById(2131365567); if (textView != null) { u3 u3Var = new u3(this, simpleDraweeView, textView); m.checkNotNullExpressionValue(u3Var, "ViewVoiceUserBinding.inf…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java b/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java index 85aab3f116..5412467b47 100644 --- a/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java +++ b/app/src/main/java/com/discord/views/calls/SpeakerPulseView.java @@ -26,13 +26,13 @@ import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import kotlinx.coroutines.Job; import s.a.e0; -import s.a.s; +import s.a.t; /* compiled from: SpeakerPulseView.kt */ public final class SpeakerPulseView extends FrameLayout { public final PathInterpolator i; public final PathInterpolator j; public boolean k; - public final s l = c.q.a.k.a.b(null, 1); + public final t l = c.q.a.k.a.b(null, 1); public Job m; public final Lazy n; public final Lazy o; @@ -289,10 +289,10 @@ public final class SpeakerPulseView extends FrameLayout { int i = this.label; if (i == 0) { l.throwOnFailure(obj); - s sVar = this.this$0.l; + t tVar = this.this$0.l; a aVar = new a(this, null); this.label = 1; - if (c.q.a.k.a.h0(sVar, aVar, this) == coroutine_suspended) { + if (c.q.a.k.a.i0(tVar, aVar, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -454,7 +454,7 @@ public final class SpeakerPulseView extends FrameLayout { } else { throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } - while (c.q.a.k.a.z(coroutineScope2)) { + while (c.q.a.k.a.A(coroutineScope2)) { e0[] e0VarArr = {c.q.a.k.a.f(coroutineScope2, null, null, new d(speakerPulseView2, null), 3, null), c.q.a.k.a.f(coroutineScope2, null, null, new e(speakerPulseView2, null), 3, null)}; cVar.L$0 = speakerPulseView2; cVar.L$1 = coroutineScope2; @@ -473,7 +473,7 @@ public final class SpeakerPulseView extends FrameLayout { i = cVar.label; if (i != 0) { } - while (c.q.a.k.a.z(coroutineScope2)) { + while (c.q.a.k.a.A(coroutineScope2)) { } return Unit.a; } @@ -484,9 +484,9 @@ public final class SpeakerPulseView extends FrameLayout { this.k = true; Job job = this.m; if (job != null) { - c.q.a.k.a.j(job, null, 1, null); + c.q.a.k.a.k(job, null, 1, null); } - this.m = c.q.a.k.a.F(coroutineScope, null, null, new f(this, null), 3, null); + this.m = c.q.a.k.a.G(coroutineScope, null, null, new f(this, null), 3, null); } } diff --git a/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java b/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java index 6771dfcf0a..b3255e891c 100644 --- a/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java +++ b/app/src/main/java/com/discord/views/calls/StageCallSpeakerView.java @@ -20,28 +20,32 @@ public final class StageCallSpeakerView extends CardView { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558814, this); - int i = 2131364987; - VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364987); + int i = 2131364990; + VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364990); if (voiceUserView != null) { - i = 2131364988; - ImageView imageView = (ImageView) findViewById(2131364988); + i = 2131364991; + ImageView imageView = (ImageView) findViewById(2131364991); if (imageView != null) { - i = 2131364990; - ImageView imageView2 = (ImageView) findViewById(2131364990); + i = 2131364993; + ImageView imageView2 = (ImageView) findViewById(2131364993); if (imageView2 != null) { - i = 2131364991; - ImageView imageView3 = (ImageView) findViewById(2131364991); + i = 2131364994; + ImageView imageView3 = (ImageView) findViewById(2131364994); if (imageView3 != null) { - i = 2131364992; - TextView textView = (TextView) findViewById(2131364992); - if (textView != null) { - i = 2131364993; - SpeakerPulseView speakerPulseView = (SpeakerPulseView) findViewById(2131364993); - if (speakerPulseView != null) { - i3 i3Var = new i3(this, voiceUserView, imageView, imageView2, imageView3, textView, speakerPulseView); - m.checkNotNullExpressionValue(i3Var, "ViewStageChannelSpeakerB…ater.from(context), this)"); - this.i = i3Var; - return; + i = 2131364995; + ImageView imageView4 = (ImageView) findViewById(2131364995); + if (imageView4 != null) { + i = 2131364996; + TextView textView = (TextView) findViewById(2131364996); + if (textView != null) { + i = 2131364997; + SpeakerPulseView speakerPulseView = (SpeakerPulseView) findViewById(2131364997); + if (speakerPulseView != null) { + i3 i3Var = new i3(this, voiceUserView, imageView, imageView2, imageView3, imageView4, textView, speakerPulseView); + m.checkNotNullExpressionValue(i3Var, "ViewStageChannelSpeakerB…ater.from(context), this)"); + this.i = i3Var; + return; + } } } } diff --git a/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java b/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java index 80caca3678..05b5251a33 100644 --- a/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java +++ b/app/src/main/java/com/discord/views/calls/StageCallVisitCommunityView.java @@ -20,14 +20,14 @@ public final class StageCallVisitCommunityView extends ConstraintLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558815, (ViewGroup) this, false); addView(inflate); - int i = 2131365512; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365512); + int i = 2131365518; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365518); if (simpleDraweeView != null) { - i = 2131365513; - TextView textView = (TextView) inflate.findViewById(2131365513); + i = 2131365519; + TextView textView = (TextView) inflate.findViewById(2131365519); if (textView != null) { - i = 2131365514; - TextView textView2 = (TextView) inflate.findViewById(2131365514); + i = 2131365520; + TextView textView2 = (TextView) inflate.findViewById(2131365520); if (textView2 != null) { j3 j3Var = new j3((ConstraintLayout) inflate, simpleDraweeView, textView, textView2); m.checkNotNullExpressionValue(j3Var, "ViewStageChannelVisitCom…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java index 4d244b6760..39fcad7a23 100644 --- a/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java +++ b/app/src/main/java/com/discord/views/calls/VideoCallParticipantView.java @@ -368,7 +368,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements @Override // com.discord.views.calls.VideoCallParticipantView.StreamResolution public CharSequence a(Context context) { m.checkNotNullParameter(context, "context"); - return c.a.l.b.g(context, 2131892994, new Object[]{Integer.valueOf(this.a)}, null, 4); + return c.a.l.b.g(context, 2131893036, new Object[]{Integer.valueOf(this.a)}, null, 4); } public boolean equals(Object obj) { @@ -398,7 +398,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements @Override // com.discord.views.calls.VideoCallParticipantView.StreamResolution public CharSequence a(Context context) { m.checkNotNullParameter(context, "context"); - return c.a.l.b.g(context, 2131892998, new Object[0], null, 4); + return c.a.l.b.g(context, 2131893040, new Object[0], null, 4); } } @@ -446,71 +446,71 @@ public final class VideoCallParticipantView extends ConstraintLayout implements int i3 = (i2 & 4) != 0 ? 0 : i; m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558826, this); - int i4 = 2131364138; - View findViewById = findViewById(2131364138); + int i4 = 2131364140; + View findViewById = findViewById(2131364140); if (findViewById != null) { - i4 = 2131364139; - View findViewById2 = findViewById(2131364139); + i4 = 2131364141; + View findViewById2 = findViewById(2131364141); if (findViewById2 != null) { - i4 = 2131364140; - ImageView imageView = (ImageView) findViewById(2131364140); + i4 = 2131364142; + ImageView imageView = (ImageView) findViewById(2131364142); if (imageView != null) { - i4 = 2131364141; - ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364141); + i4 = 2131364143; + ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(2131364143); if (constraintLayout != null) { - i4 = 2131364142; - Space space = (Space) findViewById(2131364142); + i4 = 2131364144; + Space space = (Space) findViewById(2131364144); if (space != null) { - i4 = 2131364143; - ImageView imageView2 = (ImageView) findViewById(2131364143); + i4 = 2131364145; + ImageView imageView2 = (ImageView) findViewById(2131364145); if (imageView2 != null) { - i4 = 2131364144; - TextView textView = (TextView) findViewById(2131364144); + i4 = 2131364146; + TextView textView = (TextView) findViewById(2131364146); if (textView != null) { - i4 = 2131364145; - LinearLayout linearLayout = (LinearLayout) findViewById(2131364145); + i4 = 2131364147; + LinearLayout linearLayout = (LinearLayout) findViewById(2131364147); if (linearLayout != null) { - i4 = 2131364146; - TextView textView2 = (TextView) findViewById(2131364146); + i4 = 2131364148; + TextView textView2 = (TextView) findViewById(2131364148); if (textView2 != null) { - i4 = 2131364147; - TextView textView3 = (TextView) findViewById(2131364147); + i4 = 2131364149; + TextView textView3 = (TextView) findViewById(2131364149); if (textView3 != null) { - i4 = 2131364148; - ImageView imageView3 = (ImageView) findViewById(2131364148); + i4 = 2131364150; + ImageView imageView3 = (ImageView) findViewById(2131364150); if (imageView3 != null) { - i4 = 2131364149; - ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364149); + i4 = 2131364151; + ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById(2131364151); if (constraintLayout2 != null) { - i4 = 2131364150; - ImageView imageView4 = (ImageView) findViewById(2131364150); + i4 = 2131364152; + ImageView imageView4 = (ImageView) findViewById(2131364152); if (imageView4 != null) { - i4 = 2131364151; - TextView textView4 = (TextView) findViewById(2131364151); + i4 = 2131364153; + TextView textView4 = (TextView) findViewById(2131364153); if (textView4 != null) { - i4 = 2131364152; - TextView textView5 = (TextView) findViewById(2131364152); + i4 = 2131364154; + TextView textView5 = (TextView) findViewById(2131364154); if (textView5 != null) { - i4 = 2131364153; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364153); + i4 = 2131364155; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364155); if (simpleDraweeView != null) { - i4 = 2131364154; - TextView textView6 = (TextView) findViewById(2131364154); + i4 = 2131364156; + TextView textView6 = (TextView) findViewById(2131364156); if (textView6 != null) { - i4 = 2131364155; - TextView textView7 = (TextView) findViewById(2131364155); + i4 = 2131364157; + TextView textView7 = (TextView) findViewById(2131364157); if (textView7 != null) { - i4 = 2131364156; - ProgressBar progressBar = (ProgressBar) findViewById(2131364156); + i4 = 2131364158; + ProgressBar progressBar = (ProgressBar) findViewById(2131364158); if (progressBar != null) { - i4 = 2131364157; - AppVideoStreamRenderer appVideoStreamRenderer2 = (AppVideoStreamRenderer) findViewById(2131364157); + i4 = 2131364159; + AppVideoStreamRenderer appVideoStreamRenderer2 = (AppVideoStreamRenderer) findViewById(2131364159); if (appVideoStreamRenderer2 != null) { - i4 = 2131364158; - LinearLayout linearLayout2 = (LinearLayout) findViewById(2131364158); + i4 = 2131364160; + LinearLayout linearLayout2 = (LinearLayout) findViewById(2131364160); if (linearLayout2 != null) { - i4 = 2131364159; - VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364159); + i4 = 2131364161; + VoiceUserView voiceUserView = (VoiceUserView) findViewById(2131364161); if (voiceUserView != null) { t3 t3Var = new t3(this, findViewById, findViewById2, imageView, constraintLayout, space, imageView2, textView, linearLayout, textView2, textView3, imageView3, constraintLayout2, imageView4, textView4, textView5, simpleDraweeView, textView6, textView7, progressBar, appVideoStreamRenderer2, linearLayout2, voiceUserView); m.checkNotNullExpressionValue(t3Var, "ViewVideoCallParticipant…ater.from(context), this)"); @@ -601,7 +601,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); m.checkNotNullParameter(context2, "context"); - charSequence = b.g(context2, 2131892987, new Object[]{Integer.valueOf(streamFps.a)}, null, 4); + charSequence = b.g(context2, 2131893029, new Object[]{Integer.valueOf(streamFps.a)}, null, 4); } else { charSequence = ""; } @@ -616,7 +616,7 @@ public final class VideoCallParticipantView extends ConstraintLayout implements TextView textView = this.i.h; m.checkNotNullExpressionValue(textView, "binding.participantFulls…enStreamqualLiveIndicator"); textView.setBackground(drawable); - int i2 = aVar.d ? 2131100121 : 2131100427; + int i2 = aVar.d ? 2131100121 : 2131100428; TextView textView2 = this.i.g; textView2.setText(obj); CharSequence text = textView2.getText(); @@ -970,8 +970,8 @@ public final class VideoCallParticipantView extends ConstraintLayout implements if (participantData.g == ParticipantData.Type.APPLICATION_STREAMING) { Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - setContentDescription(b.g(context, 2131889115, new Object[]{voiceUser.getDisplayName()}, null, 4)); - this.i.o.setCompoundDrawablesWithIntrinsicBounds(2131231896, 0, 0, 0); + setContentDescription(b.g(context, 2131889125, new Object[]{voiceUser.getDisplayName()}, null, 4)); + this.i.o.setCompoundDrawablesWithIntrinsicBounds(2131231899, 0, 0, 0); } else { setContentDescription(voiceUser.getDisplayName()); this.i.o.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); diff --git a/app/src/main/java/com/discord/views/calls/VolumeSliderView.java b/app/src/main/java/com/discord/views/calls/VolumeSliderView.java index 5cbb65530f..366e231a84 100644 --- a/app/src/main/java/com/discord/views/calls/VolumeSliderView.java +++ b/app/src/main/java/com/discord/views/calls/VolumeSliderView.java @@ -39,14 +39,14 @@ public final class VolumeSliderView extends LinearLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558834, this); - int i = 2131365562; - ImageView imageView = (ImageView) findViewById(2131365562); + int i = 2131365568; + ImageView imageView = (ImageView) findViewById(2131365568); if (imageView != null) { - i = 2131365563; - ImageView imageView2 = (ImageView) findViewById(2131365563); + i = 2131365569; + ImageView imageView2 = (ImageView) findViewById(2131365569); if (imageView2 != null) { - i = 2131365564; - SeekBar seekBar = (SeekBar) findViewById(2131365564); + i = 2131365570; + SeekBar seekBar = (SeekBar) findViewById(2131365570); if (seekBar != null) { w3 w3Var = new w3(this, imageView, imageView2, seekBar); m.checkNotNullExpressionValue(w3Var, "VolumeSliderViewBinding.…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java b/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java index f73625aff2..3d29d86ff2 100644 --- a/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java +++ b/app/src/main/java/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.java @@ -66,6 +66,6 @@ public final class GuildChannelSideBarActionsView extends LinearLayout { MaterialButton materialButton3 = this.i.b; DrawableCompat.setCompoundDrawablesCompat(materialButton3, (Drawable) null, ContextCompat.getDrawable(materialButton3.getContext(), themedDrawableRes$default2), (Drawable) null, (Drawable) null); materialButton3.setOnClickListener(new b(function12)); - materialButton3.setContentDescription(z3 ? materialButton3.getContext().getString(2131891505) : materialButton3.getContext().getString(2131891504)); + materialButton3.setContentDescription(z3 ? materialButton3.getContext().getString(2131891538) : materialButton3.getContext().getString(2131891537)); } } diff --git a/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java b/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java index 765830b8fc..e438af874a 100644 --- a/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java +++ b/app/src/main/java/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.java @@ -20,17 +20,17 @@ public final class PrivateChannelSideBarActionsView extends LinearLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558644, this); - int i = 2131364343; - MaterialButton materialButton = (MaterialButton) findViewById(2131364343); + int i = 2131364346; + MaterialButton materialButton = (MaterialButton) findViewById(2131364346); if (materialButton != null) { - i = 2131364344; - MaterialButton materialButton2 = (MaterialButton) findViewById(2131364344); + i = 2131364347; + MaterialButton materialButton2 = (MaterialButton) findViewById(2131364347); if (materialButton2 != null) { - i = 2131364345; - MaterialButton materialButton3 = (MaterialButton) findViewById(2131364345); + i = 2131364348; + MaterialButton materialButton3 = (MaterialButton) findViewById(2131364348); if (materialButton3 != null) { - i = 2131364346; - MaterialButton materialButton4 = (MaterialButton) findViewById(2131364346); + i = 2131364349; + MaterialButton materialButton4 = (MaterialButton) findViewById(2131364349); if (materialButton4 != null) { a1 a1Var = new a1(this, materialButton, materialButton2, materialButton3, materialButton4); m.checkNotNullExpressionValue(a1Var, "PrivateChannelSideBarAct…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java index 3fa545e4bf..db315ef417 100644 --- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java +++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardBodyView.java @@ -24,32 +24,32 @@ public final class DiscoveryStageCardBodyView extends ConstraintLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558742, this); - int i = 2131364996; - LinearLayout linearLayout = (LinearLayout) findViewById(2131364996); + int i = 2131365000; + LinearLayout linearLayout = (LinearLayout) findViewById(2131365000); if (linearLayout != null) { - i = 2131364997; - TextView textView = (TextView) findViewById(2131364997); + i = 2131365001; + TextView textView = (TextView) findViewById(2131365001); if (textView != null) { - i = 2131364998; - Barrier barrier = (Barrier) findViewById(2131364998); + i = 2131365002; + Barrier barrier = (Barrier) findViewById(2131365002); if (barrier != null) { - i = 2131364999; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364999); + i = 2131365003; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365003); if (simpleDraweeView != null) { - i = 2131365000; - TextView textView2 = (TextView) findViewById(2131365000); + i = 2131365004; + TextView textView2 = (TextView) findViewById(2131365004); if (textView2 != null) { - i = 2131365001; - FrameLayout frameLayout = (FrameLayout) findViewById(2131365001); + i = 2131365005; + FrameLayout frameLayout = (FrameLayout) findViewById(2131365005); if (frameLayout != null) { - i = 2131365002; - TextView textView3 = (TextView) findViewById(2131365002); + i = 2131365006; + TextView textView3 = (TextView) findViewById(2131365006); if (textView3 != null) { - i = 2131365003; - DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) findViewById(2131365003); + i = 2131365007; + DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) findViewById(2131365007); if (discoveryStageCardSpeakersView != null) { - i = 2131365004; - TextView textView4 = (TextView) findViewById(2131365004); + i = 2131365008; + TextView textView4 = (TextView) findViewById(2131365008); if (textView4 != null) { u1 u1Var = new u1(this, linearLayout, textView, barrier, simpleDraweeView, textView2, frameLayout, textView3, discoveryStageCardSpeakersView, textView4); m.checkNotNullExpressionValue(u1Var, "ViewDiscoveryStageCardBo…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java index e8790c283b..a575abcd00 100644 --- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java +++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardControlsView.java @@ -18,17 +18,17 @@ public final class DiscoveryStageCardControlsView extends ConstraintLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558743, this); - int i = 2131362909; - ImageView imageView = (ImageView) findViewById(2131362909); + int i = 2131362911; + ImageView imageView = (ImageView) findViewById(2131362911); if (imageView != null) { - i = 2131362910; - MaterialButton materialButton = (MaterialButton) findViewById(2131362910); + i = 2131362912; + MaterialButton materialButton = (MaterialButton) findViewById(2131362912); if (materialButton != null) { - i = 2131362911; - TextView textView = (TextView) findViewById(2131362911); + i = 2131362913; + TextView textView = (TextView) findViewById(2131362913); if (textView != null) { - i = 2131362912; - MaterialButton materialButton2 = (MaterialButton) findViewById(2131362912); + i = 2131362914; + MaterialButton materialButton2 = (MaterialButton) findViewById(2131362914); if (materialButton2 != null) { v1 v1Var = new v1(this, imageView, materialButton, textView, materialButton2); m.checkNotNullExpressionValue(v1Var, "ViewDiscoveryStageCardCo…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java index dbc698f624..bd65ff820a 100644 --- a/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java +++ b/app/src/main/java/com/discord/views/discovery/DiscoveryStageCardTopHatView.java @@ -17,11 +17,11 @@ public final class DiscoveryStageCardTopHatView extends LinearLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558745, this); - int i = 2131362929; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131362929); + int i = 2131362931; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131362931); if (simpleDraweeView != null) { - i = 2131362930; - TextView textView = (TextView) findViewById(2131362930); + i = 2131362932; + TextView textView = (TextView) findViewById(2131362932); if (textView != null) { x1 x1Var = new x1(this, simpleDraweeView, textView); m.checkNotNullExpressionValue(x1Var, "ViewDiscoveryStageCardTo…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java b/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java index 082260e69e..2b9de93185 100644 --- a/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java +++ b/app/src/main/java/com/discord/views/discovery/speakers/DiscoveryStageCardSpeakersView.java @@ -55,7 +55,7 @@ public final class DiscoveryStageCardSpeakersView extends LinearLayout { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558744, this); - SpeakersRecyclerView speakersRecyclerView = (SpeakersRecyclerView) findViewById(2131362921); + SpeakersRecyclerView speakersRecyclerView = (SpeakersRecyclerView) findViewById(2131362923); if (speakersRecyclerView != null) { w1 w1Var = new w1(this, speakersRecyclerView); m.checkNotNullExpressionValue(w1Var, "ViewDiscoveryStageCardSp…ater.from(context), this)"); @@ -74,7 +74,7 @@ public final class DiscoveryStageCardSpeakersView extends LinearLayout { recycler.setHasFixedSize(false); return; } - throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131362921))); + throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(2131362923))); } /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(r12v1 int), ('-' char), (r14v6 int)] */ diff --git a/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java b/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java index eb09efa6d9..a484b0de82 100644 --- a/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java +++ b/app/src/main/java/com/discord/views/experiments/ExperimentOverrideView.java @@ -123,23 +123,23 @@ public final class ExperimentOverrideView extends ConstraintLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558746, this); - int i = 2131363117; - TextView textView = (TextView) findViewById(2131363117); + int i = 2131363119; + TextView textView = (TextView) findViewById(2131363119); if (textView != null) { - i = 2131363118; - Spinner spinner = (Spinner) findViewById(2131363118); + i = 2131363120; + Spinner spinner = (Spinner) findViewById(2131363120); if (spinner != null) { - i = 2131363119; - MaterialCardView materialCardView = (MaterialCardView) findViewById(2131363119); + i = 2131363121; + MaterialCardView materialCardView = (MaterialCardView) findViewById(2131363121); if (materialCardView != null) { - i = 2131363120; - TextView textView2 = (TextView) findViewById(2131363120); + i = 2131363122; + TextView textView2 = (TextView) findViewById(2131363122); if (textView2 != null) { - i = 2131363121; - TextView textView3 = (TextView) findViewById(2131363121); + i = 2131363123; + TextView textView3 = (TextView) findViewById(2131363123); if (textView3 != null) { - i = 2131363122; - TextView textView4 = (TextView) findViewById(2131363122); + i = 2131363124; + TextView textView4 = (TextView) findViewById(2131363124); if (textView4 != null) { y1 y1Var = new y1(this, textView, spinner, materialCardView, textView2, textView3, textView4); m.checkNotNullExpressionValue(y1Var, "ViewExperimentOverrideBi…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java b/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java index ce43616b12..a5674b6415 100644 --- a/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java +++ b/app/src/main/java/com/discord/views/permissions/ChannelPermissionOwnerView.java @@ -37,11 +37,11 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout { i = 2131362846; TextView textView = (TextView) findViewById(2131362846); if (textView != null) { - i = 2131363537; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363537); + i = 2131363539; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363539); if (simpleDraweeView != null) { - i = 2131363990; - TextView textView2 = (TextView) findViewById(2131363990); + i = 2131363992; + TextView textView2 = (TextView) findViewById(2131363992); if (textView2 != null) { g gVar = new g(this, imageView, textView, simpleDraweeView, textView2); m.checkNotNullExpressionValue(gVar, "ChannelPermissionOwnerVi…ater.from(context), this)"); @@ -59,7 +59,7 @@ public final class ChannelPermissionOwnerView extends ConstraintLayout { int i = 8; if (permissionOwner instanceof PermissionOwner.Role) { GuildRole role = ((PermissionOwner.Role) permissionOwner).getRole(); - Drawable drawable = ContextCompat.getDrawable(getContext(), 2131231823); + Drawable drawable = ContextCompat.getDrawable(getContext(), 2131231826); m.checkNotNull(drawable); m.checkNotNullExpressionValue(drawable, "ContextCompat.getDrawabl….ic_person_shield_24dp)!!"); Context context = getContext(); diff --git a/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java b/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java index 05c725f974..0a4d658ef9 100644 --- a/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java +++ b/app/src/main/java/com/discord/views/phone/PhoneOrEmailInputView.java @@ -142,14 +142,14 @@ public final class PhoneOrEmailInputView extends LinearLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558775, this); - int i2 = 2131364212; - TextInputLayout textInputLayout = (TextInputLayout) findViewById(2131364212); + int i2 = 2131364214; + TextInputLayout textInputLayout = (TextInputLayout) findViewById(2131364214); if (textInputLayout != null) { - i2 = 2131364213; - TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364213); + i2 = 2131364215; + TextInputEditText textInputEditText = (TextInputEditText) findViewById(2131364215); if (textInputEditText != null) { - i2 = 2131364214; - TextInputLayout textInputLayout2 = (TextInputLayout) findViewById(2131364214); + i2 = 2131364216; + TextInputLayout textInputLayout2 = (TextInputLayout) findViewById(2131364216); if (textInputLayout2 != null) { i2 i2Var = new i2(this, textInputLayout, textInputEditText, textInputLayout2); m.checkNotNullExpressionValue(i2Var, "ViewPhoneOrEmailInputBin…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/premium/AccountCreditView.java b/app/src/main/java/com/discord/views/premium/AccountCreditView.java index a8ed0bbc3f..1cb5bee2e2 100644 --- a/app/src/main/java/com/discord/views/premium/AccountCreditView.java +++ b/app/src/main/java/com/discord/views/premium/AccountCreditView.java @@ -60,24 +60,24 @@ public final class AccountCreditView extends ConstraintLayout { setVisibility(i > 0 ? 0 : 8); if (i > 0) { if (j == SubscriptionPlanType.PREMIUM_MONTH_TIER_1.getPlanId()) { - obj = b.i(this, 2131892261, new Object[0], null, 4); + obj = b.i(this, 2131892299, new Object[0], null, 4); this.i.f129c.setImageResource(2131231144); TextView textView = this.i.b; m.checkNotNullExpressionValue(textView, "binding.creditHeader"); - b.n(textView, 2131892219, new Object[]{obj}, null, 4); + b.n(textView, 2131892257, new Object[]{obj}, null, 4); } else if (j == SubscriptionPlanType.PREMIUM_MONTH_TIER_2.getPlanId()) { - obj = b.i(this, 2131892263, new Object[0], null, 4); + obj = b.i(this, 2131892301, new Object[0], null, 4); this.i.f129c.setImageResource(2131231143); TextView textView2 = this.i.b; m.checkNotNullExpressionValue(textView2, "binding.creditHeader"); - b.n(textView2, 2131892219, new Object[]{obj}, null, 4); + b.n(textView2, 2131892257, new Object[]{obj}, null, 4); } else { obj = ""; } if ((modelSubscription != null && modelSubscription.isGoogleSubscription()) || modelSubscription == null || j != modelSubscription.getPlanId()) { TextView textView3 = this.i.d; m.checkNotNullExpressionValue(textView3, "binding.creditInfo"); - b.n(textView3, 2131892221, new Object[]{obj}, null, 4); + b.n(textView3, 2131892259, new Object[]{obj}, null, 4); } else { TimeUtils timeUtils = TimeUtils.INSTANCE; String currentPeriodEnd = modelSubscription.getCurrentPeriodEnd(); @@ -86,7 +86,7 @@ public final class AccountCreditView extends ConstraintLayout { String renderUtcDate$default = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodEnd, context, (String) null, (DateFormat) null, 0, 28, (Object) null); TextView textView4 = this.i.d; m.checkNotNullExpressionValue(textView4, "binding.creditInfo"); - b.n(textView4, 2131892222, new Object[]{renderUtcDate$default}, null, 4); + b.n(textView4, 2131892260, new Object[]{renderUtcDate$default}, null, 4); } TextView textView5 = this.i.e; m.checkNotNullExpressionValue(textView5, "binding.creditTime"); @@ -94,7 +94,7 @@ public final class AccountCreditView extends ConstraintLayout { m.checkNotNullExpressionValue(resources, "resources"); Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); - textView5.setText(StringResourceUtilsKt.getQuantityString(resources, context2, 2131755287, i, Integer.valueOf(i))); + textView5.setText(StringResourceUtilsKt.getQuantityString(resources, context2, 2131755288, i, Integer.valueOf(i))); } } } diff --git a/app/src/main/java/com/discord/views/premium/GiftSelectView.java b/app/src/main/java/com/discord/views/premium/GiftSelectView.java index 89bbd1ded9..0ff9fe0a49 100644 --- a/app/src/main/java/com/discord/views/premium/GiftSelectView.java +++ b/app/src/main/java/com/discord/views/premium/GiftSelectView.java @@ -21,7 +21,7 @@ public final class GiftSelectView extends FrameLayout { public GiftSelectView(Context context, AttributeSet attributeSet) { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); - View inflate = LayoutInflater.from(context).inflate(2131558973, (ViewGroup) this, false); + View inflate = LayoutInflater.from(context).inflate(2131558974, (ViewGroup) this, false); addView(inflate); WidgetChoosePlanAdapterPlanItemBinding a = WidgetChoosePlanAdapterPlanItemBinding.a(inflate); m.checkNotNullExpressionValue(a, "WidgetChoosePlanAdapterP…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java index 82c10645ca..b74b3c166e 100644 --- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java +++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildConfirmationView.java @@ -27,20 +27,20 @@ public final class PremiumGuildConfirmationView extends CardView { super(context, attributeSet); m.checkNotNullParameter(context, "context"); LayoutInflater.from(getContext()).inflate(2131558777, this); - int i = 2131364246; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364246); + int i = 2131364248; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131364248); if (simpleDraweeView != null) { - i = 2131364247; - TextView textView = (TextView) findViewById(2131364247); + i = 2131364249; + TextView textView = (TextView) findViewById(2131364249); if (textView != null) { - i = 2131364248; - Chip chip = (Chip) findViewById(2131364248); + i = 2131364250; + Chip chip = (Chip) findViewById(2131364250); if (chip != null) { - i = 2131364249; - Chip chip2 = (Chip) findViewById(2131364249); + i = 2131364251; + Chip chip2 = (Chip) findViewById(2131364251); if (chip2 != null) { - i = 2131364250; - ImageView imageView = (ImageView) findViewById(2131364250); + i = 2131364252; + ImageView imageView = (ImageView) findViewById(2131364252); if (imageView != null) { k2 k2Var = new k2(this, simpleDraweeView, textView, chip, chip2, imageView); m.checkNotNullExpressionValue(k2Var, "ViewPremiumGuildConfirma…ater.from(context), this)"); @@ -100,7 +100,7 @@ public final class PremiumGuildConfirmationView extends CardView { public final int c(int i) { if (i == 0) { - return 2131231670; + return 2131231673; } if (i == 1) { Context context = getContext(); @@ -120,7 +120,7 @@ public final class PremiumGuildConfirmationView extends CardView { } public final String d(int i) { - String string = i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892118) : getContext().getString(2131892117) : getContext().getString(2131892116) : getContext().getString(2131891971); + String string = i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892156) : getContext().getString(2131892155) : getContext().getString(2131892154) : getContext().getString(2131892009); m.checkNotNullExpressionValue(string, "when (premiumTier) {\n … else -> \"\"\n }"); return string; } diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java index fc219dbd27..c9e66a9e39 100644 --- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java +++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildProgressView.java @@ -23,14 +23,14 @@ public final class PremiumGuildProgressView extends FrameLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(getContext()).inflate(2131558780, (ViewGroup) this, false); addView(inflate); - int i = 2131364356; - ImageView imageView = (ImageView) inflate.findViewById(2131364356); + int i = 2131364359; + ImageView imageView = (ImageView) inflate.findViewById(2131364359); if (imageView != null) { - i = 2131364358; - TextView textView = (TextView) inflate.findViewById(2131364358); + i = 2131364361; + TextView textView = (TextView) inflate.findViewById(2131364361); if (textView != null) { - i = 2131364359; - ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364359); + i = 2131364362; + ProgressBar progressBar = (ProgressBar) inflate.findViewById(2131364362); if (progressBar != null) { m2 m2Var = new m2((FrameLayout) inflate, imageView, textView, progressBar); m.checkNotNullExpressionValue(m2Var, "ViewPremiumGuildProgress…rom(context), this, true)"); @@ -59,7 +59,7 @@ public final class PremiumGuildProgressView extends FrameLayout { imageView.setImageResource(i3); TextView textView = this.i.f127c; m.checkNotNullExpressionValue(textView, "binding.progressLevelText"); - textView.setText(i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892118) : getContext().getString(2131892117) : getContext().getString(2131892116) : getContext().getString(2131891971)); + textView.setText(i != 0 ? i != 1 ? i != 2 ? i != 3 ? "" : getContext().getString(2131892156) : getContext().getString(2131892155) : getContext().getString(2131892154) : getContext().getString(2131892009)); ProgressBar progressBar = this.i.d; m.checkNotNullExpressionValue(progressBar, "binding.progressProgress"); progressBar.setProgress(PremiumGuildSubscriptionUtils.INSTANCE.calculatePercentToNextTier(i, i2)); diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java index 90a16add35..bbbf8fd7e1 100644 --- a/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java +++ b/app/src/main/java/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.java @@ -52,14 +52,14 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558786, (ViewGroup) this, false); addView(inflate); - int i = 2131365501; - TextView textView = (TextView) inflate.findViewById(2131365501); + int i = 2131365507; + TextView textView = (TextView) inflate.findViewById(2131365507); if (textView != null) { - i = 2131365502; - TextView textView2 = (TextView) inflate.findViewById(2131365502); + i = 2131365508; + TextView textView2 = (TextView) inflate.findViewById(2131365508); if (textView2 != null) { - i = 2131365503; - TextView textView3 = (TextView) inflate.findViewById(2131365503); + i = 2131365509; + TextView textView3 = (TextView) inflate.findViewById(2131365509); if (textView3 != null) { r2 r2Var = new r2((LinearLayout) inflate, textView, textView2, textView3); m.checkNotNullExpressionValue(r2Var, "ViewPremiumUpsellInfoBin…rom(context), this, true)"); @@ -80,33 +80,33 @@ public final class PremiumGuildSubscriptionUpsellView extends FrameLayout { int price = subscriptionPlanType.getPrice(); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - CharSequence i = b.i(this, 2131886947, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(price, context)}, null, 4); + CharSequence i = b.i(this, 2131886948, new Object[]{PremiumUtilsKt.getFormattedPriceUsd(price, context)}, null, 4); Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); - CharSequence i2 = b.i(this, 2131886947, new Object[]{PremiumUtilsKt.getFormattedPriceUsd((int) (((float) subscriptionPlanType.getPrice()) * 0.7f), context2)}, null, 4); - CharSequence i3 = b.i(this, 2131889821, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4); + CharSequence i2 = b.i(this, 2131886948, new Object[]{PremiumUtilsKt.getFormattedPriceUsd((int) (((float) subscriptionPlanType.getPrice()) * 0.7f), context2)}, null, 4); + CharSequence i3 = b.i(this, 2131889832, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4); Context context3 = getContext(); m.checkNotNullExpressionValue(context3, "context"); - CharSequence a2 = b.a(context3, 2131889830, new Object[]{i2, i}, new a(this)); + CharSequence a2 = b.a(context3, 2131889841, new Object[]{i2, i}, new a(this)); int ordinal = premiumTier.ordinal(); if (ordinal == 1) { TextView textView2 = this.i.b; m.checkNotNullExpressionValue(textView2, "binding.viewPremiumUpsellInfoSubheading"); - b.n(textView2, 2131889829, new Object[]{i}, null, 4); + b.n(textView2, 2131889840, new Object[]{i}, null, 4); TextView textView3 = this.i.d; m.checkNotNullExpressionValue(textView3, "binding.viewPremiumUpsellInfoSubheadingPrice"); ViewExtensions.setTextAndVisibilityBy(textView3, null); } else if (ordinal == 2) { TextView textView4 = this.i.b; m.checkNotNullExpressionValue(textView4, "binding.viewPremiumUpsellInfoSubheading"); - b.n(textView4, 2131889834, new Object[]{i3}, null, 4); + b.n(textView4, 2131889845, new Object[]{i3}, null, 4); TextView textView5 = this.i.d; m.checkNotNullExpressionValue(textView5, "binding.viewPremiumUpsellInfoSubheadingPrice"); ViewExtensions.setTextAndVisibilityBy(textView5, a2); } else if (ordinal == 3) { TextView textView6 = this.i.b; m.checkNotNullExpressionValue(textView6, "binding.viewPremiumUpsellInfoSubheading"); - b.n(textView6, 2131889836, new Object[]{String.valueOf(2), i3}, null, 4); + b.n(textView6, 2131889847, new Object[]{String.valueOf(2), i3}, null, 4); TextView textView7 = this.i.d; m.checkNotNullExpressionValue(textView7, "binding.viewPremiumUpsellInfoSubheadingPrice"); ViewExtensions.setTextAndVisibilityBy(textView7, a2); diff --git a/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java b/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java index 128d50c432..1e4e1bdd43 100644 --- a/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java +++ b/app/src/main/java/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.java @@ -44,30 +44,30 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558782, (ViewGroup) this, false); addView(inflate); - int i = 2131365492; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365492); + int i = 2131365498; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365498); if (linearLayout != null) { - i = 2131365493; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365493); + i = 2131365499; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365499); if (materialButton != null) { LinearLayout linearLayout2 = (LinearLayout) inflate; - i = 2131365495; - TextView textView = (TextView) inflate.findViewById(2131365495); + i = 2131365501; + TextView textView = (TextView) inflate.findViewById(2131365501); if (textView != null) { - i = 2131365496; - TextView textView2 = (TextView) inflate.findViewById(2131365496); + i = 2131365502; + TextView textView2 = (TextView) inflate.findViewById(2131365502); if (textView2 != null) { - i = 2131365497; - TextView textView3 = (TextView) inflate.findViewById(2131365497); + i = 2131365503; + TextView textView3 = (TextView) inflate.findViewById(2131365503); if (textView3 != null) { - i = 2131365498; - TextView textView4 = (TextView) inflate.findViewById(2131365498); + i = 2131365504; + TextView textView4 = (TextView) inflate.findViewById(2131365504); if (textView4 != null) { - i = 2131365499; - TextView textView5 = (TextView) inflate.findViewById(2131365499); + i = 2131365505; + TextView textView5 = (TextView) inflate.findViewById(2131365505); if (textView5 != null) { - i = 2131365500; - TextView textView6 = (TextView) inflate.findViewById(2131365500); + i = 2131365506; + TextView textView6 = (TextView) inflate.findViewById(2131365506); if (textView6 != null) { n2 n2Var = new n2(linearLayout2, linearLayout, materialButton, linearLayout2, textView, textView2, textView3, textView4, textView5, textView6); m.checkNotNullExpressionValue(n2Var, "ViewPremiumMarketingBind…rom(context), this, true)"); @@ -90,21 +90,21 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout { m.checkNotNullParameter(function0, "onlearnMoreClickCallback"); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755165, 2, 2); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755166, 2, 2); TextView textView = this.i.h; m.checkNotNullExpressionValue(textView, "binding.viewPremiumMarketingNitroBoostDiscount"); NumberFormat percentInstance = NumberFormat.getPercentInstance(); Float valueOf = Float.valueOf(0.3f); - b.n(textView, 2131889821, new Object[]{percentInstance.format(valueOf)}, null, 4); + b.n(textView, 2131889832, new Object[]{percentInstance.format(valueOf)}, null, 4); TextView textView2 = this.i.g; m.checkNotNullExpressionValue(textView2, "binding.viewPremiumMarketingNitroBoostCount"); - b.n(textView2, 2131889823, new Object[]{i18nPluralString}, null, 4); + b.n(textView2, 2131889834, new Object[]{i18nPluralString}, null, 4); TextView textView3 = this.i.j; m.checkNotNullExpressionValue(textView3, "binding.viewPremiumMarke…NitroClassicBoostDiscount"); - b.n(textView3, 2131889821, new Object[]{NumberFormat.getPercentInstance().format(valueOf)}, null, 4); + b.n(textView3, 2131889832, new Object[]{NumberFormat.getPercentInstance().format(valueOf)}, null, 4); TextView textView4 = this.i.i; m.checkNotNullExpressionValue(textView4, "binding.viewPremiumMarketingNitroClassicBoostCount"); - b.n(textView4, 2131889822, new Object[]{i18nPluralString}, null, 4); + b.n(textView4, 2131889833, new Object[]{i18nPluralString}, null, 4); this.i.f130c.setOnClickListener(new a(function0)); int ordinal = premiumTier.ordinal(); if (ordinal == 0) { @@ -118,7 +118,7 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout { linearLayout2.setVisibility(0); TextView textView5 = this.i.f; m.checkNotNullExpressionValue(textView5, "binding.viewPremiumMarketingMarketingTitle"); - ViewExtensions.setTextAndVisibilityBy(textView5, b.i(this, 2131889825, new Object[0], null, 4)); + ViewExtensions.setTextAndVisibilityBy(textView5, b.i(this, 2131889836, new Object[0], null, 4)); TextView textView6 = this.i.e; m.checkNotNullExpressionValue(textView6, "binding.viewPremiumMarketingMarketingSubtitle"); textView6.setVisibility(8); @@ -132,10 +132,10 @@ public final class PremiumSubscriptionMarketingView extends FrameLayout { linearLayout4.setVisibility(8); TextView textView7 = this.i.f; m.checkNotNullExpressionValue(textView7, "binding.viewPremiumMarketingMarketingTitle"); - ViewExtensions.setTextAndVisibilityBy(textView7, b.i(this, 2131889826, new Object[0], null, 4)); + ViewExtensions.setTextAndVisibilityBy(textView7, b.i(this, 2131889837, new Object[0], null, 4)); TextView textView8 = this.i.e; m.checkNotNullExpressionValue(textView8, "binding.viewPremiumMarketingMarketingSubtitle"); - ViewExtensions.setTextAndVisibilityBy(textView8, b.i(this, 2131889827, new Object[]{String.valueOf(2)}, null, 4)); + ViewExtensions.setTextAndVisibilityBy(textView8, b.i(this, 2131889838, new Object[]{String.valueOf(2)}, null, 4)); unit = Unit.a; } else if (ordinal == 3) { LinearLayout linearLayout5 = this.i.d; diff --git a/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java b/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java index 3add44f955..2d40b80801 100644 --- a/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java +++ b/app/src/main/java/com/discord/views/segmentedcontrol/CardSegment.java @@ -51,7 +51,7 @@ public final class CardSegment extends CardView implements a { @Override // c.a.z.n0.a public void a(boolean z2) { int themedColor = z2 ? ColorCompat.getThemedColor(this, 2130968892) : ColorCompat.getColor(this, 2131100379); - int color = z2 ? ColorCompat.getColor(this, 2131100427) : ColorCompat.getThemedColor(this, 2130968948); + int color = z2 ? ColorCompat.getColor(this, 2131100428) : ColorCompat.getThemedColor(this, 2130968948); setCardBackgroundColor(themedColor); this.i.f88c.setTextColor(color); } diff --git a/app/src/main/java/com/discord/views/steps/StepsView.java b/app/src/main/java/com/discord/views/steps/StepsView.java index 884125cc9c..1140406da3 100644 --- a/app/src/main/java/com/discord/views/steps/StepsView.java +++ b/app/src/main/java/com/discord/views/steps/StepsView.java @@ -112,9 +112,9 @@ public final class StepsView extends RelativeLayout { /* JADX WARNING: Illegal instructions before constructor call */ public a(Class cls, int i, int i2, int i3, Function1 function1, Function1 function12, Function1 function13, boolean z2, boolean z3, boolean z4, int i4) { super(r13, r14, r15, null, null, r8, r7, r6, r5, null); - int i5 = (i4 & 2) != 0 ? 2131891329 : i; + int i5 = (i4 & 2) != 0 ? 2131891362 : i; int i6 = (i4 & 4) != 0 ? 2131886808 : i2; - int i7 = (i4 & 8) != 0 ? 2131888166 : i3; + int i7 = (i4 & 8) != 0 ? 2131888176 : i3; int i8 = i4 & 16; int i9 = i4 & 32; Function1 function14 = (i4 & 64) != 0 ? null : function13; @@ -363,23 +363,23 @@ public final class StepsView extends RelativeLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558816, (ViewGroup) this, false); addView(inflate); - int i2 = 2131365060; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365060); + int i2 = 2131365064; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365064); if (linearLayout != null) { - i2 = 2131365061; - TextView textView = (TextView) inflate.findViewById(2131365061); + i2 = 2131365065; + TextView textView = (TextView) inflate.findViewById(2131365065); if (textView != null) { - i2 = 2131365062; - ImageView imageView = (ImageView) inflate.findViewById(2131365062); + i2 = 2131365066; + ImageView imageView = (ImageView) inflate.findViewById(2131365066); if (imageView != null) { - i2 = 2131365063; - LoadingButton loadingButton = (LoadingButton) inflate.findViewById(2131365063); + i2 = 2131365067; + LoadingButton loadingButton = (LoadingButton) inflate.findViewById(2131365067); if (loadingButton != null) { - i2 = 2131365064; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365064); + i2 = 2131365068; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365068); if (materialButton != null) { - i2 = 2131365065; - ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(2131365065); + i2 = 2131365069; + ViewPager2 viewPager2 = (ViewPager2) inflate.findViewById(2131365069); if (viewPager2 != null) { k3 k3Var = new k3((RelativeLayout) inflate, linearLayout, textView, imageView, loadingButton, materialButton, viewPager2); m.checkNotNullExpressionValue(k3Var, "ViewStepsBinding.inflate…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/views/sticker/StickerView.java b/app/src/main/java/com/discord/views/sticker/StickerView.java index a48670ae53..9809cda7e3 100644 --- a/app/src/main/java/com/discord/views/sticker/StickerView.java +++ b/app/src/main/java/com/discord/views/sticker/StickerView.java @@ -37,41 +37,46 @@ import rx.Observable; import rx.Subscription; /* compiled from: StickerView.kt */ public final class StickerView extends FrameLayout { - public static final /* synthetic */ int i = 0; - public final h1 j; - public BaseSticker k; - public Subscription l; - public Job m; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StickerView(Context context) { - super(context); - m.checkNotNullParameter(context, "context"); - h1 a = h1.a(LayoutInflater.from(getContext()), this); - m.checkNotNullExpressionValue(a, "StickerViewBinding.infla…ater.from(context), this)"); - this.j = a; - } + public final h1 i; + public BaseSticker j; + public Subscription k; + public Job l; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public StickerView(Context context, AttributeSet attributeSet) { super(context, attributeSet); m.checkNotNullParameter(context, "context"); - h1 a = h1.a(LayoutInflater.from(getContext()), this); - m.checkNotNullExpressionValue(a, "StickerViewBinding.infla…ater.from(context), this)"); - this.j = a; + LayoutInflater.from(getContext()).inflate(2131558673, this); + int i = 2131365110; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365110); + if (simpleDraweeView != null) { + i = 2131365111; + RLottieImageView rLottieImageView = (RLottieImageView) findViewById(2131365111); + if (rLottieImageView != null) { + i = 2131365112; + ImageView imageView = (ImageView) findViewById(2131365112); + if (imageView != null) { + h1 h1Var = new h1(this, simpleDraweeView, rLottieImageView, imageView); + m.checkNotNullExpressionValue(h1Var, "StickerViewBinding.infla…ater.from(context), this)"); + this.i = h1Var; + return; + } + } + } + throw new NullPointerException("Missing required view with ID: ".concat(getResources().getResourceName(i))); } public static final Job a(StickerView stickerView, File file, boolean z2) { Objects.requireNonNull(stickerView); ApngUtils apngUtils = ApngUtils.INSTANCE; - SimpleDraweeView simpleDraweeView = stickerView.j.b; + SimpleDraweeView simpleDraweeView = stickerView.i.b; m.checkNotNullExpressionValue(simpleDraweeView, "binding.stickerViewImageview"); StickerUtils stickerUtils = StickerUtils.INSTANCE; return apngUtils.renderApngFromFile(file, simpleDraweeView, Integer.valueOf(stickerUtils.getDEFAULT_STICKER_SIZE_PX()), Integer.valueOf(stickerUtils.getDEFAULT_STICKER_SIZE_PX()), z2); } - public static /* synthetic */ void d(StickerView stickerView, BaseSticker baseSticker, Integer num, int i2) { - int i3 = i2 & 2; + public static /* synthetic */ void d(StickerView stickerView, BaseSticker baseSticker, Integer num, int i) { + int i2 = i & 2; stickerView.c(baseSticker, null); } @@ -81,85 +86,86 @@ public final class StickerView extends FrameLayout { m.checkNotNullExpressionValue(context, "context"); StringBuilder sb = new StringBuilder(); Sticker sticker = (Sticker) baseSticker; - sb.append(sticker.f()); + sb.append(sticker.g()); sb.append(", "); - sb.append(sticker.d()); - return b.g(context, 2131893477, new Object[]{sb.toString()}, null, 4); + sb.append(sticker.e()); + return b.g(context, 2131893517, new Object[]{sb.toString()}, null, 4); } else if (!(baseSticker instanceof StickerPartial)) { return null; } else { Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); - return b.g(context2, 2131893477, new Object[]{((StickerPartial) baseSticker).d()}, null, 4); + return b.g(context2, 2131893517, new Object[]{((StickerPartial) baseSticker).d()}, null, 4); } } public final void c(BaseSticker baseSticker, Integer num) { m.checkNotNullParameter(baseSticker, "sticker"); - BaseSticker baseSticker2 = this.k; + BaseSticker baseSticker2 = this.j; if (baseSticker2 != null && baseSticker2.c() == baseSticker.c()) { - if (this.l != null) { + if (this.k != null) { return; } } - BaseSticker baseSticker3 = this.k; + BaseSticker baseSticker3 = this.j; if (baseSticker3 != null && (baseSticker3 == null || baseSticker3.c() != baseSticker.c())) { - Subscription subscription = this.l; + Subscription subscription = this.k; if (subscription != null) { subscription.unsubscribe(); } - this.l = null; + this.k = null; } - this.k = baseSticker; + this.j = baseSticker; int ordinal = baseSticker.a().ordinal(); if (ordinal == 1) { - SimpleDraweeView simpleDraweeView = this.j.b; + SimpleDraweeView simpleDraweeView = this.i.b; m.checkNotNullExpressionValue(simpleDraweeView, "binding.stickerViewImageview"); simpleDraweeView.setVisibility(0); - ImageView imageView = this.j.d; + ImageView imageView = this.i.d; m.checkNotNullExpressionValue(imageView, "binding.stickerViewPlaceholder"); imageView.setVisibility(8); - RLottieImageView rLottieImageView = this.j.f99c; + RLottieImageView rLottieImageView = this.i.f99c; m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie"); rLottieImageView.setVisibility(8); - SimpleDraweeView simpleDraweeView2 = this.j.b; + SimpleDraweeView simpleDraweeView2 = this.i.b; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.stickerViewImageview"); simpleDraweeView2.setContentDescription(b(baseSticker)); - SimpleDraweeView simpleDraweeView3 = this.j.b; + SimpleDraweeView simpleDraweeView3 = this.i.b; m.checkNotNullExpressionValue(simpleDraweeView3, "binding.stickerViewImageview"); MGImages.setImage$default(simpleDraweeView3, StickerUtils.getCDNAssetUrl$default(StickerUtils.INSTANCE, baseSticker, null, false, 6, null), 0, 0, false, null, null, 124, null); } else if (ordinal == 2) { - SimpleDraweeView simpleDraweeView4 = this.j.b; + SimpleDraweeView simpleDraweeView4 = this.i.b; m.checkNotNullExpressionValue(simpleDraweeView4, "binding.stickerViewImageview"); simpleDraweeView4.setVisibility(0); - ImageView imageView2 = this.j.d; + ImageView imageView2 = this.i.d; m.checkNotNullExpressionValue(imageView2, "binding.stickerViewPlaceholder"); imageView2.setVisibility(0); - RLottieImageView rLottieImageView2 = this.j.f99c; + RLottieImageView rLottieImageView2 = this.i.f99c; m.checkNotNullExpressionValue(rLottieImageView2, "binding.stickerViewLottie"); rLottieImageView2.setVisibility(8); - this.j.b.setImageDrawable(null); + this.i.b.setImageDrawable(null); + Sticker sticker = baseSticker instanceof Sticker ? (Sticker) baseSticker : null; StickerUtils stickerUtils = StickerUtils.INSTANCE; Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); Observable j = Observable.j(ObservableExtensionsKt.restSubscribeOn$default(stickerUtils.fetchSticker(context, baseSticker), false, 1, null), StoreUserSettings.observeStickerAnimationSettings$default(StoreStream.Companion.getUserSettings(), false, 1, null), a.i); m.checkNotNullExpressionValue(j, "Observable.combineLatest…lobalAnimationSettings) }"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(j), StickerView.class, (Context) null, new c.a.z.o0.b(this), (Function1) null, (Function0) null, (Function0) null, new d(this, num, baseSticker), 58, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(j), StickerView.class, (Context) null, new c.a.z.o0.b(this), (Function1) null, (Function0) null, (Function0) null, new d(this, num, baseSticker, sticker), 58, (Object) null); } else if (ordinal != 3) { AppLog appLog = AppLog.g; Logger.e$default(appLog, "Invalid Sticker Format passed to " + StickerView.class + ", type: " + baseSticker.a(), null, null, 6, null); } else { - SimpleDraweeView simpleDraweeView5 = this.j.b; + SimpleDraweeView simpleDraweeView5 = this.i.b; m.checkNotNullExpressionValue(simpleDraweeView5, "binding.stickerViewImageview"); simpleDraweeView5.setVisibility(8); - ImageView imageView3 = this.j.d; + ImageView imageView3 = this.i.d; m.checkNotNullExpressionValue(imageView3, "binding.stickerViewPlaceholder"); imageView3.setVisibility(0); - RLottieImageView rLottieImageView3 = this.j.f99c; + RLottieImageView rLottieImageView3 = this.i.f99c; m.checkNotNullExpressionValue(rLottieImageView3, "binding.stickerViewLottie"); rLottieImageView3.setVisibility(0); - this.j.f99c.setImageDrawable(null); - this.j.f99c.clearAnimation(); + this.i.f99c.setImageDrawable(null); + this.i.f99c.clearAnimation(); StickerUtils stickerUtils2 = StickerUtils.INSTANCE; Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); @@ -170,29 +176,29 @@ public final class StickerView extends FrameLayout { } public final Subscription getSubscription() { - return this.l; + return this.k; } @Override // android.view.View, android.view.ViewGroup public void onDetachedFromWindow() { super.onDetachedFromWindow(); - Subscription subscription = this.l; + Subscription subscription = this.k; if (subscription != null) { subscription.unsubscribe(); } - this.l = null; + this.k = null; } @Override // android.view.View public void setOnClickListener(View.OnClickListener onClickListener) { - BaseSticker baseSticker = this.k; + BaseSticker baseSticker = this.j; StickerFormatType a = baseSticker != null ? baseSticker.a() : null; if (a != null) { int ordinal = a.ordinal(); if (ordinal == 1 || ordinal == 2) { - this.j.b.setOnClickListener(onClickListener); + this.i.b.setOnClickListener(onClickListener); } else if (ordinal == 3) { - this.j.f99c.setOnClickListener(onClickListener); + this.i.f99c.setOnClickListener(onClickListener); } } } diff --git a/app/src/main/java/com/discord/views/typing/TypingDots.java b/app/src/main/java/com/discord/views/typing/TypingDots.java index 20eca5e0da..fbea7fddb6 100644 --- a/app/src/main/java/com/discord/views/typing/TypingDots.java +++ b/app/src/main/java/com/discord/views/typing/TypingDots.java @@ -21,14 +21,14 @@ public final class TypingDots extends ConstraintLayout { super(context, attributeSet, 0); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558698, this); - int i2 = 2131365507; - TypingDot typingDot = (TypingDot) findViewById(2131365507); + int i2 = 2131365513; + TypingDot typingDot = (TypingDot) findViewById(2131365513); if (typingDot != null) { - i2 = 2131365508; - TypingDot typingDot2 = (TypingDot) findViewById(2131365508); + i2 = 2131365514; + TypingDot typingDot2 = (TypingDot) findViewById(2131365514); if (typingDot2 != null) { - i2 = 2131365509; - TypingDot typingDot3 = (TypingDot) findViewById(2131365509); + i2 = 2131365515; + TypingDot typingDot3 = (TypingDot) findViewById(2131365515); if (typingDot3 != null) { j1 j1Var = new j1(this, typingDot, typingDot2, typingDot3); m.checkNotNullExpressionValue(j1Var, "TypingDotsViewBinding.in…ater.from(context), this)"); diff --git a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java index 1fd56326cf..43945ed371 100644 --- a/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java +++ b/app/src/main/java/com/discord/views/user/UserAvatarPresenceView.java @@ -178,12 +178,12 @@ public final class UserAvatarPresenceView extends RelativeLayout { i = 2131362076; ImageView imageView = (ImageView) inflate.findViewById(2131362076); if (imageView != null) { - i = 2131365058; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131365058); + i = 2131365062; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) inflate.findViewById(2131365062); if (simpleDraweeView2 != null) { RelativeLayout relativeLayout = (RelativeLayout) inflate; - i = 2131365363; - StatusView statusView = (StatusView) inflate.findViewById(2131365363); + i = 2131365368; + StatusView statusView = (StatusView) inflate.findViewById(2131365368); if (statusView != null) { l1 l1Var = new l1(relativeLayout, simpleDraweeView, frameLayout, imageView, simpleDraweeView2, relativeLayout, statusView); m.checkNotNullExpressionValue(l1Var, "UserAvatarPresenceViewBi…rom(context), this, true)"); diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java index 9b80a7b2d7..09effe64fd 100644 --- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$binding$2.java @@ -52,8 +52,8 @@ public final /* synthetic */ class WidgetChannelFollowSheet$binding$2 extends k i = 2131362788; MaterialButton materialButton = (MaterialButton) view.findViewById(2131362788); if (materialButton != null) { - i = 2131363221; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363221); + i = 2131363223; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363223); if (appViewFlipper != null) { return new WidgetChannelFollowSheetBinding((NestedScrollView) view, imageView, textView, textView2, imageView2, simpleDraweeView, materialCardView, materialCardView2, textView3, textView4, materialButton, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java index 9d55212cbe..a786251283 100644 --- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java +++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.java @@ -19,6 +19,6 @@ public final class WidgetChannelFollowSheet$configureChannelSelector$1 implement @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetChannelSelector.Companion.launch(this.this$0, this.$selectedGuild.getId(), "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", false, 2131891407, new WidgetChannelFollowSheet.ChannelFollowChannelFilterFunction(this.$selectedGuild.getId(), this.$viewState.getAvailableChannels())); + WidgetChannelSelector.Companion.launch(this.this$0, this.$selectedGuild.getId(), "REQUEST_KEY_CHANNEL_FOLLOW_CHANNEL", false, 2131891440, new WidgetChannelFollowSheet.ChannelFollowChannelFilterFunction(this.$selectedGuild.getId(), this.$viewState.getAvailableChannels())); } } diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java index 317a06c209..b0e92197b7 100644 --- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java +++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheet.java @@ -179,7 +179,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet { i = 2130968949; TextView textView2 = getBinding().g; m.checkNotNullExpressionValue(textView2, "binding.channelFollowSelectedChannelName"); - textView2.setText(getString(2131893090)); + textView2.setText(getString(2131893132)); MaterialButton materialButton2 = getBinding().i; m.checkNotNullExpressionValue(materialButton2, "binding.createChannelFollowerButton"); materialButton2.setEnabled(false); @@ -197,7 +197,7 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet { TextView textView = getBinding().h; m.checkNotNullExpressionValue(textView, "binding.channelFollowSelectedGuildName"); if (selectedGuild == null || (str = selectedGuild.getName()) == null) { - str = getString(2131893090); + str = getString(2131893132); } textView.setText(str); int i = selectedGuild != null ? 2130968946 : 2130968949; @@ -231,13 +231,13 @@ public final class WidgetChannelFollowSheet extends AppBottomSheet { configureChannelSelector(loaded); } if (loaded.getErrorTextRes() != null) { - getBinding().f1687c.setText(loaded.getErrorTextRes().intValue()); - TextView textView2 = getBinding().f1687c; + getBinding().f1689c.setText(loaded.getErrorTextRes().intValue()); + TextView textView2 = getBinding().f1689c; m.checkNotNullExpressionValue(textView2, "binding.channelFollowErrorText"); textView2.setVisibility(0); return; } - TextView textView3 = getBinding().f1687c; + TextView textView3 = getBinding().f1689c; m.checkNotNullExpressionValue(textView3, "binding.channelFollowErrorText"); textView3.setVisibility(8); } diff --git a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java index aca5ea21f1..60108ba363 100644 --- a/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.java @@ -312,7 +312,7 @@ public final class WidgetChannelFollowSheetViewModel extends AppViewModel= 200 || !z2) { Context context3 = getContext(); m.checkNotNullExpressionValue(context3, "context"); - return b.g(context3, 2131890351, new Object[0], null, 4); + return b.g(context3, 2131890381, new Object[0], null, 4); } else { Context context4 = getContext(); m.checkNotNullExpressionValue(context4, "context"); @@ -117,8 +117,8 @@ public final class AuthInviteInfoView extends RelativeLayout { imageView.setVisibility(0); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.authInviteInfoInvitedText"); - b.n(textView, 2131889999, new Object[0], null, 4); - TextView textView2 = this.binding.f1640c; + b.n(textView, 2131890011, new Object[0], null, 4); + TextView textView2 = this.binding.f1642c; m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName"); textView2.setText(modelGuildTemplate.getName()); } @@ -146,7 +146,7 @@ public final class AuthInviteInfoView extends RelativeLayout { TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.authInviteInfoInvitedText"); textView.setText(b.k(getIntroText(modelInvite), new Object[0], null, 2)); - TextView textView2 = this.binding.f1640c; + TextView textView2 = this.binding.f1642c; m.checkNotNullExpressionValue(textView2, "binding.authInviteInfoGuildName"); textView2.setText(guild.u()); } @@ -162,7 +162,7 @@ public final class AuthInviteInfoView extends RelativeLayout { TextView textView3 = this.binding.d; m.checkNotNullExpressionValue(textView3, "binding.authInviteInfoInvitedText"); textView3.setText(b.k(getIntroText(modelInvite), new Object[0], null, 2)); - TextView textView4 = this.binding.f1640c; + TextView textView4 = this.binding.f1642c; m.checkNotNullExpressionValue(textView4, "binding.authInviteInfoGuildName"); Channel channel2 = modelInvite.getChannel(); m.checkNotNullExpressionValue(channel2, "invite.channel"); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java index 6ef2daee14..c197710735 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify$binding$2.java @@ -45,7 +45,7 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement TextView textView = (TextView) findViewById.findViewById(2131361933); if (textView != null) { z zVar = new z((ConstraintLayout) findViewById, materialButton, loadingButton, linkifiedTextView, textView); - View findViewById2 = view.findViewById(2131365328); + View findViewById2 = view.findViewById(2131365333); if (findViewById2 != null) { int i3 = 2131361937; MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131361937); @@ -56,11 +56,11 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement i3 = 2131361940; TextView textView2 = (TextView) findViewById2.findViewById(2131361940); if (textView2 != null) { - i3 = 2131365329; - TextView textView3 = (TextView) findViewById2.findViewById(2131365329); + i3 = 2131365334; + TextView textView3 = (TextView) findViewById2.findViewById(2131365334); if (textView3 != null) { a0 a0Var = new a0((ConstraintLayout) findViewById2, materialButton2, linkifiedTextView2, textView2, textView3); - View findViewById3 = view.findViewById(2131365469); + View findViewById3 = view.findViewById(2131365475); if (findViewById3 != null) { int i4 = 2131361934; LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById3.findViewById(2131361934); @@ -81,14 +81,14 @@ public final /* synthetic */ class WidgetAgeVerify$binding$2 extends k implement } throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i4))); } - i = 2131365469; + i = 2131365475; } } } } throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i3))); } - i = 2131365328; + i = 2131365333; } } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java index 94c3bd2ef3..7ddc467935 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAgeVerify.java @@ -130,8 +130,8 @@ public final class WidgetAgeVerify extends AppFragment { LoadingButton loadingButton = getBinding().e.d; m.checkNotNullExpressionValue(loadingButton, "binding.verify.ageVerifyNextButton"); loadingButton.setEnabled(viewState.getDateOfBirth() != null); - getBinding().f1667c.f185c.setIsLoading(viewState.isSubmitting()); - LoadingButton loadingButton2 = getBinding().f1667c.f185c; + getBinding().f1669c.f185c.setIsLoading(viewState.isSubmitting()); + LoadingButton loadingButton2 = getBinding().f1669c.f185c; m.checkNotNullExpressionValue(loadingButton2, "binding.confirm.ageVerifyConfirmButton"); loadingButton2.setEnabled(viewState.getDateOfBirth() != null); Resources resources = getResources(); @@ -156,7 +156,7 @@ public final class WidgetAgeVerify extends AppFragment { } if (viewState.getDisplayedChild() == 1 && (dateOfBirth = viewState.getDateOfBirth()) != null) { int age = BirthdayHelper.INSTANCE.getAge(dateOfBirth.longValue()); - TextView textView2 = getBinding().f1667c.e; + TextView textView2 = getBinding().f1669c.e; m.checkNotNullExpressionValue(textView2, "binding.confirm.ageVerifyConfirmTitle"); b.n(textView2, 2131886311, new Object[]{String.valueOf(age)}, null, 4); } @@ -224,13 +224,13 @@ public final class WidgetAgeVerify extends AppFragment { LinkifiedTextView linkifiedTextView = getBinding().e.b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.verify.ageVerifyDescription"); b.n(linkifiedTextView, booleanExtra ? 2131886323 : 2131886308, new Object[]{f.a.a(360040724612L, null)}, null, 4); - LinkifiedTextView linkifiedTextView2 = getBinding().f1667c.d; + LinkifiedTextView linkifiedTextView2 = getBinding().f1669c.d; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.confirm.ageVerifyConfirmDescription"); LinkifiedTextView linkifiedTextView3 = getBinding().e.b; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.verify.ageVerifyDescription"); linkifiedTextView2.setText(linkifiedTextView3.getText()); getBinding().e.d.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$2(this, booleanExtra)); - getBinding().f1667c.f185c.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$3(this, booleanExtra)); - getBinding().f1667c.b.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$4(this)); + getBinding().f1669c.f185c.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$3(this, booleanExtra)); + getBinding().f1669c.b.setOnClickListener(new WidgetAgeVerify$onViewBoundOrOnResume$4(this)); } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java index b3729703e4..2a5ca18435 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.java @@ -30,7 +30,7 @@ public final class WidgetAuthBirthday$validationManager$2 extends o implements F if ((WidgetAuthBirthday.access$isConsentRequired$p(this.this$0.this$0) && checkBox.isChecked()) || !WidgetAuthBirthday.access$isConsentRequired$p(this.this$0.this$0)) { return null; } - return checkBox.getContext().getString(2131893780); + return checkBox.getContext().getString(2131893820); } } @@ -68,7 +68,7 @@ public final class WidgetAuthBirthday$validationManager$2 extends o implements F @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final ValidationManager mo1invoke() { - TextInputLayout textInputLayout = WidgetAuthBirthday.access$getBinding$p(this.this$0).f1670c; + TextInputLayout textInputLayout = WidgetAuthBirthday.access$getBinding$p(this.this$0).f1672c; m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday"); return new ValidationManager(new Input.TextInputLayoutInput("dateOfBirth", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131886322)), new Input.GenericInput("tos", WidgetAuthBirthday.access$getBinding$p(this.this$0).e, new AnonymousClass1(this), AnonymousClass2.INSTANCE)); } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java index 3e7a5869e5..0574c2eead 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthBirthday.java @@ -99,7 +99,7 @@ public final class WidgetAuthBirthday extends AppFragment { private final Long getBirthday() { try { DateFormat dateFormat = this.formatter; - TextInputLayout textInputLayout = getBinding().f1670c; + TextInputLayout textInputLayout = getBinding().f1672c; m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday"); Date parse = dateFormat.parse(ViewExtensions.getTextOrEmpty(textInputLayout)); if (parse != null) { @@ -117,7 +117,7 @@ public final class WidgetAuthBirthday extends AppFragment { private final void setBirthday(long j) { String format = this.formatter.format(Long.valueOf(j)); - TextInputLayout textInputLayout = getBinding().f1670c; + TextInputLayout textInputLayout = getBinding().f1672c; m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday"); ViewExtensions.setText(textInputLayout, new SpannableStringBuilder(format)); } @@ -143,8 +143,8 @@ public final class WidgetAuthBirthday extends AppFragment { materialCheckBox.setVisibility(this.isConsentRequired ? 0 : 8); LinkifiedTextView linkifiedTextView = getBinding().b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.authPolicyLinks"); - b.n(linkifiedTextView, this.isConsentRequired ? 2131893779 : 2131893778, new Object[]{getString(2131893777), getString(2131892338)}, null, 4); - TextInputLayout textInputLayout = getBinding().f1670c; + b.n(linkifiedTextView, this.isConsentRequired ? 2131893819 : 2131893818, new Object[]{getString(2131893817), getString(2131892376)}, null, 4); + TextInputLayout textInputLayout = getBinding().f1672c; m.checkNotNullExpressionValue(textInputLayout, "binding.authRegisterBirthday"); ViewExtensions.setOnEditTextClickListener(textInputLayout, new WidgetAuthBirthday$onViewBoundOrOnResume$1(this)); getBinding().d.setOnClickListener(new WidgetAuthBirthday$onViewBoundOrOnResume$2(this)); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java index 1a8b7f13f7..7b40336995 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$binding$2.java @@ -25,8 +25,8 @@ public final /* synthetic */ class WidgetAuthCaptcha$binding$2 extends k impleme i = 2131362015; MaterialButton materialButton = (MaterialButton) view.findViewById(2131362015); if (materialButton != null) { - i = 2131364518; - ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364518); + i = 2131364521; + ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364521); if (screenTitleView != null) { return new WidgetAuthCaptchaBinding((CoordinatorLayout) view, textView, materialButton, screenTitleView); } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java index 438d57b705..4eb619d621 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha.java @@ -126,11 +126,11 @@ public final class WidgetAuthCaptcha extends AppFragment { m.checkNotNullExpressionValue(requireActivity2, "requireActivity()"); captchaRequest = new CaptchaHelper.CaptchaRequest.HCaptcha(captchaSitekey, requireActivity2); } - String string = captchaRequest instanceof CaptchaHelper.CaptchaRequest.HCaptcha ? getString(2131894411) : getString(2131894414); + String string = captchaRequest instanceof CaptchaHelper.CaptchaRequest.HCaptcha ? getString(2131894458) : getString(2131894461); m.checkNotNullExpressionValue(string, "if (captchaRequest is Ca…erify_by_recaptcha)\n }"); getBinding().d.setTitle(string); RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Captcha", "viewed", null, 4, null); - getBinding().f1671c.setOnClickListener(new WidgetAuthCaptcha$onViewBound$1(this, captchaRequest)); + getBinding().f1673c.setOnClickListener(new WidgetAuthCaptcha$onViewBound$1(this, captchaRequest)); getBinding().b.setOnClickListener(new WidgetAuthCaptcha$onViewBound$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java index 5451a7e814..c20af97b3f 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLanding.java @@ -182,7 +182,7 @@ public final class WidgetAuthLanding extends AppFragment { this.useRebrandLanding = true; } ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetAuthLanding.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthLanding$onViewBound$1(this), 62, (Object) null); - getBinding().f1672c.setOnClickListener(WidgetAuthLanding$onViewBound$2.INSTANCE); + getBinding().f1674c.setOnClickListener(WidgetAuthLanding$onViewBound$2.INSTANCE); getBinding().d.setOnClickListener(new WidgetAuthLanding$onViewBound$3(this)); } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java index 76b35ecd22..90f477fd5f 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$forgotPassword$2.java @@ -43,9 +43,9 @@ public final class WidgetAuthLogin$forgotPassword$2 extends o implements Functio Context requireContext = this.this$0.requireContext(); ActivityResultLauncher access$getPhoneVerifyPasswordLauncher$p = WidgetAuthLogin.access$getPhoneVerifyPasswordLauncher$p(this.this$0); String str = this.$login; - String string = this.this$0.getString(2131891743); + String string = this.this$0.getString(2131891780); m.checkNotNullExpressionValue(string, "getString(R.string.passw…overy_verify_phone_title)"); - String string2 = this.this$0.getString(2131891741); + String string2 = this.this$0.getString(2131891778); m.checkNotNullExpressionValue(string2, "getString(R.string.passw…ry_verify_phone_subtitle)"); companion.launch(requireContext, access$getPhoneVerifyPasswordLauncher$p, str, string, string2); error.setShowErrorToasts(false); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java index 40d86e8798..454ed656bf 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.java @@ -35,7 +35,7 @@ public final class WidgetAuthLogin$onViewBound$5 implements View.OnClickListener try { view.getContext().startActivity(new Intent("android.settings.ACCESSIBILITY_SETTINGS")); } catch (ActivityNotFoundException unused) { - c.a.d.o.g(view.getContext(), 2131891737, 0, null, 12); + c.a.d.o.g(view.getContext(), 2131891774, 0, null, 12); } } } @@ -46,7 +46,7 @@ public final class WidgetAuthLogin$onViewBound$5 implements View.OnClickListener @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.this$0.requireContext()).setTitle(2131891734).setMessage(2131891735).setPositiveButton(2131891736, AnonymousClass1.INSTANCE), 2131887177, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.this$0.requireContext()).setTitle(2131891771).setMessage(2131891772).setPositiveButton(2131891773, AnonymousClass1.INSTANCE), 2131887178, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); negativeButton$default.show(parentFragmentManager); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java index 11fb888144..c1f06bc4e4 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.java @@ -23,9 +23,9 @@ public final class WidgetAuthLogin$validationManager$2 extends o implements Func public final ValidationManager mo1invoke() { TextInputLayout mainTextInputLayout = WidgetAuthLogin.access$getBinding$p(this.this$0).e.getMainTextInputLayout(); BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion; - InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131890851)}; + InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131890881)}; TextInputLayout textInputLayout = WidgetAuthLogin.access$getBinding$p(this.this$0).g; m.checkNotNullExpressionValue(textInputLayout, "binding.authLoginPasswordWrap"); - return new ValidationManager(new Input.TextInputLayoutInput("binding.authLogin", mainTextInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout, companion.createRequiredInputValidator(2131891744))); + return new ValidationManager(new Input.TextInputLayoutInput("binding.authLogin", mainTextInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("password", textInputLayout, companion.createRequiredInputValidator(2131891781))); } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java index 503187ca7d..8f02c7cf85 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin.java @@ -113,7 +113,7 @@ public final class WidgetAuthLogin extends AppFragment { private final void forgotPassword(String str) { String textOrEmpty = getBinding().e.getTextOrEmpty(); if (textOrEmpty.length() == 0) { - o.g(getContext(), 2131890851, 0, null, 12); + o.g(getContext(), 2131890881, 0, null, 12); } else { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui(StoreStream.Companion.getAuthentication().forgotPassword(textOrEmpty, str)), getBinding().h, 0, 2, null), getContext(), "REST: forgotPassword", (Function1) null, new WidgetAuthLogin$forgotPassword$1(this, textOrEmpty), new WidgetAuthLogin$forgotPassword$2(this, textOrEmpty), (Function0) null, (Function0) null, 100, (Object) null); } @@ -164,9 +164,9 @@ public final class WidgetAuthLogin extends AppFragment { Context requireContext = requireContext(); ActivityResultLauncher activityResultLauncher = this.phoneVerifyLoginLauncher; String textOrEmpty = getBinding().e.getTextOrEmpty(); - String string = getString(2131891835); + String string = getString(2131891872); m.checkNotNullExpressionValue(string, "getString(R.string.phone_ip_authorization_title)"); - String string2 = getString(2131891833); + String string2 = getString(2131891870); m.checkNotNullExpressionValue(string2, "getString(R.string.phone…p_authorization_subtitle)"); companion.launch(requireContext, activityResultLauncher, textOrEmpty, string, string2); } else { @@ -253,7 +253,7 @@ public final class WidgetAuthLogin extends AppFragment { } private final void showEmailSentToast(String str) { - o.h(getContext(), b.g(requireContext(), 2131888214, new Object[]{str}, null, 4), 0, null, 12); + o.h(getContext(), b.g(requireContext(), 2131888224, new Object[]{str}, null, 4), 0, null, 12); } public final GoogleSmartLockManager getGoogleSmartLockManager() { @@ -291,7 +291,7 @@ public final class WidgetAuthLogin extends AppFragment { ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetAuthLogin$onViewBound$3(this), 1, null); getBinding().d.setOnClickListener(new WidgetAuthLogin$onViewBound$4(this)); getBinding().f.setOnClickListener(new WidgetAuthLogin$onViewBound$5(this)); - getBinding().f1673c.setOnClickListener(new WidgetAuthLogin$onViewBound$6(this)); + getBinding().f1675c.setOnClickListener(new WidgetAuthLogin$onViewBound$6(this)); getBinding().e.b(this); GoogleSmartLockManager.SmartLockCredentials smartLockCredentials = this.smartLockCredentials; if (smartLockCredentials != null) { diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java index 15335459ad..c937ac3c78 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java @@ -15,10 +15,10 @@ public final class WidgetAuthMfa$onViewBound$1 implements Action2 function0) { - String obj = b.g(context, 2131891627, new Object[]{exc.getMessage()}, null, 4).toString(); + String obj = b.g(context, 2131891660, new Object[]{exc.getMessage()}, null, 4).toString(); AppLog.g.w(obj, exc); o.h(context, obj, 1, null, 8); function0.mo1invoke(); @@ -438,12 +438,12 @@ public class WidgetOauth2Authorize extends AppFragment { m.checkNotNullParameter(permissionModel, "data"); if (permissionModel.getScope() != null) { this.binding.b.setImageResource(2131231503); - TextView textView = this.binding.f1617c; + TextView textView = this.binding.f1619c; m.checkNotNullExpressionValue(textView, "binding.oauthTokenPermissionDetailedName"); OAuthPermissionViews.a(textView, permissionModel.getScope()); } else if (permissionModel.getFakeText() != null) { this.binding.b.setImageResource(2131231522); - this.binding.f1617c.setText(permissionModel.getFakeText().intValue()); + this.binding.f1619c.setText(permissionModel.getFakeText().intValue()); } } } @@ -468,7 +468,7 @@ public class WidgetOauth2Authorize extends AppFragment { } public WidgetOauth2Authorize() { - super(2131559102); + super(2131559103); WidgetOauth2Authorize$oauth2ViewModel$2 widgetOauth2Authorize$oauth2ViewModel$2 = WidgetOauth2Authorize$oauth2ViewModel$2.INSTANCE; c.a.d.h0 h0Var = new c.a.d.h0(this); this.oauth2ViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(OAuth2ViewModel.class), new WidgetOauth2Authorize$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetOauth2Authorize$oauth2ViewModel$2)); @@ -492,7 +492,7 @@ public class WidgetOauth2Authorize extends AppFragment { long parseSnowflake = TimeUtils.parseSnowflake(Long.valueOf(j)); TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.oauthAuthorizeAgeNotice"); - b.n(textView, 2131891604, new Object[]{DateUtils.formatDateTime(requireContext(), parseSnowflake, 65536)}, null, 4); + b.n(textView, 2131891637, new Object[]{DateUtils.formatDateTime(requireContext(), parseSnowflake, 65536)}, null, 4); } private final void configureNotSupportedUI(Uri uri) { @@ -509,7 +509,7 @@ public class WidgetOauth2Authorize extends AppFragment { } private final void configureSecurityNoticeUI(List list) { - int i = list.contains(OAuthScope.MessagesRead.INSTANCE.a()) ? 2131891600 : 2131891601; + int i = list.contains(OAuthScope.MessagesRead.INSTANCE.a()) ? 2131891633 : 2131891634; TextView textView = getBinding().m; m.checkNotNullExpressionValue(textView, "binding.oauthAuthorizeSecurityNotice"); b.m(textView, i, new Object[0], new WidgetOauth2Authorize$configureSecurityNoticeUI$1(this)); @@ -521,21 +521,21 @@ public class WidgetOauth2Authorize extends AppFragment { private final int getRandomFakeScopeText() { switch (c.b.nextInt(8)) { case 0: - return 2131891616; + return 2131891649; case 1: - return 2131891617; + return 2131891650; case 2: - return 2131891618; + return 2131891651; case 3: - return 2131891619; + return 2131891652; case 4: - return 2131891620; + return 2131891653; case 5: - return 2131891621; + return 2131891654; case 6: - return 2131891622; + return 2131891655; default: - return 2131891623; + return 2131891656; } } @@ -550,7 +550,7 @@ public class WidgetOauth2Authorize extends AppFragment { L.append(" in "); L.append(getClass().getSimpleName()); Logger.e$default(appLog, L.toString(), invalidScopeException, null, 4, null); - o.h(requireContext(), b.g(requireContext(), 2131891626, new Object[]{invalidScopeException.a()}, null, 4), 1, null, 8); + o.h(requireContext(), b.g(requireContext(), 2131891659, new Object[]{invalidScopeException.a()}, null, 4), 1, null, 8); AppActivity appActivity = getAppActivity(); if (appActivity != null) { appActivity.setResult(0); @@ -581,8 +581,8 @@ public class WidgetOauth2Authorize extends AppFragment { textView.setText(application.g()); TextView textView2 = getBinding().k; m.checkNotNullExpressionValue(textView2, "binding.oauthAuthorizePermissionsLabelTv"); - b.n(textView2, 2131891629, new Object[]{application.g()}, null, 4); - SimpleDraweeView simpleDraweeView2 = getBinding().f1840c; + b.n(textView2, 2131891662, new Object[]{application.g()}, null, 4); + SimpleDraweeView simpleDraweeView2 = getBinding().f1842c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.oauthAuthorizeApplicationIcon"); String e = application.e(); MGImages.setImage$default(simpleDraweeView2, e != null ? IconUtils.getApplicationIcon$default(application.f(), e, 0, 4, null) : null, 0, 0, false, null, null, 124, null); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.java index de9b6fc169..d8d6a3eb26 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2.java @@ -15,7 +15,7 @@ import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import s.a.j0; -import s.a.u0; +import s.a.w0; /* compiled from: WidgetOauth2AuthorizeSamsung.kt */ public final class WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2 extends o implements Function1 { public final /* synthetic */ String $samsungAuthCode; @@ -88,6 +88,6 @@ public final class WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2 extends o public final void invoke(RestAPIParams.OAuth2Authorize.ResponsePost responsePost) { m.checkNotNullParameter(responsePost, "it"); WidgetOauth2AuthorizeSamsung.Companion.access$logI(WidgetOauth2AuthorizeSamsung.Companion, "POST /authorize success"); - a.F(u0.i, j0.b, null, new AnonymousClass1(this, responsePost, null), 2, null); + a.G(w0.i, j0.b, null, new AnonymousClass1(this, responsePost, null), 2, null); } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java index 03275486db..e287faadd3 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1.java @@ -31,7 +31,7 @@ public final class WidgetOauth2AuthorizeSamsung$samsungDisclaimerLauncher$1 i Object obj2 = (data2 == null || (extras = data2.getExtras()) == null) ? null : extras.get("error_code"); WidgetOauth2AuthorizeSamsung.Companion companion = WidgetOauth2AuthorizeSamsung.Companion; WidgetOauth2AuthorizeSamsung.Companion.logW$default(companion, "Connection requires disclaimer acceptance. [" + obj2 + "] " + obj, null, 2, null); - o.i(this.this$0, 2131888485, 0, 4); + o.i(this.this$0, 2131888495, 0, 4); AppActivity appActivity = this.this$0.getAppActivity(); if (appActivity != null) { appActivity.finish(); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java index 733b040cc8..abc22d8e7f 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.java @@ -25,10 +25,11 @@ import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlinx.coroutines.CoroutineDispatcher; import rx.Observable; -import s.a.i1; +import s.a.a.n; import s.a.j0; -import s.a.z; +import s.a.k1; /* compiled from: WidgetOauth2AuthorizeSamsung.kt */ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize { public static final Companion Companion = new Companion(null); @@ -198,7 +199,7 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize { WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1 widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1; int i; WidgetOauth2AuthorizeSamsung widgetOauth2AuthorizeSamsung; - i1 i1Var; + k1 k1Var; WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2 widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2; x xVar; String str3; @@ -222,13 +223,13 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize { widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.L$1 = str2; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.L$2 = xVar2; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.label = 1; - Object h02 = c.q.a.k.a.h0(j0.b, new c.a.s.a(str, xVar2, null), widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1); - if (h02 == coroutine_suspended) { + Object i02 = c.q.a.k.a.i0(j0.b, new c.a.s.a(str, xVar2, null), widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1); + if (i02 == coroutine_suspended) { return coroutine_suspended; } str3 = str2; xVar = xVar2; - obj = h02; + obj = i02; widgetOauth2AuthorizeSamsung = this; } else if (i == 1) { l.throwOnFailure(obj); @@ -240,12 +241,12 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize { l.throwOnFailure(obj); Companion companion = Companion; Companion.access$logI(companion, "POST /callback success " + ((Uri) obj)); - z zVar = j0.a; - i1Var = s.a.a.m.b; + CoroutineDispatcher coroutineDispatcher = j0.a; + k1Var = n.b; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2 = new WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2(widgetOauth2AuthorizeSamsung, null); widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.L$0 = null; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.label = 3; - if (c.q.a.k.a.h0(i1Var, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1) == coroutine_suspended) { + if (c.q.a.k.a.i0(k1Var, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1) == coroutine_suspended) { return coroutine_suspended; } return Unit.a; @@ -268,18 +269,18 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize { widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.L$1 = null; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.L$2 = null; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.label = 2; - obj = c.q.a.k.a.h0(j0.b, new b(state, str3, queryParameter, xVar, null), widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1); + obj = c.q.a.k.a.i0(j0.b, new b(state, str3, queryParameter, xVar, null), widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1); if (obj == coroutine_suspended) { return coroutine_suspended; } Companion companion = Companion; Companion.access$logI(companion, "POST /callback success " + ((Uri) obj)); - z zVar = j0.a; - i1Var = s.a.a.m.b; + CoroutineDispatcher coroutineDispatcher = j0.a; + k1Var = n.b; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2 = new WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2(widgetOauth2AuthorizeSamsung, null); widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.L$0 = null; widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1.label = 3; - if (c.q.a.k.a.h0(i1Var, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1) == coroutine_suspended) { + if (c.q.a.k.a.i0(k1Var, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2, widgetOauth2AuthorizeSamsung$samsungCallbackHandshake$1) == coroutine_suspended) { } return Unit.a; } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java index aaf9c28f09..d4391b15ef 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth$binding$2.java @@ -26,30 +26,30 @@ public final /* synthetic */ class WidgetRemoteAuth$binding$2 extends k implemen int i = 2131362058; View findViewById = view.findViewById(2131362058); if (findViewById != null) { - MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131364402); + MaterialButton materialButton = (MaterialButton) findViewById.findViewById(2131364405); if (materialButton != null) { c5 c5Var = new c5((LinearLayout) findViewById, materialButton); - i = 2131364022; - View findViewById2 = view.findViewById(2131364022); + i = 2131364024; + View findViewById2 = view.findViewById(2131364024); if (findViewById2 != null) { - MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131364404); + MaterialButton materialButton2 = (MaterialButton) findViewById2.findViewById(2131364407); if (materialButton2 != null) { a5 a5Var = new a5((LinearLayout) findViewById2, materialButton2); - i = 2131364189; - View findViewById3 = view.findViewById(2131364189); + i = 2131364191; + View findViewById3 = view.findViewById(2131364191); if (findViewById3 != null) { - int i2 = 2131364401; - MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131364401); + int i2 = 2131364404; + MaterialButton materialButton3 = (MaterialButton) findViewById3.findViewById(2131364404); if (materialButton3 != null) { - i2 = 2131364403; - MaterialButton materialButton4 = (MaterialButton) findViewById3.findViewById(2131364403); + i2 = 2131364406; + MaterialButton materialButton4 = (MaterialButton) findViewById3.findViewById(2131364406); if (materialButton4 != null) { - i2 = 2131364405; - SwitchMaterial switchMaterial = (SwitchMaterial) findViewById3.findViewById(2131364405); + i2 = 2131364408; + SwitchMaterial switchMaterial = (SwitchMaterial) findViewById3.findViewById(2131364408); if (switchMaterial != null) { b5 b5Var = new b5((LinearLayout) findViewById3, materialButton3, materialButton4, switchMaterial); - i = 2131364406; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364406); + i = 2131364409; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364409); if (appViewFlipper != null) { return new WidgetRemoteAuthBinding((RelativeLayout) view, c5Var, a5Var, b5Var, appViewFlipper); } @@ -59,11 +59,11 @@ public final /* synthetic */ class WidgetRemoteAuth$binding$2 extends k implemen throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i2))); } } else { - throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(2131364404))); + throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(2131364407))); } } } else { - throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131364402))); + throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131364405))); } } throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i))); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java index 550c2aedff..40ddab4a5b 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuth.java @@ -57,7 +57,7 @@ public final class WidgetRemoteAuth extends AppFragment { } public WidgetRemoteAuth() { - super(2131559113); + super(2131559114); WidgetRemoteAuth$viewModel$2 widgetRemoteAuth$viewModel$2 = new WidgetRemoteAuth$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetRemoteAuthViewModel.class), new WidgetRemoteAuth$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetRemoteAuth$viewModel$2)); @@ -84,7 +84,7 @@ public final class WidgetRemoteAuth extends AppFragment { AppViewFlipper appViewFlipper2 = getBinding().e; m.checkNotNullExpressionValue(appViewFlipper2, "binding.remoteAuthViewFlipper"); appViewFlipper2.setDisplayedChild(1); - getBinding().f1849c.b.setOnClickListener(new WidgetRemoteAuth$configureUI$1(this)); + getBinding().f1851c.b.setOnClickListener(new WidgetRemoteAuth$configureUI$1(this)); } else if (m.areEqual(viewState, WidgetRemoteAuthViewModel.ViewState.Succeeded.INSTANCE)) { AppViewFlipper appViewFlipper3 = getBinding().e; m.checkNotNullExpressionValue(appViewFlipper3, "binding.remoteAuthViewFlipper"); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java index 0a21f1d467..bd112cd332 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetRemoteAuthViewModel.java @@ -69,7 +69,7 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel { if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(1000, this) == coroutine_suspended) { + if (a.n(1000, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -111,7 +111,7 @@ public final class WidgetRemoteAuthViewModel extends AppViewModel { Object o0 = access$getTemporaryBehaviorSubject$p.o0(); m.checkNotNullExpressionValue(o0, "temporaryBehaviorSubject.value"); WidgetRemoteAuthViewModel.access$updateViewState(widgetRemoteAuthViewModel, new ViewState.Loaded(handshakeToken, ((Boolean) o0).booleanValue(), false)); - a.F(ViewModelKt.getViewModelScope(this.this$0), null, null, new AnonymousClass1(this, modelRemoteAuthHandshake, null), 3, null); + a.G(ViewModelKt.getViewModelScope(this.this$0), null, null, new AnonymousClass1(this, modelRemoteAuthHandshake, null), 3, null); } } diff --git a/app/src/main/java/com/discord/widgets/botuikit/BotUiKitTestModelGenerator.java b/app/src/main/java/com/discord/widgets/botuikit/BotUiKitTestModelGenerator.java deleted file mode 100644 index ba778ee350..0000000000 --- a/app/src/main/java/com/discord/widgets/botuikit/BotUiKitTestModelGenerator.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.discord.widgets.botuikit; - -import com.discord.api.botuikit.ActionRowComponent; -import com.discord.api.botuikit.ButtonComponent; -import com.discord.api.botuikit.ButtonStyle; -import com.discord.api.botuikit.ComponentEmoji; -import com.discord.api.botuikit.ComponentType; -import com.discord.api.botuikit.SelectComponent; -import com.discord.api.botuikit.SelectItem; -import com.discord.models.domain.ModelMessage; -import d0.t.n; -import d0.z.d.m; -/* compiled from: BotUiKitTestModelGenerator.kt */ -public final class BotUiKitTestModelGenerator { - public static final BotUiKitTestModelGenerator INSTANCE = new BotUiKitTestModelGenerator(); - - private BotUiKitTestModelGenerator() { - } - - public final ModelMessage attachTestComponents(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - ComponentType componentType = ComponentType.ACTION_ROW; - ComponentType componentType2 = ComponentType.SELECT; - SelectItem[] selectItemArr = {new SelectItem("Chocolate", "chocolate", null, null, false, 28), new SelectItem("Vanilla", "vanilla", null, "A flavor for everyone", false, 20), new SelectItem("Strawberry", "strawberry", new ComponentEmoji(null, "🍓", null, 5), null, false, 24), new SelectItem("Banana", "banana", new ComponentEmoji(null, "🍌", null, 5), "For Donky Kong who really likes bananas and this description could be too long but there's only one way to find out", false, 16), new SelectItem("Pistachio", "pistachio", new ComponentEmoji(null, "🥜", null, 5), "Not for everyone but also good", false, 16), new SelectItem("Mango Sorbet", "mango_sorbet", null, null, false, 28), new SelectItem("Mint", "mint", null, null, false, 28), new SelectItem("Butter Pecan", "butter_pecan", null, null, false, 28), new SelectItem("Bubble Gum", "bubble_gum", null, null, false, 28), new SelectItem("Chocolate Chip Cookie Dough With Little Sprinkles of Marshmallows", "chocolate_chip", null, null, false, 28)}; - SelectComponent[] selectComponentArr = {new SelectComponent(componentType2, "dropdown", false, "hash", "Select Flavor", 1, 1, n.listOf((Object[]) new SelectItem[]{new SelectItem("Chocolate", "chocolate", null, null, false, 28), new SelectItem("Vanilla", "vanilla", null, null, false, 28), new SelectItem("Strawberry", "strawberry", null, null, false, 28)})), new SelectComponent(componentType2, "dropdown", false, "hash", "Select Character", 1, 1, n.listOf((Object[]) new SelectItem[]{new SelectItem("Randi", "randi", new ComponentEmoji("764327511814963240", "randi", null, 4), null, false, 24), new SelectItem("Purim", "purim", new ComponentEmoji("764327511726882846", "purim", null, 4), null, false, 24), new SelectItem("Popoi", "popoi", new ComponentEmoji("764327511784947742", "popoi", null, 4), null, false, 24), new SelectItem("Jema", "jema", new ComponentEmoji("764328378856636426", "jema", null, 4), null, false, 24), new SelectItem("Luka", "luka", new ComponentEmoji("764328239165472798", "luka", null, 4), null, false, 24), new SelectItem("Neko", "neko", new ComponentEmoji("764328239107670077", "neko", null, 4), null, false, 24), new SelectItem("Flammie", "flammie", new ComponentEmoji("764328239136768000", "flammie", null, 4), null, false, 24)}))}; - ComponentType componentType3 = ComponentType.BUTTON; - ButtonStyle buttonStyle = ButtonStyle.PRIMARY; - ButtonStyle buttonStyle2 = ButtonStyle.SUCCESS; - ButtonStyle buttonStyle3 = ButtonStyle.SECONDARY; - Boolean bool = Boolean.TRUE; - ButtonStyle buttonStyle4 = ButtonStyle.LINK; - ButtonStyle buttonStyle5 = ButtonStyle.DANGER; - n.listOf((Object[]) new ActionRowComponent[]{new ActionRowComponent(componentType, d0.t.m.listOf(new SelectComponent(componentType2, "dropdown", false, "hash", "Select 3 Flavors", 1, 3, n.listOf((Object[]) selectItemArr)))), new ActionRowComponent(componentType, n.listOf((Object[]) selectComponentArr)), new ActionRowComponent(componentType, n.listOf((Object[]) new ButtonComponent[]{new ButtonComponent(componentType3, "primary", "hash", "Primary", buttonStyle, false, null, null, 192), new ButtonComponent(componentType3, "success", "hash", "Success", buttonStyle2, false, null, null, 192), new ButtonComponent(componentType3, "success_disabled", "hash", "Success", buttonStyle2, true, null, null, 192), new ButtonComponent(componentType3, "secondary", "hash", "Secondary", buttonStyle3, false, new ComponentEmoji("764328239165472798", "luka", null, 4), null, 128), new ButtonComponent(componentType3, "secondary", "hash", "Super long button that is very very very very very very very very very very very long", buttonStyle3, false, new ComponentEmoji("764329499272806422", "thunderbolt", bool), null, 128), new ButtonComponent(componentType3, "secondary", "hash", "Super long button that is very very very very very very very very very very very long", buttonStyle3, false, null, null, 192), new ButtonComponent(componentType3, "secondary", "hash", "Super long button that is very very very very very very very very very very very long", buttonStyle4, false, null, "https://instantostrich.com/", 64), new ButtonComponent(componentType3, "secondary", "hash", "Super long button that is very very very very very very very very very very very long", buttonStyle4, false, new ComponentEmoji("764329499272806422", "thunderbolt", bool), "https://instantostrich.com/"), new ButtonComponent(componentType3, "secondary_emoji_only", "hash", null, buttonStyle, false, new ComponentEmoji("764329499272806422", "thunderbolt", bool), null, 128), new ButtonComponent(componentType3, "secondary_emoji_only", "hash", null, buttonStyle4, false, new ComponentEmoji("764329499272806422", "thunderbolt", bool), "https://instantostrich.com/"), new ButtonComponent(componentType3, "secondary_disabled", "hash", "Secondary", buttonStyle3, true, new ComponentEmoji(null, "🦘", null, 5), null, 128), new ButtonComponent(componentType3, "destructive", "hash", "Destructive", buttonStyle5, false, null, null, 192), new ButtonComponent(componentType3, "destructive_disabled", "hash", "Destructive", buttonStyle5, true, null, null, 192), new ButtonComponent(componentType3, "link", "hash", "Link", buttonStyle4, false, null, "https://instantostrich.com/", 64), new ButtonComponent(componentType3, "link", "hash", "Link", buttonStyle4, true, null, "https://instantostrich.com/", 64)}))}); - return new ModelMessage(modelMessage); - } -} diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java index eb47fd682f..830643c20a 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/ActionRowComponentView.java @@ -40,7 +40,7 @@ public final class ActionRowComponentView extends LinearLayout implements Compon public final ActionRowComponentView inflateComponent(Context context, ViewGroup viewGroup) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(viewGroup, "root"); - k4 a = k4.a(LayoutInflater.from(context).inflate(2131558964, viewGroup, false)); + k4 a = k4.a(LayoutInflater.from(context).inflate(2131558965, viewGroup, false)); m.checkNotNullExpressionValue(a, "WidgetChatListBotUiActio…om(context), root, false)"); ActionRowComponentView actionRowComponentView = a.a; m.checkNotNullExpressionValue(actionRowComponentView, "WidgetChatListBotUiActio…ntext), root, false).root"); diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java index b204b4a18c..db5b9866b9 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/ButtonComponentView.java @@ -44,7 +44,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo public final ButtonComponentView inflateComponent(Context context, ViewGroup viewGroup) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(viewGroup, "root"); - WidgetChatListBotUiButtonComponentBinding a = WidgetChatListBotUiButtonComponentBinding.a(LayoutInflater.from(context).inflate(2131558965, viewGroup, false)); + WidgetChatListBotUiButtonComponentBinding a = WidgetChatListBotUiButtonComponentBinding.a(LayoutInflater.from(context).inflate(2131558966, viewGroup, false)); m.checkNotNullExpressionValue(a, "WidgetChatListBotUiButto…om(context), root, false)"); ButtonComponentView buttonComponentView = a.a; m.checkNotNullExpressionValue(buttonComponentView, "WidgetChatListBotUiButto…ntext), root, false).root"); @@ -111,7 +111,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo MaterialButton materialButton = a.b; m.checkNotNullExpressionValue(materialButton, "binding.button"); configureStyle(materialButton, buttonMessageComponent.getStyle()); - SimpleDraweeView simpleDraweeView = a.f1748c; + SimpleDraweeView simpleDraweeView = a.f1750c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.emoji"); configureEmoji(simpleDraweeView, buttonMessageComponent.getEmoji(), buttonMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Loading); AppCompatImageView appCompatImageView = a.e; @@ -123,7 +123,7 @@ public final class ButtonComponentView extends ConstraintLayout implements Compo MaterialTextView materialTextView2 = a.d; m.checkNotNullExpressionValue(materialTextView2, "binding.label"); ViewExtensions.setEnabledAlpha(materialTextView2, !(buttonMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Disabled), 0.5f); - SimpleDraweeView simpleDraweeView2 = a.f1748c; + SimpleDraweeView simpleDraweeView2 = a.f1750c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.emoji"); ViewExtensions.setEnabledAlpha$default(simpleDraweeView2, !(buttonMessageComponent.getStateInteraction() instanceof ActionInteractionComponentState.Disabled), 0.0f, 2, null); AppCompatImageView appCompatImageView2 = a.e; diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java index 8d3034380a..7b9539c2de 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet$binding$2.java @@ -18,20 +18,20 @@ public final /* synthetic */ class SelectComponentBottomSheet$binding$2 extends public final WidgetSelectComponentBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365614; - ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365614); + int i = 2131365620; + ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365620); if (constraintLayout != null) { - i = 2131365615; - TextView textView = (TextView) view.findViewById(2131365615); + i = 2131365621; + TextView textView = (TextView) view.findViewById(2131365621); if (textView != null) { - i = 2131365616; - MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365616); + i = 2131365622; + MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365622); if (maxHeightRecyclerView != null) { - i = 2131365617; - TextView textView2 = (TextView) view.findViewById(2131365617); + i = 2131365623; + TextView textView2 = (TextView) view.findViewById(2131365623); if (textView2 != null) { - i = 2131365618; - TextView textView3 = (TextView) view.findViewById(2131365618); + i = 2131365624; + TextView textView3 = (TextView) view.findViewById(2131365624); if (textView3 != null) { return new WidgetSelectComponentBottomSheetBinding((ConstraintLayout) view, constraintLayout, textView, maxHeightRecyclerView, textView2, textView3); } diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java index ad742ee883..2e6dd025e1 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheet.java @@ -103,7 +103,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet { if (viewState.isMultiSelect()) { TextView textView3 = getBinding().e; m.checkNotNullExpressionValue(textView3, "binding.widgetSheetComponentBottomSheetSubtitle"); - textView3.setText(b.j(this, 2131891143, new Object[]{Integer.valueOf(viewState.getMinSelections())}, null, 4)); + textView3.setText(b.j(this, 2131891174, new Object[]{Integer.valueOf(viewState.getMinSelections())}, null, 4)); } TextView textView4 = getBinding().d; m.checkNotNullExpressionValue(textView4, "binding.widgetSheetComponentBottomSheetSelect"); @@ -137,7 +137,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559128; + return 2131559129; } public final void onItemSelected(SelectItem selectItem, boolean z2) { @@ -157,7 +157,7 @@ public final class SelectComponentBottomSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); setBottomSheetCollapsedStateDisabled(); - MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1856c; + MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1858c; m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.widgetSheetComponentBottomSheetRecycler"); maxHeightRecyclerView.setAdapter(this.adapter); } diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java index 16add289fe..8e1dc59fa9 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java @@ -48,24 +48,24 @@ public final class SelectComponentBottomSheetAdapter extends RecyclerView.Adapte @Override // androidx.recyclerview.widget.RecyclerView.Adapter public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559129, viewGroup, false); - int i2 = 2131364567; - MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364567); + View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559130, viewGroup, false); + int i2 = 2131364570; + MaterialTextView materialTextView = (MaterialTextView) inflate.findViewById(2131364570); if (materialTextView != null) { - i2 = 2131364568; - View findViewById = inflate.findViewById(2131364568); + i2 = 2131364571; + View findViewById = inflate.findViewById(2131364571); if (findViewById != null) { - i2 = 2131364569; - View findViewById2 = inflate.findViewById(2131364569); + i2 = 2131364572; + View findViewById2 = inflate.findViewById(2131364572); if (findViewById2 != null) { - i2 = 2131364570; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364570); + i2 = 2131364573; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364573); if (simpleDraweeView != null) { - i2 = 2131364571; - MaterialCheckBox materialCheckBox = (MaterialCheckBox) inflate.findViewById(2131364571); + i2 = 2131364574; + MaterialCheckBox materialCheckBox = (MaterialCheckBox) inflate.findViewById(2131364574); if (materialCheckBox != null) { - i2 = 2131364572; - MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364572); + i2 = 2131364575; + MaterialTextView materialTextView2 = (MaterialTextView) inflate.findViewById(2131364575); if (materialTextView2 != null) { WidgetSelectComponentBottomSheetItemBinding widgetSelectComponentBottomSheetItemBinding = new WidgetSelectComponentBottomSheetItemBinding((ConstraintLayout) inflate, materialTextView, findViewById, findViewById2, simpleDraweeView, materialCheckBox, materialTextView2); m.checkNotNullExpressionValue(widgetSelectComponentBottomSheetItemBinding, "WidgetSelectComponentBot… false\n )"); diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java index bba039ded5..b93b24a8b9 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetItemViewHolder.java @@ -76,7 +76,7 @@ public final class SelectComponentBottomSheetItemViewHolder extends RecyclerView View view = this.binding.d; m.checkNotNullExpressionValue(view, "binding.selectComponentSheetItemDividerIcon"); view.setVisibility(z3 && !z5 ? 0 : 8); - View view2 = this.binding.f1857c; + View view2 = this.binding.f1859c; m.checkNotNullExpressionValue(view2, "binding.selectComponentSheetItemDivider"); if (z3 || z5) { z7 = false; diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java index a283d21c15..bd40789d48 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentView.java @@ -44,7 +44,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo public final SelectComponentView inflateComponent(Context context, ViewGroup viewGroup) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(viewGroup, "root"); - l4 a = l4.a(LayoutInflater.from(context).inflate(2131558966, viewGroup, false)); + l4 a = l4.a(LayoutInflater.from(context).inflate(2131558967, viewGroup, false)); m.checkNotNullExpressionValue(a, "WidgetChatListBotUiSelec…om(context), root, false)"); SelectComponentView selectComponentView = a.a; m.checkNotNullExpressionValue(selectComponentView, "WidgetChatListBotUiSelec…ntext), root, false).root"); @@ -74,7 +74,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo m.checkNotNullExpressionValue(a, "WidgetChatListBotUiSelec…mponentBinding.bind(this)"); String placeholder = selectMessageComponent.getPlaceholder(); if (placeholder == null) { - placeholder = getResources().getString(2131891142); + placeholder = getResources().getString(2131891173); m.checkNotNullExpressionValue(placeholder, "resources.getString(R.st…nent_default_placeholder)"); } int i = 0; @@ -117,7 +117,7 @@ public final class SelectComponentView extends ConstraintLayout implements Compo flexboxLayout3.removeAllViews(); LayoutInflater from = LayoutInflater.from(getContext()); for (SelectItem selectItem2 : selectMessageComponent.getSelectedOptions()) { - View inflate = from.inflate(2131558967, (ViewGroup) null, false); + View inflate = from.inflate(2131558968, (ViewGroup) null, false); Objects.requireNonNull(inflate, "rootView"); MaterialTextView materialTextView6 = (MaterialTextView) inflate; m.checkNotNullExpressionValue(new m4(materialTextView6), "WidgetChatListBotUiSelec…Binding.inflate(inflater)"); diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java index 437d0e93dc..1427edaae8 100644 --- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java +++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$binding$2.java @@ -67,11 +67,11 @@ public final /* synthetic */ class WidgetBugReport$binding$2 extends k implement i = 2131362174; MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131362174); if (materialButton2 != null) { - i = 2131365128; - MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131365128); + i = 2131365132; + MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131365132); if (materialTextView3 != null) { - i = 2131365576; - View findViewById = view.findViewById(2131365576); + i = 2131365582; + View findViewById = view.findViewById(2131365582); if (findViewById != null) { return new WidgetBugReportBinding((CoordinatorLayout) view, appCompatImageView, textInputLayout, textInputLayout2, materialTextView, textInputLayout3, materialCardView, simpleDraweeView, appCompatImageView2, imageView, stickerView, materialTextView2, materialButton, appViewFlipper, materialButton2, materialTextView3, findViewById); } diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java index 62fcd61d86..513f628233 100644 --- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java +++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$onViewBound$5.java @@ -50,7 +50,7 @@ public final class WidgetBugReport$onViewBound$5 implements View.OnClickListener a0.a aVar = a0.j; FragmentManager childFragmentManager = this.this$0.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager"); - String string = this.this$0.getString(2131887078); + String string = this.this$0.getString(2131887079); m.checkNotNullExpressionValue(string, "getString(R.string.bug_report_priority)"); List items = this.this$0.getItems(); AnonymousClass1 r4 = new AnonymousClass1(this); diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java index 81388f0259..b3e2dcc935 100644 --- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java +++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport$validationManager$2.java @@ -24,9 +24,9 @@ public final class WidgetBugReport$validationManager$2 extends o implements Func TextInputLayout textInputLayout = WidgetBugReport.access$getBinding$p(this.this$0).d; m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName"); BasicTextInputValidator.Companion companion = BasicTextInputValidator.Companion; - InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131887074)}; + InputValidator[] inputValidatorArr = {companion.createRequiredInputValidator(2131887075)}; TextInputLayout textInputLayout2 = WidgetBugReport.access$getBinding$p(this.this$0).f; m.checkNotNullExpressionValue(textInputLayout2, "binding.bugReportPriority"); - return new ValidationManager(new Input.TextInputLayoutInput("name", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("priority", textInputLayout2, companion.createRequiredInputValidator(2131887075))); + return new ValidationManager(new Input.TextInputLayoutInput("name", textInputLayout, inputValidatorArr), new Input.TextInputLayoutInput("priority", textInputLayout2, companion.createRequiredInputValidator(2131887076))); } } diff --git a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java index 71d620d3eb..2b789d32f9 100644 --- a/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java +++ b/app/src/main/java/com/discord/widgets/bugreports/WidgetBugReport.java @@ -52,7 +52,7 @@ public final class WidgetBugReport extends AppFragment { public static final String INTENT_EXTRA_SCREENSHOT_URI = "extra_screenshot_uri"; public static final int VIEW_INDEX_REPORT = 0; public static final int VIEW_INDEX_STATUS = 1; - private static final List priorityLevels = n.listOf((Object[]) new Priority[]{new Priority(2131887080, 2131887079, 801497159479722084L), new Priority(2131887082, 2131887081, 410336837563973632L), new Priority(2131887084, 2131887083, 841420679643529296L), new Priority(2131887086, 2131887085, 827645852352512021L)}); + private static final List priorityLevels = n.listOf((Object[]) new Priority[]{new Priority(2131887081, 2131887080, 801497159479722084L), new Priority(2131887083, 2131887082, 410336837563973632L), new Priority(2131887085, 2131887084, 841420679643529296L), new Priority(2131887087, 2131887086, 827645852352512021L)}); private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetBugReport$binding$2.INSTANCE, null, 2, null); private final MGImages.DistinctChangeDetector imagesChangeDetector; private final Lazy items$delegate; @@ -172,14 +172,14 @@ public final class WidgetBugReport extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarTitle(2131893636); + setActionBarTitle(2131893676); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); getBinding().h.setImageURI(Uri.parse(getMostRecentIntent().getStringExtra("extra_screenshot_uri"))); getBinding().b.setOnClickListener(new WidgetBugReport$onViewBound$1(this)); TextInputLayout textInputLayout = getBinding().d; m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetBugReport$onViewBound$2(this)); - TextInputLayout textInputLayout2 = getBinding().f1682c; + TextInputLayout textInputLayout2 = getBinding().f1684c; m.checkNotNullExpressionValue(textInputLayout2, "binding.bugReportDescription"); ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetBugReport$onViewBound$3(this)); getBinding().m.setOnClickListener(new WidgetBugReport$onViewBound$4(this)); @@ -215,7 +215,7 @@ public final class WidgetBugReport extends AppFragment { TextInputLayout textInputLayout = getBinding().d; m.checkNotNullExpressionValue(textInputLayout, "binding.bugReportName"); ViewExtensions.setTextIfDifferent(textInputLayout, report.getReportName()); - TextInputLayout textInputLayout2 = getBinding().f1682c; + TextInputLayout textInputLayout2 = getBinding().f1684c; m.checkNotNullExpressionValue(textInputLayout2, "binding.bugReportDescription"); ViewExtensions.setTextIfDifferent(textInputLayout2, report.getReportDescription()); AppCompatImageView appCompatImageView = getBinding().h; @@ -248,13 +248,13 @@ public final class WidgetBugReport extends AppFragment { m.checkNotNullExpressionValue(appViewFlipper2, "binding.bugReportSwitchFlipper"); appViewFlipper2.setDisplayedChild(1); StickerView.d(getBinding().i, getViewModel().getSendingSticker(), null, 2); - getBinding().j.setText(2131887087); + getBinding().j.setText(2131887088); } else if (viewState instanceof BugReportViewModel.ViewState.Success) { AppViewFlipper appViewFlipper3 = getBinding().l; m.checkNotNullExpressionValue(appViewFlipper3, "binding.bugReportSwitchFlipper"); appViewFlipper3.setDisplayedChild(1); StickerView.d(getBinding().i, getViewModel().getSuccessSticker(), null, 2); - getBinding().j.setText(2131887088); + getBinding().j.setText(2131887089); } } } diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java index c6445bb4b8..a19c8ce9a2 100644 --- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java +++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog$configureFooter$1.java @@ -12,6 +12,6 @@ public final class WidgetChangeLog$configureFooter$1 implements View.OnClickList @Override // android.view.View.OnClickListener public final void onClick(View view) { - UriHandler.handle$default(UriHandler.INSTANCE, this.this$0.requireContext(), this.this$0.getString(2131893934), null, 4, null); + UriHandler.handle$default(UriHandler.INSTANCE, this.this$0.requireContext(), this.this$0.getString(2131893973), null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java index 8d435e6f39..1303867060 100644 --- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java +++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLog.java @@ -100,7 +100,7 @@ public final class WidgetChangeLog extends AppFragment { private final void configureFooter() { getBinding().g.setOnClickListener(new WidgetChangeLog$configureFooter$1(this)); - getBinding().f1685c.setOnClickListener(new WidgetChangeLog$configureFooter$2(this)); + getBinding().f1687c.setOnClickListener(new WidgetChangeLog$configureFooter$2(this)); getBinding().d.setOnClickListener(new WidgetChangeLog$configureFooter$3(this)); } @@ -147,7 +147,7 @@ public final class WidgetChangeLog extends AppFragment { private final CharSequence getDateString(Context context) { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION"); if (stringExtra == null) { - stringExtra = getString(2131887241); + stringExtra = getString(2131887242); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)"); try { @@ -187,12 +187,12 @@ public final class WidgetChangeLog extends AppFragment { private final void track(String str, Map map, boolean z2) { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION"); if (stringExtra == null) { - stringExtra = getString(2131887241); + stringExtra = getString(2131887242); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)"); String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_REVISION"); if (stringExtra2 == null) { - stringExtra2 = getString(2131887243); + stringExtra2 = getString(2131887244); } m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…g.change_log_md_revision)"); HashMap hashMap = new HashMap(); @@ -219,7 +219,7 @@ public final class WidgetChangeLog extends AppFragment { public void onDestroy() { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION"); if (stringExtra == null) { - stringExtra = getString(2131887241); + stringExtra = getString(2131887242); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)"); StoreStream.Companion.getChangeLog().markSeen(stringExtra); @@ -244,11 +244,11 @@ public final class WidgetChangeLog extends AppFragment { this.openedTimestamp = ClockFactory.get().currentTimeMillis(); track$default(this, "change_log_opened", null, false, 2, null); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131894576); + setActionBarTitle(2131894623); setActionBarSubtitle(getDateString(requireContext())); String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_BODY"); if (stringExtra == null) { - stringExtra = getString(2131887240); + stringExtra = getString(2131887241); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_body)"); LinkifiedTextView linkifiedTextView = getBinding().b; @@ -256,7 +256,7 @@ public final class WidgetChangeLog extends AppFragment { linkifiedTextView.setText(ChangeLogParser.parse$default(ChangeLogParser.INSTANCE, requireContext(), stringExtra, false, new WidgetChangeLog$onViewBound$1(this), 4, null)); String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VIDEO"); if (stringExtra2 == null) { - stringExtra2 = getString(2131887244); + stringExtra2 = getString(2131887245); } m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…ring.change_log_md_video)"); configureMedia(stringExtra2); diff --git a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java index 88c311afbc..d0390f5b7a 100644 --- a/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java +++ b/app/src/main/java/com/discord/widgets/changelog/WidgetChangeLogSpecial.java @@ -165,7 +165,7 @@ public final class WidgetChangeLogSpecial extends AppFragment { private final CharSequence getDateString(Context context) { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION"); if (stringExtra == null) { - stringExtra = getString(2131887241); + stringExtra = getString(2131887242); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)"); try { @@ -203,12 +203,12 @@ public final class WidgetChangeLogSpecial extends AppFragment { private final void track(String str, Map map, boolean z2) { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION"); if (stringExtra == null) { - stringExtra = getString(2131887241); + stringExtra = getString(2131887242); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)"); String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_REVISION"); if (stringExtra2 == null) { - stringExtra2 = getString(2131887243); + stringExtra2 = getString(2131887244); } m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…g.change_log_md_revision)"); HashMap hashMap = new HashMap(); @@ -235,7 +235,7 @@ public final class WidgetChangeLogSpecial extends AppFragment { public void onDestroy() { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VERSION"); if (stringExtra == null) { - stringExtra = getString(2131887241); + stringExtra = getString(2131887242); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_date)"); StoreStream.Companion.getChangeLog().markSeen(stringExtra); @@ -262,14 +262,14 @@ public final class WidgetChangeLogSpecial extends AppFragment { setActionBarSubtitle(getDateString(requireContext())); String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_BODY"); if (stringExtra == null) { - stringExtra = getString(2131887240); + stringExtra = getString(2131887241); } m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…tring.change_log_md_body)"); if (getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_EXIT_STYLE") == Companion.ExitStyle.BACK) { ImageButton imageButton = getBinding().e; m.checkNotNullExpressionValue(imageButton, "binding.changeLogSpecialClose"); imageButton.setVisibility(8); - ImageButton imageButton2 = getBinding().f1686c; + ImageButton imageButton2 = getBinding().f1688c; m.checkNotNullExpressionValue(imageButton2, "binding.changeLogSpecialBack"); imageButton2.setVisibility(0); } @@ -281,15 +281,15 @@ public final class WidgetChangeLogSpecial extends AppFragment { linkifiedTextView.setText(ChangeLogParser.INSTANCE.parse(requireContext(), stringExtra, true, new WidgetChangeLogSpecial$onViewBound$1(this))); String stringExtra2 = getMostRecentIntent().getStringExtra("INTENT_EXTRA_VIDEO"); if (stringExtra2 == null) { - stringExtra2 = getString(2131887244); + stringExtra2 = getString(2131887245); } m.checkNotNullExpressionValue(stringExtra2, "mostRecentIntent.getStri…ring.change_log_md_video)"); configureMedia(stringExtra2); - getBinding().f1686c.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$2(this)); + getBinding().f1688c.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$2(this)); getBinding().e.setOnClickListener(new WidgetChangeLogSpecial$onViewBound$3(this)); LinkifiedTextView linkifiedTextView2 = getBinding().b; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.changeLogBody"); - c.a.l.b.n(linkifiedTextView2, 2131887260, new Object[0], null, 4); + c.a.l.b.n(linkifiedTextView2, 2131887261, new Object[0], null, 4); LinkifiedTextView linkifiedTextView3 = getBinding().b; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.changeLogBody"); linkifiedTextView3.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java b/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java index dd5a15fd6a..bfa7676d3e 100644 --- a/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/SimpleMembersAdapter.java @@ -31,11 +31,11 @@ public final class SimpleMembersAdapter extends MGRecyclerAdapterSimple implements public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363889) { + if (menuItem.getItemId() == 2131363891) { WidgetChannelGroupDMSettings widgetChannelGroupDMSettings = this.this$0; WidgetChannelGroupDMSettings.access$confirmLeave(widgetChannelGroupDMSettings, widgetChannelGroupDMSettings.requireContext(), new AnonymousClass1(this), this.$displayName); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java index 1bac2758de..ca10e229a1 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelGroupDMSettings.java @@ -75,7 +75,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment { h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChannelGroupDMSettingsViewModel.class), new WidgetChannelGroupDMSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChannelGroupDMSettings$viewModel$2)); this.iconEditedResult = WidgetChannelGroupDMSettings$iconEditedResult$1.INSTANCE; - this.state = new StatefulViews(2131362328, 2131364837); + this.state = new StatefulViews(2131362328, 2131364840); } public static final /* synthetic */ void access$configureUi(WidgetChannelGroupDMSettings widgetChannelGroupDMSettings, ChannelGroupDMSettingsViewModel.ViewState viewState) { @@ -140,7 +140,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment { } textView2.setVisibility(i); getBinding().h.setOnClickListener(new WidgetChannelGroupDMSettings$configureIcon$3(this)); - this.state.configureSaveActionView(getBinding().f1689c); + this.state.configureSaveActionView(getBinding().f1691c); } private final void configureUi(ChannelGroupDMSettingsViewModel.ViewState viewState) { @@ -154,7 +154,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment { ChannelSettings channelSettings = valid.getChannelSettings(); Channel channel = channelSettings.getChannel(); String z0 = AnimatableValueParser.z0(channel, requireContext(), true); - setActionBarTitle(2131887324); + setActionBarTitle(2131887326); setActionBarSubtitle(z0); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); AppFragment.setActionBarOptionsMenu$default(this, 2131623955, new WidgetChannelGroupDMSettings$configureUi$1(this, z0), null, 4, null); @@ -168,15 +168,15 @@ public final class WidgetChannelGroupDMSettings extends AppFragment { m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditName"); ViewExtensions.setSelectionEnd(textInputLayout3); configureIcon(valid); - this.state.configureSaveActionView(getBinding().f1689c); - getBinding().f1689c.setOnClickListener(new WidgetChannelGroupDMSettings$configureUi$2(this, channel, z0)); + this.state.configureSaveActionView(getBinding().f1691c); + getBinding().f1691c.setOnClickListener(new WidgetChannelGroupDMSettings$configureUi$2(this, channel, z0)); long g = channel.g(); - getBinding().d.updateView(new NotificationMuteSettingsView.ViewState(channelSettings.isMuted(), channelSettings.getMuteEndTime(), b.j(this, 2131891265, new Object[0], null, 4), b.j(this, 2131894028, new Object[0], null, 4), b.j(this, 2131888665, new Object[0], null, 4), 2131888666, null), new WidgetChannelGroupDMSettings$configureUi$3(this, g), new WidgetChannelGroupDMSettings$configureUi$4(this)); + getBinding().d.updateView(new NotificationMuteSettingsView.ViewState(channelSettings.isMuted(), channelSettings.getMuteEndTime(), b.j(this, 2131891298, new Object[0], null, 4), b.j(this, 2131894067, new Object[0], null, 4), b.j(this, 2131888675, new Object[0], null, 4), 2131888676, null), new WidgetChannelGroupDMSettings$configureUi$3(this, g), new WidgetChannelGroupDMSettings$configureUi$4(this)); } } private final void confirmLeave(Context context, Function0 function0, CharSequence charSequence) { - WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(b.j(this, 2131890759, new Object[]{charSequence}, null, 4)).setMessage(b.j(this, 2131890756, new Object[]{charSequence}, null, 4)).setDialogAttrTheme(2130969788).setPositiveButton(2131890755, new WidgetChannelGroupDMSettings$confirmLeave$1(function0)), 2131887177, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(b.j(this, 2131890789, new Object[]{charSequence}, null, 4)).setMessage(b.j(this, 2131890786, new Object[]{charSequence}, null, 4)).setDialogAttrTheme(2130969788).setPositiveButton(2131890785, new WidgetChannelGroupDMSettings$confirmLeave$1(function0)), 2131887178, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); negativeButton$default.show(parentFragmentManager); @@ -191,7 +191,7 @@ public final class WidgetChannelGroupDMSettings extends AppFragment { } private final void handleSettingsSaved() { - o.i(this, 2131892932, 0, 4); + o.i(this, 2131892974, 0, 4); StatefulViews.clear$default(this.state, false, 1, null); AppFragment.hideKeyboard$default(this, null, 1, null); getBinding().e.fullScroll(33); @@ -246,10 +246,10 @@ public final class WidgetChannelGroupDMSettings extends AppFragment { super.onViewBound(view); TextView textView = getBinding().g; m.checkNotNullExpressionValue(textView, "binding.settingsGroupIconLabel"); - textView.setText(b.j(this, 2131891174, new Object[]{"128", "128"}, null, 4)); + textView.setText(b.j(this, 2131891205, new Object[]{"128", "128"}, null, 4)); this.state.setupUnsavedChangesConfirmation(this); StatefulViews statefulViews = this.state; - FloatingActionButton floatingActionButton = getBinding().f1689c; + FloatingActionButton floatingActionButton = getBinding().f1691c; TextInputLayout textInputLayout = getBinding().b; m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName"); statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java index 06f8e6e04d..85f0227b7b 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$binding$2.java @@ -38,8 +38,8 @@ public final /* synthetic */ class WidgetChannelNotificationSettings$binding$2 e i = 2131362334; LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362334); if (linearLayout2 != null) { - i = 2131364525; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364525); + i = 2131364528; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528); if (nestedScrollView != null) { return new WidgetChannelNotificationSettingsBinding((CoordinatorLayout) view, linearLayout, notificationMuteSettingsView, checkedSetting, checkedSetting2, checkedSetting3, linearLayout2, nestedScrollView); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java index 2930b4060b..08fe0ede77 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.java @@ -54,7 +54,7 @@ public final class WidgetChannelNotificationSettings$configureNotificationRadios if (!model.isAboveNotifyAllSize() || i != ModelNotificationSettings.FREQUENCY_ALL) { checkedSetting.h(null, false); } else { - checkedSetting.h(b.j(this.this$0, 2131890744, new Object[0], null, 4), false); + checkedSetting.h(b.j(this.this$0, 2131890774, new Object[0], null, 4), false); } if (model.getNotificationSetting() == i) { z2 = true; diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java index d1aa777394..f29bec7e4c 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelNotificationSettings.java @@ -297,7 +297,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment { private final void configureUI(Model model) { setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)); - getBinding().f1691c.updateView(new NotificationMuteSettingsView.ViewState(model.getChannelIsMuted(), model.getChannelMuteEndTime(), AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131891263, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131891262, new Object[0], null, 4), AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131894026, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131894025, new Object[0], null, 4), b.g(requireContext(), 2131888660, new Object[0], null, 4), AnimatableValueParser.x1(model.getChannel()) ? 2131888661 : 2131888658, AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131888664, new Object[0], null, 4) : b.g(requireContext(), 2131888659, new Object[0], null, 4)), new WidgetChannelNotificationSettings$configureUI$onMute$1(this, model), new WidgetChannelNotificationSettings$configureUI$onUnmute$1(this, model)); + getBinding().f1693c.updateView(new NotificationMuteSettingsView.ViewState(model.getChannelIsMuted(), model.getChannelMuteEndTime(), AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131891296, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131891295, new Object[0], null, 4), AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131894065, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4) : b.g(requireContext(), 2131894064, new Object[0], null, 4), b.g(requireContext(), 2131888670, new Object[0], null, 4), AnimatableValueParser.x1(model.getChannel()) ? 2131888671 : 2131888668, AnimatableValueParser.x1(model.getChannel()) ? b.g(requireContext(), 2131888674, new Object[0], null, 4) : b.g(requireContext(), 2131888669, new Object[0], null, 4)), new WidgetChannelNotificationSettings$configureUI$onMute$1(this, model), new WidgetChannelNotificationSettings$configureUI$onUnmute$1(this, model)); configureNotificationRadios(model); } @@ -312,7 +312,7 @@ public final class WidgetChannelNotificationSettings extends AppFragment { setRetainInstance(true); int i = 0; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131891501); + setActionBarTitle(2131891534); this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().d, getBinding().e, getBinding().f})); LinearLayout linearLayout = getBinding().b; m.checkNotNullExpressionValue(linearLayout, "binding.channelNotificationSettingsSystem"); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java index 29c018aa77..126606f7f1 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector$binding$2.java @@ -21,8 +21,8 @@ public final /* synthetic */ class WidgetChannelSelector$binding$2 extends k imp int i = 2131362318; RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362318); if (recyclerView != null) { - i = 2131363340; - TextView textView = (TextView) view.findViewById(2131363340); + i = 2131363342; + TextView textView = (TextView) view.findViewById(2131363342); if (textView != null) { return new WidgetChannelSelectorBinding((NestedScrollView) view, recyclerView, textView); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java index 1a8555880a..1a519519f8 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSelector.java @@ -157,19 +157,19 @@ public final class WidgetChannelSelector extends AppBottomSheet { } public static /* synthetic */ void launchForInactiveStages$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) { - companion.launchForInactiveStages(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891407 : i); + companion.launchForInactiveStages(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i); } public static /* synthetic */ void launchForText$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) { - companion.launchForText(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891407 : i); + companion.launchForText(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i); } public static /* synthetic */ void launchForVocal$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) { - companion.launchForVocal(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891407 : i); + companion.launchForVocal(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i); } public static /* synthetic */ void launchForVoice$default(Companion companion, Fragment fragment, long j, String str, boolean z2, int i, int i2, Object obj) { - companion.launchForVoice(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891407 : i); + companion.launchForVoice(fragment, j, str, (i2 & 8) != 0 ? false : z2, (i2 & 16) != 0 ? 2131891440 : i); } public static /* synthetic */ void registerForResult$default(Companion companion, Fragment fragment, String str, boolean z2, Function2 function2, int i, Object obj) { diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java index 00b05abd9d..7e610f8588 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetChannelSidebarActions$binding$2 extends public final WidgetChannelSidebarActionsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365580; - GuildChannelSideBarActionsView guildChannelSideBarActionsView = (GuildChannelSideBarActionsView) view.findViewById(2131365580); + int i = 2131365586; + GuildChannelSideBarActionsView guildChannelSideBarActionsView = (GuildChannelSideBarActionsView) view.findViewById(2131365586); if (guildChannelSideBarActionsView != null) { - i = 2131365581; - PrivateChannelSideBarActionsView privateChannelSideBarActionsView = (PrivateChannelSideBarActionsView) view.findViewById(2131365581); + i = 2131365587; + PrivateChannelSideBarActionsView privateChannelSideBarActionsView = (PrivateChannelSideBarActionsView) view.findViewById(2131365587); if (privateChannelSideBarActionsView != null) { return new WidgetChannelSidebarActionsBinding((FrameLayout) view, guildChannelSideBarActionsView, privateChannelSideBarActionsView); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java index 2bf98056ba..612488235a 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelSidebarActions.java @@ -59,12 +59,12 @@ public final class WidgetChannelSidebarActions extends AppFragment { GuildChannelSideBarActionsView guildChannelSideBarActionsView = getBinding().b; m.checkNotNullExpressionValue(guildChannelSideBarActionsView, "binding.widgetChannelSidebarActionsGuildView"); guildChannelSideBarActionsView.setVisibility(8); - PrivateChannelSideBarActionsView privateChannelSideBarActionsView = getBinding().f1702c; + PrivateChannelSideBarActionsView privateChannelSideBarActionsView = getBinding().f1704c; m.checkNotNullExpressionValue(privateChannelSideBarActionsView, "binding.widgetChannelSidebarActionsPrivateView"); privateChannelSideBarActionsView.setVisibility(0); WidgetChannelSidebarActionsViewModel.ViewState.Private r2 = (WidgetChannelSidebarActionsViewModel.ViewState.Private) viewState; long channelId = r2.getChannelId(); - getBinding().f1702c.a(new WidgetChannelSidebarActions$configureUI$1(this, viewState), new WidgetChannelSidebarActions$configureUI$2(this, viewState), new WidgetChannelSidebarActions$configureUI$3(this, channelId), new WidgetChannelSidebarActions$configureUI$4(channelId, requireContext()), r2.isMuted()); + getBinding().f1704c.a(new WidgetChannelSidebarActions$configureUI$1(this, viewState), new WidgetChannelSidebarActions$configureUI$2(this, viewState), new WidgetChannelSidebarActions$configureUI$3(this, channelId), new WidgetChannelSidebarActions$configureUI$4(channelId, requireContext()), r2.isMuted()); } else if (viewState instanceof WidgetChannelSidebarActionsViewModel.ViewState.Guild) { WidgetChannelSidebarActionsViewModel.ViewState.Guild guild = (WidgetChannelSidebarActionsViewModel.ViewState.Guild) viewState; long channelId2 = guild.getChannelId(); @@ -77,7 +77,7 @@ public final class WidgetChannelSidebarActions extends AppFragment { if (view3 != null) { ViewKt.setVisible(view3, true); } - PrivateChannelSideBarActionsView privateChannelSideBarActionsView2 = getBinding().f1702c; + PrivateChannelSideBarActionsView privateChannelSideBarActionsView2 = getBinding().f1704c; m.checkNotNullExpressionValue(privateChannelSideBarActionsView2, "binding.widgetChannelSidebarActionsPrivateView"); privateChannelSideBarActionsView2.setVisibility(8); GuildChannelSideBarActionsView guildChannelSideBarActionsView3 = getBinding().b; diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java index 10de6d0c4b..1e2a61f2ab 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.java @@ -54,7 +54,7 @@ public final class WidgetChannelTopic$showContextMenu$4 implements MenuItem.OnMe WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131890759, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890756, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890755, new Object[0], null, 4), b.j(this.this$0, 2131887177, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364030, new AnonymousClass1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131890789, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890786, new Object[]{this.$channelTitle}, null, 4), b.j(this.this$0, 2131890785, new Object[0], null, 4), b.j(this.this$0, 2131887178, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364032, new AnonymousClass1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null); return true; } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java index 78c967dad0..6485510753 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetChannelTopic.java @@ -200,8 +200,8 @@ public final class WidgetChannelTopic extends AppFragment { Lifecycle lifecycle = getLifecycle(); m.checkNotNullExpressionValue(lifecycle, "lifecycle"); if (lifecycle.getCurrentState().isAtLeast(Lifecycle.State.INITIALIZED)) { - getBinding().f1703c.setOnClickListener(new WidgetChannelTopic$configureEllipsis$1(this)); - ImageView imageView = getBinding().f1703c; + getBinding().f1705c.setOnClickListener(new WidgetChannelTopic$configureEllipsis$1(this)); + ImageView imageView = getBinding().f1705c; m.checkNotNullExpressionValue(imageView, "binding.channelTopicEllipsis"); LinkifiedTextView linkifiedTextView = getBinding().f; m.checkNotNullExpressionValue(linkifiedTextView, "binding.channelTopicTitle"); @@ -264,7 +264,7 @@ public final class WidgetChannelTopic extends AppFragment { ImageView imageView3 = getBinding().d; m.checkNotNullExpressionValue(imageView3, "binding.channelTopicMoreIcon"); imageView3.setVisibility(0); - setChannelIcon(2131231557); + setChannelIcon(2131231558); renderedTopic = getRenderedTopicForDM((WidgetChannelTopicViewModel.ViewState.DM) viewState); } else if (viewState instanceof WidgetChannelTopicViewModel.ViewState.GDM) { View view4 = getView(); @@ -400,21 +400,21 @@ public final class WidgetChannelTopic extends AppFragment { m.checkNotNullExpressionValue(imageView, "binding.channelTopicMoreIcon"); PopupMenu popupMenu = new PopupMenu(imageView.getContext(), getBinding().d, 8388691); popupMenu.inflate(2131623958); - popupMenu.getMenu().findItem(2131363898).setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$1(this, j)); - MenuItem findItem = popupMenu.getMenu().findItem(2131363896); + popupMenu.getMenu().findItem(2131363900).setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$1(this, j)); + MenuItem findItem = popupMenu.getMenu().findItem(2131363898); m.checkNotNullExpressionValue(findItem, "copyChannelIdAction"); findItem.setVisible(z3); findItem.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$2(this, j)); - MenuItem findItem2 = popupMenu.getMenu().findItem(2131363897); + MenuItem findItem2 = popupMenu.getMenu().findItem(2131363899); m.checkNotNullExpressionValue(findItem2, "customizeGroupAction"); findItem2.setVisible(z2); findItem2.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$3(this, j)); - MenuItem findItem3 = popupMenu.getMenu().findItem(2131363895); + MenuItem findItem3 = popupMenu.getMenu().findItem(2131363897); if (z2) { - findItem3.setTitle(2131890755); + findItem3.setTitle(2131890785); findItem3.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$4(this, charSequence)); } else { - findItem3.setTitle(2131887393); + findItem3.setTitle(2131887395); findItem3.setOnMenuItemClickListener(new WidgetChannelTopic$showContextMenu$5(this)); } popupMenu.show(); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java index 865b0ed211..1da647699b 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java @@ -45,7 +45,7 @@ public final class WidgetCreateChannel$configureUI$1 implements Action2< public final void call(MenuItem menuItem, Context context) { m.checkNotNullParameter(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363909) { + if (menuItem.getItemId() == 2131363911) { RestAPI api = RestAPI.Companion.getApi(); long access$getGuildId$p = WidgetCreateChannel.access$getGuildId$p(this.this$0); int access$getChannelType$p = WidgetCreateChannel.access$getChannelType$p(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java index 1250a1d7c7..7a8cc9e3c6 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$onViewBoundOrOnResume$4.java @@ -17,7 +17,7 @@ public final class WidgetCreateChannel$onViewBoundOrOnResume$4 implements View.O @Override // android.view.View.OnClickListener public final void onClick(View view) { RadioManager radioManager = this.$radioManager; - RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f1757c; + RadioButton radioButton = WidgetCreateChannel.access$getBinding$p(this.this$0).f1759c; m.checkNotNullExpressionValue(radioButton, "binding.createChannelAnnouncementsRadio"); radioManager.a(radioButton); WidgetCreateChannel.access$configurePrivateRoles(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java index d9f5641a38..e36a23db7c 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java @@ -239,7 +239,7 @@ public final class WidgetCreateChannel extends AppFragment { } public WidgetCreateChannel() { - super(2131558979); + super(2131558980); } public static final /* synthetic */ void access$configurePrivateRoles(WidgetCreateChannel widgetCreateChannel) { @@ -316,7 +316,7 @@ public final class WidgetCreateChannel extends AppFragment { } boolean z2 = true; setActionBarDisplayHomeAsUpEnabled(true); - setActionBarTitle(getType() == 4 ? 2131887895 : 2131887896); + setActionBarTitle(getType() == 4 ? 2131887896 : 2131887897); AppFragment.setActionBarOptionsMenu$default(this, 2131623941, new WidgetCreateChannel$configureUI$1(this), null, 4, null); ConstraintLayout constraintLayout = getBinding().b; m.checkNotNullExpressionValue(constraintLayout, "binding.createChannelAnnouncementsContainer"); @@ -354,7 +354,7 @@ public final class WidgetCreateChannel extends AppFragment { if (radioButton.isChecked()) { return 2; } - RadioButton radioButton2 = getBinding().f1757c; + RadioButton radioButton2 = getBinding().f1759c; m.checkNotNullExpressionValue(radioButton2, "binding.createChannelAnnouncementsRadio"); if (radioButton2.isChecked()) { return 5; @@ -436,7 +436,7 @@ public final class WidgetCreateChannel extends AppFragment { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getGuildId(), getCategoryId()), this, null, 2, null), WidgetCreateChannel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCreateChannel$onViewBoundOrOnResume$1(this), 62, (Object) null); int i = 0; boolean z2 = true; - RadioManager radioManager = new RadioManager(n.listOf((Object[]) new RadioButton[]{getBinding().o, getBinding().r, getBinding().f1757c, getBinding().m})); + RadioManager radioManager = new RadioManager(n.listOf((Object[]) new RadioButton[]{getBinding().o, getBinding().r, getBinding().f1759c, getBinding().m})); getBinding().n.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$2(this, radioManager)); getBinding().q.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$3(this, radioManager)); getBinding().b.setOnClickListener(new WidgetCreateChannel$onViewBoundOrOnResume$4(this, radioManager)); @@ -451,7 +451,7 @@ public final class WidgetCreateChannel extends AppFragment { m.checkNotNullExpressionValue(radioButton2, "binding.createChannelVoiceRadio"); radioManager.a(radioButton2); } else if (type == 5) { - RadioButton radioButton3 = getBinding().f1757c; + RadioButton radioButton3 = getBinding().f1759c; m.checkNotNullExpressionValue(radioButton3, "binding.createChannelAnnouncementsRadio"); radioManager.a(radioButton3); } else if (type == 13) { @@ -470,11 +470,11 @@ public final class WidgetCreateChannel extends AppFragment { i = 8; } linearLayout.setVisibility(i); - getBinding().h.setText(getType() == 4 ? 2131892340 : 2131892343); - getBinding().f.setText(getType() == 4 ? 2131892342 : 2131892368); - getBinding().k.setText(getType() == 4 ? 2131888616 : 2131888619); + getBinding().h.setText(getType() == 4 ? 2131892378 : 2131892381); + getBinding().f.setText(getType() == 4 ? 2131892380 : 2131892406); + getBinding().k.setText(getType() == 4 ? 2131888626 : 2131888629); TextInputLayout textInputLayout = getBinding().d; m.checkNotNullExpressionValue(textInputLayout, "binding.createChannelNameLayout"); - textInputLayout.setHint(getString(getType() == 4 ? 2131887203 : 2131888617)); + textInputLayout.setHint(getString(getType() == 4 ? 2131887204 : 2131888627)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java index 87a7a7ab0e..8f1127253d 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$binding$2.java @@ -22,23 +22,23 @@ public final /* synthetic */ class WidgetGroupInviteFriends$binding$2 extends k public final WidgetGroupInviteFriendsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363327; - ChipsView chipsView = (ChipsView) view.findViewById(2131363327); + int i = 2131363329; + ChipsView chipsView = (ChipsView) view.findViewById(2131363329); if (chipsView != null) { - i = 2131363328; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363328); + i = 2131363330; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363330); if (relativeLayout != null) { - i = 2131363329; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363329); + i = 2131363331; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363331); if (recyclerView != null) { - i = 2131363330; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363330); + i = 2131363332; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363332); if (floatingActionButton != null) { - i = 2131363331; - TextView textView = (TextView) view.findViewById(2131363331); + i = 2131363333; + TextView textView = (TextView) view.findViewById(2131363333); if (textView != null) { - i = 2131363332; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363332); + i = 2131363334; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363334); if (appViewFlipper != null) { return new WidgetGroupInviteFriendsBinding((CoordinatorLayout) view, chipsView, relativeLayout, recyclerView, floatingActionButton, textView, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java index 59f3435013..f27b18fe0c 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.java @@ -31,7 +31,7 @@ public final class WidgetGroupInviteFriends$configureUI$1 extends o implements F if (!z2) { WidgetGroupInviteFriends.access$unselectUser(this.this$0, user); } else if (this.$data.getTotalNumRecipients() >= this.$data.getMaxGroupMemberCount()) { - c.a.d.o.i(this.this$0, 2131889134, 0, 4); + c.a.d.o.i(this.this$0, 2131889144, 0, 4); } else { WidgetGroupInviteFriends.access$selectUser(this.this$0, user); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java index e329e5309c..b796cb57e3 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.java @@ -12,6 +12,6 @@ public final class WidgetGroupInviteFriends$setupFAB$1 implements View.OnClickLi @Override // android.view.View.OnClickListener public final void onClick(View view) { - o.g(this.this$0.getContext(), 2131889134, 0, null, 12); + o.g(this.this$0.getContext(), 2131889144, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java index 08f1818828..623477b160 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriends.java @@ -695,7 +695,7 @@ public final class WidgetGroupInviteFriends extends AppFragment { } public WidgetGroupInviteFriends() { - super(2131559024); + super(2131559025); } public static final /* synthetic */ void access$configureUI(WidgetGroupInviteFriends widgetGroupInviteFriends, Model model) { @@ -799,16 +799,16 @@ public final class WidgetGroupInviteFriends extends AppFragment { private final void setupToolbar(Model model) { CharSequence charSequence; if (model.getChannel() != null) { - setActionBarTitle(b.j(this, 2131889146, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4)); + setActionBarTitle(b.j(this, 2131889156, new Object[]{AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)}, null, 4)); } else { - setActionBarTitle(getString(2131890515)); + setActionBarTitle(getString(2131890545)); } if (model.getChannel() != null) { List v = model.getChannel().v(); if ((v != null ? v.size() : 1) >= model.getMaxGroupMemberCount()) { - charSequence = getString(2131889133); + charSequence = getString(2131889143); m.checkNotNullExpressionValue(charSequence, "getString(R.string.group_dm_invite_full_main)"); - RelativeLayout relativeLayout = getBinding().f1788c; + RelativeLayout relativeLayout = getBinding().f1790c; m.checkNotNullExpressionValue(relativeLayout, "binding.groupInviteFriendsRecipientsContainer"); relativeLayout.setVisibility(8); setActionBarSubtitle(charSequence); @@ -818,17 +818,17 @@ public final class WidgetGroupInviteFriends extends AppFragment { if (maxGroupMemberCount > 0) { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755129, maxGroupMemberCount, Integer.valueOf(maxGroupMemberCount)); + charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755130, maxGroupMemberCount, Integer.valueOf(maxGroupMemberCount)); } else if (maxGroupMemberCount == 0) { - charSequence = getString(2131889145); + charSequence = getString(2131889155); m.checkNotNullExpressionValue(charSequence, "getString(R.string.group…_invite_will_fill_mobile)"); } else { int i = maxGroupMemberCount * -1; Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - charSequence = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755130, i, Integer.valueOf(i)); + charSequence = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755131, i, Integer.valueOf(i)); } - RelativeLayout relativeLayout2 = getBinding().f1788c; + RelativeLayout relativeLayout2 = getBinding().f1790c; m.checkNotNullExpressionValue(relativeLayout2, "binding.groupInviteFriendsRecipientsContainer"); relativeLayout2.setVisibility(0); setActionBarSubtitle(charSequence); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java index fdb9a09014..a1fbacfa04 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter.java @@ -33,30 +33,30 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetGroupInviteFriendsListItem(WidgetGroupInviteFriendsAdapter widgetGroupInviteFriendsAdapter, WidgetGroupInviteFriendsAdapter widgetGroupInviteFriendsAdapter2) { - super(2131559025, widgetGroupInviteFriendsAdapter2); + super(2131559026, widgetGroupInviteFriendsAdapter2); m.checkNotNullParameter(widgetGroupInviteFriendsAdapter2, "adapter"); this.this$0 = widgetGroupInviteFriendsAdapter; View view = this.itemView; - int i = 2131363225; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363225); + int i = 2131363227; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363227); if (relativeLayout != null) { - i = 2131363246; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363246); + i = 2131363248; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363248); if (simpleDraweeView != null) { - i = 2131363247; - RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131363247); + i = 2131363249; + RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131363249); if (relativeLayout2 != null) { - i = 2131363253; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363253); + i = 2131363255; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363255); if (simpleDraweeSpanTextView != null) { - i = 2131363255; - TextView textView = (TextView) view.findViewById(2131363255); + i = 2131363257; + TextView textView = (TextView) view.findViewById(2131363257); if (textView != null) { - i = 2131363256; - StatusView statusView = (StatusView) view.findViewById(2131363256); + i = 2131363258; + StatusView statusView = (StatusView) view.findViewById(2131363258); if (statusView != null) { - i = 2131365412; - CheckBox checkBox = (CheckBox) view.findViewById(2131365412); + i = 2131365417; + CheckBox checkBox = (CheckBox) view.findViewById(2131365417); if (checkBox != null) { WidgetGroupInviteFriendsItemBinding widgetGroupInviteFriendsItemBinding = new WidgetGroupInviteFriendsItemBinding((LinearLayout) view, relativeLayout, simpleDraweeView, relativeLayout2, simpleDraweeSpanTextView, textView, statusView, checkBox); m.checkNotNullExpressionValue(widgetGroupInviteFriendsItemBinding, "WidgetGroupInviteFriendsItemBinding.bind(itemView)"); @@ -92,8 +92,8 @@ public final class WidgetGroupInviteFriendsAdapter extends MGRecyclerAdapterSimp boolean isApplicationStreaming = friendItem.isApplicationStreaming(); SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.friendsListItemGame"); - PresenceUtils.setPresenceText(presence, isApplicationStreaming, simpleDraweeSpanTextView, true); - SimpleDraweeView simpleDraweeView = this.binding.f1789c; + PresenceUtils.setPresenceText$default(presence, isApplicationStreaming, simpleDraweeSpanTextView, true, false, 16, null); + SimpleDraweeView simpleDraweeView = this.binding.f1791c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.friendsListItemAvatar"); IconUtils.setIcon$default(simpleDraweeView, friendItem.getUser(), 2131165296, null, null, null, 56, null); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java index 3518363509..5298975cb5 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$binding$2.java @@ -71,8 +71,8 @@ public final /* synthetic */ class WidgetTextChannelSettings$binding$2 extends k i = 2131362353; TextView textView4 = (TextView) view.findViewById(2131362353); if (textView4 != null) { - i = 2131364525; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364525); + i = 2131364528; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528); if (nestedScrollView != null) { return new WidgetTextChannelSettingsBinding((CoordinatorLayout) view, checkedSetting, textInputLayout, textInputLayout2, linearLayout, checkedSetting2, textView, textView2, linearLayout2, findViewById, floatingActionButton, linearLayout3, linearLayout4, linearLayout5, textView3, seekBar, textView4, nestedScrollView); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java index 9ad16eaad9..776fb7125e 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.java @@ -20,7 +20,7 @@ public final class WidgetTextChannelSettings$configureUI$1 implements Ac public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case 2131363866: + case 2131363868: if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) { WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel()); return; @@ -28,7 +28,7 @@ public final class WidgetTextChannelSettings$configureUI$1 implements Ac WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel()); return; } - case 2131363867: + case 2131363869: StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings(); m.checkNotNullExpressionValue(context, "context"); userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel()); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java index 8d7cab483f..5abcc47ec1 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.java @@ -14,7 +14,7 @@ public final class WidgetTextChannelSettings$configureUI$2 implements Action1 } public final void call(Menu menu) { - MenuItem findItem = menu.findItem(2131363866); + MenuItem findItem = menu.findItem(2131363868); m.checkNotNullExpressionValue(findItem, "it.findItem(R.id.menu_channel_settings_delete)"); findItem.setVisible(this.$this_configureUI.getCanManageChannel()); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java index 6f40ec2b18..f0e4a6397e 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$3.java @@ -21,7 +21,7 @@ public final class WidgetTextChannelSettings$configureUI$3 implements View.OnCli WidgetTextChannelSettings widgetTextChannelSettings = this.this$0; long g = this.$this_configureUI.getChannel().g(); StatefulViews access$getState$p = WidgetTextChannelSettings.access$getState$p(this.this$0); - TextInputLayout textInputLayout = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f1966c; + TextInputLayout textInputLayout = WidgetTextChannelSettings.access$getBinding$p(this.this$0).f1968c; m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName"); String str = (String) access$getState$p.getIfChanged(textInputLayout.getId()); StatefulViews access$getState$p2 = WidgetTextChannelSettings.access$getState$p(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java index 1165aa42d6..2710e02e78 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.java @@ -10,6 +10,6 @@ public final class WidgetTextChannelSettings$configureUI$6 implements View.OnCli @Override // android.view.View.OnClickListener public final void onClick(View view) { m.checkNotNullExpressionValue(view, "it"); - o.g(view.getContext(), 2131891862, 0, null, 12); + o.g(view.getContext(), 2131891899, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.java index 492820bd09..5ef3b460f8 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.java @@ -28,6 +28,6 @@ public final class WidgetTextChannelSettings$saveChannel$1 extends o implements public final void invoke(Channel channel) { Context context = this.this$0.getContext(); m.checkNotNullExpressionValue(channel, "it"); - c.a.d.o.g(context, AnimatableValueParser.f1(channel) ? 2131887208 : 2131887325, 0, null, 12); + c.a.d.o.g(context, AnimatableValueParser.f1(channel) ? 2131887209 : 2131887327, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java index c28e09579e..6794eedbd3 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetTextChannelSettings.java @@ -276,7 +276,7 @@ public final class WidgetTextChannelSettings extends AppFragment { } public WidgetTextChannelSettings() { - super(2131559243); + super(2131559244); } public static final /* synthetic */ void access$cannotDeleteWarn(WidgetTextChannelSettings widgetTextChannelSettings, boolean z2) { @@ -323,7 +323,7 @@ public final class WidgetTextChannelSettings extends AppFragment { m.checkNotNullExpressionValue(linearLayout, "binding.root"); AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(linearLayout).create(); m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()"); - textView.setText(z2 ? 2131888072 : 2131888081); + textView.setText(z2 ? 2131888073 : 2131888082); materialButton.setOnClickListener(new WidgetTextChannelSettings$cannotDeleteWarn$1(create)); create.show(); return; @@ -344,16 +344,16 @@ public final class WidgetTextChannelSettings extends AppFragment { } CharSequence charSequence = null; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(AnimatableValueParser.x1(model.getChannel()) ? 2131887324 : 2131887207); + setActionBarTitle(AnimatableValueParser.x1(model.getChannel()) ? 2131887326 : 2131887208); setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)); setActionBarOptionsMenu(AnimatableValueParser.x1(model.getChannel()) ? 2131623965 : 2131623940, new WidgetTextChannelSettings$configureUI$1(this, model), new WidgetTextChannelSettings$configureUI$2(model)); - TextInputLayout textInputLayout = getBinding().f1966c; + TextInputLayout textInputLayout = getBinding().f1968c; m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName"); StatefulViews statefulViews = this.state; - TextInputLayout textInputLayout2 = getBinding().f1966c; + TextInputLayout textInputLayout2 = getBinding().f1968c; m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName"); ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), AnimatableValueParser.y0(model.getChannel()))); - getBinding().f1966c.setHint(AnimatableValueParser.x1(model.getChannel()) ? 2131888617 : 2131887203); + getBinding().f1968c.setHint(AnimatableValueParser.x1(model.getChannel()) ? 2131888627 : 2131887204); TextInputLayout textInputLayout3 = getBinding().d; m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic"); StatefulViews statefulViews2 = this.state; @@ -398,7 +398,7 @@ public final class WidgetTextChannelSettings extends AppFragment { CheckedSetting checkedSetting2 = getBinding().b; Context context = getContext(); if (context != null) { - charSequence = b.g(context, 2131888576, new Object[]{f.a.a(360032008192L, null)}, null, 4); + charSequence = b.g(context, 2131888586, new Object[]{f.a.a(360032008192L, null)}, null, 4); } checkedSetting2.h(charSequence, true); getBinding().b.e(new WidgetTextChannelSettings$configureUI$8(this, model)); @@ -451,12 +451,12 @@ public final class WidgetTextChannelSettings extends AppFragment { m.checkNotNullExpressionValue(linearLayout, "binding.root"); AlertDialog create = new AlertDialog.Builder(linearLayout.getContext()).setView(a.a).create(); m.checkNotNullExpressionValue(create, "AlertDialog.Builder(bind…ew(binding.root).create()"); - a.e.setText(AnimatableValueParser.x1(channel) ? 2131888059 : 2131888058); + a.e.setText(AnimatableValueParser.x1(channel) ? 2131888060 : 2131888059); a.f75c.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$1(create)); a.d.setOnClickListener(new WidgetTextChannelSettings$confirmDelete$2(this, channel)); TextView textView = a.b; m.checkNotNullExpressionValue(textView, "binding.channelSettingsDeleteBody"); - b.n(textView, 2131888060, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4); + b.n(textView, 2131888061, new Object[]{AnimatableValueParser.A0(channel, requireContext(), false, 2)}, null, 4); create.show(); } @@ -480,19 +480,19 @@ public final class WidgetTextChannelSettings extends AppFragment { if (i == 0) { TextView textView = getBinding().o; m.checkNotNullExpressionValue(textView, "binding.channelSettingsSlowModeCooldownLabel"); - textView.setText(getString(2131888735)); + textView.setText(getString(2131888745)); } else if (1 <= i && 60 > i) { TextView textView2 = getBinding().o; m.checkNotNullExpressionValue(textView2, "binding.channelSettingsSlowModeCooldownLabel"); - ViewExtensions.setPluralText(textView2, 2131755069, i, new Object[0]); + ViewExtensions.setPluralText(textView2, 2131755070, i, new Object[0]); } else if (60 <= i && 3600 > i) { TextView textView3 = getBinding().o; m.checkNotNullExpressionValue(textView3, "binding.channelSettingsSlowModeCooldownLabel"); - ViewExtensions.setPluralText(textView3, 2131755066, i / 60, new Object[0]); + ViewExtensions.setPluralText(textView3, 2131755067, i / 60, new Object[0]); } else { TextView textView4 = getBinding().o; m.checkNotNullExpressionValue(textView4, "binding.channelSettingsSlowModeCooldownLabel"); - ViewExtensions.setPluralText(textView4, 2131755064, i / 3600, new Object[0]); + ViewExtensions.setPluralText(textView4, 2131755065, i / 3600, new Object[0]); } } @@ -508,7 +508,7 @@ public final class WidgetTextChannelSettings extends AppFragment { statefulViews.addOptionalFields(textInputLayout); StatefulViews statefulViews2 = this.state; FloatingActionButton floatingActionButton = getBinding().k; - TextInputLayout textInputLayout2 = getBinding().f1966c; + TextInputLayout textInputLayout2 = getBinding().f1968c; m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName"); TextInputLayout textInputLayout3 = getBinding().d; m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic"); diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java index 4ea985616b..bc51339274 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$binding$2.java @@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetThreadNotificationSettings$binding$2 ex public final WidgetThreadNotificationSettingsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364525; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364525); + int i = 2131364528; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528); if (nestedScrollView != null) { - i = 2131365262; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365262); + i = 2131365266; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365266); if (linearLayout != null) { - i = 2131365265; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365265); + i = 2131365269; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365269); if (checkedSetting != null) { - i = 2131365266; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365266); + i = 2131365270; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365270); if (checkedSetting2 != null) { - i = 2131365267; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365267); + i = 2131365271; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365271); if (checkedSetting3 != null) { return new WidgetThreadNotificationSettingsBinding((CoordinatorLayout) view, nestedScrollView, linearLayout, checkedSetting, checkedSetting2, checkedSetting3); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java index ac827b6197..ffc4652f83 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings$configureNotificationRadio$1.java @@ -42,7 +42,7 @@ public final class WidgetThreadNotificationSettings$configureNotificationRadio$1 public final void invoke(ThreadMember threadMember) { m.checkNotNullParameter(threadMember, "threadMember"); - c.a.d.o.g(this.$context, 2131887325, 0, null, 12); + c.a.d.o.g(this.$context, 2131887327, 0, null, 12); StoreStream.Companion.getAnalytics().onThreadNotificationSettingsUpdated(this.this$0.$model.getChannel().g(), this.this$0.$model.getChannel().q(), this.this$0.$model.getNotificationSetting(), threadMember.b()); } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java index e673258531..05b7f91303 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadNotificationSettings.java @@ -142,7 +142,7 @@ public final class WidgetThreadNotificationSettings extends AppFragment { } public WidgetThreadNotificationSettings() { - super(2131559249); + super(2131559250); } public static final /* synthetic */ void access$configureUI(WidgetThreadNotificationSettings widgetThreadNotificationSettings, Model model) { @@ -162,7 +162,7 @@ public final class WidgetThreadNotificationSettings extends AppFragment { private final void configureUI(Model model) { setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)); - CheckedSetting checkedSetting = getBinding().f1972c; + CheckedSetting checkedSetting = getBinding().f1974c; m.checkNotNullExpressionValue(checkedSetting, "binding.threadSettingsNotificationsFrequency0"); configureNotificationRadio(model, checkedSetting, 2); CheckedSetting checkedSetting2 = getBinding().d; @@ -184,8 +184,8 @@ public final class WidgetThreadNotificationSettings extends AppFragment { setRetainInstance(true); int i = 0; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131891501); - this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().f1972c, getBinding().d, getBinding().e})); + setActionBarTitle(2131891534); + this.notificationSettingsRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().f1974c, getBinding().d, getBinding().e})); LinearLayout linearLayout = getBinding().b; m.checkNotNullExpressionValue(linearLayout, "binding.threadNotificationSettingsSystem"); if (!getMostRecentIntent().getBooleanExtra("SHOW_SYSTEM_SETTING", false)) { diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java index 2ce34e82b5..abc976969d 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings$binding$2.java @@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetThreadSettings$binding$2 extends k impl public final WidgetThreadSettingsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364525; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364525); + int i = 2131364528; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528); if (nestedScrollView != null) { - i = 2131365263; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365263); + i = 2131365267; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365267); if (textInputLayout != null) { - i = 2131365264; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365264); + i = 2131365268; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365268); if (linearLayout != null) { - i = 2131365268; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365268); + i = 2131365272; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131365272); if (floatingActionButton != null) { return new WidgetThreadSettingsBinding((CoordinatorLayout) view, nestedScrollView, textInputLayout, linearLayout, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java index efb005d67f..ed3b1ab83f 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettings.java @@ -53,7 +53,7 @@ public final class WidgetThreadSettings extends AppFragment { } public WidgetThreadSettings() { - super(2131559250); + super(2131559251); WidgetThreadSettings$viewModel$2 widgetThreadSettings$viewModel$2 = new WidgetThreadSettings$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadSettingsViewModel.class), new WidgetThreadSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadSettings$viewModel$2)); @@ -82,7 +82,7 @@ public final class WidgetThreadSettings extends AppFragment { } int i = 0; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131893848); + setActionBarTitle(2131893887); WidgetThreadSettingsViewModel.ViewState.Valid valid = (WidgetThreadSettingsViewModel.ViewState.Valid) viewState; setActionBarSubtitle(AnimatableValueParser.A0(valid.getChannel(), requireContext(), false, 2)); String channelNameDraft = valid.getChannelNameDraft(); @@ -93,13 +93,13 @@ public final class WidgetThreadSettings extends AppFragment { m.checkNotNullExpressionValue(textInputLayout2, "binding.threadSettingsEditName"); ViewExtensions.setText(textInputLayout2, valid.getChannelNameDraft()); } - FloatingActionButton floatingActionButton = getBinding().f1973c; + FloatingActionButton floatingActionButton = getBinding().f1975c; m.checkNotNullExpressionValue(floatingActionButton, "binding.threadSettingsSave"); if (!valid.getHasUnsavedChanges()) { i = 8; } floatingActionButton.setVisibility(i); - getBinding().f1973c.setOnClickListener(new WidgetThreadSettings$configureUI$1(this)); + getBinding().f1975c.setOnClickListener(new WidgetThreadSettings$configureUI$1(this)); } private final WidgetThreadSettingsBinding getBinding() { diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java index 3b871e197f..a646d23a56 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$1.java @@ -28,6 +28,6 @@ public final class WidgetThreadSettingsViewModel$saveThread$1 extends o implemen public final void invoke(Channel channel) { m.checkNotNullParameter(channel, "it"); PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0); - access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131893849)); + access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131893888)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java index 6d44be7ef1..9da25d0b00 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetThreadSettingsViewModel$saveThread$2.java @@ -28,6 +28,6 @@ public final class WidgetThreadSettingsViewModel$saveThread$2 extends o implemen public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); PublishSubject access$getEventSubject$p = WidgetThreadSettingsViewModel.access$getEventSubject$p(this.this$0); - access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131888048)); + access$getEventSubject$p.j.onNext(new WidgetThreadSettingsViewModel.Event.ShowToast(2131888049)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java index 28c4dfae54..088a40bd57 100644 --- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet$binding$2.java @@ -22,12 +22,12 @@ public final /* synthetic */ class GroupInviteFriendsSheet$binding$2 extends k i int i = 2131362618; ChipsView chipsView = (ChipsView) view.findViewById(2131362618); if (chipsView != null) { - i = 2131364396; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364396); + i = 2131364399; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364399); if (recyclerView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131364536; - AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364536); + i = 2131364539; + AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364539); if (appCompatImageView != null) { return new GroupInviteFriendsBottomSheetBinding(constraintLayout, chipsView, recyclerView, constraintLayout, appCompatImageView); } diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java index fbd0042d9a..edacd2ddb1 100644 --- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java +++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheet.java @@ -132,7 +132,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet { private final void handleEvent(GroupInviteFriendsSheetViewModel.Event event) { if (event instanceof GroupInviteFriendsSheetViewModel.Event.ChannelFull) { - o.i(this, 2131889134, 0, 4); + o.i(this, 2131889144, 0, 4); } } @@ -149,12 +149,12 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet { layoutParams.height = (int) (((float) resources.getDisplayMetrics().heightPixels) * 0.9f); constraintLayout.setLayoutParams(layoutParams); } - getBinding().f1610c.requestLayout(); + getBinding().f1612c.requestLayout(); } private final void scrollToTopIfDeletingChar(int i, int i2) { if (i < i2) { - getBinding().f1610c.smoothScrollToPosition(0); + getBinding().f1612c.smoothScrollToPosition(0); } } @@ -209,7 +209,7 @@ public final class GroupInviteFriendsSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1610c; + RecyclerView recyclerView = getBinding().f1612c; m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView"); this.adapter = (GroupInviteFriendsSheetAdapter) companion.configure(new GroupInviteFriendsSheetAdapter(recyclerView, new GroupInviteFriendsSheet$onViewCreated$1(this))); ChipsView chipsView = getBinding().b; diff --git a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java index 347646940f..2a056e4fc1 100644 --- a/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/invite/GroupInviteFriendsSheetAdapter.java @@ -144,14 +144,14 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl super(i, groupInviteFriendsSheetAdapter); m.checkNotNullParameter(groupInviteFriendsSheetAdapter, "adapter"); View view = this.itemView; - int i2 = 2131363246; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363246); + int i2 = 2131363248; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363248); if (simpleDraweeView != null) { - i2 = 2131363255; - TextView textView = (TextView) view.findViewById(2131363255); + i2 = 2131363257; + TextView textView = (TextView) view.findViewById(2131363257); if (textView != null) { - i2 = 2131365412; - MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131365412); + i2 = 2131365417; + MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131365417); if (materialCheckBox != null) { GroupInviteFriendsSheetItemBinding groupInviteFriendsSheetItemBinding = new GroupInviteFriendsSheetItemBinding((ConstraintLayout) view, simpleDraweeView, textView, materialCheckBox); m.checkNotNullExpressionValue(groupInviteFriendsSheetItemBinding, "GroupInviteFriendsSheetItemBinding.bind(itemView)"); @@ -175,7 +175,7 @@ public final class GroupInviteFriendsSheetAdapter extends MGRecyclerAdapterSimpl m.checkNotNullParameter(friendItem, "data"); super.onConfigure(i, (int) friendItem); User user = friendItem.getUser(); - TextView textView = this.binding.f1611c; + TextView textView = this.binding.f1613c; m.checkNotNullExpressionValue(textView, "binding.friendsListItemName"); textView.setText(user.getUsername()); SimpleDraweeView simpleDraweeView = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java index ac54784273..ba8ca7da19 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java @@ -2,10 +2,8 @@ package com.discord.widgets.channels.list; import c.d.b.a.a; import com.discord.api.channel.Channel; -import com.discord.api.stageinstance.StageInstance; import com.discord.api.voice.state.VoiceState; import com.discord.models.domain.ModelApplicationStream; -import com.discord.models.domain.ModelNotificationSettings; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.user.User; @@ -16,7 +14,6 @@ import com.discord.stores.StoreExperiments; import com.discord.stores.StoreMentions; import com.discord.stores.StoreMessagesMostRecent; import com.discord.stores.StoreStream; -import com.discord.stores.StoreThreadsActiveJoined; import com.discord.stores.StoreUserConnections; import com.discord.stores.StoreUserGuildSettings; import com.discord.stores.StoreUserPresence; @@ -26,28 +23,18 @@ import com.discord.utilities.channel.GuildChannelsInfo; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.rx.ObservableCombineLatestOverloadsKt; import com.discord.utilities.rx.ObservableExtensionsKt; -import com.discord.utilities.threads.ThreadUtils; import com.discord.widgets.channels.list.items.ChannelListItem; import com.discord.widgets.channels.list.items.ChannelListItemCategory; import com.discord.widgets.channels.list.items.ChannelListItemEventsSeparator; import com.discord.widgets.channels.list.items.ChannelListItemInvite; import com.discord.widgets.channels.list.items.ChannelListItemMfaNotice; -import com.discord.widgets.channels.list.items.ChannelListItemStageActiveEvent; -import com.discord.widgets.channels.list.items.ChannelListItemStageAudienceCount; -import com.discord.widgets.channels.list.items.ChannelListItemStageVoiceChannel; -import com.discord.widgets.channels.list.items.ChannelListItemTextChannel; -import com.discord.widgets.channels.list.items.ChannelListItemVoiceChannel; import com.discord.widgets.channels.list.items.ChannelListItemVoiceUser; -import com.discord.widgets.stage.model.StageChannel; -import d0.f0.q; -import d0.t.n; +import d0.t.q; import d0.t.u; import d0.z.d.m; import java.util.ArrayList; -import java.util.Collection; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -353,149 +340,19 @@ public final class WidgetChannelListModel { return ObservableCombineLatestOverloadsKt.combineLatest(observable, StoreChannels.observeChannelsForGuild$default(companion.getChannels(), j, null, 2, null), companion.getThreadsActiveJoined().observeActiveJoinedThreadsForGuild(j), companion.getThreadsActive().observeChannelsWithActiveThreadsByGuild(j), companion.getChannelsSelected().observeSelectedChannel(), companion.getVoiceChannelSelected().observeSelectedVoiceChannelId(), VoiceStates.get$default(VoiceStates.INSTANCE, j, null, 2, null), companion.getMentions().observeMentionCounts(), companion.getReadStates().getUnreadChannelIds(), companion.getStoreChannelCategories().observeCollapsedCategories(j), companion.getNux().getNuxState(), companion.getStageChannels().observeGuildStageChannels(j), companion.getStageInstances().observeStageInstancesForGuild(j), new WidgetChannelListModel$Companion$getSelectedGuildChannelList$1(j)); } - private final List guildListBuilder(long j, GuildChannelsInfo guildChannelsInfo, Map map, Map> map2, Set set, Channel channel, long j2, Map> map3, Map map4, Set set2, Set set3, Map map5, Map map6) { - boolean z2; - Set set4; - ArrayList arrayList; - ArrayList arrayList2 = new ArrayList(map2.size() + map.size()); - if (guildChannelsInfo.getUnelevated()) { - arrayList2.add(new ChannelListItemMfaNotice()); - } - if (guildChannelsInfo.getAbleToInstantInvite()) { - arrayList2.add(new ChannelListItemInvite(j)); - } - StageChannel stageChannel = (StageChannel) q.firstOrNull(q.filter(u.asSequence(map5.values()), WidgetChannelListModel$Companion$guildListBuilder$1.INSTANCE)); - if (stageChannel != null) { - arrayList2.add(new ChannelListItemEventsSeparator(true)); - arrayList2.add(new ChannelListItemStageActiveEvent(stageChannel)); - arrayList2.add(new ChannelListItemEventsSeparator(false)); - } - Map> sortThreadsForChannelList = ThreadUtils.INSTANCE.sortThreadsForChannelList(map2, channel); - Map> sortedCategories = guildChannelsInfo.getSortedCategories(map); - HashSet hashSet = new HashSet(); - HashSet hashSet2 = new HashSet(); - WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3 = new WidgetChannelListModel$Companion$guildListBuilder$3(arrayList2, hashSet, set3); - WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4 = new WidgetChannelListModel$Companion$guildListBuilder$4(set2); - WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5 = new WidgetChannelListModel$Companion$guildListBuilder$5(sortThreadsForChannelList, widgetChannelListModel$Companion$guildListBuilder$4); - WidgetChannelListModel$Companion$guildListBuilder$6 widgetChannelListModel$Companion$guildListBuilder$6 = new WidgetChannelListModel$Companion$guildListBuilder$6(sortThreadsForChannelList, channel); - for (Map.Entry> entry : sortedCategories.entrySet()) { - long longValue = entry.getKey().longValue(); - Collection value = entry.getValue(); - WidgetChannelListModel$Companion$guildListBuilder$6 widgetChannelListModel$Companion$guildListBuilder$62 = widgetChannelListModel$Companion$guildListBuilder$6; - WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$52 = widgetChannelListModel$Companion$guildListBuilder$5; - boolean can = PermissionUtils.can(1024, guildChannelsInfo.getChannelPermissions().get(Long.valueOf(longValue))); - boolean can2 = PermissionUtils.can(16, guildChannelsInfo.getChannelPermissions().get(Long.valueOf(longValue))); - if (can && can2) { - hashSet.add(Long.valueOf(longValue)); - } - ModelNotificationSettings.ChannelOverride channelOverride = guildChannelsInfo.getNotificationSettings().getChannelOverride(longValue); - boolean z3 = channelOverride != null && channelOverride.isMuted(); - for (Channel channel2 : value) { - long g = channel2.g(); - Long l = guildChannelsInfo.getChannelPermissions().get(Long.valueOf(g)); - ModelNotificationSettings.ChannelOverride channelOverride2 = guildChannelsInfo.getNotificationSettings().getChannelOverride(g); - boolean z4 = channelOverride2 != null && channelOverride2.isMuted(); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1(z3, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2(g, channel2, l, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3(channel2, l, widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, z4, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4(widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5(widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, channel2, l, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6(widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, channel2, l, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7(widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8 = new WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8(g, guildChannelsInfo, hashSet, channel, map4, set2, j, widgetChannelListModel$Companion$guildListBuilder$62, set3, widgetChannelListModel$Companion$guildListBuilder$4, hashSet2, widgetChannelListModel$Companion$guildListBuilder$52, j2, map3, set, map6, map5, sortThreadsForChannelList, arrayList2, widgetChannelListModel$Companion$guildListBuilder$3); - int z5 = channel2.z(); - if (z5 != 0) { - if (z5 == 2) { - set4 = set3; - z2 = can2; - arrayList = arrayList2; - ChannelListItemVoiceChannel invoke = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.mo1invoke(); - if (invoke != null) { - arrayList.add(invoke); - Object obj = (Collection) map3.get(Long.valueOf(g)); - if (obj == null) { - obj = n.emptyList(); - } - arrayList.addAll(obj); - arrayList2 = arrayList; - can2 = z2; - widgetChannelListModel$Companion$guildListBuilder$62 = widgetChannelListModel$Companion$guildListBuilder$62; - widgetChannelListModel$Companion$guildListBuilder$52 = widgetChannelListModel$Companion$guildListBuilder$52; - widgetChannelListModel$Companion$guildListBuilder$4 = widgetChannelListModel$Companion$guildListBuilder$4; - widgetChannelListModel$Companion$guildListBuilder$3 = widgetChannelListModel$Companion$guildListBuilder$3; - sortThreadsForChannelList = sortThreadsForChannelList; - hashSet = hashSet; - } - } else if (z5 != 13) { - if (z5 == 4) { - widgetChannelListModel$Companion$guildListBuilder$3.mo1invoke(); - Long valueOf = Long.valueOf(g); - set4 = set3; - z2 = can2; - ChannelListItemCategory channelListItemCategory = new ChannelListItemCategory(channel2, set4.contains(valueOf), z4, z2); - arrayList = arrayList2; - arrayList.add(channelListItemCategory); - } else if (z5 != 5) { - set4 = set3; - z2 = can2; - arrayList = arrayList2; - } - arrayList2 = arrayList; - can2 = z2; - widgetChannelListModel$Companion$guildListBuilder$62 = widgetChannelListModel$Companion$guildListBuilder$62; - widgetChannelListModel$Companion$guildListBuilder$52 = widgetChannelListModel$Companion$guildListBuilder$52; - widgetChannelListModel$Companion$guildListBuilder$4 = widgetChannelListModel$Companion$guildListBuilder$4; - widgetChannelListModel$Companion$guildListBuilder$3 = widgetChannelListModel$Companion$guildListBuilder$3; - sortThreadsForChannelList = sortThreadsForChannelList; - hashSet = hashSet; - } else { - set4 = set3; - z2 = can2; - arrayList = arrayList2; - ChannelListItemStageVoiceChannel invoke2 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.mo1invoke(); - if (invoke2 != null) { - arrayList.add(invoke2); - arrayList.addAll(widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.mo1invoke()); - StageChannel stageChannel2 = map5.get(Long.valueOf(g)); - Integer valueOf2 = stageChannel2 != null ? Integer.valueOf(stageChannel2.getAudienceSize()) : null; - if (valueOf2 != null && (valueOf2.intValue() > 0 || invoke2.getHasActiveEvent() || invoke2.getHasSpeakers())) { - arrayList.add(new ChannelListItemStageAudienceCount(channel2, valueOf2.intValue())); - } - } - } - arrayList2 = arrayList; - can2 = z2; - widgetChannelListModel$Companion$guildListBuilder$62 = widgetChannelListModel$Companion$guildListBuilder$62; - widgetChannelListModel$Companion$guildListBuilder$52 = widgetChannelListModel$Companion$guildListBuilder$52; - widgetChannelListModel$Companion$guildListBuilder$4 = widgetChannelListModel$Companion$guildListBuilder$4; - widgetChannelListModel$Companion$guildListBuilder$3 = widgetChannelListModel$Companion$guildListBuilder$3; - sortThreadsForChannelList = sortThreadsForChannelList; - hashSet = hashSet; - } - set4 = set3; - z2 = can2; - arrayList = arrayList2; - ChannelListItemTextChannel invoke3 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.mo1invoke(); - if (invoke3 != null) { - arrayList.add(invoke3); - arrayList.addAll(widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.invoke(channel2)); - } - arrayList2 = arrayList; - can2 = z2; - widgetChannelListModel$Companion$guildListBuilder$62 = widgetChannelListModel$Companion$guildListBuilder$62; - widgetChannelListModel$Companion$guildListBuilder$52 = widgetChannelListModel$Companion$guildListBuilder$52; - widgetChannelListModel$Companion$guildListBuilder$4 = widgetChannelListModel$Companion$guildListBuilder$4; - widgetChannelListModel$Companion$guildListBuilder$3 = widgetChannelListModel$Companion$guildListBuilder$3; - sortThreadsForChannelList = sortThreadsForChannelList; - hashSet = hashSet; - } - widgetChannelListModel$Companion$guildListBuilder$6 = widgetChannelListModel$Companion$guildListBuilder$62; - widgetChannelListModel$Companion$guildListBuilder$5 = widgetChannelListModel$Companion$guildListBuilder$52; - widgetChannelListModel$Companion$guildListBuilder$4 = widgetChannelListModel$Companion$guildListBuilder$4; - widgetChannelListModel$Companion$guildListBuilder$3 = widgetChannelListModel$Companion$guildListBuilder$3; - } - widgetChannelListModel$Companion$guildListBuilder$3.mo1invoke(); - return arrayList2; + /* JADX ERROR: IndexOutOfBoundsException in pass: SSATransform + java.lang.IndexOutOfBoundsException: bitIndex < 0: -107 + at java.base/java.util.BitSet.get(BitSet.java:624) + at jadx.core.dex.visitors.ssa.LiveVarAnalysis.fillBasicBlockInfo(LiveVarAnalysis.java:65) + at jadx.core.dex.visitors.ssa.LiveVarAnalysis.runAnalysis(LiveVarAnalysis.java:36) + at jadx.core.dex.visitors.ssa.SSATransform.process(SSATransform.java:55) + at jadx.core.dex.visitors.ssa.SSATransform.visit(SSATransform.java:41) + */ + private final java.util.List guildListBuilder(long r143, com.discord.utilities.channel.GuildChannelsInfo r145, java.util.Map r146, java.util.Map> r147, java.util.Set r148, com.discord.api.channel.Channel r149, long r150, java.util.Map> r152, java.util.Map r153, java.util.Set r154, java.util.Set r155, java.util.Map r156, java.util.Map r157) { + /* + // Method dump skipped, instructions count: 1057 + */ + throw new UnsupportedOperationException("Method not decompiled: com.discord.widgets.channels.list.WidgetChannelListModel.Companion.guildListBuilder(long, com.discord.utilities.channel.GuildChannelsInfo, java.util.Map, java.util.Map, java.util.Set, com.discord.api.channel.Channel, long, java.util.Map, java.util.Map, java.util.Set, java.util.Set, java.util.Map, java.util.Map):java.util.List"); } public final Observable get() { @@ -589,7 +446,7 @@ public final class WidgetChannelListModel { } } for (Map.Entry entry : hashMap.entrySet()) { - d0.t.q.sortWith((List) entry.getValue(), comparator); + q.sortWith((List) entry.getValue(), comparator); } return hashMap; } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.java index e92a49b3b5..f96374341b 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads$onDatasetChanged$1.java @@ -41,7 +41,7 @@ public final class WidgetChannelListUnreads$onDatasetChanged$1 extends k impleme if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(50, this) == coroutine_suspended) { + if (a.n(50, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java index 2abe790fbc..9157de1b92 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListUnreads.java @@ -352,7 +352,7 @@ public final class WidgetChannelListUnreads { /* JADX INFO: this call moved to the top of the method (can break code semantics) */ public /* synthetic */ WidgetChannelListUnreads(ViewStub viewStub, RecyclerView recyclerView, AppBarLayout appBarLayout, Function0 function0, int i, int i2, boolean z2, int i3, DefaultConstructorMarker defaultConstructorMarker) { - this(viewStub, recyclerView, (i3 & 4) != 0 ? null : appBarLayout, function0, (i3 & 16) != 0 ? 2131891308 : i, (i3 & 32) != 0 ? 2131891322 : i2, (i3 & 64) != 0 ? true : z2); + this(viewStub, recyclerView, (i3 & 4) != 0 ? null : appBarLayout, function0, (i3 & 16) != 0 ? 2131891341 : i, (i3 & 32) != 0 ? 2131891355 : i2, (i3 & 64) != 0 ? true : z2); } public static final /* synthetic */ ViewStub access$getUnreadsStub$p(WidgetChannelListUnreads widgetChannelListUnreads) { @@ -417,7 +417,7 @@ public final class WidgetChannelListUnreads { } private final void onConfigureView(Model.Indicator indicator, boolean z2) { - getBinding().f1717c.setBackgroundResource(getIcon(indicator)); + getBinding().f1719c.setBackgroundResource(getIcon(indicator)); getBinding().b.setText(getText(indicator)); TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.channelsListUnreads"); @@ -473,7 +473,7 @@ public final class WidgetChannelListUnreads { this.data = list; CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(this.recycler); if (coroutineScope != null) { - c.q.a.k.a.F(coroutineScope, null, null, new WidgetChannelListUnreads$onDatasetChanged$1(this, null), 3, null); + c.q.a.k.a.G(coroutineScope, null, null, new WidgetChannelListUnreads$onDatasetChanged$1(this, null), 3, null); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java index 45bfb5a43b..39c6d192b8 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$binding$2.java @@ -84,11 +84,11 @@ public final /* synthetic */ class WidgetChannelsList$binding$2 extends k implem CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131362635); if (collapsingToolbarLayout != null) { RoundedCoordinatorLayout roundedCoordinatorLayout = (RoundedCoordinatorLayout) view; - i = 2131365585; - EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131365585); + i = 2131365591; + EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = (EmptyFriendsStateContactSyncView) view.findViewById(2131365591); if (emptyFriendsStateContactSyncView != null) { - i = 2131365586; - EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131365586); + i = 2131365592; + EmptyFriendsStateView emptyFriendsStateView = (EmptyFriendsStateView) view.findViewById(2131365592); if (emptyFriendsStateView != null) { return new WidgetChannelsListBinding(roundedCoordinatorLayout, customAppBarLayout, recyclerView, simpleDraweeView, frameLayout, textView, textView2, constraintLayout, materialButton, textView3, textView4, toolbar, textView5, appCompatImageView, findViewById, findViewById2, viewStub, toolbar2, collapsingToolbarLayout, roundedCoordinatorLayout, emptyFriendsStateContactSyncView, emptyFriendsStateView); } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java index c07fcf0dc8..12a95acfc1 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5.java @@ -41,7 +41,7 @@ public final class WidgetChannelsList$onViewBound$5 extends o implements Functio m.checkNotNullExpressionValue(obtain, "event"); obtain.setEventType(16384); Object[] objArr = new Object[2]; - objArr[0] = this.this$0.getString(z2 ? 2131888451 : 2131887414); + objArr[0] = this.this$0.getString(z2 ? 2131888461 : 2131887416); objArr[1] = AnimatableValueParser.y0(channel); obtain.getText().add(a.H(objArr, 2, "%s %s", "java.lang.String.format(format, *args)")); try { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java index 2e1a164303..937a3fa032 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1.java @@ -3,6 +3,9 @@ package com.discord.widgets.channels.list; import android.content.Context; import android.view.View; import com.discord.models.domain.ModelInvite; +import com.discord.models.guild.Guild; +import com.discord.models.invite.InviteUtils; +import com.discord.stores.StoreStream; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; @@ -10,11 +13,13 @@ import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelsList.kt */ public final class WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1 extends o implements Function1 { public final /* synthetic */ View $it$inlined; + public final /* synthetic */ long $selectedGuildId; public final /* synthetic */ WidgetChannelsList$onViewBound$6 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1(WidgetChannelsList$onViewBound$6 widgetChannelsList$onViewBound$6, View view) { + public WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1(long j, WidgetChannelsList$onViewBound$6 widgetChannelsList$onViewBound$6, View view) { super(1); + this.$selectedGuildId = j; this.this$0 = widgetChannelsList$onViewBound$6; this.$it$inlined = view; } @@ -28,10 +33,21 @@ public final class WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda } public final void invoke(ModelInvite modelInvite) { - String link = modelInvite.toLink(this.this$0.this$0.getResources(), "https://discord.gg"); - Context context = this.$it$inlined.getContext(); - m.checkNotNullExpressionValue(context, "it.context"); - m.checkNotNullExpressionValue(link, "inviteLink"); - c.a.d.o.a(context, link, 2131890519); + String vanityUrlCode; + if (modelInvite != null) { + String link = modelInvite.toLink(this.this$0.this$0.getResources(), "https://discord.gg"); + Context context = this.$it$inlined.getContext(); + m.checkNotNullExpressionValue(context, "it.context"); + m.checkNotNullExpressionValue(link, "inviteLink"); + c.a.d.o.a(context, link, 2131890549); + return; + } + Guild guild = StoreStream.Companion.getGuilds().getGuild(this.$selectedGuildId); + if (guild != null && (vanityUrlCode = guild.getVanityUrlCode()) != null) { + String createLinkFromCode = InviteUtils.INSTANCE.createLinkFromCode(vanityUrlCode); + Context context2 = this.$it$inlined.getContext(); + m.checkNotNullExpressionValue(context2, "it.context"); + c.a.d.o.a(context2, createLinkFromCode, 2131890549); + } } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.java index ada4f0aa82..dbfd9f9fc9 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$6.java @@ -30,7 +30,8 @@ public final class WidgetChannelsList$onViewBound$6 extends o implements Functio m.checkNotNullParameter(view, "it"); Long access$getSelectedGuildId$p = WidgetChannelsList.access$getSelectedGuildId$p(this.this$0); if (access$getSelectedGuildId$p != null) { - ObservableExtensionsKt.ui$default(StoreStream.Companion.getInviteSettings().generateInviteDefaultChannel(access$getSelectedGuildId$p.longValue()), this.this$0, null, 2, null).k(q.a.g(this.this$0.getContext(), new WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1(this, view), null)); + long longValue = access$getSelectedGuildId$p.longValue(); + ObservableExtensionsKt.ui$default(StoreStream.Companion.getInviteSettings().generateInviteDefaultChannel(longValue), this.this$0, null, 2, null).k(q.a.g(this.this$0.getContext(), new WidgetChannelsList$onViewBound$6$$special$$inlined$let$lambda$1(longValue, this, view), null)); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java index cada5eae86..2f83ba1d78 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList.java @@ -168,17 +168,17 @@ public final class WidgetChannelsList extends AppFragment { Drawable drawable; if (guild != null) { if (guild.getFeatures().contains(GuildFeature.VERIFIED)) { - i = getBinding().b.a() ? 2131232033 : 2131232034; + i = getBinding().b.a() ? 2131232036 : 2131232037; } else if (guild.getFeatures().contains(GuildFeature.PARTNERED)) { - i = getBinding().b.a() ? 2131231808 : 2131231809; + i = getBinding().b.a() ? 2131231811 : 2131231812; } else if (guild.getPremiumTier() == 0 && guild.getPremiumSubscriptionCount() > 0) { - i = getBinding().b.a() ? 2131231669 : 2131231670; + i = getBinding().b.a() ? 2131231672 : 2131231673; } else if (guild.getPremiumTier() == 1) { - i = getBinding().b.a() ? 2131231658 : 2131231659; + i = getBinding().b.a() ? 2131231661 : 2131231662; } else if (guild.getPremiumTier() == 2) { - i = getBinding().b.a() ? 2131231660 : 2131231661; + i = getBinding().b.a() ? 2131231663 : 2131231664; } else if (guild.getPremiumTier() == 3) { - i = getBinding().b.a() ? 2131231662 : 2131231663; + i = getBinding().b.a() ? 2131231665 : 2131231666; } TextView textView = getBinding().g; Drawable drawable2 = i != 0 ? null : ContextCompat.getDrawable(requireContext(), i); @@ -212,12 +212,12 @@ public final class WidgetChannelsList extends AppFragment { EmptyFriendsStateContactSyncView emptyFriendsStateContactSyncView = getBinding().p; m.checkNotNullExpressionValue(emptyFriendsStateContactSyncView, "binding.widgetChannelsListEmptyFriendsStateCsView"); emptyFriendsStateContactSyncView.setVisibility(widgetChannelListModel.getShowEmptyState() && widgetChannelListModel.getShowContactSyncEmptyState() ? 0 : 8); - RecyclerView recyclerView = getBinding().f1705c; + RecyclerView recyclerView = getBinding().f1707c; m.checkNotNullExpressionValue(recyclerView, "binding.channelsList"); recyclerView.setVisibility(widgetChannelListModel.getShowEmptyState() ? 4 : 0); if (!m.areEqual(this.selectedGuildId, selectedGuild != null ? Long.valueOf(selectedGuild.getId()) : null)) { if (z3) { - getBinding().f1705c.scrollToPosition(0); + getBinding().f1707c.scrollToPosition(0); getBinding().b.setExpanded(true); configureHeaderColors(widgetChannelListModel.getSelectedGuild(), true); } @@ -296,7 +296,7 @@ public final class WidgetChannelsList extends AppFragment { } private final int getTintColor(Context context, Guild guild, boolean z2) { - return ((guild != null ? guild.getBanner() : null) == null || z2) ? ColorCompat.getThemedColor(context, 2130968946) : ColorCompat.getColor(context, 2131100427); + return ((guild != null ? guild.getBanner() : null) == null || z2) ? ColorCompat.getThemedColor(context, 2130968946) : ColorCompat.getColor(context, 2131100428); } private final void handleGlobalStatusIndicatorState(WidgetGlobalStatusIndicatorState.State state) { @@ -325,7 +325,7 @@ public final class WidgetChannelsList extends AppFragment { getBinding().q.updateView("Channels List"); getBinding().p.updateView(true); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1705c; + RecyclerView recyclerView = getBinding().f1707c; m.checkNotNullExpressionValue(recyclerView, "binding.channelsList"); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); @@ -366,13 +366,13 @@ public final class WidgetChannelsList extends AppFragment { } widgetChannelsListAdapter7.setOnSelectUserOptions(new WidgetChannelsList$onViewBound$7(this)); getBinding().k.setOnClickListener(new WidgetChannelsList$onViewBound$8(this)); - getBinding().f1705c.setHasFixedSize(false); - RecyclerView recyclerView2 = getBinding().f1705c; + getBinding().f1707c.setHasFixedSize(false); + RecyclerView recyclerView2 = getBinding().f1707c; m.checkNotNullExpressionValue(recyclerView2, "binding.channelsList"); recyclerView2.setItemAnimator(null); ViewStub viewStub = getBinding().m; m.checkNotNullExpressionValue(viewStub, "binding.channelsListUnreadsStub"); - RecyclerView recyclerView3 = getBinding().f1705c; + RecyclerView recyclerView3 = getBinding().f1707c; m.checkNotNullExpressionValue(recyclerView3, "binding.channelsList"); this.channelListUnreads = new WidgetChannelListUnreads(viewStub, recyclerView3, getBinding().b, new WidgetChannelsList$onViewBound$9(this), 0, 0, false, 112, null); WidgetChannelsListAdapter widgetChannelsListAdapter8 = this.adapter; diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelDirectory$onConfigure$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelDirectory$onConfigure$$inlined$apply$lambda$1.java new file mode 100644 index 0000000000..d2cfd2fe8e --- /dev/null +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelDirectory$onConfigure$$inlined$apply$lambda$1.java @@ -0,0 +1,20 @@ +package com.discord.widgets.channels.list; + +import android.view.View; +import com.discord.widgets.channels.list.WidgetChannelsListAdapter; +import com.discord.widgets.channels.list.items.ChannelListItemDirectory; +/* compiled from: WidgetChannelsListAdapter.kt */ +public final class WidgetChannelsListAdapter$ItemChannelDirectory$onConfigure$$inlined$apply$lambda$1 implements View.OnClickListener { + public final /* synthetic */ ChannelListItemDirectory $item$inlined; + public final /* synthetic */ WidgetChannelsListAdapter.ItemChannelDirectory this$0; + + public WidgetChannelsListAdapter$ItemChannelDirectory$onConfigure$$inlined$apply$lambda$1(WidgetChannelsListAdapter.ItemChannelDirectory itemChannelDirectory, ChannelListItemDirectory channelListItemDirectory) { + this.this$0 = itemChannelDirectory; + this.$item$inlined = channelListItemDirectory; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + WidgetChannelsListAdapter.ItemChannelDirectory.access$getAdapter$p(this.this$0).getOnSelectChannel().invoke(this.$item$inlined.getChannel()); + } +} diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java index 47b62c3a28..df635d2231 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java @@ -33,6 +33,7 @@ import com.discord.databinding.WidgetChannelsListItemChannelBinding; import com.discord.databinding.WidgetChannelsListItemChannelPrivateBinding; import com.discord.databinding.WidgetChannelsListItemChannelStageVoiceBinding; import com.discord.databinding.WidgetChannelsListItemChannelVoiceBinding; +import com.discord.databinding.WidgetChannelsListItemDirectoryBinding; import com.discord.databinding.WidgetChannelsListItemHeaderBinding; import com.discord.databinding.WidgetChannelsListItemMfaBinding; import com.discord.databinding.WidgetChannelsListItemThreadBinding; @@ -59,6 +60,7 @@ import com.discord.widgets.channels.list.WidgetChannelListModel; import com.discord.widgets.channels.list.items.ChannelListBottomNavSpaceItem; import com.discord.widgets.channels.list.items.ChannelListItem; import com.discord.widgets.channels.list.items.ChannelListItemCategory; +import com.discord.widgets.channels.list.items.ChannelListItemDirectory; import com.discord.widgets.channels.list.items.ChannelListItemHeader; import com.discord.widgets.channels.list.items.ChannelListItemInvite; import com.discord.widgets.channels.list.items.ChannelListItemPrivate; @@ -236,8 +238,8 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0) { View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - return b.i(view, 2131889150, new Object[]{charSequence}, null, 4); + return b.i(view, 2131889160, new Object[]{charSequence}, null, 4); } else if (AnimatableValueParser.i1(channelListItemPrivate.getChannel())) { View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); - return b.i(view2, 2131889149, new Object[]{charSequence}, null, 4); + return b.i(view2, 2131889159, new Object[]{charSequence}, null, 4); } else if (channelListItemPrivate.getMentionCount() > 0) { View view3 = this.itemView; m.checkNotNullExpressionValue(view3, "itemView"); - return b.i(view3, 2131888110, new Object[]{charSequence}, null, 4); + return b.i(view3, 2131888115, new Object[]{charSequence}, null, 4); } else { View view4 = this.itemView; m.checkNotNullExpressionValue(view4, "itemView"); - return b.i(view4, 2131888109, new Object[]{charSequence}, null, 4); + return b.i(view4, 2131888114, new Object[]{charSequence}, null, 4); } } @@ -336,7 +379,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple v = channel.v(); int size = v != null ? v.size() : 0; - CharSequence g = b.g(context, 2131891106, new Object[0], null, 4); + CharSequence g = b.g(context, 2131891137, new Object[0], null, 4); StringBuilder sb = new StringBuilder(); sb.append(size + 1); sb.append(' '); @@ -372,8 +415,15 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0) { RelativeLayout relativeLayout = this.binding.a; m.checkNotNullExpressionValue(relativeLayout, "binding.root"); - return b.i(relativeLayout, 2131889904, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), Integer.valueOf(channelListVocalItem.getNumUsersConnected()), Integer.valueOf(i)}, null, 4); + return b.i(relativeLayout, 2131889915, new Object[]{AnimatableValueParser.y0(channelListVocalItem.getChannel()), Integer.valueOf(channelListVocalItem.getNumUsersConnected()), Integer.valueOf(i)}, null, 4); } else if (channelListVocalItem.getNumUsersConnected() > 0) { RelativeLayout relativeLayout2 = this.binding.a; m.checkNotNullExpressionValue(relativeLayout2, "binding.root"); @@ -519,11 +579,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0) { View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - return b.i(view, 2131889894, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755168, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); + return b.i(view, 2131889905, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755169, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); } else if (z2 && channelListItemTextChannel.isUnread()) { View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); - return b.i(view2, 2131889895, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); + return b.i(view2, 2131889906, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); } else if (z2) { View view3 = this.itemView; m.checkNotNullExpressionValue(view3, "itemView"); - return b.i(view3, 2131889893, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); + return b.i(view3, 2131889904, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); } else if (channelListItemTextChannel.getMentionCount() > 0) { View view4 = this.itemView; m.checkNotNullExpressionValue(view4, "itemView"); - return b.i(view4, 2131889897, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755169, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); + return b.i(view4, 2131889908, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755170, channelListItemTextChannel.getMentionCount(), Integer.valueOf(channelListItemTextChannel.getMentionCount())), AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); } else if (channelListItemTextChannel.isUnread()) { View view5 = this.itemView; m.checkNotNullExpressionValue(view5, "itemView"); - return b.i(view5, 2131889898, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); + return b.i(view5, 2131889909, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); } else { View view6 = this.itemView; m.checkNotNullExpressionValue(view6, "itemView"); - return b.i(view6, 2131889896, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); + return b.i(view6, 2131889907, new Object[]{AnimatableValueParser.y0(channelListItemTextChannel.getChannel())}, null, 4); } } @@ -681,7 +741,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0 ? 0 : 8); - TextView textView3 = this.binding.f1708c; + TextView textView3 = this.binding.f1710c; m.checkNotNullExpressionValue(textView3, "binding.channelsItemChannelMentions"); textView3.setText(String.valueOf(Math.min(99, channelListItemTextChannel.getMentionCount()))); ImageView imageView2 = this.binding.e; @@ -800,26 +860,26 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0) { View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - return b.i(view, 2131889897, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755169, channelListItemThread.getMentionCount(), Integer.valueOf(channelListItemThread.getMentionCount())), channelListItemThread.getChannel().l()}, null, 4); + return b.i(view, 2131889908, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755170, channelListItemThread.getMentionCount(), Integer.valueOf(channelListItemThread.getMentionCount())), channelListItemThread.getChannel().l()}, null, 4); } else if (channelListItemThread.isUnread()) { View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); - return b.i(view2, 2131889898, new Object[]{channelListItemThread.getChannel().l()}, null, 4); + return b.i(view2, 2131889909, new Object[]{channelListItemThread.getChannel().l()}, null, 4); } else { View view3 = this.itemView; m.checkNotNullExpressionValue(view3, "itemView"); - return b.i(view3, 2131889896, new Object[]{channelListItemThread.getChannel().l()}, null, 4); + return b.i(view3, 2131889907, new Object[]{channelListItemThread.getChannel().l()}, null, 4); } } private final int getSpineResourceId(WidgetChannelListModel.ThreadSpineType threadSpineType) { if (m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Single.INSTANCE)) { - return 2131231939; + return 2131231942; } if (m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.Start.INSTANCE)) { - return 2131231937; + return 2131231940; } - return m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.End.INSTANCE) ? 2131231940 : 2131231938; + return m.areEqual(threadSpineType, WidgetChannelListModel.ThreadSpineType.End.INSTANCE) ? 2131231943 : 2131231941; } @ColorInt @@ -857,12 +917,12 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0 ? 0 : 8); - TextView textView3 = this.binding.f1715c; + TextView textView3 = this.binding.f1717c; m.checkNotNullExpressionValue(textView3, "binding.channelsItemThreadMentions"); textView3.setText(String.valueOf(Math.min(99, channelListItemThread.getMentionCount()))); ImageView imageView = this.binding.f; @@ -942,7 +1002,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple 0) { RelativeLayout relativeLayout = this.binding.a; m.checkNotNullExpressionValue(relativeLayout, "binding.root"); - return b.i(relativeLayout, 2131889904, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()), Integer.valueOf(i)}, null, 4); + return b.i(relativeLayout, 2131889915, new Object[]{AnimatableValueParser.y0(channelListItemVoiceChannel.getChannel()), Integer.valueOf(channelListItemVoiceChannel.getNumUsersConnected()), Integer.valueOf(i)}, null, 4); } else if (channelListItemVoiceChannel.getNumUsersConnected() > 0) { RelativeLayout relativeLayout2 = this.binding.a; m.checkNotNullExpressionValue(relativeLayout2, "binding.root"); @@ -950,11 +1010,11 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple(2131558903, this); + return new MGRecyclerViewHolder<>(2131558904, this); case 15: return new ItemStageActiveEvent(2131558893, this); case 16: return new ItemStageChannelAudienceCount(2131558894, this); + case 17: + return new ItemChannelDirectory(2131558900, this); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java index 0b91ada136..a050b05f36 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.java @@ -165,7 +165,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet { public final CharSequence getMuteChannelText(Context context) { m.checkNotNullParameter(context, "context"); - return this.isMuted ? b.g(context, 2131894024, new Object[0], null, 4) : b.g(context, 2131891263, new Object[]{AnimatableValueParser.A0(this.channel, context, false, 2)}, null, 4); + return this.isMuted ? b.g(context, 2131894063, new Object[0], null, 4) : b.g(context, 2131891296, new Object[]{AnimatableValueParser.A0(this.channel, context, false, 2)}, null, 4); } public final int getMuteIconResId(Context context) { @@ -267,7 +267,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet { TextView textView5 = getBinding().k; textView5.setVisibility(ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && CreateThreadsFeatureFlag.Companion.getINSTANCE().isEnabled(model.getChannel().e()) ? 0 : 8); setOnClickAndDismissListener(textView5, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$3(textView5, this, model)); - TextView textView6 = getBinding().f1713c; + TextView textView6 = getBinding().f1715c; textView6.setVisibility(model.getCanManageChannel() ? 0 : 8); setOnClickAndDismissListener(textView6, new WidgetChannelsListItemChannelActions$configureUI$$inlined$apply$lambda$4(this, model)); textView6.setText(getSettingsText(model.getChannel(), model.getCanManageChannel())); @@ -300,7 +300,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet { } private final String getSettingsText(Channel channel, boolean z2) { - String string = getString((!AnimatableValueParser.x1(channel) || !z2) ? (!AnimatableValueParser.x1(channel) || z2) ? AnimatableValueParser.f1(channel) ? 2131888190 : 2131892897 : 2131887324 : 2131888191); + String string = getString((!AnimatableValueParser.x1(channel) || !z2) ? (!AnimatableValueParser.x1(channel) || z2) ? AnimatableValueParser.f1(channel) ? 2131888200 : 2131892939 : 2131887326 : 2131888201); m.checkNotNullExpressionValue(string, "getString(\n when {\n…_empty_string\n }\n )"); return string; } @@ -318,7 +318,7 @@ public final class WidgetChannelsListItemChannelActions extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131558904; + return 2131558905; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java index 9ef1113f7e..3cea45a9a9 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions$unarchiveThread$1.java @@ -29,6 +29,6 @@ public final class WidgetChannelsListItemThreadActions$unarchiveThread$1 extends Error.Response response = error.getResponse(); m.checkNotNullExpressionValue(response, "error.response"); Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode()); - c.a.d.o.g(this.this$0.getContext(), abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891287, 0, null, 12); + c.a.d.o.g(this.this$0.getContext(), abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891320, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java index 54c6af90cd..08410f787d 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListItemThreadActions.java @@ -331,7 +331,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet { ThreadMetadata x4 = model.getChannel().x(); m.checkNotNull(x4); String autoArchiveDurationName = threadUtils.autoArchiveDurationName(requireContext2, x4.c()); - TextView textView5 = getBinding().f1714c; + TextView textView5 = getBinding().f1716c; m.checkNotNullExpressionValue(textView5, "binding.channelsListItem…sArchiveSettingsSubheader"); Locale locale = Locale.getDefault(); m.checkNotNullExpressionValue(locale, "Locale.getDefault()"); @@ -393,7 +393,7 @@ public final class WidgetChannelsListItemThreadActions extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131558906; + return 2131558907; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java index 5c1065bcfa..0a9c658353 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter.java @@ -50,11 +50,11 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp super(i, widgetCollapsedUsersListAdapter); m.checkNotNullParameter(widgetCollapsedUsersListAdapter, "adapter"); View view = this.itemView; - int i2 = 2131365592; - TextView textView = (TextView) view.findViewById(2131365592); + int i2 = 2131365598; + TextView textView = (TextView) view.findViewById(2131365598); if (textView != null) { - i2 = 2131365593; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365593); + i2 = 2131365599; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365599); if (simpleDraweeView != null) { WidgetCollapsedVoiceUserListItemBinding widgetCollapsedVoiceUserListItemBinding = new WidgetCollapsedVoiceUserListItemBinding((FrameLayout) view, textView, simpleDraweeView); m.checkNotNullExpressionValue(widgetCollapsedVoiceUserListItemBinding, "WidgetCollapsedVoiceUser…temBinding.bind(itemView)"); @@ -77,14 +77,14 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp sb.append(collapsedUser.getExtraCount()); ViewExtensions.setTextAndVisibilityBy(textView, sb.toString()); MGImages mGImages = MGImages.INSTANCE; - SimpleDraweeView simpleDraweeView = this.binding.f1753c; + SimpleDraweeView simpleDraweeView = this.binding.f1755c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetCollapsedUserImageview"); MGImages.setImage$default(mGImages, simpleDraweeView, 2131231126, (MGImages.ChangeDetector) null, 4, (Object) null); } else if (!collapsedUser.getEmptySlot()) { TextView textView2 = this.binding.b; m.checkNotNullExpressionValue(textView2, "binding.widgetCollapsedUserCount"); textView2.setVisibility(8); - SimpleDraweeView simpleDraweeView2 = this.binding.f1753c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1755c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.widgetCollapsedUserImageview"); IconUtils.setIcon$default(simpleDraweeView2, collapsedUser.getUser(), 2131165290, null, null, null, 56, null); } @@ -103,6 +103,6 @@ public final class WidgetCollapsedUsersListAdapter extends MGRecyclerAdapterSimp @Override // androidx.recyclerview.widget.RecyclerView.Adapter public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - return new WidgetCollapsedUserListItem(2131558975, this); + return new WidgetCollapsedUserListItem(2131558976, this); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java index eeb0e979a3..1553e453e1 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetThreadArchiveActions.java @@ -151,7 +151,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet { Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); Channel channel = model.getChannel(); - LinearLayout linearLayout = getBinding().f1967c; + LinearLayout linearLayout = getBinding().f1969c; m.checkNotNullExpressionValue(linearLayout, "binding.autoArchiveHeader"); linearLayout.setVisibility(0); long computeThreadAutoArchiveTimeMs = ThreadUtils.INSTANCE.computeThreadAutoArchiveTimeMs(channel); @@ -189,7 +189,7 @@ public final class WidgetThreadArchiveActions extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559244; + return 2131559245; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItem.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItem.java index cf94eba185..9d70bf0fab 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItem.java +++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItem.java @@ -11,6 +11,7 @@ public interface ChannelListItem extends MGRecyclerDataPayload { public static final int TYPE_CHANNEL_STAGE_VOICE = 13; public static final int TYPE_CHANNEL_VOICE = 1; public static final int TYPE_CHANNEL_VOICE_USER = 2; + public static final int TYPE_DIRECTORY = 17; public static final int TYPE_HEADER = 6; public static final int TYPE_INVITE = 9; public static final int TYPE_MFA_NOTICE = 7; @@ -29,6 +30,7 @@ public interface ChannelListItem extends MGRecyclerDataPayload { public static final int TYPE_CHANNEL_STAGE_VOICE = 13; public static final int TYPE_CHANNEL_VOICE = 1; public static final int TYPE_CHANNEL_VOICE_USER = 2; + public static final int TYPE_DIRECTORY = 17; public static final int TYPE_HEADER = 6; public static final int TYPE_INVITE = 9; public static final int TYPE_MFA_NOTICE = 7; diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java new file mode 100644 index 0000000000..13710adcfe --- /dev/null +++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemDirectory.java @@ -0,0 +1,95 @@ +package com.discord.widgets.channels.list.items; + +import c.d.b.a.a; +import com.discord.api.channel.Channel; +import d0.z.d.m; +/* compiled from: ChannelListItemDirectory.kt */ +public final class ChannelListItemDirectory implements ChannelListItem { + private final Channel channel; + private final String key; + private final boolean selected; + private final int type = 17; + + /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0015: INVOKE (r0v1 int) = (r2v0 'this' com.discord.widgets.channels.list.items.ChannelListItemDirectory A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.channels.list.items.ChannelListItemDirectory.getType():int), (wrap: long : 0x001c: INVOKE (r0v2 long) = (r3v0 com.discord.api.channel.Channel) type: VIRTUAL call: com.discord.api.channel.Channel.g():long)] */ + public ChannelListItemDirectory(Channel channel, boolean z2) { + m.checkNotNullParameter(channel, "channel"); + this.channel = channel; + this.selected = z2; + StringBuilder sb = new StringBuilder(); + sb.append(getType()); + sb.append(channel.g()); + this.key = sb.toString(); + } + + public static /* synthetic */ ChannelListItemDirectory copy$default(ChannelListItemDirectory channelListItemDirectory, Channel channel, boolean z2, int i, Object obj) { + if ((i & 1) != 0) { + channel = channelListItemDirectory.channel; + } + if ((i & 2) != 0) { + z2 = channelListItemDirectory.selected; + } + return channelListItemDirectory.copy(channel, z2); + } + + public final Channel component1() { + return this.channel; + } + + public final boolean component2() { + return this.selected; + } + + public final ChannelListItemDirectory copy(Channel channel, boolean z2) { + m.checkNotNullParameter(channel, "channel"); + return new ChannelListItemDirectory(channel, z2); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ChannelListItemDirectory)) { + return false; + } + ChannelListItemDirectory channelListItemDirectory = (ChannelListItemDirectory) obj; + return m.areEqual(this.channel, channelListItemDirectory.channel) && this.selected == channelListItemDirectory.selected; + } + + public final Channel getChannel() { + return this.channel; + } + + @Override // com.discord.widgets.channels.list.items.ChannelListItem, com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider + public String getKey() { + return this.key; + } + + public final boolean getSelected() { + return this.selected; + } + + @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload + public int getType() { + return this.type; + } + + public int hashCode() { + Channel channel = this.channel; + int hashCode = (channel != null ? channel.hashCode() : 0) * 31; + boolean z2 = this.selected; + if (z2) { + z2 = true; + } + int i = z2 ? 1 : 0; + int i2 = z2 ? 1 : 0; + int i3 = z2 ? 1 : 0; + return hashCode + i; + } + + public String toString() { + StringBuilder L = a.L("ChannelListItemDirectory(channel="); + L.append(this.channel); + L.append(", selected="); + return a.G(L, this.selected, ")"); + } +} diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java index a08c1e843f..7bf531932c 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.java @@ -1,17 +1,32 @@ package com.discord.widgets.channels.memberlist; +import com.discord.api.channel.Channel; +import com.discord.models.guild.Guild; +import com.discord.stores.StoreEmojiCustom; +import com.discord.stores.StoreGuilds; import com.discord.utilities.lazy.memberlist.ChannelMemberList; import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter; import d0.z.d.m; import d0.z.d.o; +import java.util.Map; import kotlin.NoWhenBranchMatchedException; import kotlin.jvm.functions.Function1; /* compiled from: GuildMemberListItemGenerator.kt */ public final class GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1 extends o implements Function1 { - public static final GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1 INSTANCE = new GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1(); + public final /* synthetic */ Channel $channel; + public final /* synthetic */ Guild $guild; + public final /* synthetic */ Map $guildRoles; + public final /* synthetic */ StoreEmojiCustom $storeCustomEmojis; + public final /* synthetic */ StoreGuilds $storeGuilds; - public GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1() { + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1(StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Guild guild, Channel channel, Map map) { super(1); + this.$storeGuilds = storeGuilds; + this.$storeCustomEmojis = storeEmojiCustom; + this.$guild = guild; + this.$channel = channel; + this.$guildRoles = map; } public final ChannelMembersListAdapter.Item invoke(ChannelMemberList.Row row) { @@ -31,7 +46,7 @@ public final class GuildMemberListItemGeneratorKt$generateGuildMemberListItems$l return new ChannelMembersListAdapter.Item.Header(rowId, type, statusHeader.getMemberCount()); } else if (row instanceof ChannelMemberList.Row.Member) { ChannelMemberList.Row.Member member = (ChannelMemberList.Row.Member) row; - return new ChannelMembersListAdapter.Item.Member(member.getUserId(), member.getName(), member.isBot(), member.getTagText(), member.getTagVerified(), member.getPresence(), member.getColor(), member.getAvatarUrl(), member.getShowOwnerIndicator(), member.getPremiumSince(), member.isApplicationStreaming()); + return new ChannelMembersListAdapter.Item.Member(member.getUserId(), Long.valueOf(this.$channel.e()), member.getName(), member.isBot(), member.getTagText(), member.getTagVerified(), member.getPresence(), member.getColor(), member.getAvatarUrl(), member.getShowOwnerIndicator(), member.getPremiumSince(), member.isApplicationStreaming(), GuildMemberListItemGeneratorKt.access$calculateCanDisplayStatusEmoji(this.$storeGuilds, this.$storeCustomEmojis, member.getUserId(), this.$guild, this.$channel, member.getPresence(), this.$guildRoles)); } else if (row instanceof ChannelMemberList.Row.RoleHeader) { ChannelMemberList.Row.RoleHeader roleHeader = (ChannelMemberList.Row.RoleHeader) row; return new ChannelMembersListAdapter.Item.RoleHeader(roleHeader.getRoleId(), roleHeader.getRoleName(), roleHeader.getMemberCount()); diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java index 6005b5533d..50be4b18c2 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.java @@ -1,9 +1,20 @@ package com.discord.widgets.channels.memberlist; +import com.discord.api.activity.Activity; +import com.discord.api.activity.ActivityEmoji; +import com.discord.api.channel.Channel; +import com.discord.api.role.GuildRole; +import com.discord.models.guild.Guild; +import com.discord.models.presence.Presence; +import com.discord.stores.StoreEmojiCustom; +import com.discord.stores.StoreGuilds; import com.discord.utilities.collections.SparseMutableList; import com.discord.utilities.lazy.memberlist.ChannelMemberList; +import com.discord.utilities.permissions.PermissionUtils; +import com.discord.utilities.presence.PresenceUtils; import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel; import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter; +import d0.g0.s; import d0.t.g0; import d0.t.n; import d0.t.u; @@ -29,20 +40,40 @@ public final class GuildMemberListItemGeneratorKt { } } + public static final /* synthetic */ boolean access$calculateCanDisplayStatusEmoji(StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, long j, Guild guild, Channel channel, Presence presence, Map map) { + return calculateCanDisplayStatusEmoji(storeGuilds, storeEmojiCustom, j, guild, channel, presence, map); + } + public static final /* synthetic */ List access$getPLACEHOLDER_INSTANCES$p() { return PLACEHOLDER_INSTANCES; } - public static final WidgetChannelMembersListViewModel.MemberList generateGuildMemberListItems(ChannelMemberList channelMemberList, boolean z2) { + private static final boolean calculateCanDisplayStatusEmoji(StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, long j, Guild guild, Channel channel, Presence presence, Map map) { + Activity customStatusActivity; + ActivityEmoji f; + String b; + Long longOrNull; + long e = channel.e(); + if (PermissionUtils.can(262144, Long.valueOf(PermissionUtils.computeNonThreadPermissions(j, channel.e(), guild != null ? guild.getOwnerId() : 0, storeGuilds.getMember(e, j), map, channel.r()))) || presence == null || (customStatusActivity = PresenceUtils.INSTANCE.getCustomStatusActivity(presence)) == null || (f = customStatusActivity.f()) == null || (b = f.b()) == null || (longOrNull = s.toLongOrNull(b)) == null) { + return true; + } + return storeEmojiCustom.getEmojiForGuild(e).get(Long.valueOf(longOrNull.longValue())) != null; + } + + public static final WidgetChannelMembersListViewModel.MemberList generateGuildMemberListItems(ChannelMemberList channelMemberList, Guild guild, Channel channel, Map map, boolean z2, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom) { m.checkNotNullParameter(channelMemberList, "channelMemberList"); - SparseMutableList deepCopy = channelMemberList.getRows().deepCopy(GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1.INSTANCE); + m.checkNotNullParameter(channel, "channel"); + m.checkNotNullParameter(map, "guildRoles"); + m.checkNotNullParameter(storeGuilds, "storeGuilds"); + m.checkNotNullParameter(storeEmojiCustom, "storeCustomEmojis"); + SparseMutableList deepCopy = channelMemberList.getRows().deepCopy(new GuildMemberListItemGeneratorKt$generateGuildMemberListItems$listItems$1(storeGuilds, storeEmojiCustom, guild, channel, map)); if ((!deepCopy.isEmpty()) && u.first((List) deepCopy) == null) { deepCopy.set(0, new ChannelMembersListAdapter.Item.PlaceholderHeader(channelMemberList.getListId())); } SortedMap groupIndices = channelMemberList.getGroupIndices(); int size = channelMemberList.getSize(); if (z2) { - deepCopy.add(0, new ChannelMembersListAdapter.Item.AddMember(channelMemberList.getListId(), 2131890526)); + deepCopy.add(0, new ChannelMembersListAdapter.Item.AddMember(channelMemberList.getListId(), 2131890556)); LinkedHashMap linkedHashMap = new LinkedHashMap(g0.mapCapacity(groupIndices.size())); Iterator it = groupIndices.entrySet().iterator(); while (it.hasNext()) { diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java index 79a0b4b7af..3c16e2c8d6 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.java @@ -27,7 +27,7 @@ public final class PrivateChannelMemberListItemGeneratorKt { } private static final ChannelMembersListAdapter.Item.Member createMemberListItem(User user, Presence presence, boolean z2, String str, boolean z3) { - return new ChannelMembersListAdapter.Item.Member(user.getId(), str != null ? str : user.getUsername(), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893685 : 2131887050), UserUtils.INSTANCE.isVerifiedBot(user), presence, null, IconUtils.getForUser$default(user, false, null, 6, null), z2, null, z3); + return new ChannelMembersListAdapter.Item.Member(user.getId(), null, str != null ? str : user.getUsername(), user.isBot(), Integer.valueOf(user.isSystemUser() ? 2131893725 : 2131887051), UserUtils.INSTANCE.isVerifiedBot(user), presence, null, IconUtils.getForUser$default(user, false, null, 6, null), z2, null, z3, true); } /* JADX WARN: Multi-variable type inference failed */ @@ -97,7 +97,7 @@ public final class PrivateChannelMemberListItemGeneratorKt { int size = map.size(); ArrayList arrayList = new ArrayList(size + 1); if (z2) { - arrayList.add(0, new ChannelMembersListAdapter.Item.AddMember(String.valueOf(channel.g()), AnimatableValueParser.i1(channel) ? 2131889127 : 2131887909)); + arrayList.add(0, new ChannelMembersListAdapter.Item.AddMember(String.valueOf(channel.g()), AnimatableValueParser.i1(channel) ? 2131889137 : 2131887910)); } arrayList.add(createGroupDmHeader(size)); arrayList.addAll(treeMap.values()); diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$viewModel$2.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$viewModel$2.java index 1d97f0a835..2b02ad3f37 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$viewModel$2.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$viewModel$2.java @@ -15,6 +15,6 @@ public final class WidgetChannelMembersList$viewModel$2 extends o implements Fun @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new WidgetChannelMembersListViewModel(null, null, 3, null); + return new WidgetChannelMembersListViewModel(null, null, null, null, 15, null); } } diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java index 04aeab92aa..45130820f4 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$Companion$observeStoreState$1.java @@ -2,7 +2,10 @@ package com.discord.widgets.channels.memberlist; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.role.GuildRole; +import com.discord.models.guild.Guild; import com.discord.stores.StoreChannelMembers; +import com.discord.stores.StoreGuilds; import com.discord.stores.StorePermissions; import com.discord.stores.StoreUserRelationships; import com.discord.utilities.lazy.memberlist.ChannelMemberList; @@ -10,14 +13,16 @@ import com.discord.widgets.channels.memberlist.PrivateChannelMemberListService; import com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel; import d0.z.d.m; import j0.k.b; +import java.util.Map; import rx.Observable; import rx.functions.Func2; -import rx.functions.Func3; +import rx.functions.Func5; /* compiled from: WidgetChannelMembersListViewModel.kt */ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState$1 implements b> { public final /* synthetic */ Observable $isPanelOpenObservable; public final /* synthetic */ PrivateChannelMemberListService $privateChannelMemberListService; public final /* synthetic */ StoreChannelMembers $storeChannelMembers; + public final /* synthetic */ StoreGuilds $storeGuilds; public final /* synthetic */ StorePermissions $storePermissions; public final /* synthetic */ StoreUserRelationships $storeUserRelationships; @@ -38,19 +43,27 @@ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState /* compiled from: WidgetChannelMembersListViewModel.kt */ /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$Companion$observeStoreState$1$2 reason: invalid class name */ - public static final class AnonymousClass2 implements Func3 { + public static final class AnonymousClass2 implements Func5, Long, ChannelMemberList, Boolean, WidgetChannelMembersListViewModel.StoreState.Guild> { public final /* synthetic */ Channel $channel; public AnonymousClass2(Channel channel) { this.$channel = channel; } - public final WidgetChannelMembersListViewModel.StoreState.Guild call(Long l, ChannelMemberList channelMemberList, Boolean bool) { + public final WidgetChannelMembersListViewModel.StoreState.Guild call(Guild guild, Map map, Long l, ChannelMemberList channelMemberList, Boolean bool) { m.checkNotNullExpressionValue(bool, "isPanelOpen"); boolean booleanValue = bool.booleanValue(); Channel channel = this.$channel; m.checkNotNullExpressionValue(channelMemberList, "channelMemberList"); - return new WidgetChannelMembersListViewModel.StoreState.Guild(booleanValue, channel, channelMemberList, l); + m.checkNotNullExpressionValue(map, "guildRoles"); + return new WidgetChannelMembersListViewModel.StoreState.Guild(booleanValue, channel, guild, channelMemberList, l, map); + } + + /* 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ + @Override // rx.functions.Func5 + public /* bridge */ /* synthetic */ WidgetChannelMembersListViewModel.StoreState.Guild call(Guild guild, Map map, Long l, ChannelMemberList channelMemberList, Boolean bool) { + return call(guild, (Map) map, l, channelMemberList, bool); } } @@ -65,15 +78,16 @@ public final class WidgetChannelMembersListViewModel$Companion$observeStoreState } } - public WidgetChannelMembersListViewModel$Companion$observeStoreState$1(PrivateChannelMemberListService privateChannelMemberListService, Observable observable, StoreUserRelationships storeUserRelationships, StorePermissions storePermissions, StoreChannelMembers storeChannelMembers) { + public WidgetChannelMembersListViewModel$Companion$observeStoreState$1(PrivateChannelMemberListService privateChannelMemberListService, Observable observable, StoreUserRelationships storeUserRelationships, StoreGuilds storeGuilds, StorePermissions storePermissions, StoreChannelMembers storeChannelMembers) { this.$privateChannelMemberListService = privateChannelMemberListService; this.$isPanelOpenObservable = observable; this.$storeUserRelationships = storeUserRelationships; + this.$storeGuilds = storeGuilds; this.$storePermissions = storePermissions; this.$storeChannelMembers = storeChannelMembers; } public final Observable call(Channel channel) { - return (channel == null || !AnimatableValueParser.r1(channel)) ? channel != null ? Observable.i(this.$storePermissions.observePermissionsForChannel(channel.g()), this.$storeChannelMembers.observeChannelMemberList(channel.e(), channel.g()), this.$isPanelOpenObservable, new AnonymousClass2(channel)) : this.$isPanelOpenObservable.G(AnonymousClass3.INSTANCE) : Observable.j(this.$privateChannelMemberListService.observeStateForGroupDm(channel), this.$isPanelOpenObservable, new AnonymousClass1(this)); + return (channel == null || !AnimatableValueParser.r1(channel)) ? channel != null ? Observable.g(this.$storeGuilds.observeGuild(channel.e()), this.$storeGuilds.observeRoles(channel.e()), this.$storePermissions.observePermissionsForChannel(channel.g()), this.$storeChannelMembers.observeChannelMemberList(channel.e(), channel.g()), this.$isPanelOpenObservable, new AnonymousClass2(channel)) : this.$isPanelOpenObservable.G(AnonymousClass3.INSTANCE) : Observable.j(this.$privateChannelMemberListService.observeStateForGroupDm(channel), this.$isPanelOpenObservable, new AnonymousClass1(this)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java index eaca5f3abe..7b1bae0119 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel.java @@ -5,6 +5,7 @@ import androidx.annotation.MainThread; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.role.GuildRole; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelApplicationStream; import com.discord.models.domain.ModelUserRelationship; @@ -12,6 +13,8 @@ import com.discord.models.presence.Presence; import com.discord.models.user.User; import com.discord.stores.StoreChannelMembers; import com.discord.stores.StoreChannelsSelected; +import com.discord.stores.StoreEmojiCustom; +import com.discord.stores.StoreGuilds; import com.discord.stores.StoreNavigation; import com.discord.stores.StorePermissions; import com.discord.stores.StoreStream; @@ -36,6 +39,8 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel eventSubject; private final GuildChannelRangeSubscriber guildChannelRangeSubscriber; + private final StoreEmojiCustom storeCustomEmojis; + private final StoreGuilds storeGuilds; /* compiled from: WidgetChannelMembersListViewModel.kt */ /* renamed from: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$1 reason: invalid class name */ @@ -82,30 +87,14 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel observeStoreState(StoreChannelMembers storeChannelMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships) { - Observable Z = storeChannelsSelected.observeSelectedChannel().Z(new WidgetChannelMembersListViewModel$Companion$observeStoreState$1(privateChannelMemberListService, storeNavigation.observeRightPanelState().G(WidgetChannelMembersListViewModel$Companion$observeStoreState$isPanelOpenObservable$1.INSTANCE), storeUserRelationships, storePermissions, storeChannelMembers)); + private final Observable observeStoreState(StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships) { + Observable Z = storeChannelsSelected.observeSelectedChannel().Z(new WidgetChannelMembersListViewModel$Companion$observeStoreState$1(privateChannelMemberListService, storeNavigation.observeRightPanelState().G(WidgetChannelMembersListViewModel$Companion$observeStoreState$isPanelOpenObservable$1.INSTANCE), storeUserRelationships, storeGuilds, storePermissions, storeChannelMembers)); m.checkNotNullExpressionValue(Z, "storeChannelsSelected\n … }\n }"); return Z; } - public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreChannelMembers storeChannelMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, int i, Object obj) { - if ((i & 1) != 0) { - storeChannelMembers = StoreStream.Companion.getChannelMembers(); - } - if ((i & 2) != 0) { - storeChannelsSelected = StoreStream.Companion.getChannelsSelected(); - } - if ((i & 4) != 0) { - storeNavigation = StoreStream.Companion.getNavigation(); - } - PrivateChannelMemberListService privateChannelMemberListService2 = (i & 8) != 0 ? new PrivateChannelMemberListService(null, null, null, 7, null) : privateChannelMemberListService; - if ((i & 16) != 0) { - storePermissions = StoreStream.Companion.getPermissions(); - } - if ((i & 32) != 0) { - storeUserRelationships = StoreStream.Companion.getUserRelationships(); - } - return companion.observeStoreState(storeChannelMembers, storeChannelsSelected, storeNavigation, privateChannelMemberListService2, storePermissions, storeUserRelationships); + public static /* synthetic */ Observable observeStoreState$default(Companion companion, StoreGuilds storeGuilds, StoreChannelMembers storeChannelMembers, StoreChannelsSelected storeChannelsSelected, StoreNavigation storeNavigation, PrivateChannelMemberListService privateChannelMemberListService, StorePermissions storePermissions, StoreUserRelationships storeUserRelationships, int i, Object obj) { + return companion.observeStoreState((i & 1) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds, (i & 2) != 0 ? StoreStream.Companion.getChannelMembers() : storeChannelMembers, (i & 4) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected, (i & 8) != 0 ? StoreStream.Companion.getNavigation() : storeNavigation, (i & 16) != 0 ? new PrivateChannelMemberListService(null, null, null, 7, null) : privateChannelMemberListService, (i & 32) != 0 ? StoreStream.Companion.getPermissions() : storePermissions, (i & 64) != 0 ? StoreStream.Companion.getUserRelationships() : storeUserRelationships); } } @@ -179,20 +168,27 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel guildRoles; private final boolean isPanelOpen; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Guild(boolean z2, Channel channel, ChannelMemberList channelMemberList, Long l) { + public Guild(boolean z2, Channel channel, com.discord.models.guild.Guild guild, ChannelMemberList channelMemberList, Long l, Map map) { super(z2, channel, null); m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(channelMemberList, "channelMembers"); + m.checkNotNullParameter(map, "guildRoles"); this.isPanelOpen = z2; this.channel = channel; + this.guild = guild; this.channelMembers = channelMemberList; this.channelPermissions = l; + this.guildRoles = map; } - public static /* synthetic */ Guild copy$default(Guild guild, boolean z2, Channel channel, ChannelMemberList channelMemberList, Long l, int i, Object obj) { + /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel$StoreState$Guild */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ Guild copy$default(Guild guild, boolean z2, Channel channel, com.discord.models.guild.Guild guild2, ChannelMemberList channelMemberList, Long l, Map map, int i, Object obj) { if ((i & 1) != 0) { z2 = guild.isPanelOpen(); } @@ -200,12 +196,18 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel component6() { + return this.guildRoles; + } + + public final Guild copy(boolean z2, Channel channel, com.discord.models.guild.Guild guild, ChannelMemberList channelMemberList, Long l, Map map) { m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(channelMemberList, "channelMembers"); - return new Guild(z2, channel, channelMemberList, l); + m.checkNotNullParameter(map, "guildRoles"); + return new Guild(z2, channel, guild, channelMemberList, l, map); } public boolean equals(Object obj) { @@ -238,7 +249,7 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel getGuildRoles() { + return this.guildRoles; + } + public int hashCode() { boolean isPanelOpen = isPanelOpen(); if (isPanelOpen) { @@ -266,13 +285,17 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel map = this.guildRoles; + if (map != null) { + i5 = map.hashCode(); } - return hashCode2 + i5; + return hashCode4 + i5; } @Override // com.discord.widgets.channels.memberlist.WidgetChannelMembersListViewModel.StoreState @@ -285,10 +308,14 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel observable) { + public WidgetChannelMembersListViewModel(GuildChannelRangeSubscriber guildChannelRangeSubscriber, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Observable observable) { super(ViewState.Empty.INSTANCE); m.checkNotNullParameter(guildChannelRangeSubscriber, "guildChannelRangeSubscriber"); + m.checkNotNullParameter(storeGuilds, "storeGuilds"); + m.checkNotNullParameter(storeEmojiCustom, "storeCustomEmojis"); m.checkNotNullParameter(observable, "storeStateObservable"); this.guildChannelRangeSubscriber = guildChannelRangeSubscriber; + this.storeGuilds = storeGuilds; + this.storeCustomEmojis = storeEmojiCustom; this.eventSubject = PublishSubject.l0(); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetChannelMembersListViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this), 62, (Object) null); } - /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ WidgetChannelMembersListViewModel(GuildChannelRangeSubscriber guildChannelRangeSubscriber, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? new AnonymousClass1() : guildChannelRangeSubscriber, (i & 2) != 0 ? Companion.observeStoreState$default(Companion, null, null, null, null, null, null, 63, null) : observable); + /* JADX WARNING: Illegal instructions before constructor call */ + public /* synthetic */ WidgetChannelMembersListViewModel(GuildChannelRangeSubscriber guildChannelRangeSubscriber, StoreGuilds storeGuilds, StoreEmojiCustom storeEmojiCustom, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(r0, r1, (i & 4) != 0 ? StoreStream.Companion.getCustomEmojis() : storeEmojiCustom, (i & 8) != 0 ? Companion.observeStoreState$default(Companion, r1, null, null, null, null, null, null, 126, null) : observable); + GuildChannelRangeSubscriber r0 = (i & 1) != 0 ? new AnonymousClass1() : guildChannelRangeSubscriber; + StoreGuilds guilds = (i & 2) != 0 ? StoreStream.Companion.getGuilds() : storeGuilds; } public static final /* synthetic */ void access$handleStoreState(WidgetChannelMembersListViewModel widgetChannelMembersListViewModel, StoreState storeState) { @@ -683,7 +716,7 @@ public final class WidgetChannelMembersListViewModel extends AppViewModel relationships = r0.getRelationships(); diff --git a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java index 93338bf41b..b5ba7d2dfc 100644 --- a/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.java @@ -357,7 +357,9 @@ public final class ChannelMembersListAdapter extends RecyclerView.Adapter { super(2131558879, addMemberAdapter); m.checkNotNullParameter(addMemberAdapter, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131363727); + TextView textView = (TextView) view.findViewById(2131363730); if (textView != null) { WidgetChannelSettingsAddMemberCategoryBinding widgetChannelSettingsAddMemberCategoryBinding = new WidgetChannelSettingsAddMemberCategoryBinding((LinearLayout) view, textView); m.checkNotNullExpressionValue(widgetChannelSettingsAddMemberCategoryBinding, "WidgetChannelSettingsAdd…oryBinding.bind(itemView)"); this.binding = widgetChannelSettingsAddMemberCategoryBinding; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363727))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363730))); } public void onConfigure(int i, Item item) { @@ -67,9 +67,9 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple { m.checkNotNullExpressionValue(textView, "binding.label"); int ordinal = ((Item.CategoryItem) item).getCategoryType().ordinal(); if (ordinal == 0) { - str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131892867); + str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131892909); } else if (ordinal == 1) { - str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131891106); + str = ((AddMemberAdapter) this.adapter).getRecycler().getContext().getString(2131891137); } else { throw new NoWhenBranchMatchedException(); } @@ -128,7 +128,7 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple { } else if ((addStatus instanceof Item.PermissionOwnerItem.Companion.AddStatus.CannotAdd) && ((Item.PermissionOwnerItem.Companion.AddStatus.CannotAdd) permissionOwnerItem.getAddStatus()).getReason().ordinal() == 0) { FrameLayout frameLayout = this.binding.a; m.checkNotNullExpressionValue(frameLayout, "binding.root"); - Toast.makeText(frameLayout.getContext(), 2131887288, 0).show(); + Toast.makeText(frameLayout.getContext(), 2131887290, 0).show(); } } @@ -149,10 +149,10 @@ public final class AddMemberAdapter extends MGRecyclerAdapterSimple { super.onConfigure(i, (int) item); Item.PermissionOwnerItem permissionOwnerItem = (Item.PermissionOwnerItem) item; this.binding.b.a(permissionOwnerItem.getPermissionOwner()); - MaterialCheckBox materialCheckBox = this.binding.f1693c; + MaterialCheckBox materialCheckBox = this.binding.f1695c; m.checkNotNullExpressionValue(materialCheckBox, "binding.checkbox"); materialCheckBox.setChecked(permissionOwnerItem.getChecked()); - this.binding.f1693c.setOnClickListener(new AddMemberAdapter$AddMemberAdapterItemItem$onConfigure$1(this, permissionOwnerItem)); + this.binding.f1695c.setOnClickListener(new AddMemberAdapter$AddMemberAdapterItemItem$onConfigure$1(this, permissionOwnerItem)); this.binding.d.setOnClickListener(new AddMemberAdapter$AddMemberAdapterItemItem$onConfigure$2(this, permissionOwnerItem)); ConstraintLayout constraintLayout = this.binding.d; m.checkNotNullExpressionValue(constraintLayout, "binding.container"); diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java index 4407ef5091..8f5f8935eb 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog$binding$2.java @@ -28,8 +28,8 @@ public final /* synthetic */ class ConfirmRemovePermissionDialog$binding$2 exten i = 2131362672; LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362672); if (loadingButton != null) { - i = 2131364028; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364028); + i = 2131364030; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030); if (linearLayout != null) { return new ConfirmRemovePermissionDialogBinding((LinearLayout) view, textView, materialButton, loadingButton, linearLayout); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java index 3077bed99c..e920af450e 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/ConfirmRemovePermissionDialog.java @@ -131,8 +131,8 @@ public final class ConfirmRemovePermissionDialog extends AppDialog { } TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.body"); - b.n(textView, 2131893180, new Object[]{str}, null, 4); + b.n(textView, 2131893222, new Object[]{str}, null, 4); getBinding().d.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$2(this)); - getBinding().f1600c.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$3(this)); + getBinding().f1602c.setOnClickListener(new ConfirmRemovePermissionDialog$onResume$3(this)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java index e8ed50546b..7f14a37e15 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView$PermissionOwnerViewHolder$configure$1.java @@ -28,11 +28,11 @@ public final class PermissionOwnerListView$PermissionOwnerViewHolder$configure$1 if (ordinal == 2) { ConstraintLayout constraintLayout = PermissionOwnerListView.PermissionOwnerViewHolder.access$getBinding$p(this.this$0).a; m.checkNotNullExpressionValue(constraintLayout, "binding.root"); - Toast.makeText(constraintLayout.getContext(), 2131887319, 0).show(); + Toast.makeText(constraintLayout.getContext(), 2131887321, 0).show(); } else if (ordinal == 3) { ConstraintLayout constraintLayout2 = PermissionOwnerListView.PermissionOwnerViewHolder.access$getBinding$p(this.this$0).a; m.checkNotNullExpressionValue(constraintLayout2, "binding.root"); - Toast.makeText(constraintLayout2.getContext(), 2131887298, 0).show(); + Toast.makeText(constraintLayout2.getContext(), 2131887300, 0).show(); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java index 8616d6249b..807cc799d6 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/PermissionOwnerListView.java @@ -48,11 +48,11 @@ public final class PermissionOwnerListView extends RecyclerView { public PermissionOwnerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131558649, viewGroup, false); - int i2 = 2131364200; - ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) inflate.findViewById(2131364200); + int i2 = 2131364202; + ChannelPermissionOwnerView channelPermissionOwnerView = (ChannelPermissionOwnerView) inflate.findViewById(2131364202); if (channelPermissionOwnerView != null) { - i2 = 2131364407; - ImageView imageView = (ImageView) inflate.findViewById(2131364407); + i2 = 2131364410; + ImageView imageView = (ImageView) inflate.findViewById(2131364410); if (imageView != null) { RemovablePermissionOwnerViewBinding removablePermissionOwnerViewBinding = new RemovablePermissionOwnerViewBinding((ConstraintLayout) inflate, channelPermissionOwnerView, imageView); m.checkNotNullExpressionValue(removablePermissionOwnerViewBinding, "RemovablePermissionOwner…,\n false\n )"); @@ -181,10 +181,10 @@ public final class PermissionOwnerListView extends RecyclerView { m.checkNotNullParameter(item, "item"); m.checkNotNullParameter(function0, "onRemoveClicked"); this.binding.b.a(item.getPermissionOwner()); - ImageView imageView = this.binding.f1621c; + ImageView imageView = this.binding.f1623c; m.checkNotNullExpressionValue(imageView, "binding.remove"); ViewExtensions.setEnabledAlpha$default(imageView, item.getRemoveStatus() instanceof RemoveStatus.CanRemove, 0.0f, 2, null); - this.binding.f1621c.setOnClickListener(new PermissionOwnerListView$PermissionOwnerViewHolder$configure$1(this, item, function0)); + this.binding.f1623c.setOnClickListener(new PermissionOwnerListView$PermissionOwnerViewHolder$configure$1(this, item, function0)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java index 76e22b635e..09a538cb15 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetChannelSettingsAddMemberFragment$bindin public final WidgetChannelSettingsAddMemberBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364395; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364395); + int i = 2131364398; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364398); if (recyclerView != null) { - i = 2131364537; - SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364537); + i = 2131364540; + SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364540); if (searchInputView != null) { return new WidgetChannelSettingsAddMemberBinding((CoordinatorLayout) view, recyclerView, searchInputView); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java index 9e372717a7..983d23f642 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberFragment.java @@ -130,8 +130,8 @@ public final class WidgetChannelSettingsAddMemberFragment extends AppFragment { Observable s2 = this.querySubject.o(200, TimeUnit.MILLISECONDS).s(); m.checkNotNullExpressionValue(s2, "querySubject\n .de… .distinctUntilChanged()"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetChannelSettingsAddMemberFragment.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$1(this), 62, (Object) null); - getBinding().f1692c.setText(getViewModel().getQuery()); - getBinding().f1692c.a(this, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$2(this)); + getBinding().f1694c.setText(getViewModel().getQuery()); + getBinding().f1694c.a(this, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$2(this)); getAdapter().setOnClickListener(new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$3(this)); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetChannelSettingsAddMemberFragment.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChannelSettingsAddMemberFragment$onViewBoundOrOnResume$4(this), 62, (Object) null); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java index cdaf3912e9..0c634950ab 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet$binding$2.java @@ -24,11 +24,11 @@ public final /* synthetic */ class WidgetChannelSettingsAddMemberSheet$binding$2 i = 2131362749; FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131362749); if (fragmentContainerView != null) { - i = 2131365129; - TextView textView2 = (TextView) view.findViewById(2131365129); + i = 2131365133; + TextView textView2 = (TextView) view.findViewById(2131365133); if (textView2 != null) { - i = 2131365281; - TextView textView3 = (TextView) view.findViewById(2131365281); + i = 2131365286; + TextView textView3 = (TextView) view.findViewById(2131365286); if (textView3 != null) { return new WidgetChannelSettingsAddMemberSheetBinding((LinearLayout) view, textView, fragmentContainerView, textView2, textView3); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java index 1b8ca94047..28748eabf3 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsAddMemberSheet.java @@ -132,7 +132,7 @@ public final class WidgetChannelSettingsAddMemberSheet extends AppBottomSheet { super.onViewCreated(view, bundle); this.fragment = WidgetChannelSettingsAddMemberFragment.Companion.create(getChannelId(), false); FragmentTransaction beginTransaction = getChildFragmentManager().beginTransaction(); - FragmentContainerView fragmentContainerView = getBinding().f1694c; + FragmentContainerView fragmentContainerView = getBinding().f1696c; m.checkNotNullExpressionValue(fragmentContainerView, "binding.content"); int id2 = fragmentContainerView.getId(); WidgetChannelSettingsAddMemberFragment widgetChannelSettingsAddMemberFragment = this.fragment; diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java index 0316b7876c..cfb227f0dc 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$binding$2.java @@ -114,8 +114,8 @@ public final /* synthetic */ class WidgetChannelSettingsEditPermissions$binding$ i = 2131362316; LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362316); if (linearLayout3 != null) { - i = 2131364557; - TextView textView3 = (TextView) view.findViewById(2131364557); + i = 2131364560; + TextView textView3 = (TextView) view.findViewById(2131364560); if (textView3 != null) { return new WidgetChannelSettingsEditPermissionsBinding((CoordinatorLayout) view, ternaryCheckBox, ternaryCheckBox2, ternaryCheckBox3, ternaryCheckBox4, ternaryCheckBox5, ternaryCheckBox6, ternaryCheckBox7, ternaryCheckBox8, ternaryCheckBox9, ternaryCheckBox10, ternaryCheckBox11, ternaryCheckBox12, ternaryCheckBox13, ternaryCheckBox14, ternaryCheckBox15, ternaryCheckBox16, ternaryCheckBox17, ternaryCheckBox18, ternaryCheckBox19, ternaryCheckBox20, ternaryCheckBox21, ternaryCheckBox22, ternaryCheckBox23, ternaryCheckBox24, simpleDraweeView, textView, floatingActionButton, linearLayout, textView2, linearLayout2, linearLayout3, textView3); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java index 4869aa8830..edf7b64989 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$configureUI$1.java @@ -16,7 +16,7 @@ public final class WidgetChannelSettingsEditPermissions$configureUI$1 im public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363883) { + if (menuItem.getItemId() == 2131363885) { WidgetChannelSettingsEditPermissions.access$deletePermissionOverwrites(this.this$0, this.$model.getChannel().g(), WidgetChannelSettingsEditPermissions.access$getTargetId$p(this.this$0)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java index b40c04b55a..c992968e16 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions$permissionCheckboxes$2.java @@ -19,6 +19,6 @@ public final class WidgetChannelSettingsEditPermissions$permissionCheckboxes$2 e @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final List mo1invoke() { - return n.listOf((Object[]) new TernaryCheckBox[]{WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).b, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1695c, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).d, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).e, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).h, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).i, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).j, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).k, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).l, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).m, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).n, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).o, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).q, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).p, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).g, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).r, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1696s, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).t, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).u, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).w, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1698y, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1697x, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).v, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f}); + return n.listOf((Object[]) new TernaryCheckBox[]{WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).b, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1697c, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).d, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).e, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).h, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).i, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).j, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).k, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).l, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).m, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).n, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).o, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).q, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).p, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).g, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).r, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1698s, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).t, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).u, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).w, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1700y, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f1699x, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).v, WidgetChannelSettingsEditPermissions.access$getBinding$p(this.this$0).f}); } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java index a4e8ab1995..baca49a52e 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java @@ -252,11 +252,11 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { permissionOverwrite = null; } int i = permissionOverwrite != null ? 2131623949 : 2131623951; - setActionBarTitle(AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 2131887207 : 2131887324); + setActionBarTitle(AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 2131887208 : 2131887326); setActionBarSubtitle(AnimatableValueParser.z0(widgetChannelSettingsEditPermissionsModel.getChannel(), requireContext(), true)); AppFragment.setActionBarOptionsMenu$default(this, i, new WidgetChannelSettingsEditPermissions$configureUI$1(this, widgetChannelSettingsEditPermissionsModel), null, 4, null); if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForRole) { - SimpleDraweeView simpleDraweeView = getBinding().f1699z; + SimpleDraweeView simpleDraweeView = getBinding().f1701z; m.checkNotNullExpressionValue(simpleDraweeView, "binding.channelPermissionsAvatar"); simpleDraweeView.setVisibility(8); Companion companion = Companion; @@ -266,7 +266,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { Companion.access$setTextWithFont(companion, textView, modelForRole.getGuildRole().f(), 2130969326); getBinding().D.setTextColor(RoleUtils.getRoleColor$default(modelForRole.getGuildRole(), requireContext(), null, 2, null)); } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForUser) { - SimpleDraweeView simpleDraweeView2 = getBinding().f1699z; + SimpleDraweeView simpleDraweeView2 = getBinding().f1701z; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.channelPermissionsAvatar"); simpleDraweeView2.setVisibility(0); Companion companion2 = Companion; @@ -274,7 +274,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { m.checkNotNullExpressionValue(textView2, "binding.channelPermissionsTargetName"); WidgetChannelSettingsEditPermissionsModel.ModelForUser modelForUser = (WidgetChannelSettingsEditPermissionsModel.ModelForUser) widgetChannelSettingsEditPermissionsModel; Companion.access$setTextWithFont(companion2, textView2, modelForUser.getUser().getUsername(), 2130969325); - SimpleDraweeView simpleDraweeView3 = getBinding().f1699z; + SimpleDraweeView simpleDraweeView3 = getBinding().f1701z; m.checkNotNullExpressionValue(simpleDraweeView3, "binding.channelPermissionsAvatar"); IconUtils.setIcon$default(simpleDraweeView3, modelForUser.getUser(), 2131165296, null, null, null, 56, null); } @@ -294,7 +294,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { m.checkNotNullExpressionValue(ternaryCheckBox, "binding.channelPermissionGeneralManageWebhooks"); ternaryCheckBox.setVisibility(AnimatableValueParser.j1(widgetChannelSettingsEditPermissionsModel.getChannel()) || AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel()) ? 0 : 8); if (AnimatableValueParser.f1(widgetChannelSettingsEditPermissionsModel.getChannel())) { - getBinding().G.setText(2131892805); + getBinding().G.setText(2131892847); } Map categoryLabels = ChannelPermissionUtilsKt.getCategoryLabels(requireContext()); boolean z3 = widgetChannelSettingsEditPermissionsModel.getType() == 1 && widgetChannelSettingsEditPermissionsModel.getTargetId() == widgetChannelSettingsEditPermissionsModel.getChannel().e(); @@ -320,7 +320,7 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { setupPermissionEnabledState(ternaryCheckBox2, access$getPermission, widgetChannelSettingsEditPermissionsModel); setupPermissionCheckedState(ternaryCheckBox2, permissionOverwrite2); if (id2 == 2131362306) { - ternaryCheckBox2.setSubtext(b.i(ternaryCheckBox2, 2131892796, new Object[]{getString(2131890709)}, null, 4)); + ternaryCheckBox2.setSubtext(b.i(ternaryCheckBox2, 2131892838, new Object[]{getString(2131890739)}, null, 4)); } updateCheckboxLabels(ternaryCheckBox2, widgetChannelSettingsEditPermissionsModel.getChannel().z(), z3, categoryLabels.get(Integer.valueOf(id2))); } @@ -394,19 +394,19 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { private final void setupPermissionEnabledState(TernaryCheckBox ternaryCheckBox, long j, WidgetChannelSettingsEditPermissionsModel widgetChannelSettingsEditPermissionsModel) { if (AnimatableValueParser.u1(widgetChannelSettingsEditPermissionsModel.getChannel()) && STAGE_DISABLED_PERMISSIONS.contains(Long.valueOf(j))) { - ternaryCheckBox.setDisabled(2131893298); + ternaryCheckBox.setDisabled(2131893340); } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForUser) { WidgetChannelSettingsEditPermissionsModel.ModelForUser modelForUser = (WidgetChannelSettingsEditPermissionsModel.ModelForUser) widgetChannelSettingsEditPermissionsModel; if (modelForUser.isMe()) { if (ternaryCheckBox.b()) { - ternaryCheckBox.setDisabled(2131887183); + ternaryCheckBox.setDisabled(2131887184); } else { - ternaryCheckBox.setOffDisabled(2131887183); + ternaryCheckBox.setOffDisabled(2131887184); } } else if ((modelForUser.getMyPermissionsForChannel() & j) == j) { ternaryCheckBox.c(); } else { - ternaryCheckBox.setDisabled(2131887182); + ternaryCheckBox.setDisabled(2131887183); } } else if (widgetChannelSettingsEditPermissionsModel instanceof WidgetChannelSettingsEditPermissionsModel.ModelForRole) { WidgetChannelSettingsEditPermissionsModel.ModelForRole modelForRole = (WidgetChannelSettingsEditPermissionsModel.ModelForRole) widgetChannelSettingsEditPermissionsModel; @@ -428,9 +428,9 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { } else if (!ternaryCheckBox.b()) { } else { if (!modelForRole.canNeutralizeRolePermission(j)) { - ternaryCheckBox.setDisabled(2131887184); + ternaryCheckBox.setDisabled(2131887185); } else if (modelForRole.canNeutralizeRolePermission(j) && !modelForRole.canDenyRolePermission(j)) { - ternaryCheckBox.setOffDisabled(2131887184); + ternaryCheckBox.setOffDisabled(2131887185); } else if (modelForRole.canNeutralizeRolePermission(j) && modelForRole.canDenyRolePermission(j)) { ternaryCheckBox.c(); } @@ -438,9 +438,9 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment { } else if (modelForRole.canDenyRolePermission(j)) { ternaryCheckBox.c(); } else if ((modelForRole.getMyPermissionsForChannel() & j) == j) { - ternaryCheckBox.setOffDisabled(2131887184); + ternaryCheckBox.setOffDisabled(2131887185); } else { - ternaryCheckBox.setOffDisabled(2131887182); + ternaryCheckBox.setOffDisabled(2131887183); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java index 5620aa66c9..b4b0b4bd90 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$configureUI$1.java @@ -18,7 +18,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced$configureUI$1 implem if (this.$model.getCanAddRole()) { WidgetChannelSettingsPermissionsAddRole.create(this.this$0.getContext(), this.$model.getChannel().g()); } else { - o.i(this.this$0, 2131891722, 0, 4); + o.i(this.this$0, 2131891759, 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java index 93a55460f5..dff47dbae6 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced$viewBinding$2.java @@ -25,17 +25,17 @@ public final /* synthetic */ class WidgetChannelSettingsPermissionsAdvanced$view i = 2131361921; TextView textView2 = (TextView) view.findViewById(2131361921); if (textView2 != null) { - i = 2131363853; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363853); + i = 2131363856; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363856); if (linearLayout != null) { - i = 2131363855; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363855); + i = 2131363858; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363858); if (recyclerView != null) { - i = 2131364497; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364497); + i = 2131364500; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364500); if (linearLayout2 != null) { - i = 2131364500; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364500); + i = 2131364503; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364503); if (recyclerView2 != null) { return new WidgetChannelSettingsPermissionsAdvancedBinding((CoordinatorLayout) view, textView, textView2, linearLayout, recyclerView, linearLayout2, recyclerView2); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java index 11cd30b0ab..f8d1737757 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsAdvanced.java @@ -311,7 +311,7 @@ public final class WidgetChannelSettingsPermissionsAdvanced extends AppFragment private final void configureUI(Model model) { if (model != null && model.getCanManage()) { - getViewBinding().f1700c.setOnClickListener(new WidgetChannelSettingsPermissionsAdvanced$configureUI$1(this, model)); + getViewBinding().f1702c.setOnClickListener(new WidgetChannelSettingsPermissionsAdvanced$configureUI$1(this, model)); getViewBinding().b.setOnClickListener(new WidgetChannelSettingsPermissionsAdvanced$configureUI$2(this, model)); configureRoles(model); configureMembers(model); diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java index 1a10647f04..d87c4d694e 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview$viewBinding$2.java @@ -22,14 +22,14 @@ public final /* synthetic */ class WidgetChannelSettingsPermissionsOverview$view int i = 2131361924; FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131361924); if (fragmentContainerView != null) { - i = 2131363209; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363209); + i = 2131363211; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363211); if (appViewFlipper != null) { - i = 2131364561; - SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131364561); + i = 2131364564; + SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131364564); if (segmentedControlContainer != null) { - i = 2131365009; - FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365009); + i = 2131365013; + FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365013); if (fragmentContainerView2 != null) { return new WidgetChannelSettingsPermissionsOverviewBinding((CoordinatorLayout) view, fragmentContainerView, appViewFlipper, segmentedControlContainer, fragmentContainerView2); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java index a3655d65c7..a3e2c10cc4 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsPermissionsOverview.java @@ -278,7 +278,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment m.checkNotNullExpressionValue(appViewFlipper2, "viewBinding.flipper"); appViewFlipper2.setDisplayedChild(1); } - SegmentedControlContainer segmentedControlContainer = getViewBinding().f1701c; + SegmentedControlContainer segmentedControlContainer = getViewBinding().f1703c; int ordinal2 = viewState.getSelectedTab().ordinal(); if (ordinal2 == 0) { i = 0; @@ -288,8 +288,8 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment throw new NoWhenBranchMatchedException(); } segmentedControlContainer.a(i); - getViewBinding().f1701c.setOnSegmentSelectedChangeListener(new WidgetChannelSettingsPermissionsOverview$configureTabs$1(this)); - SegmentedControlContainer segmentedControlContainer2 = getViewBinding().f1701c; + getViewBinding().f1703c.setOnSegmentSelectedChangeListener(new WidgetChannelSettingsPermissionsOverview$configureTabs$1(this)); + SegmentedControlContainer segmentedControlContainer2 = getViewBinding().f1703c; m.checkNotNullExpressionValue(segmentedControlContainer2, "viewBinding.segmentedControl"); if (viewState.getAvailableTabs().size() <= 1) { z2 = false; @@ -301,7 +301,7 @@ public final class WidgetChannelSettingsPermissionsOverview extends AppFragment } private final void configureToolbar(Channel channel) { - setActionBarTitle(AnimatableValueParser.f1(channel) ? 2131887207 : 2131887324); + setActionBarTitle(AnimatableValueParser.f1(channel) ? 2131887208 : 2131887326); setActionBarSubtitle(AnimatableValueParser.z0(channel, requireContext(), true)); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java index 99f086a0f5..3e3bcb9093 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember$onViewBound$2.java @@ -27,7 +27,7 @@ public final class WidgetCreateChannelAddMember$onViewBound$2 extends o implemen public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363879) { + if (menuItem.getItemId() == 2131363881) { WidgetCreateChannelAddMember widgetCreateChannelAddMember = this.this$0.this$0; Map map = this.$selected; m.checkNotNullExpressionValue(map, "selected"); diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java index a42e40fbb2..f49d02000e 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetCreateChannelAddMember.java @@ -53,7 +53,7 @@ public final class WidgetCreateChannelAddMember extends AppFragment { } public WidgetCreateChannelAddMember() { - super(2131558980); + super(2131558981); } public static final /* synthetic */ void access$addPermissionOverwrites(WidgetCreateChannelAddMember widgetCreateChannelAddMember, Map map) { @@ -119,7 +119,7 @@ public final class WidgetCreateChannelAddMember extends AppFragment { } beginTransaction.replace(id2, widgetChannelSettingsAddMemberFragment, widgetChannelSettingsAddMemberFragment2.getClass().getSimpleName()).commit(); setActionBarDisplayHomeAsUpEnabled(true); - setActionBarTitle(2131887293); + setActionBarTitle(2131887295); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getChannels().observeChannel(getChannelId()), this, null, 2, null), WidgetCreateChannelAddMember.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCreateChannelAddMember$onViewBound$1(this), 62, (Object) null); WidgetChannelSettingsAddMemberFragment widgetChannelSettingsAddMemberFragment3 = this.fragment; if (widgetChannelSettingsAddMemberFragment3 == null) { diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java index 6396d056dd..1359a43628 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$configureUI$1.java @@ -25,7 +25,7 @@ public final class WidgetStageChannelModeratorPermissions$configureUI$1 implemen m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion.show(parentFragmentManager, WidgetStageChannelModeratorPermissions.access$getChannelId$p(this.this$0)); } else if (!canEditModerators) { - Toast.makeText(this.this$0.getContext(), 2131887298, 0).show(); + Toast.makeText(this.this$0.getContext(), 2131887300, 0).show(); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java index 8bd5379e29..646a67cd53 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions$viewBinding$2.java @@ -19,11 +19,11 @@ public final /* synthetic */ class WidgetStageChannelModeratorPermissions$viewBi int i = 2131361920; AddPermissionOwnerView addPermissionOwnerView = (AddPermissionOwnerView) view.findViewById(2131361920); if (addPermissionOwnerView != null) { - i = 2131363854; - PermissionOwnerListView permissionOwnerListView = (PermissionOwnerListView) view.findViewById(2131363854); + i = 2131363857; + PermissionOwnerListView permissionOwnerListView = (PermissionOwnerListView) view.findViewById(2131363857); if (permissionOwnerListView != null) { - i = 2131364499; - PermissionOwnerListView permissionOwnerListView2 = (PermissionOwnerListView) view.findViewById(2131364499); + i = 2131364502; + PermissionOwnerListView permissionOwnerListView2 = (PermissionOwnerListView) view.findViewById(2131364502); if (permissionOwnerListView2 != null) { return new WidgetStageChannelModeratorPermissionsBinding((CoordinatorLayout) view, addPermissionOwnerView, permissionOwnerListView, permissionOwnerListView2); } diff --git a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java index 522e64caa9..392ba40e52 100644 --- a/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java +++ b/app/src/main/java/com/discord/widgets/channels/permissions/WidgetStageChannelModeratorPermissions.java @@ -32,7 +32,7 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment { private final Lazy viewModel$delegate; public WidgetStageChannelModeratorPermissions() { - super(2131559225); + super(2131559226); WidgetStageChannelModeratorPermissions$viewModel$2 widgetStageChannelModeratorPermissions$viewModel$2 = new WidgetStageChannelModeratorPermissions$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetStageChannelModeratorPermissionsViewModel.class), new WidgetStageChannelModeratorPermissions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStageChannelModeratorPermissions$viewModel$2)); @@ -62,7 +62,7 @@ public final class WidgetStageChannelModeratorPermissions extends AppFragment { ViewExtensions.setEnabledAlpha$default(addPermissionOwnerView, valid.getCanEditModerators(), 0.0f, 2, null); getViewBinding().b.setOnClickListener(new WidgetStageChannelModeratorPermissions$configureUI$1(this, viewState)); getViewBinding().d.setData(valid.getRoleItems(), new WidgetStageChannelModeratorPermissions$configureUI$2(this)); - getViewBinding().f1951c.setData(valid.getMemberItems(), new WidgetStageChannelModeratorPermissions$configureUI$3(this)); + getViewBinding().f1953c.setData(valid.getMemberItems(), new WidgetStageChannelModeratorPermissions$configureUI$3(this)); } } diff --git a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java index b79324c074..05d9731db7 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/WidgetThreadDraftArchiveSheet.java @@ -152,7 +152,7 @@ public final class WidgetThreadDraftArchiveSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559244; + return 2131559245; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java index 526447b0fe..1cdc99eb7e 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/ThreadBrowserThreadView.java @@ -16,10 +16,10 @@ import android.widget.TextView; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; import com.discord.api.thread.ThreadMetadata; import com.discord.databinding.ThreadBrowserThreadViewBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.models.user.CoreUser; import com.discord.models.user.User; @@ -27,12 +27,12 @@ import com.discord.simpleast.core.parser.Parser; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.font.FontUtils; import com.discord.utilities.icon.IconUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.spans.TypefaceSpanCompat; import com.discord.utilities.textprocessing.AstRenderer; import com.discord.utilities.textprocessing.DiscordParser; import com.discord.utilities.textprocessing.MessageParseState; import com.discord.utilities.textprocessing.MessageRenderContext; -import com.discord.utilities.textprocessing.MessageUtils; import com.discord.utilities.time.ClockFactory; import com.discord.utilities.time.TimeUtils; import com.discord.utilities.view.text.SimpleDraweeSpanTextView; @@ -61,12 +61,12 @@ public final class ThreadBrowserThreadView extends FrameLayout { private final Map channelNames; private final Map guildMembers; private final Map guildRoles; - private final ModelMessage message; + private final Message message; private final long myUserId; private final User owner; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ActiveThread(Channel channel, User user, ModelMessage modelMessage, long j, Map map, Map map2, Map map3) { + public ActiveThread(Channel channel, User user, Message message, long j, Map map, Map map2, Map map3) { super(channel, user, map, null); m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(map, "guildMembers"); @@ -74,15 +74,15 @@ public final class ThreadBrowserThreadView extends FrameLayout { m.checkNotNullParameter(map3, "channelNames"); this.channel = channel; this.owner = user; - this.message = modelMessage; + this.message = message; this.myUserId = j; this.guildMembers = map; this.guildRoles = map2; this.channelNames = map3; } - public static /* synthetic */ ActiveThread copy$default(ActiveThread activeThread, Channel channel, User user, ModelMessage modelMessage, long j, Map map, Map map2, Map map3, int i, Object obj) { - return activeThread.copy((i & 1) != 0 ? activeThread.getChannel() : channel, (i & 2) != 0 ? activeThread.getOwner() : user, (i & 4) != 0 ? activeThread.message : modelMessage, (i & 8) != 0 ? activeThread.myUserId : j, (i & 16) != 0 ? activeThread.getGuildMembers() : map, (i & 32) != 0 ? activeThread.guildRoles : map2, (i & 64) != 0 ? activeThread.channelNames : map3); + public static /* synthetic */ ActiveThread copy$default(ActiveThread activeThread, Channel channel, User user, Message message, long j, Map map, Map map2, Map map3, int i, Object obj) { + return activeThread.copy((i & 1) != 0 ? activeThread.getChannel() : channel, (i & 2) != 0 ? activeThread.getOwner() : user, (i & 4) != 0 ? activeThread.message : message, (i & 8) != 0 ? activeThread.myUserId : j, (i & 16) != 0 ? activeThread.getGuildMembers() : map, (i & 32) != 0 ? activeThread.guildRoles : map2, (i & 64) != 0 ? activeThread.channelNames : map3); } public final Channel component1() { @@ -93,7 +93,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { return getOwner(); } - public final ModelMessage component3() { + public final Message component3() { return this.message; } @@ -113,12 +113,12 @@ public final class ThreadBrowserThreadView extends FrameLayout { return this.channelNames; } - public final ActiveThread copy(Channel channel, User user, ModelMessage modelMessage, long j, Map map, Map map2, Map map3) { + public final ActiveThread copy(Channel channel, User user, Message message, long j, Map map, Map map2, Map map3) { m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(map, "guildMembers"); m.checkNotNullParameter(map2, "guildRoles"); m.checkNotNullParameter(map3, "channelNames"); - return new ActiveThread(channel, user, modelMessage, j, map, map2, map3); + return new ActiveThread(channel, user, message, j, map, map2, map3); } public boolean equals(Object obj) { @@ -150,7 +150,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { return this.guildRoles; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -169,8 +169,8 @@ public final class ThreadBrowserThreadView extends FrameLayout { int hashCode = (channel != null ? channel.hashCode() : 0) * 31; User owner = getOwner(); int hashCode2 = (hashCode + (owner != null ? owner.hashCode() : 0)) * 31; - ModelMessage modelMessage = this.message; - int a = (b.a(this.myUserId) + ((hashCode2 + (modelMessage != null ? modelMessage.hashCode() : 0)) * 31)) * 31; + Message message = this.message; + int a = (b.a(this.myUserId) + ((hashCode2 + (message != null ? message.hashCode() : 0)) * 31)) * 31; Map guildMembers = getGuildMembers(); int hashCode3 = (a + (guildMembers != null ? guildMembers.hashCode() : 0)) * 31; Map map = this.guildRoles; @@ -381,26 +381,26 @@ public final class ThreadBrowserThreadView extends FrameLayout { super(context, attributeSet, i); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558696, this); - int i2 = 2131365228; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365228); + int i2 = 2131365232; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365232); if (simpleDraweeView != null) { - i2 = 2131365257; - ImageView imageView = (ImageView) findViewById(2131365257); + i2 = 2131365261; + ImageView imageView = (ImageView) findViewById(2131365261); if (imageView != null) { - i2 = 2131365258; - FrameLayout frameLayout = (FrameLayout) findViewById(2131365258); + i2 = 2131365262; + FrameLayout frameLayout = (FrameLayout) findViewById(2131365262); if (frameLayout != null) { - i2 = 2131365259; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365259); + i2 = 2131365263; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) findViewById(2131365263); if (simpleDraweeSpanTextView != null) { - i2 = 2131365260; - TextView textView = (TextView) findViewById(2131365260); + i2 = 2131365264; + TextView textView = (TextView) findViewById(2131365264); if (textView != null) { - i2 = 2131365275; - TextView textView2 = (TextView) findViewById(2131365275); + i2 = 2131365279; + TextView textView2 = (TextView) findViewById(2131365279); if (textView2 != null) { - i2 = 2131365276; - TextView textView3 = (TextView) findViewById(2131365276); + i2 = 2131365280; + TextView textView3 = (TextView) findViewById(2131365280); if (textView3 != null) { ThreadBrowserThreadViewBinding threadBrowserThreadViewBinding = new ThreadBrowserThreadViewBinding(this, simpleDraweeView, imageView, frameLayout, simpleDraweeSpanTextView, textView, textView2, textView3); m.checkNotNullExpressionValue(threadBrowserThreadViewBinding, "ThreadBrowserThreadViewB…ater.from(context), this)"); @@ -429,10 +429,10 @@ public final class ThreadBrowserThreadView extends FrameLayout { private final void configureActiveThreadUI(ThreadData.ActiveThread activeThread) { DraweeSpanStringBuilder draweeSpanStringBuilder; String str; - ModelMessage message = activeThread.getMessage(); + Message message = activeThread.getMessage(); DraweeSpanStringBuilder draweeSpanStringBuilder2 = null; - String content = message != null ? message.getContent() : null; - if (message == null || content == null) { + String k = message != null ? message.k() : null; + if (message == null || k == null) { TextView textView = this.binding.g; m.checkNotNullExpressionValue(textView, "binding.threadTimestampSeparator"); textView.setVisibility(8); @@ -442,7 +442,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { if (activeThread.getOwner() == null) { SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadMessage"); - simpleDraweeSpanTextView.setText(getContext().getString(2131893822)); + simpleDraweeSpanTextView.setText(getContext().getString(2131893862)); configureAvatar(null); return; } @@ -451,17 +451,18 @@ public final class ThreadBrowserThreadView extends FrameLayout { Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); MessageRenderContext messageRenderContext = new MessageRenderContext(context, activeThread.getMyUserId(), true, MessageUtils.getNickOrUsernames$default(message, activeThread.getChannel(), activeThread.getGuildMembers(), null, 8, null), activeThread.getChannelNames(), activeThread.getGuildRoles(), 0, null, null, ColorCompat.getThemedColor(getContext(), 2130970180), 0, null, null, null, 15808, null); - com.discord.api.user.User author = activeThread.getMessage().getAuthor(); - m.checkNotNullExpressionValue(author, "threadData.message.author"); - CoreUser coreUser = new CoreUser(author); - String string = message.hasStickers() ? getContext().getString(2131892551) : (message.hasAttachments() || message.hasEmbeds()) ? getContext().getString(2131892549) : null; + com.discord.api.user.User g = activeThread.getMessage().g(); + m.checkNotNull(g); + CoreUser coreUser = new CoreUser(g); + MessageUtils messageUtils = MessageUtils.INSTANCE; + String string = messageUtils.hasStickers(message) ? getContext().getString(2131892593) : (messageUtils.hasAttachments(message) || messageUtils.hasEmbeds(message)) ? getContext().getString(2131892591) : null; if (string != null) { draweeSpanStringBuilder2 = new DraweeSpanStringBuilder(); draweeSpanStringBuilder2.append((CharSequence) (string + (char) 160)); draweeSpanStringBuilder2.setSpan(new StyleSpan(2), 0, string.length(), 33); - } else if (!t.isBlank(content)) { + } else if (!t.isBlank(k)) { str = "binding.threadTimestamp"; - draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), content, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext); + draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), k, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext); if (draweeSpanStringBuilder != null) { GuildMember guildMember = activeThread.getGuildMembers().get(Long.valueOf(coreUser.getId())); String nickOrUsername$default = GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, coreUser, guildMember, activeThread.getChannel(), null, 8, null); @@ -480,7 +481,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { configureAvatar(coreUser); TextView textView5 = this.binding.f; m.checkNotNullExpressionValue(textView5, str); - textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + 1420070400000L)); + textView5.setText(formatActivityTimestamp((message.r() >>> 22) + 1420070400000L)); } str = "binding.threadTimestamp"; draweeSpanStringBuilder = draweeSpanStringBuilder2; @@ -495,7 +496,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { configureAvatar(coreUser); TextView textView5 = this.binding.f; m.checkNotNullExpressionValue(textView5, str); - textView5.setText(formatActivityTimestamp((message.getId() >>> 22) + 1420070400000L)); + textView5.setText(formatActivityTimestamp((message.r() >>> 22) + 1420070400000L)); } private final void configureArchivedThreadUI(ThreadData.ArchivedThread archivedThread) { @@ -513,9 +514,9 @@ public final class ThreadBrowserThreadView extends FrameLayout { } int ordinal2 = archivedThread.getTimestampMode().ordinal(); if (ordinal2 == 0) { - i = 2131893811; + i = 2131893851; } else if (ordinal2 == 1) { - i = 2131893813; + i = 2131893853; } else { throw new NoWhenBranchMatchedException(); } @@ -530,7 +531,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { private final void configureAvatar(User user) { if (user == null) { - ImageView imageView = this.binding.f1633c; + ImageView imageView = this.binding.f1635c; m.checkNotNullExpressionValue(imageView, "binding.threadIcon"); imageView.setVisibility(0); SimpleDraweeView simpleDraweeView = this.binding.b; @@ -538,7 +539,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { simpleDraweeView.setVisibility(8); return; } - ImageView imageView2 = this.binding.f1633c; + ImageView imageView2 = this.binding.f1635c; m.checkNotNullExpressionValue(imageView2, "binding.threadIcon"); imageView2.setVisibility(8); SimpleDraweeView simpleDraweeView2 = this.binding.b; @@ -554,21 +555,21 @@ public final class ThreadBrowserThreadView extends FrameLayout { if (currentTimeMillis < 60000) { Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - return c.a.l.b.g(context, 2131893831, new Object[]{1}, null, 4); + return c.a.l.b.g(context, 2131893871, new Object[]{1}, null, 4); } else if (currentTimeMillis < 3600000) { Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); - return c.a.l.b.g(context2, 2131893831, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4); + return c.a.l.b.g(context2, 2131893871, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4); } else if (currentTimeMillis < 86400000) { Context context3 = getContext(); m.checkNotNullExpressionValue(context3, "context"); - return c.a.l.b.g(context3, 2131893830, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4); + return c.a.l.b.g(context3, 2131893870, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4); } else if (currentTimeMillis < 2592000000L) { Context context4 = getContext(); m.checkNotNullExpressionValue(context4, "context"); - return c.a.l.b.g(context4, 2131893829, new Object[]{Long.valueOf(currentTimeMillis / 86400000)}, null, 4); + return c.a.l.b.g(context4, 2131893869, new Object[]{Long.valueOf(currentTimeMillis / 86400000)}, null, 4); } else { - String string = getContext().getString(2131893832); + String string = getContext().getString(2131893872); m.checkNotNullExpressionValue(string, "context.getString(R.stri…imestamp_more_than_month)"); return string; } @@ -579,15 +580,15 @@ public final class ThreadBrowserThreadView extends FrameLayout { if (currentTimeMillis < 60000) { Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - return c.a.l.b.g(context, 2131893831, new Object[]{1}, null, 4); + return c.a.l.b.g(context, 2131893871, new Object[]{1}, null, 4); } else if (currentTimeMillis < 3600000) { Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); - return c.a.l.b.g(context2, 2131893831, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4); + return c.a.l.b.g(context2, 2131893871, new Object[]{Long.valueOf(currentTimeMillis / 60000)}, null, 4); } else if (currentTimeMillis < 86400000) { Context context3 = getContext(); m.checkNotNullExpressionValue(context3, "context"); - return c.a.l.b.g(context3, 2131893830, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4); + return c.a.l.b.g(context3, 2131893870, new Object[]{Long.valueOf(currentTimeMillis / 3600000)}, null, 4); } else { String formatDateTime = DateUtils.formatDateTime(getContext(), j, 131076); m.checkNotNullExpressionValue(formatDateTime, "DateUtils.formatDateTime…teUtils.FORMAT_SHOW_YEAR)"); @@ -626,7 +627,7 @@ public final class ThreadBrowserThreadView extends FrameLayout { String nickOrUsername$default = GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, owner, guildMember, threadData.getChannel(), null, 8, null); SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.d; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadMessage"); - c.a.l.b.m(simpleDraweeSpanTextView, 2131893828, new Object[0], new ThreadBrowserThreadView$setThreadData$1(this, nickOrUsername$default, guildMember)); + c.a.l.b.m(simpleDraweeSpanTextView, 2131893868, new Object[0], new ThreadBrowserThreadView$setThreadData$1(this, nickOrUsername$default, guildMember)); if (threadData instanceof ThreadData.ActiveThread) { configureActiveThreadUI((ThreadData.ActiveThread) threadData); } else if (threadData instanceof ThreadData.ArchivedThread) { diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java index 13505b335e..14a5a9dd8a 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$binding$2.java @@ -22,11 +22,11 @@ public final /* synthetic */ class WidgetThreadBrowser$binding$2 extends k imple int i = 2131361869; TabLayout tabLayout = (TabLayout) view.findViewById(2131361869); if (tabLayout != null) { - i = 2131365240; - AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365240); + i = 2131365244; + AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131365244); if (appBarLayout != null) { - i = 2131365242; - SimplePager simplePager = (SimplePager) view.findViewById(2131365242); + i = 2131365246; + SimplePager simplePager = (SimplePager) view.findViewById(2131365246); if (simplePager != null) { return new WidgetThreadBrowserBinding((ConstraintLayout) view, tabLayout, appBarLayout, simplePager); } diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java index 94b3c7303f..a3fb0718d2 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java @@ -18,11 +18,11 @@ public final class WidgetThreadBrowser$updateMenu$1 implements Action2 implements Action1 } public final void call(Menu menu) { - MenuItem findItem = menu.findItem(2131363912); + MenuItem findItem = menu.findItem(2131363914); boolean z2 = true; if (findItem != null) { findItem.setVisible(this.$selectedPage == WidgetThreadBrowser.access$getARCHIVED_PAGE$p(this.this$0)); } - MenuItem findItem2 = menu.findItem(2131363911); + MenuItem findItem2 = menu.findItem(2131363913); if (findItem2 != null) { if (this.$selectedPage != WidgetThreadBrowser.access$getACTIVE_PAGE$p(this.this$0) || !m.areEqual(this.$canCreateThread, Boolean.TRUE)) { z2 = false; diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java index a49b299b09..60cde30a8a 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser.java @@ -67,7 +67,7 @@ public final class WidgetThreadBrowser extends AppFragment { } public WidgetThreadBrowser() { - super(2131559245); + super(2131559246); } public static final /* synthetic */ int access$getACTIVE_PAGE$p(WidgetThreadBrowser widgetThreadBrowser) { @@ -135,19 +135,19 @@ public final class WidgetThreadBrowser extends AppFragment { } private final void initializeAdapter(WidgetThreadBrowserViewModel.ViewState.Browser browser) { - SimplePager simplePager = getBinding().f1970c; + SimplePager simplePager = getBinding().f1972c; m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager"); if (simplePager.getAdapter() == null) { ArrayList arrayList = new ArrayList(); - String string = getString(2131893810); + String string = getString(2131893850); m.checkNotNullExpressionValue(string, "getString(R.string.thread_browser_active)"); arrayList.add(new SimplePager.Adapter.Item(string, new WidgetThreadBrowser$initializeAdapter$1(this))); if (browser.getCanViewArchivedThreads()) { - String string2 = getString(2131893812); + String string2 = getString(2131893852); m.checkNotNullExpressionValue(string2, "getString(R.string.thread_browser_archived)"); arrayList.add(new SimplePager.Adapter.Item(string2, new WidgetThreadBrowser$initializeAdapter$2(this))); } - SimplePager simplePager2 = getBinding().f1970c; + SimplePager simplePager2 = getBinding().f1972c; m.checkNotNullExpressionValue(simplePager2, "binding.threadBrowserViewPager"); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); @@ -156,7 +156,7 @@ public final class WidgetThreadBrowser extends AppFragment { Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array"); SimplePager.Adapter.Item[] itemArr = (SimplePager.Adapter.Item[]) array; simplePager2.setAdapter(new SimplePager.Adapter(parentFragmentManager, (SimplePager.Adapter.Item[]) Arrays.copyOf(itemArr, itemArr.length))); - getBinding().f1970c.addOnPageChangeListener(new WidgetThreadBrowser$initializeAdapter$3(this)); + getBinding().f1972c.addOnPageChangeListener(new WidgetThreadBrowser$initializeAdapter$3(this)); TabLayout tabLayout = getBinding().b; m.checkNotNullExpressionValue(tabLayout, "binding.actionBarTabs"); if (!browser.getCanViewArchivedThreads()) { @@ -186,7 +186,7 @@ public final class WidgetThreadBrowser extends AppFragment { L.append(browser.getChannelName()); setActionBarSubtitle(L.toString()); } - SimplePager simplePager = getBinding().f1970c; + SimplePager simplePager = getBinding().f1972c; m.checkNotNullExpressionValue(simplePager, "binding.threadBrowserViewPager"); updateMenu(simplePager.getCurrentItem(), Boolean.valueOf(browser.getCanCreateThread())); } @@ -203,6 +203,6 @@ public final class WidgetThreadBrowser extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131893833); + setActionBarTitle(2131893873); } } diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java index 0838134096..4b5ffe1c67 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive$binding$2.java @@ -18,15 +18,15 @@ public final /* synthetic */ class WidgetThreadBrowserActive$binding$2 extends k public final WidgetThreadBrowserActiveBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363040; - View findViewById = view.findViewById(2131363040); + int i = 2131363042; + View findViewById = view.findViewById(2131363042); if (findViewById != null) { i1 a = i1.a(findViewById); - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364396); + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364399); if (recyclerView != null) { return new WidgetThreadBrowserActiveBinding((ConstraintLayout) view, a, recyclerView); } - i = 2131364396; + i = 2131364399; } throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i))); } diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java index cb5d97a033..e6a10f9c97 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActive.java @@ -59,7 +59,7 @@ public final class WidgetThreadBrowserActive extends AppFragment { } public WidgetThreadBrowserActive() { - super(2131559246); + super(2131559247); WidgetThreadBrowserActive$viewModel$2 widgetThreadBrowserActive$viewModel$2 = new WidgetThreadBrowserActive$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadBrowserActiveViewModel.class), new WidgetThreadBrowserActive$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadBrowserActive$viewModel$2)); @@ -106,7 +106,7 @@ public final class WidgetThreadBrowserActive extends AppFragment { widgetThreadBrowserAdapter.setData(viewState.getListItems()); TextView textView = getBinding().b.d; m.checkNotNullExpressionValue(textView, "binding.emptyView.threadBrowserEmptyHeading"); - textView.setText(requireContext().getString(2131893814)); + textView.setText(requireContext().getString(2131893854)); ConstraintLayout constraintLayout = getBinding().b.b; m.checkNotNullExpressionValue(constraintLayout, "binding.emptyView.threadBrowserEmpty"); int i = 0; @@ -130,7 +130,7 @@ public final class WidgetThreadBrowserActive extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1968c; + RecyclerView recyclerView = getBinding().f1970c; m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView"); this.adapter = (WidgetThreadBrowserAdapter) companion.configure(new WidgetThreadBrowserAdapter(recyclerView, new WidgetThreadBrowserActive$onViewBound$1(getBrowserViewModel()), new WidgetThreadBrowserActive$onViewBound$2(this))); getBinding().b.f103c.setOnClickListener(new WidgetThreadBrowserActive$onViewBound$3(this)); diff --git a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java index 97ac22f17b..7f326d0ec3 100644 --- a/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java +++ b/app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowserActiveViewModel.java @@ -4,9 +4,9 @@ import android.content.Context; import androidx.annotation.MainThread; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; import com.discord.app.AppViewModel; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.models.user.MeUser; import com.discord.models.user.User; @@ -417,11 +417,11 @@ public final class WidgetThreadBrowserActiveViewModel extends AppViewModel implements b> { - public final /* synthetic */ ModelAllowedMentions $allowedMentions; + public final /* synthetic */ MessageAllowedMentions $allowedMentions; public final /* synthetic */ List $attachments; public final /* synthetic */ String $content; public final /* synthetic */ MeUser $me; @@ -21,7 +21,7 @@ public final class MessageManager$sendMessage$messageResultObservable$1 im public final /* synthetic */ List $stickers; public final /* synthetic */ MessageManager this$0; - public MessageManager$sendMessage$messageResultObservable$1(MessageManager messageManager, StorePendingReplies.PendingReply pendingReply, long j, MeUser meUser, String str, List list, List list2, List list3, ModelAllowedMentions modelAllowedMentions) { + public MessageManager$sendMessage$messageResultObservable$1(MessageManager messageManager, StorePendingReplies.PendingReply pendingReply, long j, MeUser meUser, String str, List list, List list2, List list3, MessageAllowedMentions messageAllowedMentions) { this.this$0 = messageManager; this.$pendingReply = pendingReply; this.$nonNullChannelId = j; @@ -30,7 +30,7 @@ public final class MessageManager$sendMessage$messageResultObservable$1 im this.$mentions = list; this.$attachments = list2; this.$stickers = list3; - this.$allowedMentions = modelAllowedMentions; + this.$allowedMentions = messageAllowedMentions; } public final Observable call(Integer num) { diff --git a/app/src/main/java/com/discord/widgets/chat/MessageManager.java b/app/src/main/java/com/discord/widgets/chat/MessageManager.java index 5498a171de..20255f330a 100644 --- a/app/src/main/java/com/discord/widgets/chat/MessageManager.java +++ b/app/src/main/java/com/discord/widgets/chat/MessageManager.java @@ -6,11 +6,12 @@ import android.os.Build; import androidx.core.content.pm.ShortcutInfoCompat; import androidx.core.content.pm.ShortcutManagerCompat; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; +import com.discord.api.message.allowedmentions.MessageAllowedMentions; +import com.discord.api.message.allowedmentions.MessageAllowedMentionsTypes; import com.discord.api.sticker.Sticker; import com.discord.api.user.User; -import com.discord.models.domain.ModelAllowedMentions; -import com.discord.models.domain.ModelMessage; import com.discord.models.experiments.domain.Experiment; import com.discord.models.guild.Guild; import com.discord.models.user.MeUser; @@ -33,7 +34,6 @@ import d0.t.o; import d0.t.u; import d0.z.d.m; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.List; import kotlin.Unit; @@ -360,46 +360,46 @@ public final class MessageManager { return messageManager.editMessage(j, j2, str, (i & 8) != 0 ? null : function2, (i & 16) != 0 ? null : num); } - /* JADX WARNING: Removed duplicated region for block: B:28:0x007e A[RETURN] */ - /* JADX WARNING: Removed duplicated region for block: B:29:0x007f */ - private final ModelAllowedMentions getAllowedMentionsForMessageEdit(long j, long j2) { - MessageReference messageReference; + private final MessageAllowedMentions getAllowedMentionsForMessageEdit(long j, long j2) { + Integer M; + MessageReference A; Long c2; boolean z2; - ModelMessage message = this.storeMessages.getMessage(j, j2); - if (!(message == null || message.getType() != 19 || (messageReference = message.getMessageReference()) == null || (c2 = messageReference.c()) == null)) { + Message message = this.storeMessages.getMessage(j, j2); + if (!(message == null || (M = message.M()) == null || M.intValue() != 19 || (A = message.A()) == null || (c2 = A.c()) == null)) { StoreMessageReplies.MessageState messageState = this.storeMessageReplies.getAllMessageReferences().get(Long.valueOf(c2.longValue())); if (messageState == null || !(messageState instanceof StoreMessageReplies.MessageState.Loaded)) { return null; } - List mentions = message.getMentions(); - m.checkNotNullExpressionValue(mentions, "originalMessage.mentions"); - boolean z3 = true; - if (!(mentions instanceof Collection) || !mentions.isEmpty()) { - Iterator it = mentions.iterator(); - while (true) { - if (!it.hasNext()) { - break; - } - if (((User) it.next()).i() == ((StoreMessageReplies.MessageState.Loaded) messageState).getModelMessage().getAuthor().i()) { - z2 = true; - continue; - } else { - z2 = false; - continue; - } - if (z2) { - break; + List z3 = message.z(); + if (z3 != null) { + boolean z4 = false; + if (!z3.isEmpty()) { + Iterator it = z3.iterator(); + while (true) { + if (!it.hasNext()) { + break; + } + long i = ((User) it.next()).i(); + User g = ((StoreMessageReplies.MessageState.Loaded) messageState).getMessage().g(); + if (g == null || i != g.i()) { + z2 = false; + continue; + } else { + z2 = true; + continue; + } + if (z2) { + z4 = true; + break; + } } } - if (!z3) { + if (z4) { return null; } - return new ModelAllowedMentions(k.toList(ModelAllowedMentions.Types.values()), null, null, Boolean.FALSE, 6, null); - } - z3 = false; - if (!z3) { } + return new MessageAllowedMentions(k.toList(MessageAllowedMentionsTypes.values()), null, null, Boolean.FALSE, 6); } return null; } @@ -506,7 +506,7 @@ public final class MessageManager { } } StorePendingReplies.PendingReply pendingReply = z2 ? this.storePendingReplies.getPendingReply(longValue) : null; - Observable a02 = Observable.j(this.storeSlowMode.getCooldownSecs(l).a0(1).Z(new MessageManager$sendMessage$messageResultObservable$1(this, pendingReply, longValue, me2, str, list, attachments, list2, (pendingReply == null || pendingReply.getShouldMention()) ? null : new ModelAllowedMentions(k.toList(ModelAllowedMentions.Types.values()), null, null, Boolean.FALSE, 6, null))), this.storeGuilds.observeFromChannelId(longValue), MessageManager$sendMessage$1.INSTANCE).a0(1); + Observable a02 = Observable.j(this.storeSlowMode.getCooldownSecs(l).a0(1).Z(new MessageManager$sendMessage$messageResultObservable$1(this, pendingReply, longValue, me2, str, list, attachments, list2, (pendingReply == null || pendingReply.getShouldMention()) ? null : new MessageAllowedMentions(k.toList(MessageAllowedMentionsTypes.values()), null, null, Boolean.FALSE, 6))), this.storeGuilds.observeFromChannelId(longValue), MessageManager$sendMessage$1.INSTANCE).a0(1); m.checkNotNullExpressionValue(a02, "Observable.combineLatest…d)\n }\n .take(1)"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.restSubscribeOn$default(a02, false, 1, null)), MessageManager.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new MessageManager$sendMessage$2(function1), 62, (Object) null); return true; diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java index ba3aa98524..10fe183bd8 100644 --- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java +++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.java @@ -17,7 +17,7 @@ public final class WidgetUrlActions$onViewCreated$3 implements View.OnClickListe Context requireContext = this.this$0.requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); String access$getUrl$p = WidgetUrlActions.access$getUrl$p(this.this$0); - String string = this.this$0.getString(2131888723); + String string = this.this$0.getString(2131888733); m.checkNotNullExpressionValue(string, "getString(R.string.form_label_send_to)"); IntentUtils.performChooserSendIntent(requireContext, access$getUrl$p, string); this.this$0.dismiss(); diff --git a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java index 4773ce1cb7..5cb1600e37 100644 --- a/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java +++ b/app/src/main/java/com/discord/widgets/chat/WidgetUrlActions.java @@ -86,7 +86,7 @@ public final class WidgetUrlActions extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559256; + return 2131559257; } @Override // androidx.fragment.app.Fragment @@ -115,7 +115,7 @@ public final class WidgetUrlActions extends AppBottomSheet { m.checkNotNullExpressionValue(textView, "binding.dialogUrlActionsUrl"); ViewExtensions.setTextAndVisibilityBy(textView, getUrl()); getBinding().b.setOnClickListener(new WidgetUrlActions$onViewCreated$1(this)); - getBinding().f1978c.setOnClickListener(new WidgetUrlActions$onViewCreated$2(this)); + getBinding().f1980c.setOnClickListener(new WidgetUrlActions$onViewCreated$2(this)); getBinding().d.setOnClickListener(new WidgetUrlActions$onViewCreated$3(this)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java index da11273ba3..43e4cf7000 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$Companion$observeStores$1.java @@ -27,7 +27,7 @@ public final class AppFlexInputViewModel$Companion$observeStores$1 impleme public final AppFlexInputViewModel.StoreState call(PanelState panelState, PanelState panelState2, Long l, StoreNotices.Notice notice, Boolean bool, Boolean bool2, Experiment experiment) { m.checkNotNullExpressionValue(panelState, "leftPanelState"); m.checkNotNullExpressionValue(panelState2, "rightPanelState"); - return new AppFlexInputViewModel.StoreState(panelState, panelState2, this.$channel, l, notice, false, false); + return new AppFlexInputViewModel.StoreState(panelState, panelState2, this.$channel, l, notice, false); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java index 95bf560e55..0045115193 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$getMatchingStickers$1.java @@ -35,7 +35,7 @@ public final class AppFlexInputViewModel$getMatchingStickers$1 extends o impleme LinkedHashMap linkedHashMap = new LinkedHashMap(); for (Map.Entry entry : stickers.entrySet()) { Sticker value = entry.getValue(); - if (z2 ? !u.contains(emptyList, value.g()) : u.contains(emptyList, value.g())) { + if (z2 ? !u.contains(emptyList, value.h()) : u.contains(emptyList, value.h())) { linkedHashMap.put(entry.getKey(), entry.getValue()); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java index afff960393..842c321c07 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel.java @@ -3,7 +3,6 @@ package com.discord.widgets.chat.input; import android.content.Context; import android.view.View; import androidx.annotation.MainThread; -import androidx.fragment.app.FragmentManager; import c.b.a.h.a; import c.i.a.f.e.o.c; import com.airbnb.lottie.parser.AnimatableValueParser; @@ -13,19 +12,14 @@ import com.discord.app.AppPermissionsRequests; import com.discord.app.AppViewModel; import com.discord.panels.PanelState; import com.discord.stores.StoreAnalytics; -import com.discord.stores.StoreChannelsSelected; import com.discord.stores.StoreExpressionSuggestions; import com.discord.stores.StoreNotices; import com.discord.stores.StoreStickers; import com.discord.stores.StoreStream; -import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.rx.ObservableExtensionsKt; -import com.discord.widgets.chat.input.sticker.StickerPackStoreSheetViewType; import com.discord.widgets.chat.input.sticker.StickerPickerFeatureFlag; -import com.discord.widgets.chat.input.sticker.WidgetStickerPackStoreSheet; import com.discord.widgets.home.WidgetHome; -import com.discord.widgets.stickers.StickerPurchaseLocation; import com.lytefast.flexinput.FlexInputListener; import com.lytefast.flexinput.model.Attachment; import com.lytefast.flexinput.viewmodel.FlexInputState; @@ -51,7 +45,6 @@ public final class AppFlexInputViewModel extends AppViewModel im private PublishSubject eventSubject; private final AppPermissionsRequests permissionRequests; private final StoreAnalytics storeAnalytics; - private final StoreChannelsSelected storeChannelsSelected; private final StoreExpressionSuggestions storeExpressionSuggestions; private final StoreStickers storeStickers; @@ -103,10 +96,9 @@ public final class AppFlexInputViewModel extends AppViewModel im private final StoreNotices.Notice notice; private final PanelState rightPanelState; private final Channel selectedChannel; - private final boolean stickerNudgeEnabled; private final boolean stickerSuggestionsEnabled; - public StoreState(PanelState panelState, PanelState panelState2, Channel channel, Long l, StoreNotices.Notice notice, boolean z2, boolean z3) { + public StoreState(PanelState panelState, PanelState panelState2, Channel channel, Long l, StoreNotices.Notice notice, boolean z2) { m.checkNotNullParameter(panelState, "leftPanelState"); m.checkNotNullParameter(panelState2, "rightPanelState"); this.leftPanelState = panelState; @@ -115,10 +107,9 @@ public final class AppFlexInputViewModel extends AppViewModel im this.channelPermission = l; this.notice = notice; this.stickerSuggestionsEnabled = z2; - this.stickerNudgeEnabled = z3; } - public static /* synthetic */ StoreState copy$default(StoreState storeState, PanelState panelState, PanelState panelState2, Channel channel, Long l, StoreNotices.Notice notice, boolean z2, boolean z3, int i, Object obj) { + public static /* synthetic */ StoreState copy$default(StoreState storeState, PanelState panelState, PanelState panelState2, Channel channel, Long l, StoreNotices.Notice notice, boolean z2, int i, Object obj) { if ((i & 1) != 0) { panelState = storeState.leftPanelState; } @@ -137,10 +128,7 @@ public final class AppFlexInputViewModel extends AppViewModel im if ((i & 32) != 0) { z2 = storeState.stickerSuggestionsEnabled; } - if ((i & 64) != 0) { - z3 = storeState.stickerNudgeEnabled; - } - return storeState.copy(panelState, panelState2, channel, l, notice, z2, z3); + return storeState.copy(panelState, panelState2, channel, l, notice, z2); } public final PanelState component1() { @@ -167,14 +155,10 @@ public final class AppFlexInputViewModel extends AppViewModel im return this.stickerSuggestionsEnabled; } - public final boolean component7() { - return this.stickerNudgeEnabled; - } - - public final StoreState copy(PanelState panelState, PanelState panelState2, Channel channel, Long l, StoreNotices.Notice notice, boolean z2, boolean z3) { + public final StoreState copy(PanelState panelState, PanelState panelState2, Channel channel, Long l, StoreNotices.Notice notice, boolean z2) { m.checkNotNullParameter(panelState, "leftPanelState"); m.checkNotNullParameter(panelState2, "rightPanelState"); - return new StoreState(panelState, panelState2, channel, l, notice, z2, z3); + return new StoreState(panelState, panelState2, channel, l, notice, z2); } public boolean equals(Object obj) { @@ -185,7 +169,7 @@ public final class AppFlexInputViewModel extends AppViewModel im return false; } StoreState storeState = (StoreState) obj; - return m.areEqual(this.leftPanelState, storeState.leftPanelState) && m.areEqual(this.rightPanelState, storeState.rightPanelState) && m.areEqual(this.selectedChannel, storeState.selectedChannel) && m.areEqual(this.channelPermission, storeState.channelPermission) && m.areEqual(this.notice, storeState.notice) && this.stickerSuggestionsEnabled == storeState.stickerSuggestionsEnabled && this.stickerNudgeEnabled == storeState.stickerNudgeEnabled; + return m.areEqual(this.leftPanelState, storeState.leftPanelState) && m.areEqual(this.rightPanelState, storeState.rightPanelState) && m.areEqual(this.selectedChannel, storeState.selectedChannel) && m.areEqual(this.channelPermission, storeState.channelPermission) && m.areEqual(this.notice, storeState.notice) && this.stickerSuggestionsEnabled == storeState.stickerSuggestionsEnabled; } public final Long getChannelPermission() { @@ -208,10 +192,6 @@ public final class AppFlexInputViewModel extends AppViewModel im return this.selectedChannel; } - public final boolean getStickerNudgeEnabled() { - return this.stickerNudgeEnabled; - } - public final boolean getStickerSuggestionsEnabled() { return this.stickerSuggestionsEnabled; } @@ -232,19 +212,13 @@ public final class AppFlexInputViewModel extends AppViewModel im } int i2 = (hashCode4 + i) * 31; boolean z2 = this.stickerSuggestionsEnabled; - int i3 = 1; if (z2) { z2 = true; } + int i3 = z2 ? 1 : 0; int i4 = z2 ? 1 : 0; int i5 = z2 ? 1 : 0; - int i6 = z2 ? 1 : 0; - int i7 = (i2 + i4) * 31; - boolean z3 = this.stickerNudgeEnabled; - if (!z3) { - i3 = z3 ? 1 : 0; - } - return i7 + i3; + return i2 + i3; } public String toString() { @@ -259,14 +233,12 @@ public final class AppFlexInputViewModel extends AppViewModel im L.append(", notice="); L.append(this.notice); L.append(", stickerSuggestionsEnabled="); - L.append(this.stickerSuggestionsEnabled); - L.append(", stickerNudgeEnabled="); - return c.d.b.a.a.G(L, this.stickerNudgeEnabled, ")"); + return c.d.b.a.a.G(L, this.stickerSuggestionsEnabled, ")"); } } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, StoreChannelsSelected storeChannelsSelected) { + public AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions) { super(flexInputState); m.checkNotNullParameter(appPermissionsRequests, "permissionRequests"); m.checkNotNullParameter(flexInputState, "initialViewState"); @@ -274,12 +246,10 @@ public final class AppFlexInputViewModel extends AppViewModel im m.checkNotNullParameter(storeStickers, "storeStickers"); m.checkNotNullParameter(storeAnalytics, "storeAnalytics"); m.checkNotNullParameter(storeExpressionSuggestions, "storeExpressionSuggestions"); - m.checkNotNullParameter(storeChannelsSelected, "storeChannelsSelected"); this.permissionRequests = appPermissionsRequests; this.storeStickers = storeStickers; this.storeAnalytics = storeAnalytics; this.storeExpressionSuggestions = storeExpressionSuggestions; - this.storeChannelsSelected = storeChannelsSelected; this.eventSubject = PublishSubject.l0(); Observable s2 = ObservableExtensionsKt.computationLatest(observable).s(); m.checkNotNullExpressionValue(s2, "storeObservable\n … .distinctUntilChanged()"); @@ -287,8 +257,8 @@ public final class AppFlexInputViewModel extends AppViewModel im } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, StoreChannelsSelected storeChannelsSelected, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(appPermissionsRequests, (i & 2) != 0 ? new FlexInputState(null, false, null, null, false, false, false, false, false, false, 1023) : flexInputState, (i & 4) != 0 ? Companion.access$observeStores(Companion) : observable, (i & 8) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? StoreStream.Companion.getExpressionSuggestions() : storeExpressionSuggestions, (i & 64) != 0 ? StoreStream.Companion.getChannelsSelected() : storeChannelsSelected); + public /* synthetic */ AppFlexInputViewModel(AppPermissionsRequests appPermissionsRequests, FlexInputState flexInputState, Observable observable, StoreStickers storeStickers, StoreAnalytics storeAnalytics, StoreExpressionSuggestions storeExpressionSuggestions, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(appPermissionsRequests, (i & 2) != 0 ? new FlexInputState(null, false, null, null, false, false, false, false, false, 511) : flexInputState, (i & 4) != 0 ? Companion.access$observeStores(Companion) : observable, (i & 8) != 0 ? StoreStream.Companion.getStickers() : storeStickers, (i & 16) != 0 ? StoreStream.Companion.getAnalytics() : storeAnalytics, (i & 32) != 0 ? StoreStream.Companion.getExpressionSuggestions() : storeExpressionSuggestions); } public static final /* synthetic */ StoreStickers access$getStoreStickers$p(AppFlexInputViewModel appFlexInputViewModel) { @@ -324,7 +294,7 @@ public final class AppFlexInputViewModel extends AppViewModel im } else { z2 = z6; } - updateViewState(FlexInputState.a(requireViewState, null, false, null, null, hasAccessWrite, z5, z2, false, storeState.getStickerSuggestionsEnabled(), storeState.getStickerNudgeEnabled(), 143)); + updateViewState(FlexInputState.a(requireViewState, null, false, null, null, hasAccessWrite, z5, z2, false, storeState.getStickerSuggestionsEnabled(), 143)); } private final void showKeyboard() { @@ -336,7 +306,7 @@ public final class AppFlexInputViewModel extends AppViewModel im public final void clean(boolean z2) { FlexInputState viewState = getViewState(); if (viewState != null) { - updateViewState(FlexInputState.a(viewState, z2 ? "" : viewState.a, true, n.emptyList(), null, false, false, false, false, false, false, 1008)); + updateViewState(FlexInputState.a(viewState, z2 ? "" : viewState.a, true, n.emptyList(), null, false, false, false, false, false, 496)); } } @@ -365,7 +335,7 @@ public final class AppFlexInputViewModel extends AppViewModel im if (viewState == null || !viewState.g) { return false; } - updateViewState(FlexInputState.a(viewState, null, false, null, null, false, false, false, false, false, false, 959)); + updateViewState(FlexInputState.a(viewState, null, false, null, null, false, false, false, false, false, 447)); return true; } @@ -392,20 +362,20 @@ public final class AppFlexInputViewModel extends AppViewModel im @MainThread public void onAttachmentsUpdated(List> list) { m.checkNotNullParameter(list, "attachments"); - updateViewState(FlexInputState.a(requireViewState(), null, false, new ArrayList(list), null, false, false, false, false, false, false, 1019)); + updateViewState(FlexInputState.a(requireViewState(), null, false, new ArrayList(list), null, false, false, false, false, false, 507)); } @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel @MainThread public void onContentDialogDismissed() { showKeyboard(); - updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, false, false, false, 1015)); + updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, false, false, 503)); } @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel @MainThread public void onContentDialogPageChanged(int i) { - updateViewState(FlexInputState.a(requireViewState(), null, false, null, Integer.valueOf(i), false, false, false, false, false, false, 1015)); + updateViewState(FlexInputState.a(requireViewState(), null, false, null, Integer.valueOf(i), false, false, false, false, false, 503)); if (i == 0) { this.storeAnalytics.trackChatInputComponentViewed("media picker"); } else if (i == 1) { @@ -418,7 +388,7 @@ public final class AppFlexInputViewModel extends AppViewModel im @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel @MainThread public void onExpandButtonClicked() { - updateViewState(FlexInputState.a(requireViewState(), null, true, null, null, false, false, false, false, false, false, 1021)); + updateViewState(FlexInputState.a(requireViewState(), null, true, null, null, false, false, false, false, false, 509)); } @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel @@ -430,7 +400,7 @@ public final class AppFlexInputViewModel extends AppViewModel im } else { hideKeyboard(); } - updateViewState(FlexInputState.a(requireViewState, null, false, null, null, false, false, !requireViewState.g, false, false, false, 959)); + updateViewState(FlexInputState.a(requireViewState, null, false, null, null, false, false, !requireViewState.g, false, false, 447)); } @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel @@ -445,11 +415,11 @@ public final class AppFlexInputViewModel extends AppViewModel im FlexInputState requireViewState = requireViewState(); if (!requireViewState.f) { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new a.e(2131887179)); + publishSubject.j.onNext(new a.e(2131887180)); return; } hideKeyboard(); - updateViewState(FlexInputState.a(requireViewState, null, false, null, 0, false, false, false, false, false, false, 951)); + updateViewState(FlexInputState.a(requireViewState, null, false, null, 0, false, false, false, false, false, 439)); } @Override // com.lytefast.flexinput.viewmodel.FlexInputViewModel @@ -496,7 +466,7 @@ public final class AppFlexInputViewModel extends AppViewModel im if (z3) { this.storeExpressionSuggestions.setExpressionSuggestionsEnabled(true); } - updateViewState(FlexInputState.a(requireViewState, str, z2, null, null, false, false, false, false, false, false, 1020)); + updateViewState(FlexInputState.a(requireViewState, str, z2, null, null, false, false, false, false, false, 508)); } } z2 = requireViewState.b; @@ -506,7 +476,7 @@ public final class AppFlexInputViewModel extends AppViewModel im } if (z3) { } - updateViewState(FlexInputState.a(requireViewState, str, z2, null, null, false, false, false, false, false, false, 1020)); + updateViewState(FlexInputState.a(requireViewState, str, z2, null, null, false, false, false, false, false, 508)); } } @@ -514,7 +484,7 @@ public final class AppFlexInputViewModel extends AppViewModel im @MainThread public boolean onInputTextClicked() { showKeyboard(); - updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, false, false, false, 959)); + updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, false, false, 447)); return false; } @@ -532,22 +502,11 @@ public final class AppFlexInputViewModel extends AppViewModel im hideKeyboard(); } - @MainThread - public final void onStickerNudgeClicked(Sticker sticker, FragmentManager fragmentManager) { - m.checkNotNullParameter(sticker, "stickerMatch"); - m.checkNotNullParameter(fragmentManager, "fragmentManager"); - AnalyticsTracker.INSTANCE.stickerNudgeOpened(sticker.getId()); - WidgetStickerPackStoreSheet.Companion companion = WidgetStickerPackStoreSheet.Companion; - StickerPackStoreSheetViewType stickerPackStoreSheetViewType = StickerPackStoreSheetViewType.STICKER_PACK_VIEW_ALL; - Channel selectedChannel = this.storeChannelsSelected.getSelectedChannel(); - companion.show(fragmentManager, sticker, stickerPackStoreSheetViewType, (selectedChannel != null ? Long.valueOf(selectedChannel.e()) : null) != null ? "Guild Channel" : "DM Channel", StickerPurchaseLocation.NUDGED_STICKER); - } - @MainThread public final void onStickerSuggestionSent(boolean z2) { FlexInputState viewState = getViewState(); if (viewState != null) { - updateViewState(FlexInputState.a(viewState, z2 ? "" : viewState.a, true, n.emptyList(), null, false, false, false, false, false, false, 1008)); + updateViewState(FlexInputState.a(viewState, z2 ? "" : viewState.a, true, n.emptyList(), null, false, false, false, false, false, 496)); if (z2) { hideKeyboard(); } else { @@ -572,7 +531,7 @@ public final class AppFlexInputViewModel extends AppViewModel im } public void setShowExpressionTrayButtonBadge(boolean z2) { - updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, z2, false, false, 895)); + updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, z2, false, 383)); } @MainThread @@ -581,12 +540,12 @@ public final class AppFlexInputViewModel extends AppViewModel im if (viewState == null || viewState.g) { return false; } - updateViewState(FlexInputState.a(viewState, null, false, null, null, false, false, true, false, false, false, 959)); + updateViewState(FlexInputState.a(viewState, null, false, null, null, false, false, true, false, false, 447)); return true; } public final void showKeyboardAndHideExpressionTray() { - updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, false, false, false, 959)); + updateViewState(FlexInputState.a(requireViewState(), null, false, null, null, false, false, false, false, false, 447)); showKeyboard(); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java index 3d49b69bd0..1174293014 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$Companion$getPendingReplyStateObservable$1.java @@ -5,6 +5,7 @@ import com.discord.models.user.CoreUser; import com.discord.models.user.User; import com.discord.stores.StorePendingReplies; import com.discord.stores.StoreStream; +import com.discord.utilities.message.MessageUtils; import com.discord.widgets.chat.input.ChatInputViewModel; import d0.z.d.m; import j0.k.b; @@ -34,12 +35,14 @@ public final class ChatInputViewModel$Companion$getPendingReplyStateObservable$1 if (pendingReply == null) { return new j(null); } - if (pendingReply.getOriginalMessage().isWebhook()) { - com.discord.api.user.User author = pendingReply.getOriginalMessage().getAuthor(); - m.checkNotNullExpressionValue(author, "pendingReply.originalMessage.author"); - return new j(new ChatInputViewModel.StoreState.Loaded.PendingReply(pendingReply, new CoreUser(author), null)); + if (MessageUtils.INSTANCE.isWebhook(pendingReply.getOriginalMessage())) { + com.discord.api.user.User g = pendingReply.getOriginalMessage().g(); + m.checkNotNull(g); + return new j(new ChatInputViewModel.StoreState.Loaded.PendingReply(pendingReply, new CoreUser(g), null)); } - long i = pendingReply.getOriginalMessage().getAuthor().i(); + com.discord.api.user.User g2 = pendingReply.getOriginalMessage().g(); + m.checkNotNull(g2); + long i = g2.i(); Long b = pendingReply.getMessageReference().b(); if (b != null) { observable = StoreStream.Companion.getGuilds().observeComputed(b.longValue()).G(new ChatInputViewModel$Companion$getPendingReplyStateObservable$1$$special$$inlined$let$lambda$1(i)).s(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java index eef9cf8940..17c70023e1 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$1.java @@ -101,7 +101,7 @@ public final class ChatInputViewModel$sendMessage$1 extends o implements Functio Error.Response response = error.getResponse(); m.checkNotNullExpressionValue(response, "error.response"); Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(response.getCode()); - c.a.d.o.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891287, 0, null, 12); + c.a.d.o.g(this.this$0.$context, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891320, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java index 841be29215..a1efea254c 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$messageSendResultHandler$1.java @@ -20,6 +20,7 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext public final /* synthetic */ ArrayList $attachments; public final /* synthetic */ Context $context; public final /* synthetic */ ChatInputViewModel$sendMessage$1 $createAndGotoThread$1; + public final /* synthetic */ boolean $hasGif; public final /* synthetic */ boolean $hasImage; public final /* synthetic */ boolean $hasVideo; public final /* synthetic */ boolean $isSendingMessageInNewThread; @@ -51,7 +52,7 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext MeUser me2 = this.this$0.$loadedViewState.getMe(); boolean isPremium = me2 != null ? UserUtils.INSTANCE.isPremium(me2) : false; ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = this.this$0; - access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(max, Float.MAX_VALUE, Float.MAX_VALUE, isPremium, chatInputViewModel$sendMessage$messageSendResultHandler$1.$attachments, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasImage, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasVideo, chatInputViewModel$sendMessage$messageSendResultHandler$1.$messageResendCompressedHandler)); + access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(max, Float.MAX_VALUE, Float.MAX_VALUE, isPremium, chatInputViewModel$sendMessage$messageSendResultHandler$1.$attachments, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasImage, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasVideo, chatInputViewModel$sendMessage$messageSendResultHandler$1.$hasGif, chatInputViewModel$sendMessage$messageSendResultHandler$1.$messageResendCompressedHandler)); } } @@ -75,7 +76,7 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$messageSendResultHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, boolean z2, boolean z3, Function0 function0, boolean z4, boolean z5, ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1) { + public ChatInputViewModel$sendMessage$messageSendResultHandler$1(ChatInputViewModel chatInputViewModel, Context context, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, boolean z2, boolean z3, boolean z4, Function0 function0, boolean z5, boolean z6, ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1) { super(2); this.this$0 = chatInputViewModel; this.$context = context; @@ -83,9 +84,10 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext this.$attachments = arrayList; this.$hasImage = z2; this.$hasVideo = z3; + this.$hasGif = z4; this.$messageResendCompressedHandler = function0; - this.$isThreadDraft = z4; - this.$isSendingMessageInNewThread = z5; + this.$isThreadDraft = z5; + this.$isSendingMessageInNewThread = z6; this.$createAndGotoThread$1 = chatInputViewModel$sendMessage$1; } @@ -104,7 +106,7 @@ public final class ChatInputViewModel$sendMessage$messageSendResultHandler$1 ext } else if (this.$isThreadDraft) { ChatInputViewModel.access$getStoreThreadDraft$p(this.this$0).clearDraftState(); if ((messageResult instanceof MessageResult.Success) && !this.$isSendingMessageInNewThread) { - ChatInputViewModel$sendMessage$1.invoke$default(this.$createAndGotoThread$1, Long.valueOf(((MessageResult.Success) messageResult).getMessage().getId()), null, 2, null); + ChatInputViewModel$sendMessage$1.invoke$default(this.$createAndGotoThread$1, Long.valueOf(((MessageResult.Success) messageResult).getMessage().r()), null, 2, null); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java index 2f7542be05..bc9903fc1d 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1$synchronousValidationSucceeded$2.java @@ -26,6 +26,6 @@ public final class ChatInputViewModel$sendMessage$sendMessage$1$synchronousValid public final void invoke(int i, boolean z2) { PublishSubject access$getEventSubject$p = ChatInputViewModel.access$getEventSubject$p(this.this$0.this$0); ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = this.this$0; - access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(i, chatInputViewModel$sendMessage$sendMessage$1.$currentFileSizeMB, chatInputViewModel$sendMessage$sendMessage$1.$maxAttachmentSizeMB, z2, chatInputViewModel$sendMessage$sendMessage$1.$attachments, chatInputViewModel$sendMessage$sendMessage$1.$hasImage, chatInputViewModel$sendMessage$sendMessage$1.$hasVideo, chatInputViewModel$sendMessage$sendMessage$1.$messageResendCompressedHandler)); + access$getEventSubject$p.j.onNext(new ChatInputViewModel.Event.FilesTooLarge(i, chatInputViewModel$sendMessage$sendMessage$1.$currentFileSizeMB, chatInputViewModel$sendMessage$sendMessage$1.$maxAttachmentSizeMB, z2, chatInputViewModel$sendMessage$sendMessage$1.$attachments, chatInputViewModel$sendMessage$sendMessage$1.$hasImage, chatInputViewModel$sendMessage$sendMessage$1.$hasVideo, chatInputViewModel$sendMessage$sendMessage$1.$hasGif, chatInputViewModel$sendMessage$sendMessage$1.$messageResendCompressedHandler)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java index 736bddd4f4..abf05c9280 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel$sendMessage$sendMessage$1.java @@ -13,6 +13,7 @@ import kotlin.jvm.functions.Function2; public final class ChatInputViewModel$sendMessage$sendMessage$1 extends o implements Function1 { public final /* synthetic */ ArrayList $attachments; public final /* synthetic */ float $currentFileSizeMB; + public final /* synthetic */ boolean $hasGif; public final /* synthetic */ boolean $hasImage; public final /* synthetic */ boolean $hasVideo; public final /* synthetic */ ChatInputViewModel.ViewState.Loaded $loadedViewState; @@ -26,7 +27,7 @@ public final class ChatInputViewModel$sendMessage$sendMessage$1 extends o implem public final /* synthetic */ ChatInputViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public ChatInputViewModel$sendMessage$sendMessage$1(ChatInputViewModel chatInputViewModel, MessageManager messageManager, MessageContent messageContent, float f, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, Function2 function2, Function2 function22, float f2, boolean z2, boolean z3, Function0 function0, Function1 function1) { + public ChatInputViewModel$sendMessage$sendMessage$1(ChatInputViewModel chatInputViewModel, MessageManager messageManager, MessageContent messageContent, float f, ChatInputViewModel.ViewState.Loaded loaded, ArrayList arrayList, Function2 function2, Function2 function22, float f2, boolean z2, boolean z3, boolean z4, Function0 function0, Function1 function1) { super(1); this.this$0 = chatInputViewModel; this.$messageManager = messageManager; @@ -39,6 +40,7 @@ public final class ChatInputViewModel$sendMessage$sendMessage$1 extends o implem this.$maxAttachmentSizeMB = f2; this.$hasImage = z2; this.$hasVideo = z3; + this.$hasGif = z4; this.$messageResendCompressedHandler = function0; this.$onValidationResult = function1; } diff --git a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java index 47fc416ed5..2867e40320 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/ChatInputViewModel.java @@ -12,10 +12,10 @@ import com.discord.api.channel.Channel; import com.discord.api.guild.GuildVerificationLevel; import com.discord.api.guildjoinrequest.ApplicationStatus; import com.discord.api.guildjoinrequest.GuildJoinRequest; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; import com.discord.api.sticker.Sticker; import com.discord.app.AppViewModel; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.ModelUserRelationship; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; @@ -252,6 +252,7 @@ public final class ChatInputViewModel extends AppViewModel { public static final class FilesTooLarge extends Event { private final List> attachments; private final float currentFileSizeMB; + private final boolean hasGif; private final boolean hasImage; private final boolean hasVideo; private final boolean isUserPremium; @@ -262,7 +263,7 @@ public final class ChatInputViewModel extends AppViewModel { /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: java.util.List> */ /* JADX WARN: Multi-variable type inference failed */ /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public FilesTooLarge(int i, float f, float f2, boolean z2, List> list, boolean z3, boolean z4, Function0 function0) { + public FilesTooLarge(int i, float f, float f2, boolean z2, List> list, boolean z3, boolean z4, boolean z5, Function0 function0) { super(null); m.checkNotNullParameter(list, "attachments"); this.maxFileSizeMB = i; @@ -272,11 +273,12 @@ public final class ChatInputViewModel extends AppViewModel { this.attachments = list; this.hasImage = z3; this.hasVideo = z4; + this.hasGif = z5; this.onResendCompressed = function0; } - public static /* synthetic */ FilesTooLarge copy$default(FilesTooLarge filesTooLarge, int i, float f, float f2, boolean z2, List list, boolean z3, boolean z4, Function0 function0, int i2, Object obj) { - return filesTooLarge.copy((i2 & 1) != 0 ? filesTooLarge.maxFileSizeMB : i, (i2 & 2) != 0 ? filesTooLarge.currentFileSizeMB : f, (i2 & 4) != 0 ? filesTooLarge.maxAttachmentSizeMB : f2, (i2 & 8) != 0 ? filesTooLarge.isUserPremium : z2, (i2 & 16) != 0 ? filesTooLarge.attachments : list, (i2 & 32) != 0 ? filesTooLarge.hasImage : z3, (i2 & 64) != 0 ? filesTooLarge.hasVideo : z4, (i2 & 128) != 0 ? filesTooLarge.onResendCompressed : function0); + public static /* synthetic */ FilesTooLarge copy$default(FilesTooLarge filesTooLarge, int i, float f, float f2, boolean z2, List list, boolean z3, boolean z4, boolean z5, Function0 function0, int i2, Object obj) { + return filesTooLarge.copy((i2 & 1) != 0 ? filesTooLarge.maxFileSizeMB : i, (i2 & 2) != 0 ? filesTooLarge.currentFileSizeMB : f, (i2 & 4) != 0 ? filesTooLarge.maxAttachmentSizeMB : f2, (i2 & 8) != 0 ? filesTooLarge.isUserPremium : z2, (i2 & 16) != 0 ? filesTooLarge.attachments : list, (i2 & 32) != 0 ? filesTooLarge.hasImage : z3, (i2 & 64) != 0 ? filesTooLarge.hasVideo : z4, (i2 & 128) != 0 ? filesTooLarge.hasGif : z5, (i2 & 256) != 0 ? filesTooLarge.onResendCompressed : function0); } public final int component1() { @@ -307,13 +309,17 @@ public final class ChatInputViewModel extends AppViewModel { return this.hasVideo; } - public final Function0 component8() { + public final boolean component8() { + return this.hasGif; + } + + public final Function0 component9() { return this.onResendCompressed; } - public final FilesTooLarge copy(int i, float f, float f2, boolean z2, List> list, boolean z3, boolean z4, Function0 function0) { + public final FilesTooLarge copy(int i, float f, float f2, boolean z2, List> list, boolean z3, boolean z4, boolean z5, Function0 function0) { m.checkNotNullParameter(list, "attachments"); - return new FilesTooLarge(i, f, f2, z2, list, z3, z4, function0); + return new FilesTooLarge(i, f, f2, z2, list, z3, z4, z5, function0); } public boolean equals(Object obj) { @@ -324,7 +330,7 @@ public final class ChatInputViewModel extends AppViewModel { return false; } FilesTooLarge filesTooLarge = (FilesTooLarge) obj; - return this.maxFileSizeMB == filesTooLarge.maxFileSizeMB && Float.compare(this.currentFileSizeMB, filesTooLarge.currentFileSizeMB) == 0 && Float.compare(this.maxAttachmentSizeMB, filesTooLarge.maxAttachmentSizeMB) == 0 && this.isUserPremium == filesTooLarge.isUserPremium && m.areEqual(this.attachments, filesTooLarge.attachments) && this.hasImage == filesTooLarge.hasImage && this.hasVideo == filesTooLarge.hasVideo && m.areEqual(this.onResendCompressed, filesTooLarge.onResendCompressed); + return this.maxFileSizeMB == filesTooLarge.maxFileSizeMB && Float.compare(this.currentFileSizeMB, filesTooLarge.currentFileSizeMB) == 0 && Float.compare(this.maxAttachmentSizeMB, filesTooLarge.maxAttachmentSizeMB) == 0 && this.isUserPremium == filesTooLarge.isUserPremium && m.areEqual(this.attachments, filesTooLarge.attachments) && this.hasImage == filesTooLarge.hasImage && this.hasVideo == filesTooLarge.hasVideo && this.hasGif == filesTooLarge.hasGif && m.areEqual(this.onResendCompressed, filesTooLarge.onResendCompressed); } public final List> getAttachments() { @@ -335,6 +341,10 @@ public final class ChatInputViewModel extends AppViewModel { return this.currentFileSizeMB; } + public final boolean getHasGif() { + return this.hasGif; + } + public final boolean getHasImage() { return this.hasImage; } @@ -378,15 +388,23 @@ public final class ChatInputViewModel extends AppViewModel { int i9 = z3 ? 1 : 0; int i10 = (hashCode + i7) * 31; boolean z4 = this.hasVideo; - if (!z4) { - i = z4 ? 1 : 0; + if (z4) { + z4 = true; } - int i11 = (i10 + i) * 31; + int i11 = z4 ? 1 : 0; + int i12 = z4 ? 1 : 0; + int i13 = z4 ? 1 : 0; + int i14 = (i10 + i11) * 31; + boolean z5 = this.hasGif; + if (!z5) { + i = z5 ? 1 : 0; + } + int i15 = (i14 + i) * 31; Function0 function0 = this.onResendCompressed; if (function0 != null) { i6 = function0.hashCode(); } - return i11 + i6; + return i15 + i6; } public final boolean isUserPremium() { @@ -408,6 +426,8 @@ public final class ChatInputViewModel extends AppViewModel { L.append(this.hasImage); L.append(", hasVideo="); L.append(this.hasVideo); + L.append(", hasGif="); + L.append(this.hasGif); L.append(", onResendCompressed="); L.append(this.onResendCompressed); L.append(")"); @@ -1804,7 +1824,7 @@ public final class ChatInputViewModel extends AppViewModel { GuildMember meGuildMember = loaded.getMeGuildMember(); boolean z5 = hasVerificationGate$default && ((meGuildMember != null ? meGuildMember.getPending() : false) || z4); boolean z6 = !AnimatableValueParser.w1(loaded.getChannel()) && !loaded.isLurking() && !z4 && !z3 && !z5; - boolean z7 = z2 && loaded.getEditingMessage() != null && loaded.getEditingMessage().getMessage().getChannelId() == loaded.getChannel().g(); + boolean z7 = z2 && loaded.getEditingMessage() != null && loaded.getEditingMessage().getMessage().i() == loaded.getChannel().g(); boolean z8 = replying instanceof ViewState.Loaded.PendingReplyState.Replying; Channel channel = loaded.getChannel(); long g = loaded.getChannel().g(); @@ -1954,25 +1974,27 @@ public final class ChatInputViewModel extends AppViewModel { return false; } - /* JADX WARNING: Removed duplicated region for block: B:17:0x0071 */ - /* JADX WARNING: Removed duplicated region for block: B:26:0x00a5 A[LOOP:2: B:24:0x009f->B:26:0x00a5, LOOP_END] */ - /* JADX WARNING: Removed duplicated region for block: B:29:0x00ce */ - /* JADX WARNING: Removed duplicated region for block: B:30:0x00d5 */ - /* JADX WARNING: Removed duplicated region for block: B:33:0x00de */ - /* JADX WARNING: Removed duplicated region for block: B:34:0x00e1 */ - /* JADX WARNING: Removed duplicated region for block: B:37:0x00e9 */ - /* JADX WARNING: Removed duplicated region for block: B:38:0x00ee */ - /* JADX WARNING: Removed duplicated region for block: B:40:0x00f2 */ - /* JADX WARNING: Removed duplicated region for block: B:46:0x0113 A[ADDED_TO_REGION] */ - /* JADX WARNING: Removed duplicated region for block: B:51:0x014c */ - /* JADX WARNING: Removed duplicated region for block: B:57:0x0180 */ - /* JADX WARNING: Removed duplicated region for block: B:66:0x01c0 */ - /* JADX WARNING: Removed duplicated region for block: B:72:0x01ed */ + /* JADX WARNING: Removed duplicated region for block: B:17:0x0072 */ + /* JADX WARNING: Removed duplicated region for block: B:26:0x009a */ + /* JADX WARNING: Removed duplicated region for block: B:35:0x00ce A[LOOP:3: B:33:0x00c8->B:35:0x00ce, LOOP_END] */ + /* JADX WARNING: Removed duplicated region for block: B:38:0x00f7 */ + /* JADX WARNING: Removed duplicated region for block: B:39:0x00fe */ + /* JADX WARNING: Removed duplicated region for block: B:42:0x0107 */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x010a */ + /* JADX WARNING: Removed duplicated region for block: B:46:0x0112 */ + /* JADX WARNING: Removed duplicated region for block: B:47:0x0117 */ + /* JADX WARNING: Removed duplicated region for block: B:49:0x011b */ + /* JADX WARNING: Removed duplicated region for block: B:55:0x013c A[ADDED_TO_REGION] */ + /* JADX WARNING: Removed duplicated region for block: B:60:0x017b */ + /* JADX WARNING: Removed duplicated region for block: B:66:0x01b4 */ + /* JADX WARNING: Removed duplicated region for block: B:74:0x01f0 */ + /* JADX WARNING: Removed duplicated region for block: B:80:0x0220 */ public final void sendMessage(Context context, MessageManager messageManager, MessageContent messageContent, List> list, boolean z2, Function1 function1) { boolean z3; boolean z4; - float floatValue; boolean z5; + float floatValue; + boolean z6; ChatInputViewModel$sendMessage$messageResendCompressedHandler$1 chatInputViewModel$sendMessage$messageResendCompressedHandler$1; ChatInputViewModel$sendMessage$onMessageTooLong$1 chatInputViewModel$sendMessage$onMessageTooLong$1; m.checkNotNullParameter(context, "context"); @@ -1988,6 +2010,7 @@ public final class ChatInputViewModel extends AppViewModel { ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null) { ArrayList arrayList = new ArrayList(list); + int i = 0; if (!arrayList.isEmpty()) { Iterator it = arrayList.iterator(); while (true) { @@ -2014,104 +2037,152 @@ public final class ChatInputViewModel extends AppViewModel { break; } } + if (!arrayList.isEmpty()) { + Iterator it3 = arrayList.iterator(); + while (true) { + if (!it3.hasNext()) { + break; + } + Attachment attachment3 = (Attachment) it3.next(); + m.checkNotNullExpressionValue(attachment3, "attachment"); + if (AttachmentUtilsKt.isGif(attachment3, context.getContentResolver())) { + z5 = true; + break; + } + } + ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); + for (Attachment attachment4 : arrayList) { + Uri uri = attachment4.getUri(); + ContentResolver contentResolver = context.getContentResolver(); + m.checkNotNullExpressionValue(contentResolver, "context.contentResolver"); + arrayList2.add(Float.valueOf(SendUtilsKt.computeFileSizeMegabytes(uri, contentResolver))); + } + float sumOfFloat = u.sumOfFloat(arrayList2); + Float maxOrNull = u.m92maxOrNull((Iterable) arrayList2); + floatValue = maxOrNull == null ? maxOrNull.floatValue() : 0.0f; + z6 = loaded.getSelectedThreadDraft() == null; + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); + boolean z7 = (selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null || loaded.getThreadDraftState().isPrivate(); + ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context); + chatInputViewModel$sendMessage$messageResendCompressedHandler$1 = (!z2 || !z3) ? null : new ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(this, context, arrayList, messageManager, messageContent, function1); + ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1); + chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); + if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null || !this.storeUserSettings.getIsAutoImageCompressionEnabled()) { + ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); + if (!loaded.isEditing() && loaded.getEditingMessage() != null) { + Message message = loaded.getEditingMessage().getMessage(); + long r = message.r(); + long i2 = message.i(); + String textContent = messageContent.getTextContent(); + String k = message.k(); + if (k != null) { + i = k.length(); + } + function1.invoke(Boolean.valueOf(messageManager.editMessage(r, i2, textContent, chatInputViewModel$sendMessage$onMessageTooLong$1, Integer.valueOf(i)))); + } else if (z6) { + chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId())); + return; + } else if (z7) { + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft2 = loaded.getSelectedThreadDraft(); + if (selectedThreadDraft2 != null) { + l = selectedThreadDraft2.getStarterMessageId(); + } + chatInputViewModel$sendMessage$1.invoke(l, (Function1) new ChatInputViewModel$sendMessage$2(chatInputViewModel$sendMessage$sendMessage$1)); + } else { + this.storeThreadDraft.setDraftSending(); + chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId())); + return; + } + return; + } + chatInputViewModel$sendMessage$messageResendCompressedHandler$1.mo1invoke(); + return; + } + z5 = false; ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); - for (Attachment attachment3 : arrayList) { - Uri uri = attachment3.getUri(); - ContentResolver contentResolver = context.getContentResolver(); - m.checkNotNullExpressionValue(contentResolver, "context.contentResolver"); - arrayList2.add(Float.valueOf(SendUtilsKt.computeFileSizeMegabytes(uri, contentResolver))); + while (r1.hasNext()) { } float sumOfFloat = u.sumOfFloat(arrayList2); Float maxOrNull = u.m92maxOrNull((Iterable) arrayList2); - floatValue = maxOrNull != null ? maxOrNull.floatValue() : 0.0f; - z5 = loaded.getSelectedThreadDraft() != null; - StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); - boolean z6 = (selectedThreadDraft != null ? selectedThreadDraft.getStarterMessageId() : null) == null || loaded.getThreadDraftState().isPrivate(); - ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context); - chatInputViewModel$sendMessage$messageResendCompressedHandler$1 = (!z2 || !z3) ? null : new ChatInputViewModel$sendMessage$messageResendCompressedHandler$1(this, context, arrayList, messageManager, messageContent, function1); - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z5, z6, chatInputViewModel$sendMessage$1); - chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); - if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null || !this.storeUserSettings.getIsAutoImageCompressionEnabled()) { - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); - if (!loaded.isEditing() && loaded.getEditingMessage() != null) { - ModelMessage message = loaded.getEditingMessage().getMessage(); - long id2 = message.getId(); - long channelId = message.getChannelId(); - String textContent = messageContent.getTextContent(); - String content = message.getContent(); - function1.invoke(Boolean.valueOf(messageManager.editMessage(id2, channelId, textContent, chatInputViewModel$sendMessage$onMessageTooLong$1, content != null ? Integer.valueOf(content.length()) : null))); - } else if (!z5) { - chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId())); - return; - } else if (z6) { - StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft2 = loaded.getSelectedThreadDraft(); - if (selectedThreadDraft2 != null) { - l = selectedThreadDraft2.getStarterMessageId(); - } - chatInputViewModel$sendMessage$1.invoke(l, (Function1) new ChatInputViewModel$sendMessage$2(chatInputViewModel$sendMessage$sendMessage$1)); - } else { - this.storeThreadDraft.setDraftSending(); - chatInputViewModel$sendMessage$sendMessage$1.invoke((ChatInputViewModel$sendMessage$sendMessage$1) Long.valueOf(loaded.getChannelId())); - return; - } - return; + if (maxOrNull == null) { + } + if (loaded.getSelectedThreadDraft() == null) { + } + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); + if ((selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null) { + } + ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context); + if (!z2) { + } + ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1); + chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); + if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) { + } + ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); + if (!loaded.isEditing()) { + } + if (z6) { } - chatInputViewModel$sendMessage$messageResendCompressedHandler$1.mo1invoke(); - return; } z4 = false; + if (!arrayList.isEmpty()) { + } + z5 = false; ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); while (r1.hasNext()) { } float sumOfFloat = u.sumOfFloat(arrayList2); Float maxOrNull = u.m92maxOrNull((Iterable) arrayList2); - if (maxOrNull != null) { + if (maxOrNull == null) { } - if (loaded.getSelectedThreadDraft() != null) { + if (loaded.getSelectedThreadDraft() == null) { } StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); - if ((selectedThreadDraft != null ? selectedThreadDraft.getStarterMessageId() : null) == null) { + if ((selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null) { } ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context); if (!z2) { } - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z5, z6, chatInputViewModel$sendMessage$1); + ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1); chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) { } - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); + ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); if (!loaded.isEditing()) { } - if (!z5) { + if (z6) { } } z3 = false; if (!arrayList.isEmpty()) { } z4 = false; + if (!arrayList.isEmpty()) { + } + z5 = false; ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10)); while (r1.hasNext()) { } float sumOfFloat = u.sumOfFloat(arrayList2); Float maxOrNull = u.m92maxOrNull((Iterable) arrayList2); - if (maxOrNull != null) { + if (maxOrNull == null) { } - if (loaded.getSelectedThreadDraft() != null) { + if (loaded.getSelectedThreadDraft() == null) { } StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft selectedThreadDraft = loaded.getSelectedThreadDraft(); - if ((selectedThreadDraft != null ? selectedThreadDraft.getStarterMessageId() : null) == null) { + if ((selectedThreadDraft == null ? selectedThreadDraft.getStarterMessageId() : null) == null) { } ChatInputViewModel$sendMessage$1 chatInputViewModel$sendMessage$1 = new ChatInputViewModel$sendMessage$1(this, loaded, messageContent, arrayList, context); if (!z2) { } - ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z5, z6, chatInputViewModel$sendMessage$1); + ChatInputViewModel$sendMessage$messageSendResultHandler$1 chatInputViewModel$sendMessage$messageSendResultHandler$1 = new ChatInputViewModel$sendMessage$messageSendResultHandler$1(this, context, loaded, arrayList, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, z6, z7, chatInputViewModel$sendMessage$1); chatInputViewModel$sendMessage$onMessageTooLong$1 = new ChatInputViewModel$sendMessage$onMessageTooLong$1(this); if (chatInputViewModel$sendMessage$messageResendCompressedHandler$1 != null) { } - ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); + ChatInputViewModel$sendMessage$sendMessage$1 chatInputViewModel$sendMessage$sendMessage$1 = new ChatInputViewModel$sendMessage$sendMessage$1(this, messageManager, messageContent, sumOfFloat, loaded, arrayList, chatInputViewModel$sendMessage$messageSendResultHandler$1, chatInputViewModel$sendMessage$onMessageTooLong$1, floatValue, z3, z4, z5, chatInputViewModel$sendMessage$messageResendCompressedHandler$1, function1); if (!loaded.isEditing()) { } - if (!z5) { + if (z6) { } } else { function1.invoke(Boolean.FALSE); diff --git a/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java index b96e652140..4179fd3718 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java +++ b/app/src/main/java/com/discord/widgets/chat/input/CommandCategoryViewHolder.java @@ -25,8 +25,8 @@ public final class CommandCategoryViewHolder extends MGRecyclerViewHolder) new AnonymousClass1(this, function1)); } else { - function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131891384))); + function1.invoke(Boolean.valueOf(this.$sendMessageError$4.invoke(2131891417))); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1$lambda$1.java deleted file mode 100644 index 0f3a293491..0000000000 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1$lambda$1.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.discord.widgets.chat.input; - -import android.view.View; -import androidx.fragment.app.FragmentManager; -import com.discord.api.sticker.Sticker; -import d0.z.d.m; -/* compiled from: WidgetChatInput.kt */ -public final class WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1$lambda$1 implements View.OnClickListener { - public final /* synthetic */ WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1 this$0; - - public WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1$lambda$1(WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1 widgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1) { - this.this$0 = widgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1; - } - - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - AppFlexInputViewModel access$getFlexInputViewModel$p = WidgetChatInput.access$getFlexInputViewModel$p(this.this$0.this$0.this$0); - WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1 widgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1 = this.this$0; - Sticker sticker = widgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1.$stickerMatch$inlined; - FragmentManager supportFragmentManager = widgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1.this$0.this$0.requireAppActivity().getSupportFragmentManager(); - m.checkNotNullExpressionValue(supportFragmentManager, "requireAppActivity().supportFragmentManager"); - access$getFlexInputViewModel$p.onStickerNudgeClicked(sticker, supportFragmentManager); - } -} diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1.java deleted file mode 100644 index 8f31c2fd51..0000000000 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.discord.widgets.chat.input; - -import android.view.View; -import com.discord.api.sticker.Sticker; -import d0.z.d.m; -/* compiled from: View.kt */ -public final class WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1 implements View.OnLayoutChangeListener { - public final /* synthetic */ Sticker $stickerMatch$inlined; - public final /* synthetic */ WidgetChatInput$configureStickerNudge$1 this$0; - - public WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1(WidgetChatInput$configureStickerNudge$1 widgetChatInput$configureStickerNudge$1, Sticker sticker) { - this.this$0 = widgetChatInput$configureStickerNudge$1; - this.$stickerMatch$inlined = sticker; - } - - @Override // android.view.View.OnLayoutChangeListener - public void onLayoutChange(View view, int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8) { - m.checkParameterIsNotNull(view, "view"); - view.removeOnLayoutChangeListener(this); - view.setOnClickListener(new WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1$lambda$1(this)); - } -} diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$lambda$1.java deleted file mode 100644 index 0264f6c24b..0000000000 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$lambda$1.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.discord.widgets.chat.input; - -import android.view.View; -import androidx.fragment.app.FragmentManager; -import com.discord.api.sticker.Sticker; -import d0.z.d.m; -/* compiled from: WidgetChatInput.kt */ -public final class WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$lambda$1 implements View.OnClickListener { - public final /* synthetic */ Sticker $stickerMatch$inlined; - public final /* synthetic */ WidgetChatInput$configureStickerNudge$1 this$0; - - public WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$lambda$1(WidgetChatInput$configureStickerNudge$1 widgetChatInput$configureStickerNudge$1, Sticker sticker) { - this.this$0 = widgetChatInput$configureStickerNudge$1; - this.$stickerMatch$inlined = sticker; - } - - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - AppFlexInputViewModel access$getFlexInputViewModel$p = WidgetChatInput.access$getFlexInputViewModel$p(this.this$0.this$0); - Sticker sticker = this.$stickerMatch$inlined; - FragmentManager supportFragmentManager = this.this$0.this$0.requireAppActivity().getSupportFragmentManager(); - m.checkNotNullExpressionValue(supportFragmentManager, "requireAppActivity().supportFragmentManager"); - access$getFlexInputViewModel$p.onStickerNudgeClicked(sticker, supportFragmentManager); - } -} diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1.java deleted file mode 100644 index 4346b4a97e..0000000000 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$configureStickerNudge$1.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.discord.widgets.chat.input; - -import android.content.Context; -import android.widget.FrameLayout; -import androidx.core.view.ViewCompat; -import androidx.core.view.ViewKt; -import com.discord.api.sticker.Sticker; -import com.discord.utilities.analytics.AnalyticsTracker; -import com.discord.utilities.dimen.DimenUtils; -import com.discord.views.sticker.StickerView; -import com.lytefast.flexinput.viewmodel.FlexInputState; -import d0.t.u; -import d0.z.d.m; -import d0.z.d.o; -import java.util.List; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: WidgetChatInput.kt */ -public final class WidgetChatInput$configureStickerNudge$1 extends o implements Function0 { - public final /* synthetic */ FlexInputState $state; - public final /* synthetic */ WidgetChatInput this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatInput$configureStickerNudge$1(WidgetChatInput widgetChatInput, FlexInputState flexInputState) { - super(0); - this.this$0 = widgetChatInput; - this.$state = flexInputState; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - StickerView stickerView = (StickerView) WidgetChatInput.access$getFlexInputFragment$p(this.this$0).l().findViewWithTag("NUDGE_STICKER_VIEW"); - if (!this.$state.j) { - if (stickerView != null) { - ViewKt.setVisible(stickerView, false); - } - WidgetChatInput.access$getFlexInputFragment$p(this.this$0).k().setVisibility(0); - return; - } - Sticker sticker = (Sticker) u.firstOrNull((List) WidgetChatInput.access$getFlexInputViewModel$p(this.this$0).getMatchingStickers(this.$state.a, true)); - if (sticker == null) { - if (stickerView != null) { - ViewKt.setVisible(stickerView, false); - } - WidgetChatInput.access$getFlexInputFragment$p(this.this$0).k().setVisibility(0); - return; - } - if (stickerView == null) { - Context context = WidgetChatInput.access$getFlexInputFragment$p(this.this$0).l().getContext(); - m.checkNotNullExpressionValue(context, "flexInputFragment.getExp…ButtonContainer().context"); - stickerView = new StickerView(context); - stickerView.setLayoutParams(new FrameLayout.LayoutParams(DimenUtils.dpToPixels(32), DimenUtils.dpToPixels(32))); - stickerView.setTag("NUDGE_STICKER_VIEW"); - WidgetChatInput.access$getFlexInputFragment$p(this.this$0).l().addView(stickerView); - } - stickerView.setVisibility(0); - int i = StickerView.i; - stickerView.c(sticker, null); - if (!ViewCompat.isLaidOut(stickerView) || stickerView.isLayoutRequested()) { - stickerView.addOnLayoutChangeListener(new WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$1(this, sticker)); - } else { - stickerView.setOnClickListener(new WidgetChatInput$configureStickerNudge$1$$special$$inlined$doOnLayout$lambda$1(this, sticker)); - } - WidgetChatInput.access$getFlexInputFragment$p(this.this$0).k().setVisibility(8); - AnalyticsTracker.INSTANCE.stickerNudgeDisplayed(sticker.getId()); - } -} diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java index 251fa5c968..abf2e93605 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$flexInputViewModel$2.java @@ -17,6 +17,6 @@ public final class WidgetChatInput$flexInputViewModel$2 extends o implements Fun @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, 126, null); + return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java index 39b9fafa14..869da1c389 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBound$1.java @@ -81,9 +81,9 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0< @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - FlexEditText m = WidgetChatInput.access$getFlexInputFragment$p(this.this$0).m(); + FlexEditText k = WidgetChatInput.access$getFlexInputFragment$p(this.this$0).k(); WidgetChatInput.access$getBinding$p(this.this$0).l.setBackgroundColor(ColorCompat.getThemedColor(this.this$0.requireContext(), 2130968905)); - RecyclerView recyclerView = WidgetChatInput.access$getBinding$p(this.this$0).f1719c; + RecyclerView recyclerView = WidgetChatInput.access$getBinding$p(this.this$0).f1721c; m.checkNotNullExpressionValue(recyclerView, "binding.chatInputCategoriesRecycler"); recyclerView.setItemAnimator(null); WidgetChatInput widgetChatInput = this.this$0; @@ -97,16 +97,16 @@ public final class WidgetChatInput$onViewBound$1 extends o implements Function0< m.checkNotNullExpressionValue(textView2, "binding.chatInputEmojiMatchingHeader"); RecyclerView recyclerView3 = WidgetChatInput.access$getBinding$p(this.this$0).l; m.checkNotNullExpressionValue(recyclerView3, "binding.chatInputMentionsRecycler"); - RecyclerView recyclerView4 = WidgetChatInput.access$getBinding$p(this.this$0).f1719c; + RecyclerView recyclerView4 = WidgetChatInput.access$getBinding$p(this.this$0).f1721c; m.checkNotNullExpressionValue(recyclerView4, "binding.chatInputCategoriesRecycler"); WidgetChatInputApplicationCommandsBinding widgetChatInputApplicationCommandsBinding = WidgetChatInput.access$getBinding$p(this.this$0).b; m.checkNotNullExpressionValue(widgetChatInputApplicationCommandsBinding, "binding.applicationCommandsRoot"); - WidgetChatInput.access$setChatInputEditTextHolder$p(widgetChatInput, new WidgetChatInputEditText(m, recyclerView2, linearLayout, textView, textView2, recyclerView3, recyclerView4, widgetChatInputApplicationCommandsBinding, new AnonymousClass1(WidgetChatInput.access$getViewModel$p(this.this$0)), new AnonymousClass2(WidgetChatInput.access$getViewModel$p(this.this$0)), new AnonymousClass3(WidgetChatInput.access$getViewModel$p(this.this$0)), null, 2048, null)); + WidgetChatInput.access$setChatInputEditTextHolder$p(widgetChatInput, new WidgetChatInputEditText(k, recyclerView2, linearLayout, textView, textView2, recyclerView3, recyclerView4, widgetChatInputApplicationCommandsBinding, new AnonymousClass1(WidgetChatInput.access$getViewModel$p(this.this$0)), new AnonymousClass2(WidgetChatInput.access$getViewModel$p(this.this$0)), new AnonymousClass3(WidgetChatInput.access$getViewModel$p(this.this$0)), null, 2048, null)); WidgetChatInputEditText access$getChatInputEditTextHolder$p = WidgetChatInput.access$getChatInputEditTextHolder$p(this.this$0); if (access$getChatInputEditTextHolder$p != null) { access$getChatInputEditTextHolder$p.configureMentionsDataSubscriptions(this.this$0); } - WidgetChatInput.access$setChatInputTruncatedHint$p(this.this$0, new WidgetChatInputTruncatedHint(m)); + WidgetChatInput.access$setChatInputTruncatedHint$p(this.this$0, new WidgetChatInputTruncatedHint(k)); WidgetChatInputTruncatedHint access$getChatInputTruncatedHint$p = WidgetChatInput.access$getChatInputTruncatedHint$p(this.this$0); if (access$getChatInputTruncatedHint$p != null) { access$getChatInputTruncatedHint$p.addBindedTextWatcher(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$3.java index 4d9cdd3300..495ca45ba5 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$3.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$3.java @@ -1,26 +1,27 @@ package com.discord.widgets.chat.input; -import com.lytefast.flexinput.viewmodel.FlexInputState; -import d0.z.d.k; -import d0.z.d.m; +import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatInput.kt */ -public final /* synthetic */ class WidgetChatInput$onViewBoundOrOnResume$3 extends k implements Function1 { +public final class WidgetChatInput$onViewBoundOrOnResume$3 extends o implements Function1 { + public final /* synthetic */ WidgetChatInput this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatInput$onViewBoundOrOnResume$3(WidgetChatInput widgetChatInput) { - super(1, widgetChatInput, WidgetChatInput.class, "configureStickerNudge", "configureStickerNudge(Lcom/lytefast/flexinput/viewmodel/FlexInputState;)V", 0); + super(1); + this.this$0 = widgetChatInput; } /* 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(FlexInputState flexInputState) { - invoke(flexInputState); + public /* bridge */ /* synthetic */ Unit invoke(Boolean bool) { + invoke(bool.booleanValue()); return Unit.a; } - public final void invoke(FlexInputState flexInputState) { - m.checkNotNullParameter(flexInputState, "p1"); - WidgetChatInput.access$configureStickerNudge((WidgetChatInput) this.receiver, flexInputState); + public final void invoke(boolean z2) { + WidgetChatInput.access$setWindowInsetsListeners(this.this$0, !z2); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$4.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$4.java deleted file mode 100644 index b23582eb16..0000000000 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$onViewBoundOrOnResume$4.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.discord.widgets.chat.input; - -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: WidgetChatInput.kt */ -public final class WidgetChatInput$onViewBoundOrOnResume$4 extends o implements Function1 { - public final /* synthetic */ WidgetChatInput this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatInput$onViewBoundOrOnResume$4(WidgetChatInput widgetChatInput) { - super(1); - this.this$0 = widgetChatInput; - } - - /* 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(Boolean bool) { - invoke(bool.booleanValue()); - return Unit.a; - } - - public final void invoke(boolean z2) { - WidgetChatInput.access$setWindowInsetsListeners(this.this$0, !z2); - } -} diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java index 5d973d32a1..d9b370b59e 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$setWindowInsetsListeners$3.java @@ -28,7 +28,7 @@ public final class WidgetChatInput$setWindowInsetsListeners$3 implements OnApply d4 d4Var = WidgetChatInput.access$getBinding$p(this.this$0).r; m.checkNotNullExpressionValue(d4Var, "binding.guard"); ViewCompat.dispatchApplyWindowInsets(d4Var.a, build); - e4 e4Var = WidgetChatInput.access$getBinding$p(this.this$0).f1720s; + e4 e4Var = WidgetChatInput.access$getBinding$p(this.this$0).f1722s; m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification"); ViewCompat.dispatchApplyWindowInsets(e4Var.a, build); return windowInsetsCompat.consumeSystemWindowInsets(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java index d4262da3e0..26390ee49b 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput$showExpressionButtonSparkle$1.java @@ -3,6 +3,7 @@ package com.discord.widgets.chat.input; import android.content.Context; import android.view.View; import android.widget.LinearLayout; +import androidx.appcompat.widget.AppCompatImageButton; import c.a.w.c; import com.discord.floating_view_manager.FloatingViewGravity; import com.discord.tooltips.TooltipManager; @@ -62,7 +63,8 @@ public final class WidgetChatInput$showExpressionButtonSparkle$1 extends o imple @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - View k = WidgetChatInput.access$getFlexInputFragment$p(this.this$0).k(); + AppCompatImageButton appCompatImageButton = WidgetChatInput.access$getFlexInputFragment$p(this.this$0).j().i; + m.checkNotNullExpressionValue(appCompatImageButton, "binding.expressionBtn"); LinearLayout linearLayout = WidgetChatInput.access$getBinding$p(this.this$0).d; m.checkNotNullExpressionValue(linearLayout, "binding.chatInputContainer"); Context context = linearLayout.getContext(); @@ -73,7 +75,7 @@ public final class WidgetChatInput$showExpressionButtonSparkle$1 extends o imple FloatingViewGravity floatingViewGravity = FloatingViewGravity.CENTER; Observable G = this.this$0.getUnsubscribeSignal().G(AnonymousClass1.INSTANCE); m.checkNotNullExpressionValue(G, "unsubscribeSignal.map { }"); - TooltipManager.e(access$getTooltipManager$p, k, cVar, tooltip, floatingViewGravity, 0, 0, false, G, 112, null); - cVar.setOnClickListener(new AnonymousClass2(this, k)); + TooltipManager.e(access$getTooltipManager$p, appCompatImageButton, cVar, tooltip, floatingViewGravity, 0, 0, false, G, 112, null); + cVar.setOnClickListener(new AnonymousClass2(this, appCompatImageButton)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java index 920186fe3c..f727c0e1fb 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInput.java @@ -58,7 +58,6 @@ import com.discord.widgets.notice.WidgetNoticeDialog; import com.google.android.material.button.MaterialButton; import com.lytefast.flexinput.fragment.FlexInputFragment; import com.lytefast.flexinput.model.Attachment; -import com.lytefast.flexinput.viewmodel.FlexInputState; import d0.g; import d0.g0.t; import d0.z.d.a0; @@ -72,14 +71,11 @@ import kotlin.NoWhenBranchMatchedException; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; -import kotlin.jvm.internal.DefaultConstructorMarker; import kotlin.reflect.KProperty; import rx.Observable; /* compiled from: WidgetChatInput.kt */ public final class WidgetChatInput extends AppFragment { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.W(WidgetChatInput.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChatInputBinding;", 0)}; - public static final Companion Companion = new Companion(null); - private static final String NUDGE_STICKER_VIEW_TAG = "NUDGE_STICKER_VIEW"; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding(this, WidgetChatInput$binding$2.INSTANCE, new WidgetChatInput$binding$3(this)); private WidgetChatInputAttachments chatAttachments; private WidgetChatInputEditText chatInputEditTextHolder; @@ -91,16 +87,6 @@ public final class WidgetChatInput extends AppFragment { private final TooltipManager tooltipManager; private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChatInputViewModel.class), new WidgetChatInput$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetChatInput$viewModel$2.INSTANCE)); - /* compiled from: WidgetChatInput.kt */ - public static final class Companion { - private Companion() { - } - - public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { - this(); - } - } - public final /* synthetic */ class WhenMappings { public static final /* synthetic */ int[] $EnumSwitchMapping$0; public static final /* synthetic */ int[] $EnumSwitchMapping$1; @@ -130,7 +116,7 @@ public final class WidgetChatInput extends AppFragment { } public WidgetChatInput() { - super(2131558909); + super(2131558910); AppLog appLog = AppLog.g; m.checkNotNullParameter(appLog, "logger"); WeakReference weakReference = a.b.a; @@ -155,10 +141,6 @@ public final class WidgetChatInput extends AppFragment { widgetChatInput.configureSendListeners(loaded); } - public static final /* synthetic */ void access$configureStickerNudge(WidgetChatInput widgetChatInput, FlexInputState flexInputState) { - widgetChatInput.configureStickerNudge(flexInputState); - } - public static final /* synthetic */ void access$configureUI(WidgetChatInput widgetChatInput, ChatInputViewModel.ViewState viewState) { widgetChatInput.configureUI(viewState); } @@ -179,10 +161,6 @@ public final class WidgetChatInput extends AppFragment { return widgetChatInput.getFlexInputFragment(); } - public static final /* synthetic */ AppFlexInputViewModel access$getFlexInputViewModel$p(WidgetChatInput widgetChatInput) { - return widgetChatInput.getFlexInputViewModel(); - } - public static final /* synthetic */ CharSequence access$getHint(WidgetChatInput widgetChatInput, Context context, Channel channel, boolean z2, boolean z3) { return widgetChatInput.getHint(context, channel, z2, z3); } @@ -248,7 +226,7 @@ public final class WidgetChatInput extends AppFragment { m.checkNotNullExpressionValue(linearLayout, "binding.guard.root"); int i = 0; linearLayout.setVisibility(loaded.isLurking() || loaded.isVerificationLevelTriggered() || loaded.isSystemDM() || loaded.getShouldShowFollow() ? 0 : 8); - e4 e4Var = getBinding().f1720s; + e4 e4Var = getBinding().f1722s; m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification"); RelativeLayout relativeLayout = e4Var.a; m.checkNotNullExpressionValue(relativeLayout, "binding.guardMemberVerification.root"); @@ -260,14 +238,14 @@ public final class WidgetChatInput extends AppFragment { i = 8; } relativeLayout.setVisibility(i); - e4 e4Var2 = getBinding().f1720s; + e4 e4Var2 = getBinding().f1722s; m.checkNotNullExpressionValue(e4Var2, "binding.guardMemberVerification"); e4Var2.a.setOnClickListener(new WidgetChatInput$configureChatGuard$1(this, loaded)); if (loaded.isSystemDM()) { - getBinding().r.e.setText(2131893682); + getBinding().r.e.setText(2131893722); TextView textView = getBinding().r.d; m.checkNotNullExpressionValue(textView, "binding.guard.chatInputGuardSubtext"); - ViewExtensions.setTextAndVisibilityBy(textView, getString(2131893683)); + ViewExtensions.setTextAndVisibilityBy(textView, getString(2131893723)); MaterialButton materialButton = getBinding().r.b; m.checkNotNullExpressionValue(materialButton, "binding.guard.chatInputGuardAction"); materialButton.setVisibility(8); @@ -276,30 +254,30 @@ public final class WidgetChatInput extends AppFragment { materialButton2.setVisibility(8); } else if (loaded.isLurking()) { if (loaded.getShouldShowFollow()) { - getBinding().r.e.setText(2131888525); + getBinding().r.e.setText(2131888535); MaterialButton materialButton3 = getBinding().r.b; m.checkNotNullExpressionValue(materialButton3, "binding.guard.chatInputGuardAction"); - ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(2131888943)); + ViewExtensions.setTextAndVisibilityBy(materialButton3, getString(2131888953)); getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$2(this, loaded)); MaterialButton materialButton4 = getBinding().r.f81c; m.checkNotNullExpressionValue(materialButton4, "binding.guard.chatInputGuardActionSecondary"); - ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(2131890861)); + ViewExtensions.setTextAndVisibilityBy(materialButton4, getString(2131890891)); getBinding().r.f81c.setOnClickListener(new WidgetChatInput$configureChatGuard$3(this)); } else { - getBinding().r.e.setText(2131890862); + getBinding().r.e.setText(2131890892); MaterialButton materialButton5 = getBinding().r.b; m.checkNotNullExpressionValue(materialButton5, "binding.guard.chatInputGuardAction"); - ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(2131890861)); + ViewExtensions.setTextAndVisibilityBy(materialButton5, getString(2131890891)); getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$4(this)); MaterialButton materialButton6 = getBinding().r.f81c; m.checkNotNullExpressionValue(materialButton6, "binding.guard.chatInputGuardActionSecondary"); materialButton6.setVisibility(8); } } else if (loaded.getShouldShowFollow()) { - getBinding().r.e.setText(2131888525); + getBinding().r.e.setText(2131888535); MaterialButton materialButton7 = getBinding().r.b; m.checkNotNullExpressionValue(materialButton7, "binding.guard.chatInputGuardAction"); - ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(2131888943)); + ViewExtensions.setTextAndVisibilityBy(materialButton7, getString(2131888953)); getBinding().r.b.setOnClickListener(new WidgetChatInput$configureChatGuard$5(this, loaded)); MaterialButton materialButton8 = getBinding().r.f81c; m.checkNotNullExpressionValue(materialButton8, "binding.guard.chatInputGuardActionSecondary"); @@ -329,17 +307,17 @@ public final class WidgetChatInput extends AppFragment { if (joinRequestStatus != null) { int ordinal = joinRequestStatus.ordinal(); if (ordinal == 1) { - getBinding().f1720s.f86c.setText(2131890985); - getBinding().f1720s.b.setImageResource(2131232180); + getBinding().f1722s.f86c.setText(2131891016); + getBinding().f1722s.b.setImageResource(2131232183); return; } else if (ordinal == 2) { - getBinding().f1720s.f86c.setText(2131890990); - getBinding().f1720s.b.setImageResource(2131232179); + getBinding().f1722s.f86c.setText(2131891021); + getBinding().f1722s.b.setImageResource(2131232182); return; } } - getBinding().f1720s.f86c.setText(2131890999); - getBinding().f1720s.b.setImageResource(2131232181); + getBinding().f1722s.f86c.setText(2131891030); + getBinding().f1722s.b.setImageResource(2131232184); } } @@ -362,7 +340,7 @@ public final class WidgetChatInput extends AppFragment { RelativeLayout relativeLayout2 = getBinding().e; m.checkNotNullExpressionValue(relativeLayout2, "binding.chatInputContextBar"); relativeLayout2.setClickable(false); - getBinding().g.setText(2131888204); + getBinding().g.setText(2131888214); getBinding().f.setOnClickListener(new WidgetChatInput$configureContextBarEditing$1(this)); LinearLayout linearLayout = getBinding().h; m.checkNotNullExpressionValue(linearLayout, "binding.chatInputContextReplyMentionButton"); @@ -382,7 +360,7 @@ public final class WidgetChatInput extends AppFragment { } TextView textView = getBinding().g; m.checkNotNullExpressionValue(textView, "binding.chatInputContextDescription"); - b.m(textView, 2131891190, new Object[]{str}, new WidgetChatInput$configureContextBarReplying$1(requireContext, replying)); + b.m(textView, 2131891223, new Object[]{str}, new WidgetChatInput$configureContextBarReplying$1(requireContext, replying)); getBinding().e.setOnClickListener(new WidgetChatInput$configureContextBarReplying$2(this, replying)); getBinding().f.setOnClickListener(new WidgetChatInput$configureContextBarReplying$3(this)); LinearLayout linearLayout = getBinding().h; @@ -397,7 +375,7 @@ public final class WidgetChatInput extends AppFragment { m.checkNotNullExpressionValue(imageView, "binding.chatInputContextReplyMentionButtonImage"); ColorCompatKt.tintWithColor(imageView, themedColor); getBinding().j.setTextColor(themedColor); - getBinding().j.setText(replying.getShouldMention() ? 2131892542 : 2131892540); + getBinding().j.setText(replying.getShouldMention() ? 2131892584 : 2131892582); } private final void configureInitialText(ChatInputViewModel.ViewState.Loaded loaded) { @@ -436,10 +414,6 @@ public final class WidgetChatInput extends AppFragment { } } - private final void configureStickerNudge(FlexInputState flexInputState) { - getFlexInputFragment().i(new WidgetChatInput$configureStickerNudge$1(this, flexInputState)); - } - private final void configureText(ChatInputViewModel.ViewState.Loaded loaded) { if (!loaded.getAbleToSendMessage()) { c.c0(getFlexInputViewModel(), "", null, 2, null); @@ -452,7 +426,7 @@ public final class WidgetChatInput extends AppFragment { LinearLayout linearLayout = getBinding().q; m.checkNotNullExpressionValue(linearLayout, "binding.chatInputWrap"); linearLayout.setVisibility(8); - e4 e4Var = getBinding().f1720s; + e4 e4Var = getBinding().f1722s; m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification"); RelativeLayout relativeLayout = e4Var.a; m.checkNotNullExpressionValue(relativeLayout, "binding.guardMemberVerification.root"); @@ -496,13 +470,13 @@ public final class WidgetChatInput extends AppFragment { private final CharSequence getHint(Context context, Channel channel, boolean z2, boolean z3) { if (z2) { - String string = context.getString(2131888165); + String string = context.getString(2131888175); m.checkNotNullExpressionValue(string, "context.getString(R.stri…erification_text_blocked)"); return string; } else if (z3) { - return b.g(context, 2131893793, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4); + return b.g(context, 2131893833, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4); } else { - String string2 = context.getString(2131891384); + String string2 = context.getString(2131891417); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…s_permission_placeholder)"); return string2; } @@ -511,29 +485,29 @@ public final class WidgetChatInput extends AppFragment { private final String getVerificationActionText(Context context, GuildVerificationLevel guildVerificationLevel) { int ordinal = guildVerificationLevel.ordinal(); if (ordinal == 1) { - return context.getString(2131894407); + return context.getString(2131894454); } if (ordinal != 4) { return null; } - return context.getString(2131894419); + return context.getString(2131894466); } private final CharSequence getVerificationText(Context context, GuildVerificationLevel guildVerificationLevel) { int ordinal = guildVerificationLevel.ordinal(); if (ordinal == 1) { - return context.getString(2131890105); + return context.getString(2131890118); } if (ordinal == 2) { - return b.g(context, 2131890103, new Object[]{"5"}, null, 4); + return b.g(context, 2131890116, new Object[]{"5"}, null, 4); } if (ordinal == 3) { - return b.g(context, 2131890104, new Object[]{"10"}, null, 4); + return b.g(context, 2131890117, new Object[]{"10"}, null, 4); } if (ordinal != 4) { return null; } - return context.getString(2131890106); + return context.getString(2131890119); } private final ChatInputViewModel getViewModel() { @@ -551,7 +525,7 @@ public final class WidgetChatInput extends AppFragment { ChatInputViewModel.Event.FilesTooLarge filesTooLarge = (ChatInputViewModel.Event.FilesTooLarge) event; float currentFileSizeMB = filesTooLarge.getCurrentFileSizeMB(); float maxAttachmentSizeMB = filesTooLarge.getMaxAttachmentSizeMB(); - bVar.a(parentFragmentManager, filesTooLarge.isUserPremium(), filesTooLarge.getMaxFileSizeMB(), maxAttachmentSizeMB, currentFileSizeMB, new WidgetChatInput$handleEvent$1(this, event), filesTooLarge.getAttachments().size(), filesTooLarge.getHasImage(), filesTooLarge.getHasVideo()); + bVar.a(parentFragmentManager, filesTooLarge.isUserPremium(), filesTooLarge.getMaxFileSizeMB(), maxAttachmentSizeMB, currentFileSizeMB, new WidgetChatInput$handleEvent$1(this, event), filesTooLarge.getAttachments().size(), filesTooLarge.getHasImage(), filesTooLarge.getHasVideo(), filesTooLarge.getHasGif()); clearInput$default(this, null, false, 1, null); unit = Unit.a; } else if (event instanceof ChatInputViewModel.Event.MessageTooLong) { @@ -561,14 +535,14 @@ public final class WidgetChatInput extends AppFragment { FragmentManager parentFragmentManager2 = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager2, "parentFragmentManager"); ChatInputViewModel.Event.MessageTooLong messageTooLong = (ChatInputViewModel.Event.MessageTooLong) event; - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager2, getString(2131891147), c.a.l.b.j(this, 2131891146, new Object[]{numberInstance.format(Integer.valueOf(messageTooLong.getCurrentCharacterCount())), numberInstance.format(Integer.valueOf(messageTooLong.getMaxCharacterCount()))}, null, 4), getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager2, getString(2131891178), c.a.l.b.j(this, 2131891177, new Object[]{numberInstance.format(Integer.valueOf(messageTooLong.getCurrentCharacterCount())), numberInstance.format(Integer.valueOf(messageTooLong.getMaxCharacterCount()))}, null, 4), getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); unit = Unit.a; } else if (event instanceof ChatInputViewModel.Event.FailedDeliveryToRecipient) { getFlexInputViewModel().hideKeyboard(); WidgetNoticeDialog.Companion companion2 = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager3 = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager3, "parentFragmentManager"); - WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager3, getString(2131888366), c.a.l.b.j(this, 2131887042, new Object[]{f.a.a(360060145013L, null)}, null, 4), getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager3, getString(2131888376), c.a.l.b.j(this, 2131887043, new Object[]{f.a.a(360060145013L, null)}, null, 4), getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); unit = Unit.a; } else if (event instanceof ChatInputViewModel.Event.AppendChatText) { getFlexInputViewModel().onInputTextAppended(((ChatInputViewModel.Event.AppendChatText) event).getText()); @@ -642,7 +616,7 @@ public final class WidgetChatInput extends AppFragment { d4 d4Var = getBinding().r; m.checkNotNullExpressionValue(d4Var, "binding.guard"); ViewCompat.setOnApplyWindowInsetsListener(d4Var.a, WidgetChatInput$setWindowInsetsListeners$1.INSTANCE); - e4 e4Var = getBinding().f1720s; + e4 e4Var = getBinding().f1722s; m.checkNotNullExpressionValue(e4Var, "binding.guardMemberVerification"); ViewCompat.setOnApplyWindowInsetsListener(e4Var.a, WidgetChatInput$setWindowInsetsListeners$2.INSTANCE); ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, new WidgetChatInput$setWindowInsetsListeners$3(this, z2)); @@ -700,14 +674,11 @@ public final class WidgetChatInput extends AppFragment { m.checkNotNullExpressionValue(s2, "viewModel\n .obser… .distinctUntilChanged()"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s2, this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$1(this), 62, (Object) null); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$2(this), 62, (Object) null); - Observable s3 = getFlexInputViewModel().observeState().s(); - m.checkNotNullExpressionValue(s3, "flexInputViewModel\n … .distinctUntilChanged()"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(s3, this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$3(this), 62, (Object) null); WidgetChatInputAttachments widgetChatInputAttachments = this.chatAttachments; if (widgetChatInputAttachments == null) { m.throwUninitializedPropertyAccessException("chatAttachments"); } widgetChatInputAttachments.setViewModel(getFlexInputViewModel()); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(this.inlineVoiceVisibilityObserver.observeIsVisible(), this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$4(this), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(this.inlineVoiceVisibilityObserver.observeIsVisible(), this), WidgetChatInput.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetChatInput$onViewBoundOrOnResume$3(this), 62, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.java index 835f212026..b106bbe51f 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1.java @@ -20,6 +20,6 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1$$spec @Override // c.b.a.f.a public void requestHide() { WidgetChatInputAttachments$configureFlexInputFragment$1 widgetChatInputAttachments$configureFlexInputFragment$1 = this.this$0; - widgetChatInputAttachments$configureFlexInputFragment$1.$fragment.hideKeyboard(WidgetChatInputAttachments.access$getFlexInputFragment$p(widgetChatInputAttachments$configureFlexInputFragment$1.this$0).m()); + widgetChatInputAttachments$configureFlexInputFragment$1.$fragment.hideKeyboard(WidgetChatInputAttachments.access$getFlexInputFragment$p(widgetChatInputAttachments$configureFlexInputFragment$1.this$0).k()); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.java index c18c7e28e8..2b92a3abeb 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2.java @@ -27,7 +27,7 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1$$spec public final void invoke(InputContentInfoCompat inputContentInfoCompat) { m.checkNotNullParameter(inputContentInfoCompat, "it"); WidgetChatInputAttachments widgetChatInputAttachments = this.this$0.this$0; - Context context = WidgetChatInputAttachments.access$getFlexInputFragment$p(widgetChatInputAttachments).m().getContext(); + Context context = WidgetChatInputAttachments.access$getFlexInputFragment$p(widgetChatInputAttachments).k().getContext(); m.checkNotNullExpressionValue(context, "flexInputFragment.getTextInput().context"); WidgetChatInputAttachments.access$setAttachmentFromPicker(widgetChatInputAttachments, context, inputContentInfoCompat); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java index c73c9698de..72a630ff90 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$1.java @@ -39,14 +39,14 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1 exten m.checkNotNullExpressionValue(requireContext2, "requireContext()"); Context requireContext3 = access$getFlexInputFragment$p.requireContext(); m.checkNotNullExpressionValue(requireContext3, "requireContext()"); - d.a[] aVarArr = {new WidgetChatInputAttachments$configureFlexInputFragment$1$1$1(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext, 2130969408, 0, 2, (Object) null), 2131886728), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$2(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext2, 2130969407, 0, 2, (Object) null), 2131886727), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$3(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext3, 2130969405, 0, 2, (Object) null), 2131887136)}; + d.a[] aVarArr = {new WidgetChatInputAttachments$configureFlexInputFragment$1$1$1(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext, 2130969408, 0, 2, (Object) null), 2131886728), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$2(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext2, 2130969407, 0, 2, (Object) null), 2131886727), new WidgetChatInputAttachments$configureFlexInputFragment$1$1$3(access$getFlexInputFragment$p, DrawableCompat.getThemedDrawableRes$default(requireContext3, 2130969405, 0, 2, (Object) null), 2131887137)}; m.checkNotNullParameter(aVarArr, "pageSuppliers"); access$getFlexInputFragment$p.q = aVarArr; FileManager fileManager = this.$fragment.getFileManager(); m.checkNotNullParameter(fileManager, ""); access$getFlexInputFragment$p.o = fileManager; access$getFlexInputFragment$p.m = new WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$1(this); - WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).m().setInputContentHandler(new WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2(this)); + WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).k().setInputContentHandler(new WidgetChatInputAttachments$configureFlexInputFragment$1$$special$$inlined$apply$lambda$2(this)); AttachmentPreviewAdapter> access$createPreviewAdapter = WidgetChatInputAttachments.access$createPreviewAdapter(this.this$0, this.$fragment.getContext()); m.checkNotNullParameter(access$createPreviewAdapter, "previewAdapter"); access$createPreviewAdapter.a.initFrom(access$getFlexInputFragment$p.b()); @@ -61,7 +61,7 @@ public final class WidgetChatInputAttachments$configureFlexInputFragment$1 exten WidgetChatInputAttachments widgetChatInputAttachments = this.this$0; FragmentManager childFragmentManager = this.$fragment.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "fragment.childFragmentManager"); - Fragment access$createAndConfigureExpressionFragment = WidgetChatInputAttachments.access$createAndConfigureExpressionFragment(widgetChatInputAttachments, childFragmentManager, WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).m()); + Fragment access$createAndConfigureExpressionFragment = WidgetChatInputAttachments.access$createAndConfigureExpressionFragment(widgetChatInputAttachments, childFragmentManager, WidgetChatInputAttachments.access$getFlexInputFragment$p(this.this$0).k()); if (access$createAndConfigureExpressionFragment != null) { access$getFlexInputFragment$p.getChildFragmentManager().beginTransaction().replace(R.e.expression_tray_container, access$createAndConfigureExpressionFragment, access$createAndConfigureExpressionFragment.getClass().getSimpleName()).commit(); AppCompatImageButton appCompatImageButton = access$getFlexInputFragment$p.j().i; diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java index 399098960d..43ad1ffd67 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAttachments.java @@ -35,7 +35,7 @@ public final class WidgetChatInputAttachments { @Override // com.lytefast.flexinput.fragment.FilesFragment public EmptyListAdapter newPermissionsRequestAdapter(View.OnClickListener onClickListener) { m.checkNotNullParameter(onClickListener, "onClickListener"); - return new PermissionsEmptyListAdapter(2131558917, 2131361874, onClickListener); + return new PermissionsEmptyListAdapter(2131558918, 2131361874, onClickListener); } } @@ -44,7 +44,7 @@ public final class WidgetChatInputAttachments { @Override // com.lytefast.flexinput.fragment.MediaFragment public EmptyListAdapter newPermissionsRequestAdapter(View.OnClickListener onClickListener) { m.checkNotNullParameter(onClickListener, "onClickListener"); - return new PermissionsEmptyListAdapter(2131558917, 2131361874, onClickListener); + return new PermissionsEmptyListAdapter(2131558918, 2131361874, onClickListener); } } @@ -64,12 +64,12 @@ public final class WidgetChatInputAttachments { int i2 = 2131361874; MaterialButton materialButton = (MaterialButton) view.findViewById(2131361874); if (materialButton != null) { - i2 = 2131364199; - TextView textView = (TextView) view.findViewById(2131364199); + i2 = 2131364201; + TextView textView = (TextView) view.findViewById(2131364201); if (textView != null) { m.checkNotNullExpressionValue(new f4((LinearLayout) view, materialButton, textView), "WidgetChatInputPermReqFi…ing.bind(holder.itemView)"); m.checkNotNullExpressionValue(textView, "binding.permReqText"); - b.n(textView, 2131893761, new Object[0], null, 4); + b.n(textView, 2131893801, new Object[0], null, 4); return onCreateViewHolder; } } @@ -102,7 +102,7 @@ public final class WidgetChatInputAttachments { WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$emojiPickerListener$1(this); WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$stickerPickerListener$1(this); WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1 widgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1 = new WidgetChatInputAttachments$createAndConfigureExpressionFragment$onBackspacePressedListener$1(textView); - Fragment findFragmentById = fragmentManager.findFragmentById(2131363129); + Fragment findFragmentById = fragmentManager.findFragmentById(2131363131); if (!(findFragmentById instanceof WidgetExpressionTray)) { findFragmentById = null; } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java index 4ba6d2d91d..5c9a5d449e 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete$configureDataSubscriptions$17.java @@ -162,14 +162,14 @@ public final class WidgetChatInputAutocomplete$configureDataSubscriptions$17 ext Object[] objArr = new Object[1]; String access$getLastToken$p = WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0); objArr[0] = access$getLastToken$p != null ? t.replace$default(access$getLastToken$p, String.valueOf(':'), "", false, 4, (Object) null) : null; - stickersHeader.setText(b.j(appFragment, 2131893540, objArr, null, 4)); + stickersHeader.setText(b.j(appFragment, 2131893580, objArr, null, 4)); TextView access$getEmojiHeader$p = WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0); Character leadingIdentifier2 = component1.getAutocompleteToken().getLeadingIdentifier(); if (leadingIdentifier2 != null && leadingIdentifier2.charValue() == ':' && size > 0) { i = 0; } access$getEmojiHeader$p.setVisibility(i); - WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0).setText(b.j(this.$fragment, 2131888278, new Object[]{WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0)}, null, 4)); + WidgetChatInputAutocomplete.access$getEmojiHeader$p(this.this$0).setText(b.j(this.$fragment, 2131888288, new Object[]{WidgetChatInputAutocomplete.access$getLastToken$p(this.this$0)}, null, 4)); StoreStream.Companion companion = StoreStream.Companion; companion.getAnalytics().trackAutocompleteOpen(companion.getChannelsSelected().getId(), component1.getAutocompleteType(), component1.getEmojiNumCount(), component1.getStickerNumCount()); companion.getAutocomplete().setAutocompleteVisible(true); diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java index deb448c7a2..221a6ca98d 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputCommandsAdapter.java @@ -125,7 +125,7 @@ public class WidgetChatInputCommandsAdapter extends MGRecyclerAdapterSimple onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { - return i == 7 ? new CommandHeaderItem(2131558912, this) : i == 9 ? new CommandLoadingItem(2131558918, this) : i == 11 ? new EmojiAutocompleteUpsellItem(this) : new Item(2131558911, this); + return i == 7 ? new CommandHeaderItem(2131558913, this) : i == 9 ? new CommandLoadingItem(2131558919, this) : i == 11 ? new EmojiAutocompleteUpsellItem(this) : new Item(2131558912, this); } public void scrollToPosition(int i) { diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java index 15f4cf1d78..d855194b19 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java +++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandSectionHeadingAdapterItem.java @@ -18,8 +18,8 @@ public final class SelectedAppCommandSectionHeadingAdapterItem extends MGRecycle int i = 2131361970; TextView textView = (TextView) view.findViewById(2131361970); if (textView != null) { - i = 2131362937; - View findViewById = view.findViewById(2131362937); + i = 2131362939; + View findViewById = view.findViewById(2131362939); if (findViewById != null) { ViewAppcommandsOptionheadingListitemBinding viewAppcommandsOptionheadingListitemBinding = new ViewAppcommandsOptionheadingListitemBinding((ConstraintLayout) view, textView, findViewById); m.checkNotNullExpressionValue(viewAppcommandsOptionheadingListitemBinding, "ViewAppcommandsOptionhea…temBinding.bind(itemView)"); diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java index 9eb27c2aeb..eea7592dac 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java +++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedAppCommandTitleAdapterItem.java @@ -45,7 +45,7 @@ public final class SelectedAppCommandTitleAdapterItem extends MGRecyclerViewHold textView.setText(sb); Application application = selectedApplicationCommandItem.getApplication(); if (application != null) { - SimpleDraweeView simpleDraweeView = this.binding.f1639c; + SimpleDraweeView simpleDraweeView = this.binding.f1641c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.appcommandsOptiontitleAvatar"); IconUtils.setApplicationIcon$default(simpleDraweeView, application, false, 4, null); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java index ee9c9c02aa..7e8f4f7400 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/SelectedApplicationCommandAdapter.java @@ -142,7 +142,7 @@ public final class SelectedApplicationCommandAdapter extends MGRecyclerAdapterSi } } if (i != 0) { - arrayList.add(new SelectedApplicationCommandItem(null, null, false, false, false, null, getRecycler().getResources().getString(2131887460), 63, null)); + arrayList.add(new SelectedApplicationCommandItem(null, null, false, false, false, null, getRecycler().getResources().getString(2131887462), 63, null)); } List options3 = applicationCommand.getOptions(); ArrayList arrayList3 = new ArrayList(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java index 26c5116fc8..0daa22b1df 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java +++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommands.java @@ -99,7 +99,7 @@ public final class WidgetChatInputApplicationCommands { m.checkNotNullParameter(widgetChatInputApplicationCommandsBinding, "binding"); this.editText = flexEditText; this.binding = widgetChatInputApplicationCommandsBinding; - RecyclerView recyclerView = widgetChatInputApplicationCommandsBinding.f1718c; + RecyclerView recyclerView = widgetChatInputApplicationCommandsBinding.f1720c; m.checkNotNullExpressionValue(recyclerView, "binding.chatInputApplicationCommandsRecycler"); SelectedApplicationCommandAdapter selectedApplicationCommandAdapter = new SelectedApplicationCommandAdapter(recyclerView, new WidgetChatInputApplicationCommands$applicationCommandsParamAdapter$1(this)); this.applicationCommandsParamAdapter = selectedApplicationCommandAdapter; @@ -107,10 +107,10 @@ public final class WidgetChatInputApplicationCommands { m.checkNotNullExpressionValue(constraintLayout, "binding.root"); Context context = constraintLayout.getContext(); this.context = context; - RecyclerView recyclerView2 = widgetChatInputApplicationCommandsBinding.f1718c; + RecyclerView recyclerView2 = widgetChatInputApplicationCommandsBinding.f1720c; m.checkNotNullExpressionValue(recyclerView2, "binding.chatInputApplicationCommandsRecycler"); recyclerView2.setLayoutManager(new LinearLayoutManager(context, 0, false)); - RecyclerView recyclerView3 = widgetChatInputApplicationCommandsBinding.f1718c; + RecyclerView recyclerView3 = widgetChatInputApplicationCommandsBinding.f1720c; m.checkNotNullExpressionValue(recyclerView3, "binding.chatInputApplicationCommandsRecycler"); recyclerView3.setAdapter(selectedApplicationCommandAdapter); selectedApplicationCommandAdapter.getRecycler().setItemAnimator(null); @@ -288,7 +288,7 @@ public final class WidgetChatInputApplicationCommands { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; Context context = this.editText.getContext(); m.checkNotNullExpressionValue(context, "editText.context"); - accessibilityUtils.sendAnnouncement(context, 2131887426); + accessibilityUtils.sendAnnouncement(context, 2131887428); StoreStream.Companion companion = StoreStream.Companion; companion.getAnalytics().trackApplicationCommandBrowserOpened(companion.getChannelsSelected().getId()); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java index adc8cafcf0..38d53df89d 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/EmojiCategoryAdapter.java @@ -102,33 +102,33 @@ public final class EmojiCategoryAdapter extends RecyclerView.Adapter { linkedHashMap = linkedHashMap2; } if (z2 && (!linkedHashSet2.isEmpty())) { - linkedHashSet.add(new WidgetEmojiAdapter.HeaderItem.StringHeaderItem(2131888260)); + linkedHashSet.add(new WidgetEmojiAdapter.HeaderItem.StringHeaderItem(2131888270)); linkedHashSet.addAll(linkedHashSet2); linkedHashSet.add(WidgetEmojiAdapter.UpsellItem.INSTANCE); } @@ -1240,7 +1240,7 @@ public class EmojiPickerViewModel extends AppViewModel { if ((emoji instanceof ModelEmojiCustom) && ((ModelEmojiCustom) emoji).isAnimated()) { z2 = true; } - this.eventSubject.j.onNext(new Event.ShowPremiumUpsellDialog(z2 ? 2 : 1, z2 ? 2131892288 : 2131892296, z2 ? 2131892289 : 2131892297, "Emoji Picker Popout", false, false)); + this.eventSubject.j.onNext(new Event.ShowPremiumUpsellDialog(z2 ? 2 : 1, z2 ? 2131892326 : 2131892334, z2 ? 2131892327 : 2131892335, "Emoji Picker Popout", false, false)); this.storeAnalytics.emojiPickerUpsellLockedItemClicked(this.emojiPickerContextType, z2); } else if (emoji.isAvailable()) { function1.invoke(emoji); diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java index 5894f0df44..e1ac59f36c 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiAdapter.java @@ -527,27 +527,27 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter { m.checkNotNullParameter(emojiCategory, "emojiCategory"); switch (emojiCategory.ordinal()) { case 0: - return 2131888263; + return 2131888273; case 1: - return 2131888270; + return 2131888280; case 2: - return 2131888262; - case 3: - return 2131888268; - case 4: - return 2131888266; - case 5: - return 2131888265; - case 6: - return 2131888261; - case 7: return 2131888272; - case 8: - return 2131888267; - case 9: + case 3: + return 2131888278; + case 4: + return 2131888276; + case 5: + return 2131888275; + case 6: return 2131888271; + case 7: + return 2131888282; + case 8: + return 2131888277; + case 9: + return 2131888281; case 10: - return 2131888264; + return 2131888274; default: throw new NoWhenBranchMatchedException(); } @@ -649,7 +649,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter { super(2131558484, widgetEmojiAdapter); m.checkNotNullParameter(widgetEmojiAdapter, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131363002); + TextView textView = (TextView) view.findViewById(2131363004); if (textView != null) { EmojiPickerPremiumUpsellBinding emojiPickerPremiumUpsellBinding = new EmojiPickerPremiumUpsellBinding((LinearLayout) view, textView); m.checkNotNullExpressionValue(emojiPickerPremiumUpsellBinding, "EmojiPickerPremiumUpsellBinding.bind(itemView)"); @@ -657,7 +657,7 @@ public final class WidgetEmojiAdapter extends WidgetExpressionPickerAdapter { textView.setOnClickListener(new AnonymousClass1(widgetEmojiAdapter)); return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363002))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363004))); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java index a5c0606cdd..263347a332 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$binding$2.java @@ -32,42 +32,42 @@ public final /* synthetic */ class WidgetEmojiPicker$binding$2 extends k impleme i = 2131362459; AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131362459); if (appViewFlipper != null) { - i = 2131363003; - AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363003); + i = 2131363005; + AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363005); if (appBarLayout != null) { - i = 2131363007; - TextView textView = (TextView) view.findViewById(2131363007); + i = 2131363009; + TextView textView = (TextView) view.findViewById(2131363009); if (textView != null) { - i = 2131363010; - ImageView imageView = (ImageView) view.findViewById(2131363010); + i = 2131363012; + ImageView imageView = (ImageView) view.findViewById(2131363012); if (imageView != null) { - i = 2131363011; - ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363011); + i = 2131363013; + ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363013); if (constraintLayout != null) { - i = 2131363012; - View findViewById = view.findViewById(2131363012); + i = 2131363014; + View findViewById = view.findViewById(2131363014); if (findViewById != null) { - i = 2131363013; - Barrier barrier = (Barrier) view.findViewById(2131363013); + i = 2131363015; + Barrier barrier = (Barrier) view.findViewById(2131363015); if (barrier != null) { - i = 2131363014; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363014); + i = 2131363016; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363016); if (recyclerView2 != null) { CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view; - i = 2131363016; - ImageView imageView2 = (ImageView) view.findViewById(2131363016); + i = 2131363018; + ImageView imageView2 = (ImageView) view.findViewById(2131363018); if (imageView2 != null) { - i = 2131363017; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363017); + i = 2131363019; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363019); if (frameLayout != null) { - i = 2131363018; - ImageView imageView3 = (ImageView) view.findViewById(2131363018); + i = 2131363020; + ImageView imageView3 = (ImageView) view.findViewById(2131363020); if (imageView3 != null) { - i = 2131363019; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363019); + i = 2131363021; + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363021); if (textInputEditText != null) { - i = 2131363023; - Toolbar toolbar = (Toolbar) view.findViewById(2131363023); + i = 2131363025; + Toolbar toolbar = (Toolbar) view.findViewById(2131363025); if (toolbar != null) { return new WidgetEmojiPickerBinding(coordinatorLayout, recyclerView, appViewFlipper, appBarLayout, textView, imageView, constraintLayout, findViewById, barrier, recyclerView2, coordinatorLayout, imageView2, frameLayout, imageView3, textInputEditText, toolbar); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$1.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$1.java index 4b5ba39f58..431a69ab5e 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$1.java +++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker$initializeSearchBar$1.java @@ -49,7 +49,7 @@ public final class WidgetEmojiPicker$initializeSearchBar$1 implements View.OnCli if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(250, this) == coroutine_suspended) { + if (a.n(250, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -74,7 +74,7 @@ public final class WidgetEmojiPicker$initializeSearchBar$1 implements View.OnCli m.checkNotNullExpressionValue(view, "view"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(view); if (coroutineScope != null) { - a.F(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + a.G(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); } WidgetEmojiPicker.access$launchBottomSheet(this.this$0); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java index 7c06cc5b86..402fb9fa4a 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java +++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPicker.java @@ -96,7 +96,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec } public WidgetEmojiPicker() { - super(2131558991); + super(2131558992); } public static final /* synthetic */ void access$checkUpsellHeaderVisibility(WidgetEmojiPicker widgetEmojiPicker, RecyclerView recyclerView) { @@ -227,7 +227,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec stringHeaderItem = boundItem; } WidgetEmojiAdapter.HeaderItem.StringHeaderItem stringHeaderItem2 = stringHeaderItem; - if (stringHeaderItem2 != null && stringHeaderItem2.getStringRes() == 2131888260) { + if (stringHeaderItem2 != null && stringHeaderItem2.getStringRes() == 2131888270) { getViewModel().onUpsellHeaderVisible(); } } @@ -249,7 +249,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec } if (viewState != null) { if (viewState instanceof EmojiPickerViewModel.ViewState.EmptySearch) { - AppViewFlipper appViewFlipper = getBinding().f1767c; + AppViewFlipper appViewFlipper = getBinding().f1769c; m.checkNotNullExpressionValue(appViewFlipper, "binding.chatInputEmojiPickerViewFlipper"); appViewFlipper.setDisplayedChild(1); setEmojiPickerBottomBarVisible(false); @@ -257,7 +257,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec } else if (viewState instanceof EmojiPickerViewModel.ViewState.Results) { EmojiPickerViewModel.ViewState.Results results = (EmojiPickerViewModel.ViewState.Results) viewState; setEmojiPickerBottomBarVisible(results.getShowBottomBar()); - AppViewFlipper appViewFlipper2 = getBinding().f1767c; + AppViewFlipper appViewFlipper2 = getBinding().f1769c; m.checkNotNullExpressionValue(appViewFlipper2, "binding.chatInputEmojiPickerViewFlipper"); appViewFlipper2.setDisplayedChild(0); WidgetEmojiAdapter widgetEmojiAdapter = this.emojiAdapter; @@ -404,14 +404,14 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec private final void handleInputChanged(String str) { getViewModel().setSearchText(str); boolean z2 = str.length() == 0; - getBinding().l.setImageResource(z2 ? 2131231898 : 2131231519); + getBinding().l.setImageResource(z2 ? 2131231901 : 2131231519); ImageView imageView = getBinding().l; m.checkNotNullExpressionValue(imageView, "binding.emojiSearchClear"); imageView.setImageTintList(z2 ? ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968988)) : ColorStateList.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968989))); if (z2) { ImageView imageView2 = getBinding().l; m.checkNotNullExpressionValue(imageView2, "binding.emojiSearchClear"); - imageView2.setContentDescription(b.j(this, 2131893029, new Object[0], null, 4)); + imageView2.setContentDescription(b.j(this, 2131893071, new Object[0], null, 4)); ImageView imageView3 = getBinding().l; m.checkNotNullExpressionValue(imageView3, "binding.emojiSearchClear"); imageView3.setImportantForAccessibility(2); @@ -419,7 +419,7 @@ public final class WidgetEmojiPicker extends AppFragment implements OnEmojiSelec } ImageView imageView4 = getBinding().l; m.checkNotNullExpressionValue(imageView4, "binding.emojiSearchClear"); - imageView4.setContentDescription(b.j(this, 2131892599, new Object[0], null, 4)); + imageView4.setContentDescription(b.j(this, 2131892641, new Object[0], null, 4)); ImageView imageView5 = getBinding().l; m.checkNotNullExpressionValue(imageView5, "binding.emojiSearchClear"); imageView5.setImportantForAccessibility(1); diff --git a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java index 37540a2688..c9cc3575e3 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java +++ b/app/src/main/java/com/discord/widgets/chat/input/emoji/WidgetEmojiPickerSheet.java @@ -74,7 +74,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131558992; + return 2131558993; } @Override // com.discord.widgets.chat.input.expression.WidgetExpressionPickerSheet, androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener @@ -126,7 +126,7 @@ public final class WidgetEmojiPickerSheet extends WidgetExpressionPickerSheet im if (widgetEmojiPicker4 == null) { m.throwUninitializedPropertyAccessException("emojiPickerFragment"); } - beginTransaction.replace(2131363020, widgetEmojiPicker3, widgetEmojiPicker4.getClass().getSimpleName()).runOnCommit(new WidgetEmojiPickerSheet$onViewCreated$2(this)).commit(); + beginTransaction.replace(2131363022, widgetEmojiPicker3, widgetEmojiPicker4.getClass().getSimpleName()).runOnCommit(new WidgetEmojiPickerSheet$onViewCreated$2(this)).commit(); } public final void setEmojiPickerListener(EmojiPickerListener emojiPickerListener) { diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java index 33bc426b5d..1b37a8c48a 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$binding$2.java @@ -26,50 +26,50 @@ public final /* synthetic */ class WidgetExpressionTray$binding$2 extends k impl public final WidgetExpressionTrayBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); FrameLayout frameLayout = (FrameLayout) view; - int i = 2131363130; - FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363130); + int i = 2131363132; + FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363132); if (frameLayout2 != null) { - i = 2131363131; - FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131363131); + i = 2131363133; + FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131363133); if (fragmentContainerView != null) { - i = 2131363132; - CardSegment cardSegment = (CardSegment) view.findViewById(2131363132); + i = 2131363134; + CardSegment cardSegment = (CardSegment) view.findViewById(2131363134); if (cardSegment != null) { - i = 2131363133; - FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131363133); + i = 2131363135; + FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131363135); if (fragmentContainerView2 != null) { - i = 2131363134; - CardSegment cardSegment2 = (CardSegment) view.findViewById(2131363134); + i = 2131363136; + CardSegment cardSegment2 = (CardSegment) view.findViewById(2131363136); if (cardSegment2 != null) { - i = 2131363135; - FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131363135); + i = 2131363137; + FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131363137); if (fragmentContainerView3 != null) { - i = 2131363136; - ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view.findViewById(2131363136); + i = 2131363138; + ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view.findViewById(2131363138); if (contentResizingCoordinatorLayout != null) { - i = 2131363137; - RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view.findViewById(2131363137); + i = 2131363139; + RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view.findViewById(2131363139); if (roundedRelativeLayout != null) { - i = 2131363138; - TextView textView = (TextView) view.findViewById(2131363138); + i = 2131363140; + TextView textView = (TextView) view.findViewById(2131363140); if (textView != null) { - i = 2131363139; - ImageView imageView = (ImageView) view.findViewById(2131363139); + i = 2131363141; + ImageView imageView = (ImageView) view.findViewById(2131363141); if (imageView != null) { - i = 2131363140; - SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131363140); + i = 2131363142; + SegmentedControlContainer segmentedControlContainer = (SegmentedControlContainer) view.findViewById(2131363142); if (segmentedControlContainer != null) { - i = 2131363141; - CardSegment cardSegment3 = (CardSegment) view.findViewById(2131363141); + i = 2131363143; + CardSegment cardSegment3 = (CardSegment) view.findViewById(2131363143); if (cardSegment3 != null) { - i = 2131363142; - FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131363142); + i = 2131363144; + FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131363144); if (fragmentContainerView4 != null) { - i = 2131363143; - CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131363143); + i = 2131363145; + CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) view.findViewById(2131363145); if (collapsingToolbarLayout != null) { - i = 2131363144; - AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363144); + i = 2131363146; + AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363146); if (appBarLayout != null) { return new WidgetExpressionTrayBinding((FrameLayout) view, frameLayout, frameLayout2, fragmentContainerView, cardSegment, fragmentContainerView2, cardSegment2, fragmentContainerView3, contentResizingCoordinatorLayout, roundedRelativeLayout, textView, imageView, segmentedControlContainer, cardSegment3, fragmentContainerView4, collapsingToolbarLayout, appBarLayout); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java index 9d92fca4ac..5e6ba55110 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$flexInputViewModel$2.java @@ -18,6 +18,6 @@ public final class WidgetExpressionTray$flexInputViewModel$2 extends o implement @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, 126, null); + return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java index 353fc4fcad..7c3093c372 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray$setWindowInsetsListeners$2.java @@ -14,6 +14,6 @@ public final class WidgetExpressionTray$setWindowInsetsListeners$2 implements On @Override // androidx.core.view.OnApplyWindowInsetsListener public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) { - return ViewCompat.dispatchApplyWindowInsets(WidgetExpressionTray.access$getBinding$p(this.this$0).f1772c, windowInsetsCompat); + return ViewCompat.dispatchApplyWindowInsets(WidgetExpressionTray.access$getBinding$p(this.this$0).f1774c, windowInsetsCompat); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java index 75c2f21b94..1e8f8b3bcb 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java +++ b/app/src/main/java/com/discord/widgets/chat/input/expression/WidgetExpressionTray.java @@ -158,7 +158,7 @@ public final class WidgetExpressionTray extends AppFragment implements c { } public WidgetExpressionTray() { - super(2131558999); + super(2131559000); TooltipManager tooltipManager = null; AppLog appLog = AppLog.g; m.checkNotNullParameter(appLog, "logger"); @@ -271,8 +271,8 @@ public final class WidgetExpressionTray extends AppFragment implements c { bundle.putSerializable("GIF_CATEGORY_ITEM", ((ExpressionDetailPage.GifCategoryPage) expressionDetailPage).getGifCategoryItem()); widgetGifCategory.setArguments(bundle); widgetGifCategory.setOnGifSelected(new WidgetExpressionTray$configureDetailPage$gifCategoryFragment$1$2(this)); - getChildFragmentManager().beginTransaction().replace(2131363131, widgetGifCategory, WidgetGifCategory.class.getSimpleName()).commit(); - } else if (expressionDetailPage == null && (findFragmentById = getChildFragmentManager().findFragmentById(2131363131)) != null) { + getChildFragmentManager().beginTransaction().replace(2131363133, widgetGifCategory, WidgetGifCategory.class.getSimpleName()).commit(); + } else if (expressionDetailPage == null && (findFragmentById = getChildFragmentManager().findFragmentById(2131363133)) != null) { getChildFragmentManager().beginTransaction().remove(findFragmentById).commit(); } } @@ -305,11 +305,11 @@ public final class WidgetExpressionTray extends AppFragment implements c { } int ordinal2 = selectedExpressionTab.ordinal(); if (ordinal2 == 0) { - i = 2131893042; - } else if (ordinal2 == 1) { i = 2131893084; + } else if (ordinal2 == 1) { + i = 2131893126; } else if (ordinal2 == 2) { - i = 2131893044; + i = 2131893086; } else { throw new NoWhenBranchMatchedException(); } @@ -459,7 +459,7 @@ public final class WidgetExpressionTray extends AppFragment implements c { bundle.putSerializable("MODE", EmojiPickerMode.INLINE); bundle.putSerializable("EMOJI_PICKER_CONTEXT_TYPE", EmojiPickerContextType.CHAT); widgetEmojiPicker.setArguments(bundle); - getChildFragmentManager().beginTransaction().replace(2131363133, widgetEmojiPicker, WidgetEmojiPicker.class.getSimpleName()).commit(); + getChildFragmentManager().beginTransaction().replace(2131363135, widgetEmojiPicker, WidgetEmojiPicker.class.getSimpleName()).commit(); this.emojiPickerFragment = widgetEmojiPicker; } } @@ -469,7 +469,7 @@ public final class WidgetExpressionTray extends AppFragment implements c { this.gifPickerInitialized = true; WidgetGifPicker widgetGifPicker = new WidgetGifPicker(); widgetGifPicker.setOnSelectGifCategory(new WidgetExpressionTray$setUpGifPicker$1(getExpressionTrayViewModel())); - getChildFragmentManager().beginTransaction().replace(2131363135, widgetGifPicker, WidgetGifPicker.class.getSimpleName()).commit(); + getChildFragmentManager().beginTransaction().replace(2131363137, widgetGifPicker, WidgetGifPicker.class.getSimpleName()).commit(); this.gifPickerFragment = widgetGifPicker; } } @@ -485,7 +485,7 @@ public final class WidgetExpressionTray extends AppFragment implements c { Bundle bundle = new Bundle(); bundle.putSerializable("MODE", StickerPickerMode.INLINE); widgetStickerPicker.setArguments(bundle); - getChildFragmentManager().beginTransaction().replace(2131363142, widgetStickerPicker, WidgetStickerPicker.class.getSimpleName()).commit(); + getChildFragmentManager().beginTransaction().replace(2131363144, widgetStickerPicker, WidgetStickerPicker.class.getSimpleName()).commit(); this.stickerPickerFragment = widgetStickerPicker; } } @@ -511,7 +511,7 @@ public final class WidgetExpressionTray extends AppFragment implements c { FragmentContainerView fragmentContainerView4 = getBinding().d; m.checkNotNullExpressionValue(fragmentContainerView4, "binding.expressionTrayDetailPage"); ViewExtensions.setForwardingWindowInsetsListener(fragmentContainerView4); - ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1772c, new WidgetExpressionTray$setWindowInsetsListeners$1(this)); + ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1774c, new WidgetExpressionTray$setWindowInsetsListeners$1(this)); ViewCompat.setOnApplyWindowInsetsListener(getBinding().g, new WidgetExpressionTray$setWindowInsetsListeners$2(this)); FrameLayout frameLayout = getBinding().b; m.checkNotNullExpressionValue(frameLayout, "binding.expressionTrayContainer"); diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java index e6641d78dd..ea3a60000e 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifAdapter.java @@ -141,22 +141,22 @@ public final class GifAdapter extends RecyclerView.Adapter { int ordinal = GifAdapterItem.ViewType.Companion.fromInt(i).ordinal(); if (ordinal == 0) { View inflate = from.inflate(2131558507, viewGroup, false); - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363272); + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363274); if (simpleDraweeView != null) { GifItemViewBinding gifItemViewBinding = new GifItemViewBinding((CardView) inflate, simpleDraweeView); m.checkNotNullExpressionValue(gifItemViewBinding, "GifItemViewBinding.infla…(inflater, parent, false)"); gifViewHolder = new GifViewHolder.Gif(gifItemViewBinding); } else { - throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363272))); + throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363274))); } } else if (ordinal == 1 || ordinal == 2) { View inflate2 = from.inflate(2131558509, viewGroup, false); LinearLayout linearLayout = (LinearLayout) inflate2; - int i2 = 2131363281; - FlexboxLayout flexboxLayout = (FlexboxLayout) inflate2.findViewById(2131363281); + int i2 = 2131363283; + FlexboxLayout flexboxLayout = (FlexboxLayout) inflate2.findViewById(2131363283); if (flexboxLayout != null) { - i2 = 2131363282; - TextView textView = (TextView) inflate2.findViewById(2131363282); + i2 = 2131363284; + TextView textView = (TextView) inflate2.findViewById(2131363284); if (textView != null) { GifSuggestedTermViewBinding gifSuggestedTermViewBinding = new GifSuggestedTermViewBinding((LinearLayout) inflate2, linearLayout, flexboxLayout, textView); m.checkNotNullExpressionValue(gifSuggestedTermViewBinding, "GifSuggestedTermViewBind…(inflater, parent, false)"); diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java index 18d032e5b6..258067163f 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifCategoryAdapter.java @@ -60,14 +60,14 @@ public final class GifCategoryAdapter extends RecyclerView.Adapter { if (o0.length() <= 0) { z3 = false; } - arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, 2131888960) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131888958) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891355) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891356)); + arrayList.add(z4 ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults(suggested, 2131888970) : (!z3 || z5) ? (!z3 || !z5) ? new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131888968) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891388) : new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(suggested, 2131891389)); } else if (storeState instanceof StoreState.TrendingSearchTermsResults) { - arrayList.add(new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(trendingSearchTerms, 2131888958)); + arrayList.add(new GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults(trendingSearchTerms, 2131888968)); } ViewState.Loaded loaded = new ViewState.Loaded(arrayList); if (z2) { diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java index bbeec58b6c..fd9b4880ed 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/GifViewHolder.java @@ -86,7 +86,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder { private final void configureSearchTerms(GifAdapterItem.SuggestedTermsItem suggestedTermsItem, Function1 function1, int i) { List terms = suggestedTermsItem.getTerms(); - TextView textView = this.binding.f1609c; + TextView textView = this.binding.f1611c; m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText"); b.n(textView, suggestedTermsItem.getTitleResId(), new Object[0], null, 4); int size = terms.size(); @@ -142,7 +142,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder { public final void configure(GifAdapterItem.SuggestedTermsItem.SuggestedTermsEmptyResults suggestedTermsEmptyResults, Function1 function1) { m.checkNotNullParameter(suggestedTermsEmptyResults, "termsItem"); - TextView textView = this.binding.f1609c; + TextView textView = this.binding.f1611c; m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText"); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); @@ -155,7 +155,7 @@ public abstract class GifViewHolder extends RecyclerView.ViewHolder { public final void configure(GifAdapterItem.SuggestedTermsItem.SuggestedTermsNonEmptyResults suggestedTermsNonEmptyResults, Function1 function1) { m.checkNotNullParameter(suggestedTermsNonEmptyResults, "termsItem"); - TextView textView = this.binding.f1609c; + TextView textView = this.binding.f1611c; m.checkNotNullExpressionValue(textView, "binding.gifSearchSuggestedTermsIconText"); DrawableCompat.setCompoundDrawablesCompat$default(textView, (Drawable) null, (Drawable) null, (Drawable) null, (Drawable) null, 13, (Object) null); configureSearchTerms(suggestedTermsNonEmptyResults, function1, -2); diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java index 2795433cac..ecdb9d0870 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$binding$2.java @@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetGifCategory$binding$2 extends k impleme public final WidgetGifCategoryBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); ContentResizingCoordinatorLayout contentResizingCoordinatorLayout = (ContentResizingCoordinatorLayout) view; - int i = 2131363266; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363266); + int i = 2131363268; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363268); if (recyclerView != null) { - i = 2131363270; - GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363270); + i = 2131363272; + GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363272); if (gifLoadingView != null) { - i = 2131363271; - TextView textView = (TextView) view.findViewById(2131363271); + i = 2131363273; + TextView textView = (TextView) view.findViewById(2131363273); if (textView != null) { return new WidgetGifCategoryBinding((ContentResizingCoordinatorLayout) view, contentResizingCoordinatorLayout, recyclerView, gifLoadingView, textView); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java index 9cd9409383..c6363fb490 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory$setWindowInsetsListeners$2.java @@ -14,7 +14,7 @@ public final class WidgetGifCategory$setWindowInsetsListeners$2 implements OnApp @Override // androidx.core.view.OnApplyWindowInsetsListener public final WindowInsetsCompat onApplyWindowInsets(View view, WindowInsetsCompat windowInsetsCompat) { - ViewCompat.dispatchApplyWindowInsets(WidgetGifCategory.access$getBinding$p(this.this$0).f1782c, windowInsetsCompat); + ViewCompat.dispatchApplyWindowInsets(WidgetGifCategory.access$getBinding$p(this.this$0).f1784c, windowInsetsCompat); return windowInsetsCompat.consumeSystemWindowInsets(); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java index 083c3ad6ff..8921429e5a 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifCategory.java @@ -56,7 +56,7 @@ public final class WidgetGifCategory extends AppFragment { } public WidgetGifCategory() { - super(2131559014); + super(2131559015); WidgetGifCategory$gifCategoryViewModel$2 widgetGifCategory$gifCategoryViewModel$2 = new WidgetGifCategory$gifCategoryViewModel$2(this); h0 h0Var = new h0(this); this.gifCategoryViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifCategoryViewModel.class), new WidgetGifCategory$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifCategory$gifCategoryViewModel$2)); @@ -105,7 +105,7 @@ public final class WidgetGifCategory extends AppFragment { } private final void handleViewState(GifCategoryViewModel.ViewState viewState) { - RecyclerView recyclerView = getBinding().f1782c; + RecyclerView recyclerView = getBinding().f1784c; m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler"); recyclerView.setVisibility(0); GifLoadingView gifLoadingView = getBinding().d; @@ -133,25 +133,25 @@ public final class WidgetGifCategory extends AppFragment { private final void setUpGifRecycler(int i) { StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(i, 1); - RecyclerView recyclerView = getBinding().f1782c; + RecyclerView recyclerView = getBinding().f1784c; m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler"); recyclerView.setLayoutManager(staggeredGridLayoutManager); - RecyclerView recyclerView2 = getBinding().f1782c; + RecyclerView recyclerView2 = getBinding().f1784c; m.checkNotNullExpressionValue(recyclerView2, "binding.gifCategoryGifRecycler"); recyclerView2.setItemAnimator(null); int dpToPixels = DimenUtils.dpToPixels(8); GifAdapter.Companion companion = GifAdapter.Companion; - RecyclerView recyclerView3 = getBinding().f1782c; + RecyclerView recyclerView3 = getBinding().f1784c; m.checkNotNullExpressionValue(recyclerView3, "binding.gifCategoryGifRecycler"); this.gifAdapter = new GifAdapter(this, new WidgetGifCategory$setUpGifRecycler$1(this), companion.calculateColumnWidth(recyclerView3, i, dpToPixels), null, null, 24, null); - RecyclerView recyclerView4 = getBinding().f1782c; + RecyclerView recyclerView4 = getBinding().f1784c; m.checkNotNullExpressionValue(recyclerView4, "binding.gifCategoryGifRecycler"); GifAdapter gifAdapter = this.gifAdapter; if (gifAdapter == null) { m.throwUninitializedPropertyAccessException("gifAdapter"); } recyclerView4.setAdapter(gifAdapter); - getBinding().f1782c.addItemDecoration(new u(dpToPixels, i)); + getBinding().f1784c.addItemDecoration(new u(dpToPixels, i)); } private final void setUpTitle() { @@ -162,7 +162,7 @@ public final class WidgetGifCategory extends AppFragment { if (gifCategory instanceof GifCategoryItem.Standard) { str = ((GifCategoryItem.Standard) gifCategory).getGifCategory().getCategoryName(); } else if (gifCategory instanceof GifCategoryItem.Trending) { - str = getResources().getString(2131888961); + str = getResources().getString(2131888971); } else { throw new NoWhenBranchMatchedException(); } @@ -170,7 +170,7 @@ public final class WidgetGifCategory extends AppFragment { } private final void setWindowInsetsListeners() { - ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1782c, WidgetGifCategory$setWindowInsetsListeners$1.INSTANCE); + ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1784c, WidgetGifCategory$setWindowInsetsListeners$1.INSTANCE); ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, new WidgetGifCategory$setWindowInsetsListeners$2(this)); } @@ -179,7 +179,7 @@ public final class WidgetGifCategory extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); GifAdapter.Companion companion = GifAdapter.Companion; - RecyclerView recyclerView = getBinding().f1782c; + RecyclerView recyclerView = getBinding().f1784c; m.checkNotNullExpressionValue(recyclerView, "binding.gifCategoryGifRecycler"); int calculateColumnCount = companion.calculateColumnCount(recyclerView); setUpTitle(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java index 12da26c598..a3074080d3 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker$binding$2.java @@ -17,15 +17,15 @@ public final /* synthetic */ class WidgetGifPicker$binding$2 extends k implement public final WidgetGifPickerBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363273; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363273); + int i = 2131363275; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363275); if (recyclerView != null) { FrameLayout frameLayout = (FrameLayout) view; - GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363275); + GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363277); if (gifLoadingView != null) { return new WidgetGifPickerBinding(frameLayout, recyclerView, frameLayout, gifLoadingView); } - i = 2131363275; + i = 2131363277; } throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i))); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java index dd407352d7..ded1b86499 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPicker.java @@ -34,7 +34,7 @@ public final class WidgetGifPicker extends AppFragment { private final Lazy viewModel$delegate; public WidgetGifPicker() { - super(2131559015); + super(2131559016); WidgetGifPicker$viewModel$2 widgetGifPicker$viewModel$2 = WidgetGifPicker$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifPickerViewModel.class), new WidgetGifPicker$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifPicker$viewModel$2)); @@ -95,7 +95,7 @@ public final class WidgetGifPicker extends AppFragment { private final void setWindowInsetsListeners() { ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, WidgetGifPicker$setWindowInsetsListeners$1.INSTANCE); ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, WidgetGifPicker$setWindowInsetsListeners$2.INSTANCE); - ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1783c, new WidgetGifPicker$setWindowInsetsListeners$3(this)); + ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1785c, new WidgetGifPicker$setWindowInsetsListeners$3(this)); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java index a423f16636..5eb192a582 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch$binding$2.java @@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetGifPickerSearch$binding$2 extends k imp public final WidgetGifPickerSearchBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363276; - AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363276); + int i = 2131363278; + AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131363278); if (appBarLayout != null) { - i = 2131363277; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363277); + i = 2131363279; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363279); if (recyclerView != null) { - i = 2131363278; - GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363278); + i = 2131363280; + GifLoadingView gifLoadingView = (GifLoadingView) view.findViewById(2131363280); if (gifLoadingView != null) { - i = 2131363283; - Toolbar toolbar = (Toolbar) view.findViewById(2131363283); + i = 2131363285; + Toolbar toolbar = (Toolbar) view.findViewById(2131363285); if (toolbar != null) { - i = 2131363284; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363284); + i = 2131363286; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363286); if (appViewFlipper != null) { - i = 2131364537; - SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364537); + i = 2131364540; + SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364540); if (searchInputView != null) { return new WidgetGifPickerSearchBinding((CoordinatorLayout) view, appBarLayout, recyclerView, gifLoadingView, toolbar, appViewFlipper, searchInputView); } diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java index d1a2893535..01dee03077 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSearch.java @@ -35,7 +35,7 @@ public final class WidgetGifPickerSearch extends AppFragment { private Function0 onGifSelected; public WidgetGifPickerSearch() { - super(2131559016); + super(2131559017); WidgetGifPickerSearch$gifPickerViewModel$2 widgetGifPickerSearch$gifPickerViewModel$2 = new WidgetGifPickerSearch$gifPickerViewModel$2(this); h0 h0Var = new h0(this); this.gifPickerViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GifSearchViewModel.class), new WidgetGifPickerSearch$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGifPickerSearch$gifPickerViewModel$2)); @@ -128,7 +128,7 @@ public final class WidgetGifPickerSearch extends AppFragment { int calculateColumnCount = companion.calculateColumnCount(recyclerView); setUpGifRecycler(calculateColumnCount); setupSearchBar(); - GifLoadingView.updateView$default(getBinding().f1784c, calculateColumnCount, 0, 2, null); + GifLoadingView.updateView$default(getBinding().f1786c, calculateColumnCount, 0, 2, null); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java index ef719f099c..346c87c29c 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java +++ b/app/src/main/java/com/discord/widgets/chat/input/gifpicker/WidgetGifPickerSheet.java @@ -83,7 +83,7 @@ public final class WidgetGifPickerSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559017; + return 2131559018; } @Override // androidx.fragment.app.DialogFragment, android.content.DialogInterface.OnCancelListener @@ -122,7 +122,7 @@ public final class WidgetGifPickerSheet extends AppBottomSheet { if (widgetGifPickerSearch3 == null) { m.throwUninitializedPropertyAccessException("gifPickerFragment"); } - beginTransaction.replace(2131363279, widgetGifPickerSearch2, widgetGifPickerSearch3.getClass().getSimpleName()).runOnCommit(new WidgetGifPickerSheet$onViewCreated$2(this)).commit(); + beginTransaction.replace(2131363281, widgetGifPickerSearch2, widgetGifPickerSearch3.getClass().getSimpleName()).runOnCommit(new WidgetGifPickerSheet$onViewCreated$2(this)).commit(); } public final void setOnCancel(Function0 function0) { diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java index 337a9b6594..2760783ff9 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/OwnedHeaderViewHolder.java @@ -57,9 +57,9 @@ public final class OwnedHeaderViewHolder extends MGRecyclerViewHolder function1) { m.checkNotNullParameter(packItem, "packItem"); m.checkNotNullParameter(function1, "onPackClicked"); - this.binding.f1628c.c(packItem.getPack().getCoverSticker(), 2); - this.binding.f1628c.setOnClickListener(new StickerCategoryViewHolder$Pack$configure$1(function1, packItem)); - StickerView stickerView = this.binding.f1628c; - SimpleDraweeView simpleDraweeView = stickerView.j.b; + this.binding.f1630c.c(packItem.getPack().getCoverSticker(), 2); + this.binding.f1630c.setOnClickListener(new StickerCategoryViewHolder$Pack$configure$1(function1, packItem)); + StickerView stickerView = this.binding.f1630c; + SimpleDraweeView simpleDraweeView = stickerView.i.b; m.checkNotNullExpressionValue(simpleDraweeView, "binding.stickerViewImageview"); simpleDraweeView.setImportantForAccessibility(4); - RLottieImageView rLottieImageView = stickerView.j.f99c; + RLottieImageView rLottieImageView = stickerView.i.f99c; m.checkNotNullExpressionValue(rLottieImageView, "binding.stickerViewLottie"); rLottieImageView.setImportantForAccessibility(4); - ImageView imageView = stickerView.j.d; + ImageView imageView = stickerView.i.d; m.checkNotNullExpressionValue(imageView, "binding.stickerViewPlaceholder"); imageView.setImportantForAccessibility(4); - StickerView stickerView2 = this.binding.f1628c; + StickerView stickerView2 = this.binding.f1630c; m.checkNotNullExpressionValue(stickerView2, "binding.stickerCategoryItemPackAvatar"); stickerView2.setContentDescription(packItem.getPack().getName()); View view = this.binding.b.b; diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java index 2473b53575..edf2bc157f 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerFullSizeDialog$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class StickerFullSizeDialog$binding$2 extends k imp public final StickerFullSizeDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - StickerView stickerView = (StickerView) view.findViewById(2131365070); + StickerView stickerView = (StickerView) view.findViewById(2131365074); if (stickerView != null) { return new StickerFullSizeDialogBinding((FrameLayout) view, stickerView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365070))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365074))); } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java index 367a461977..855a89c590 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java @@ -104,14 +104,14 @@ public class StickerPickerViewModel extends AppViewModel { return n.emptyList(); } for (Sticker sticker : modelStickerPack.getStickers()) { - String f = sticker.f(); - Objects.requireNonNull(f, "null cannot be cast to non-null type java.lang.String"); - String lowerCase = f.toLowerCase(locale); + String g = sticker.g(); + Objects.requireNonNull(g, "null cannot be cast to non-null type java.lang.String"); + String lowerCase = g.toLowerCase(locale); m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)"); if (!w.contains$default((CharSequence) lowerCase, (CharSequence) str, false, 2, (Object) null)) { - String h = sticker.h(); - Objects.requireNonNull(h, "null cannot be cast to non-null type java.lang.String"); - String lowerCase2 = h.toLowerCase(locale); + String i2 = sticker.i(); + Objects.requireNonNull(i2, "null cannot be cast to non-null type java.lang.String"); + String lowerCase2 = i2.toLowerCase(locale); m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)"); if (w.contains$default((CharSequence) lowerCase2, (CharSequence) str, false, 2, (Object) null)) { } @@ -764,16 +764,16 @@ public class StickerPickerViewModel extends AppViewModel { if (z2) { linkedHashSet.add(-1L); } - Long g = sticker.g(); - m.checkNotNull(g); - linkedHashSet.add(g); + Long h = sticker.h(); + m.checkNotNull(h); + linkedHashSet.add(h); } z2 = false; if (z2) { } - Long g = sticker.g(); - m.checkNotNull(g); - linkedHashSet.add(g); + Long h = sticker.h(); + m.checkNotNull(h); + linkedHashSet.add(h); } } } @@ -815,16 +815,16 @@ public class StickerPickerViewModel extends AppViewModel { boolean z2 = true; if (!frequentlyUsedStickers.isEmpty()) { for (Sticker sticker : frequentlyUsedStickers) { - String f = sticker.f(); + String g = sticker.g(); Locale locale2 = this.locale; - Objects.requireNonNull(f, "null cannot be cast to non-null type java.lang.String"); - String lowerCase2 = f.toLowerCase(locale2); + Objects.requireNonNull(g, "null cannot be cast to non-null type java.lang.String"); + String lowerCase2 = g.toLowerCase(locale2); m.checkNotNullExpressionValue(lowerCase2, "(this as java.lang.String).toLowerCase(locale)"); if (!w.contains$default((CharSequence) lowerCase2, (CharSequence) lowerCase, false, 2, (Object) null)) { - String h = sticker.h(); + String i = sticker.i(); Locale locale3 = this.locale; - Objects.requireNonNull(h, "null cannot be cast to non-null type java.lang.String"); - String lowerCase3 = h.toLowerCase(locale3); + Objects.requireNonNull(i, "null cannot be cast to non-null type java.lang.String"); + String lowerCase3 = i.toLowerCase(locale3); m.checkNotNullExpressionValue(lowerCase3, "(this as java.lang.String).toLowerCase(locale)"); if (w.contains$default((CharSequence) lowerCase3, (CharSequence) lowerCase, false, 2, (Object) null)) { } diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java index 589c577d2b..eb6e392d59 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StickerViewHolder.java @@ -39,14 +39,14 @@ public final class StickerViewHolder extends MGRecyclerViewHolder s2 = this.recyclerScrollingWithinThresholdSubject.s(); diff --git a/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java index b3b41eb298..b2980154f7 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java +++ b/app/src/main/java/com/discord/widgets/chat/input/sticker/StoreHeaderViewHolder.java @@ -23,26 +23,26 @@ public final class StoreHeaderViewHolder extends MGRecyclerViewHolder ((float) 0); - InlineMediaView.access$getBinding$p(this.this$0).g.setImageDrawable(ContextCompat.getDrawable(this.this$0.getContext(), z2 ? 2131232052 : 2131232050)); + InlineMediaView.access$getBinding$p(this.this$0).g.setImageDrawable(ContextCompat.getDrawable(this.this$0.getContext(), z2 ? 2131232055 : 2131232053)); InlineMediaView.access$getBinding$p(this.this$0).g.setOnClickListener(new AnonymousClass1(this, z2)); - int i = z2 ? 2131894433 : 2131894434; + int i = z2 ? 2131894480 : 2131894481; ImageView imageView = InlineMediaView.access$getBinding$p(this.this$0).g; m.checkNotNullExpressionValue(imageView, "binding.inlineMediaVolumeToggle"); imageView.setContentDescription(b.i(this.this$0, i, new Object[0], null, 4)); diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java index 6c2c8b6978..6705d6e1c0 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java +++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java @@ -326,7 +326,7 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat boolean z2 = true; int i = 0; if (m.areEqual(event, AppMediaPlayer.Event.a.a)) { - SimpleDraweeView simpleDraweeView = this.binding.f1613c; + SimpleDraweeView simpleDraweeView = this.binding.f1615c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.inlineMediaImagePreview"); if (!(!shouldAutoPlay())) { i = 8; @@ -370,7 +370,7 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat private final void resetViews() { ViewParams viewParams = this.viewParams; if (viewParams != null) { - SimpleDraweeView simpleDraweeView = this.binding.f1613c; + SimpleDraweeView simpleDraweeView = this.binding.f1615c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.inlineMediaImagePreview"); int i = 0; simpleDraweeView.setVisibility(0); @@ -429,7 +429,7 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat requestLayout(); } if ((renderableEmbedMedia != null ? renderableEmbedMedia.a : null) != null) { - SimpleDraweeView simpleDraweeView = this.binding.f1613c; + SimpleDraweeView simpleDraweeView = this.binding.f1615c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.inlineMediaImagePreview"); MGImages.setImage$default(simpleDraweeView, EmbedResourceUtils.INSTANCE.getPreviewUrls(renderableEmbedMedia.a, num.intValue(), num2.intValue(), shouldAutoPlay()), 0, 0, false, null, null, null, 252, null); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java index 794a444245..db64876873 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog$binding$2.java @@ -18,23 +18,23 @@ public final /* synthetic */ class PublishActionDialog$binding$2 extends k imple public final PublishMessageDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364023; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364023); + int i = 2131364025; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364025); if (linearLayout != null) { - i = 2131364024; - TextView textView = (TextView) view.findViewById(2131364024); + i = 2131364026; + TextView textView = (TextView) view.findViewById(2131364026); if (textView != null) { - i = 2131364025; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364025); + i = 2131364027; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364027); if (materialButton != null) { - i = 2131364027; - TextView textView2 = (TextView) view.findViewById(2131364027); + i = 2131364029; + TextView textView2 = (TextView) view.findViewById(2131364029); if (textView2 != null) { - i = 2131364028; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364028); + i = 2131364030; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364030); if (linearLayout2 != null) { - i = 2131364030; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364030); + i = 2131364032; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364032); if (materialButton2 != null) { return new PublishMessageDialogBinding((LinearLayout) view, linearLayout, textView, materialButton, textView2, linearLayout2, materialButton2); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java index d5ce72cdae..9ef2696532 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java +++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialog.java @@ -113,9 +113,9 @@ public final class PublishActionDialog extends AppDialog { private final void handleEvent(PublishActionDialogViewModel.Event event) { if (event instanceof PublishActionDialogViewModel.Event.Success) { - o.i(this, 2131891137, 0, 4); + o.i(this, 2131891168, 0, 4); } else if (event instanceof PublishActionDialogViewModel.Event.Failure) { - o.i(this, 2131892418, 0, 4); + o.i(this, 2131892459, 0, 4); } dismiss(); } @@ -123,19 +123,19 @@ public final class PublishActionDialog extends AppDialog { private final void renderHasFollowers(PublishActionDialogViewModel.ViewState.LoadedHasFollowers loadedHasFollowers) { TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.noticeBodyText"); - b.n(textView, 2131892414, new Object[]{String.valueOf(loadedHasFollowers.getFollowerStats().getGuildsFollowing())}, null, 4); + b.n(textView, 2131892455, new Object[]{String.valueOf(loadedHasFollowers.getFollowerStats().getGuildsFollowing())}, null, 4); } private final void renderLoading() { TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.noticeBodyText"); - b.n(textView, 2131890787, new Object[0], null, 4); + b.n(textView, 2131890817, new Object[0], null, 4); } private final void renderNoFollowers() { TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.noticeBodyText"); - b.n(textView, 2131892413, new Object[0], null, 4); + b.n(textView, 2131892454, new Object[0], null, 4); } public static final void show(FragmentManager fragmentManager, long j, long j2, Function0 function0, Integer num) { @@ -173,7 +173,7 @@ public final class PublishActionDialog extends AppDialog { super.onViewBound(view); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.noticeHeader"); - b.n(textView, 2131891326, new Object[0], null, 4); + b.n(textView, 2131891359, new Object[0], null, 4); LinearLayout linearLayout = getBinding().e; m.checkNotNullExpressionValue(linearLayout, "binding.noticeHeaderContainer"); linearLayout.setVisibility(0); @@ -185,12 +185,12 @@ public final class PublishActionDialog extends AppDialog { textView3.setMovementMethod(new WidgetNoticeDialog.ActionLinkMovementMethod(new PublishActionDialog$onViewBound$1(this))); MaterialButton materialButton = getBinding().f; m.checkNotNullExpressionValue(materialButton, "binding.noticeOk"); - ViewExtensions.setTextAndVisibilityBy(materialButton, b.j(this, 2131891325, new Object[0], null, 4)); + ViewExtensions.setTextAndVisibilityBy(materialButton, b.j(this, 2131891358, new Object[0], null, 4)); getBinding().f.setOnClickListener(new PublishActionDialog$onViewBound$2(this)); - MaterialButton materialButton2 = getBinding().f1620c; + MaterialButton materialButton2 = getBinding().f1622c; m.checkNotNullExpressionValue(materialButton2, "binding.noticeCancel"); - ViewExtensions.setTextAndVisibilityBy(materialButton2, b.j(this, 2131887177, new Object[0], null, 4)); - getBinding().f1620c.setOnClickListener(new PublishActionDialog$onViewBound$3(this)); + ViewExtensions.setTextAndVisibilityBy(materialButton2, b.j(this, 2131887178, new Object[0], null, 4)); + getBinding().f1622c.setOnClickListener(new PublishActionDialog$onViewBound$3(this)); } @Override // com.discord.app.AppDialog diff --git a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java index 46b6a395e8..3a77d794c0 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java +++ b/app/src/main/java/com/discord/widgets/chat/list/PublishActionDialogViewModel.java @@ -299,12 +299,12 @@ public final class PublishActionDialogViewModel extends AppViewModel private final void emitFailureEvent() { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.Failure(2131888048)); + publishSubject.j.onNext(new Event.Failure(2131888049)); } private final void emitSuccessActionEvent() { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.Success(2131891137)); + publishSubject.j.onNext(new Event.Success(2131891168)); } private final void handleStoreState(StoreState storeState) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java b/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java index 674ec8660b..e0d1b723d5 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java +++ b/app/src/main/java/com/discord/widgets/chat/list/ThreadSpineItemDecoration.java @@ -21,7 +21,7 @@ public final class ThreadSpineItemDecoration extends RecyclerView.ItemDecoration m.checkNotNullParameter(widgetChatListAdapter, "adapter"); this.context = context; this.adapter = widgetChatListAdapter; - this.drawable = ContextCompat.getDrawable(context, 2131232319); + this.drawable = ContextCompat.getDrawable(context, 2131232322); this.startPositionPx = context.getResources().getDimensionPixelSize(2131165317); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java index eff8768483..5bcbbb93c8 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/ViewEmbedGameInvite.java @@ -477,13 +477,13 @@ public final class ViewEmbedGameInvite extends LinearLayout { Activity activity; ActivityParty i; boolean isDeadInvite = model.isDeadInvite(clock.currentTimeMillis()); - TextView textView = this.binding.f1643c; + TextView textView = this.binding.f1645c; m.checkNotNullExpressionValue(textView, "binding.itemGameInviteApplicationNameTv"); textView.setText(model.getApplication().g()); TextView textView2 = this.binding.g; - int i2 = 2131890480; + int i2 = 2131890510; if (!isDeadInvite && model.getMessageActivity().b() != MessageActivityType.SPECTATE) { - i2 = 2131890484; + i2 = 2131890514; } textView2.setText(i2); int i3 = 0; @@ -521,12 +521,12 @@ public final class ViewEmbedGameInvite extends LinearLayout { m.checkNotNullExpressionValue(materialButton, "binding.itemGameInviteActionBtn"); boolean z4 = false; materialButton.setVisibility(0); - int i = 2131890612; + int i = 2131890642; if (z2 || !model.getCanJoin()) { MaterialButton materialButton2 = this.binding.b; m.checkNotNullExpressionValue(materialButton2, "binding.itemGameInviteActionBtn"); materialButton2.setEnabled(false); - this.binding.b.setText(2131890612); + this.binding.b.setText(2131890642); return; } MaterialButton materialButton3 = this.binding.b; @@ -537,9 +537,9 @@ public final class ViewEmbedGameInvite extends LinearLayout { materialButton3.setEnabled(z4); MaterialButton materialButton4 = this.binding.b; if (z3) { - i = 2131890479; + i = 2131890509; } else if (model.isInParty()) { - i = 2131890491; + i = 2131890521; } materialButton4.setText(i); this.binding.b.setOnClickListener(new ViewEmbedGameInvite$onConfigureActionButton$1(this, model)); diff --git a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java index f2e18bb531..ccf340a1b1 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList$flexInputViewModel$2.java @@ -18,6 +18,6 @@ public final class WidgetChatList$flexInputViewModel$2 extends o implements Func @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, 126, null); + return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java index 1f80d42366..ec83388a6c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java +++ b/app/src/main/java/com/discord/widgets/chat/list/WidgetChatList.java @@ -36,7 +36,7 @@ public final class WidgetChatList extends AppFragment { private final Lazy flexInputViewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(AppFlexInputViewModel.class), new WidgetChatList$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(new WidgetChatList$flexInputViewModel$2(this))); public WidgetChatList() { - super(2131558920); + super(2131558921); } public static final /* synthetic */ void access$configureUI(WidgetChatList widgetChatList, WidgetChatListModel widgetChatListModel) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java index 10c270c6db..aee220e841 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showDeleteMessageConfirmation$1.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.actions; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreStream; import d0.z.d.m; import d0.z.d.o; @@ -10,13 +10,13 @@ import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: MessageActionDialogs.kt */ public final class MessageActionDialogs$showDeleteMessageConfirmation$1 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ Function0 $onSuccess; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public MessageActionDialogs$showDeleteMessageConfirmation$1(ModelMessage modelMessage, Function0 function0) { + public MessageActionDialogs$showDeleteMessageConfirmation$1(Message message, Function0 function0) { super(1); - this.$message = modelMessage; + this.$message = message; this.$onSuccess = function0; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java index 54644c3d82..38de8be46e 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1.java @@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.actions; import android.content.Context; import android.view.View; +import com.discord.api.message.Message; import com.discord.app.AppComponent; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import d0.z.d.m; @@ -16,7 +16,7 @@ public final class MessageActionDialogs$showPinMessageConfirmation$1 extends o i public final /* synthetic */ AppComponent $appComponent; public final /* synthetic */ Context $context; public final /* synthetic */ boolean $isPinned; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ Function0 $onSuccess; /* compiled from: MessageActionDialogs.kt */ @@ -39,15 +39,16 @@ public final class MessageActionDialogs$showPinMessageConfirmation$1 extends o i } public final void invoke(Void r5) { - c.a.d.o.g(this.this$0.$context, this.this$0.$message.isPinned() ? 2131891151 : 2131891135, 0, null, 12); + MessageActionDialogs$showPinMessageConfirmation$1 messageActionDialogs$showPinMessageConfirmation$1 = this.this$0; + c.a.d.o.g(messageActionDialogs$showPinMessageConfirmation$1.$context, messageActionDialogs$showPinMessageConfirmation$1.$isPinned ? 2131891182 : 2131891166, 0, null, 12); this.this$0.$onSuccess.mo1invoke(); } } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public MessageActionDialogs$showPinMessageConfirmation$1(ModelMessage modelMessage, boolean z2, AppComponent appComponent, Context context, Function0 function0) { + public MessageActionDialogs$showPinMessageConfirmation$1(Message message, boolean z2, AppComponent appComponent, Context context, Function0 function0) { super(1); - this.$message = modelMessage; + this.$message = message; this.$isPinned = z2; this.$appComponent = appComponent; this.$context = context; @@ -64,8 +65,8 @@ public final class MessageActionDialogs$showPinMessageConfirmation$1 extends o i public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - long channelId = this.$message.getChannelId(); - long id2 = this.$message.getId(); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.$isPinned ? RestAPI.Companion.getApi().deleteChannelPin(channelId, id2) : RestAPI.Companion.getApi().addChannelPin(channelId, id2), false, 1, null), this.$appComponent, null, 2, null), MessageActionDialogs.INSTANCE.getClass(), view.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null); + long i = this.$message.i(); + long r = this.$message.r(); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.$isPinned ? RestAPI.Companion.getApi().deleteChannelPin(i, r) : RestAPI.Companion.getApi().addChannelPin(i, r), false, 1, null), this.$appComponent, null, 2, null), MessageActionDialogs.INSTANCE.getClass(), view.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 60, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java index 966eea6772..4e3cbe5eaa 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/MessageActionDialogs.java @@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.actions; import android.content.Context; import androidx.fragment.app.FragmentManager; +import com.discord.api.message.Message; import com.discord.app.AppComponent; -import com.discord.models.domain.ModelMessage; import com.discord.widgets.chat.list.PublishActionDialog; import com.discord.widgets.notice.WidgetNoticeDialog; import d0.o; @@ -18,36 +18,36 @@ public final class MessageActionDialogs { private MessageActionDialogs() { } - public final void showDeleteMessageConfirmation(FragmentManager fragmentManager, Context context, ModelMessage modelMessage, Function0 function0) { + public final void showDeleteMessageConfirmation(FragmentManager fragmentManager, Context context, Message message, Function0 function0) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); m.checkNotNullParameter(context, "context"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(function0, "onSuccess"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = context.getString(2131888062); - String string2 = context.getString(2131888063); + String string = context.getString(2131888063); + String string2 = context.getString(2131888064); m.checkNotNullExpressionValue(string2, "context.getString(R.string.delete_message_body)"); - WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(2131888051), context.getString(2131887177), g0.mapOf(o.to(2131364030, new MessageActionDialogs$showDeleteMessageConfirmation$1(modelMessage, function0))), null, null, null, 2130969788, null, null, 0, null, 15808, null); + WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(2131888052), context.getString(2131887178), g0.mapOf(o.to(2131364032, new MessageActionDialogs$showDeleteMessageConfirmation$1(message, function0))), null, null, null, 2130969788, null, null, 0, null, 15808, null); } - public final void showPinMessageConfirmation(FragmentManager fragmentManager, Context context, ModelMessage modelMessage, AppComponent appComponent, Function0 function0) { + public final void showPinMessageConfirmation(FragmentManager fragmentManager, Context context, Message message, AppComponent appComponent, Function0 function0) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); m.checkNotNullParameter(context, "context"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(appComponent, "appComponent"); m.checkNotNullParameter(function0, "onSuccess"); - boolean isPinned = modelMessage.isPinned(); + boolean areEqual = m.areEqual(message.D(), Boolean.TRUE); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = context.getString(isPinned ? 2131894038 : 2131891852); - String string2 = context.getString(isPinned ? 2131894034 : 2131891850); + String string = context.getString(areEqual ? 2131894077 : 2131891889); + String string2 = context.getString(areEqual ? 2131894073 : 2131891887); m.checkNotNullExpressionValue(string2, "context.getString(\n …age_body_mobile\n )"); - WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(isPinned ? 2131894031 : 2131891846), context.getString(2131887177), g0.mapOf(o.to(2131364030, new MessageActionDialogs$showPinMessageConfirmation$1(modelMessage, isPinned, appComponent, context, function0))), null, null, null, null, null, null, 0, null, 16320, null); + WidgetNoticeDialog.Companion.show$default(companion, fragmentManager, string, string2, context.getString(areEqual ? 2131894070 : 2131891883), context.getString(2131887178), g0.mapOf(o.to(2131364032, new MessageActionDialogs$showPinMessageConfirmation$1(message, areEqual, appComponent, context, function0))), null, null, null, null, null, null, 0, null, 16320, null); } - public final void showPublishMessageConfirmation(FragmentManager fragmentManager, ModelMessage modelMessage, Function0 function0) { + public final void showPublishMessageConfirmation(FragmentManager fragmentManager, Message message, Function0 function0) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(function0, "onSuccess"); - PublishActionDialog.Companion.show$default(PublishActionDialog.Companion, fragmentManager, modelMessage.getId(), modelMessage.getChannelId(), function0, null, 16, null); + PublishActionDialog.Companion.show$default(PublishActionDialog.Companion, fragmentManager, message.r(), message.i(), function0, null, 16, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java index a4c3dc5548..3d0cef750e 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$1.java @@ -1,15 +1,15 @@ package com.discord.widgets.chat.list.actions; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.o; import kotlin.Pair; import rx.functions.Func2; /* compiled from: WidgetChatListActions.kt */ -public final class WidgetChatListActions$Model$Companion$get$1 implements Func2> { +public final class WidgetChatListActions$Model$Companion$get$1 implements Func2> { public static final WidgetChatListActions$Model$Companion$get$1 INSTANCE = new WidgetChatListActions$Model$Companion$get$1(); - public final Pair call(ModelMessage modelMessage, Channel channel) { - return o.to(modelMessage, channel); + public final Pair call(Message message, Channel channel) { + return o.to(message, channel); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java index 91ecb528b0..37d0804467 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$Model$Companion$get$2.java @@ -1,8 +1,8 @@ package com.discord.widgets.chat.list.actions; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.emoji.EmojiSet; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; @@ -19,7 +19,7 @@ import kotlin.Pair; import rx.Observable; import rx.functions.Func5; /* compiled from: WidgetChatListActions.kt */ -public final class WidgetChatListActions$Model$Companion$get$2 implements b, Observable> { +public final class WidgetChatListActions$Model$Companion$get$2 implements b, Observable> { public final /* synthetic */ long $channelId; public final /* synthetic */ CharSequence $messageContent; public final /* synthetic */ int $type; @@ -62,25 +62,25 @@ public final class WidgetChatListActions$Model$Companion$get$2 implements /* renamed from: com.discord.widgets.chat.list.actions.WidgetChatListActions$Model$Companion$get$2$3 reason: invalid class name */ public static final class AnonymousClass3 implements Func5 { public final /* synthetic */ Channel $channel; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListActions$Model$Companion$get$2 this$0; - public AnonymousClass3(WidgetChatListActions$Model$Companion$get$2 widgetChatListActions$Model$Companion$get$2, ModelMessage modelMessage, Channel channel) { + public AnonymousClass3(WidgetChatListActions$Model$Companion$get$2 widgetChatListActions$Model$Companion$get$2, Message message, Channel channel) { this.this$0 = widgetChatListActions$Model$Companion$get$2; - this.$message = modelMessage; + this.$message = message; this.$channel = channel; } public final WidgetChatListActions.Model call(Long l, MeUser meUser, GuildMember guildMember, Integer num, EmojiSet emojiSet) { WidgetChatListActions.Model.Companion companion = WidgetChatListActions.Model.Companion; - ModelMessage modelMessage = this.$message; + Message message = this.$message; m.checkNotNullExpressionValue(meUser, "meUser"); Channel channel = this.$channel; WidgetChatListActions$Model$Companion$get$2 widgetChatListActions$Model$Companion$get$2 = this.this$0; CharSequence charSequence = widgetChatListActions$Model$Companion$get$2.$messageContent; int i = widgetChatListActions$Model$Companion$get$2.$type; m.checkNotNullExpressionValue(emojiSet, "emojis"); - return WidgetChatListActions.Model.Companion.access$create(companion, modelMessage, l, meUser, guildMember, num, channel, charSequence, i, emojiSet); + return WidgetChatListActions.Model.Companion.access$create(companion, message, l, meUser, guildMember, num, channel, charSequence, i, emojiSet); } } @@ -93,19 +93,19 @@ public final class WidgetChatListActions$Model$Companion$get$2 implements /* 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 // j0.k.b - public /* bridge */ /* synthetic */ Observable call(Pair pair) { - return call((Pair) pair); + public /* bridge */ /* synthetic */ Observable call(Pair pair) { + return call((Pair) pair); } - public final Observable call(Pair pair) { - User author; - ModelMessage modelMessage = (ModelMessage) pair.component1(); + public final Observable call(Pair pair) { + User g; + Message component1 = pair.component1(); Channel component2 = pair.component2(); - long i = (modelMessage == null || (author = modelMessage.getAuthor()) == null) ? 0 : author.i(); + long i = (component1 == null || (g = component1.g()) == null) ? 0 : g.i(); if (component2 == null) { return new j(null); } StoreStream.Companion companion = StoreStream.Companion; - return Observable.g(companion.getPermissions().observePermissionsForChannel(this.$channelId), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeComputed(component2.e(), d0.t.m.listOf(Long.valueOf(i))).G(new AnonymousClass1(i)), companion.getGuilds().observeGuild(component2.e()).G(AnonymousClass2.INSTANCE).s(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), component2.e(), component2.g(), false, false, 12, null), new AnonymousClass3(this, modelMessage, component2)); + return Observable.g(companion.getPermissions().observePermissionsForChannel(this.$channelId), StoreUser.observeMe$default(companion.getUsers(), false, 1, null), companion.getGuilds().observeComputed(component2.e(), d0.t.m.listOf(Long.valueOf(i))).G(new AnonymousClass1(i)), companion.getGuilds().observeGuild(component2.e()).G(AnonymousClass2.INSTANCE).s(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), component2.e(), component2.g(), false, false, 12, null), new AnonymousClass3(this, component1, component2)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java index c3f538cec6..30dfc51fab 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10.java @@ -16,7 +16,7 @@ public final class WidgetChatListActions$configureUI$10 implements View.OnClickL @Override // android.view.View.OnClickListener public final void onClick(View view) { - this.this$0.requireContext().startActivity(Intent.createChooser(IntentUtils.INSTANCE.toExternalizedSend(IntentUtils.RouteBuilders.selectChannel(this.$data.getMessage().getChannelId(), this.$data.getGuildId(), Long.valueOf(this.$data.getMessage().getId()))), this.this$0.getString(2131893197))); + this.this$0.requireContext().startActivity(Intent.createChooser(IntentUtils.INSTANCE.toExternalizedSend(IntentUtils.RouteBuilders.selectChannel(this.$data.getMessage().i(), this.$data.getGuildId(), Long.valueOf(this.$data.getMessage().r()))), this.this$0.getString(2131893239))); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java index 70a703f69d..db07bd7afe 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13.java @@ -2,6 +2,7 @@ package com.discord.widgets.chat.list.actions; import android.view.View; import androidx.fragment.app.FragmentManager; +import com.discord.api.user.User; import com.discord.widgets.chat.list.actions.WidgetChatListActions; import com.discord.widgets.user.usersheet.WidgetUserSheet; import d0.z.d.m; @@ -18,10 +19,13 @@ public final class WidgetChatListActions$configureUI$13 implements View.OnClickL @Override // android.view.View.OnClickListener public final void onClick(View view) { this.this$0.dismiss(); - WidgetUserSheet.Companion companion = WidgetUserSheet.Companion; - long i = this.$data.getMessage().getAuthor().i(); - FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); - m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetUserSheet.Companion.show$default(companion, i, null, parentFragmentManager, null, null, null, null, 122, null); + User g = this.$data.getMessage().g(); + if (g != null) { + long i = g.i(); + WidgetUserSheet.Companion companion = WidgetUserSheet.Companion; + FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); + m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); + WidgetUserSheet.Companion.show$default(companion, i, null, parentFragmentManager, null, null, null, null, 122, null); + } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java index 335796064c..3404f56b48 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$15.java @@ -16,6 +16,6 @@ public final class WidgetChatListActions$configureUI$15 implements View.OnClickL @Override // android.view.View.OnClickListener public final void onClick(View view) { this.this$0.dismiss(); - ChannelSelector.Companion.getInstance().openCreateThread(this.$data.getGuildId(), this.$data.getMessage().getChannelId(), Long.valueOf(this.$data.getMessage().getId())); + ChannelSelector.Companion.getInstance().openCreateThread(this.$data.getGuildId(), this.$data.getMessage().i(), Long.valueOf(this.$data.getMessage().r())); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java index fa2470f2b9..e6f2e53f0d 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$5.java @@ -46,7 +46,8 @@ public final class WidgetChatListActions$configureUI$5 implements View.OnClickLi @Override // android.view.View.OnClickListener public final void onClick(View view) { - if (this.$data.getMessage().getType() == -4) { + Integer M = this.$data.getMessage().M(); + if (M != null && M.intValue() == -4) { StoreStream.Companion.getInteractions().resendApplicationCommand(this.$data.getMessage()); } else { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(StoreMessages.resendMessage$default(StoreStream.Companion.getMessages(), this.$data.getMessage(), false, 2, null)), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass1.INSTANCE, 62, (Object) null); diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java index 46a2730bf7..88ca5ed372 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$6.java @@ -15,7 +15,7 @@ public final class WidgetChatListActions$configureUI$6 implements View.OnClickLi @Override // android.view.View.OnClickListener public final void onClick(View view) { - StoreStream.Companion.getMessageAck().markUnread(this.$data.getMessage().getChannelId(), this.$data.getMessage().getId()); + StoreStream.Companion.getMessageAck().markUnread(this.$data.getMessage().i(), this.$data.getMessage().r()); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java index 934cbe6dfe..d54c42ebd4 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$8.java @@ -19,7 +19,7 @@ public final class WidgetChatListActions$configureUI$8 implements View.OnClickLi public final void onClick(View view) { Context requireContext = this.this$0.requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - o.c(requireContext, String.valueOf(this.$data.getMessage().getId()), 0, 4); + o.c(requireContext, String.valueOf(this.$data.getMessage().r()), 0, 4); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java index ab70aa1c65..230c664891 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.java @@ -19,9 +19,9 @@ public final class WidgetChatListActions$configureUI$9 implements View.OnClickLi @Override // android.view.View.OnClickListener public final void onClick(View view) { if (ReportsFeatureFlag.Companion.isEnabled()) { - WidgetMobileReports.Companion.launchMessageReport(a.T(view, "view", "view.context"), this.$data.getMessage().getId(), WidgetChatListActions.access$getChannelId$p(this.this$0)); + WidgetMobileReports.Companion.launchMessageReport(a.T(view, "view", "view.context"), this.$data.getMessage().r(), WidgetChatListActions.access$getChannelId$p(this.this$0)); } else { - WidgetTosReportViolation.Companion.show(a.T(view, "view", "view.context"), this.$data.getMessageAuthorName(), Long.valueOf(this.$data.getMessage().getChannelId()), Long.valueOf(this.$data.getMessage().getId())); + WidgetTosReportViolation.Companion.show(a.T(view, "view", "view.context"), this.$data.getMessageAuthorName(), Long.valueOf(this.$data.getMessage().i()), Long.valueOf(this.$data.getMessage().r())); } this.this$0.dismiss(); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java index 64cd8cc4f7..8db5865b3b 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$1.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.actions; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.domain.emoji.EmojiSet; import com.discord.models.guild.Guild; import com.discord.models.user.User; @@ -15,7 +15,7 @@ import rx.Observable; import rx.functions.Func3; /* compiled from: WidgetChatListActions.kt */ public final class WidgetChatListActions$editMessage$1 implements b, Observable> { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; /* compiled from: WidgetChatListActions.kt */ /* renamed from: com.discord.widgets.chat.list.actions.WidgetChatListActions$editMessage$1$1 reason: invalid class name */ @@ -31,15 +31,15 @@ public final class WidgetChatListActions$editMessage$1 implements b map, Map map2, EmojiSet emojiSet) { - String content = this.this$0.$message.getContent(); - if (content == null) { - content = ""; + String k = this.this$0.$message.k(); + if (k == null) { + k = ""; } Map map3 = this.$channels; m.checkNotNullExpressionValue(map3, "channels"); m.checkNotNullExpressionValue(map, "users"); m.checkNotNullExpressionValue(emojiSet, "emojiSet"); - return MessageUnparser.unparse(content, map2.get(Long.valueOf(this.$guildId)), map3, map, emojiSet); + return MessageUnparser.unparse(k, map2.get(Long.valueOf(this.$guildId)), map3, map, emojiSet); } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -50,8 +50,8 @@ public final class WidgetChatListActions$editMessage$1 implements b implements b call(Map map) { - Channel channel = map.get(Long.valueOf(this.$message.getChannelId())); + Channel channel = map.get(Long.valueOf(this.$message.i())); long e = channel != null ? channel.e() : 0; StoreStream.Companion companion = StoreStream.Companion; - return Observable.i(companion.getUsers().observeAllUsers(), companion.getGuilds().observeGuilds(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), e, this.$message.getChannelId(), false, false, 12, null), new AnonymousClass1(this, e, map)); + return Observable.i(companion.getUsers().observeAllUsers(), companion.getGuilds().observeGuilds(), StoreEmoji.getEmojiSet$default(companion.getEmojis(), e, this.$message.i(), false, false, 12, null), new AnonymousClass1(this, e, map)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java index 7a5aca383b..479b0dfa53 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$editMessage$2.java @@ -1,6 +1,6 @@ package com.discord.widgets.chat.list.actions; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreChat; import com.discord.stores.StoreStream; import d0.z.d.m; @@ -9,12 +9,12 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListActions.kt */ public final class WidgetChatListActions$editMessage$2 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListActions$editMessage$2(ModelMessage modelMessage) { + public WidgetChatListActions$editMessage$2(Message message) { super(1); - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -27,8 +27,8 @@ public final class WidgetChatListActions$editMessage$2 extends o implements Func public final void invoke(CharSequence charSequence) { StoreChat chat = StoreStream.Companion.getChat(); - ModelMessage modelMessage = this.$message; + Message message = this.$message; m.checkNotNullExpressionValue(charSequence, "unparsedMessageContent"); - chat.setEditingMessage(new StoreChat.EditingMessage(modelMessage, charSequence)); + chat.setEditingMessage(new StoreChat.EditingMessage(message, charSequence)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java index 9681d481d6..b06237e118 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions$removeAllReactions$1.java @@ -55,6 +55,6 @@ public final class WidgetChatListActions$removeAllReactions$1 extends o implemen public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeAllReactions(this.$model.getMessage().getChannelId(), this.$model.getMessage().getId()), false, 1, null), this.this$0, null, 2, null), view.getContext(), "REST: removeAllReactions", (Function1) null, new AnonymousClass1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().removeAllReactions(this.$model.getMessage().i(), this.$model.getMessage().r()), false, 1, null), this.this$0, null, 2, null), view.getContext(), "REST: removeAllReactions", (Function1) null, new AnonymousClass1(this), (Function1) null, (Function0) null, (Function0) null, 116, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java index 78dbcb7347..25d7df8fa6 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java +++ b/app/src/main/java/com/discord/widgets/chat/list/actions/WidgetChatListActions.java @@ -12,17 +12,18 @@ import androidx.recyclerview.widget.RecyclerView; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; -import com.discord.api.message.reaction.MessageReaction; +import com.discord.api.message.Message; import com.discord.api.thread.ThreadMetadata; +import com.discord.api.user.User; import com.discord.app.AppBottomSheet; import com.discord.databinding.WidgetChatListActionsBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.emoji.Emoji; import com.discord.models.domain.emoji.EmojiSet; import com.discord.models.member.GuildMember; import com.discord.models.user.MeUser; import com.discord.stores.StoreStream; import com.discord.utilities.dimen.DimenUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; import com.discord.utilities.permissions.ManageMessageContext; import com.discord.utilities.permissions.PermissionUtils; @@ -38,7 +39,6 @@ import d0.t.g0; import d0.z.d.m; import j0.l.e.j; import java.util.List; -import java.util.Map; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -106,7 +106,7 @@ public final class WidgetChatListActions extends AppBottomSheet { /* renamed from: me reason: collision with root package name */ private final MeUser f2132me; - private final ModelMessage message; + private final Message message; private final String messageAuthorName; private final CharSequence messageContent; private final Long permissions; @@ -122,25 +122,34 @@ public final class WidgetChatListActions extends AppBottomSheet { this(); } - public static final /* synthetic */ Model access$create(Companion companion, ModelMessage modelMessage, Long l, MeUser meUser, GuildMember guildMember, Integer num, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) { - return companion.create(modelMessage, l, meUser, guildMember, num, channel, charSequence, i, emojiSet); + public static final /* synthetic */ Model access$create(Companion companion, Message message, Long l, MeUser meUser, GuildMember guildMember, Integer num, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) { + return companion.create(message, l, meUser, guildMember, num, channel, charSequence, i, emojiSet); } - private final Model create(ModelMessage modelMessage, Long l, MeUser meUser, GuildMember guildMember, Integer num, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) { - String str; + private final Model create(Message message, Long l, MeUser meUser, GuildMember guildMember, Integer num, Channel channel, CharSequence charSequence, int i, EmojiSet emojiSet) { + String nick; ThreadMetadata x2; - if (modelMessage == null) { + String str = null; + if (message == null) { return null; } - ManageMessageContext from = ManageMessageContext.Companion.from(modelMessage, l, meUser, num, channel != null && AnimatableValueParser.r1(channel), channel != null && AnimatableValueParser.w1(channel), (channel == null || (x2 = channel.x()) == null || !x2.b()) ? false : true); - if (guildMember == null || (str = guildMember.getNick()) == null) { - str = modelMessage.getAuthor().r(); + ManageMessageContext from = ManageMessageContext.Companion.from(message, l, meUser, num, channel != null && AnimatableValueParser.r1(channel), channel != null && AnimatableValueParser.w1(channel), (channel == null || (x2 = channel.x()) == null || !x2.b()) ? false : true); + if (guildMember == null || (nick = guildMember.getNick()) == null) { + User g = message.g(); + if (g != null) { + str = g.r(); + } + } else { + str = nick; + } + if (str == null) { + str = ""; } long e = channel != null ? channel.e() : 0; boolean isDeveloperMode = StoreStream.Companion.getUserSettings().getIsDeveloperMode(); List list = emojiSet.recentEmojis; m.checkNotNullExpressionValue(list, "emojis.recentEmojis"); - return new Model(modelMessage, e, str, charSequence, from, i, isDeveloperMode, list, channel, l, meUser); + return new Model(message, e, str, charSequence, from, i, isDeveloperMode, list, channel, l, meUser); } public final Observable get(long j, long j2, CharSequence charSequence, int i) { @@ -152,13 +161,13 @@ public final class WidgetChatListActions extends AppBottomSheet { /* JADX DEBUG: Multi-variable search result rejected for r10v0, resolved type: java.util.List */ /* JADX WARN: Multi-variable type inference failed */ - public Model(ModelMessage modelMessage, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser) { - m.checkNotNullParameter(modelMessage, "message"); + public Model(Message message, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(str, "messageAuthorName"); m.checkNotNullParameter(manageMessageContext, "manageMessageContext"); m.checkNotNullParameter(list, "recentEmojis"); m.checkNotNullParameter(meUser, "me"); - this.message = modelMessage; + this.message = message; this.guildId = j; this.messageAuthorName = str; this.messageContent = charSequence; @@ -171,11 +180,11 @@ public final class WidgetChatListActions extends AppBottomSheet { this.f2132me = meUser; } - public static /* synthetic */ Model copy$default(Model model, ModelMessage modelMessage, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser, int i2, Object obj) { - return model.copy((i2 & 1) != 0 ? model.message : modelMessage, (i2 & 2) != 0 ? model.guildId : j, (i2 & 4) != 0 ? model.messageAuthorName : str, (i2 & 8) != 0 ? model.messageContent : charSequence, (i2 & 16) != 0 ? model.manageMessageContext : manageMessageContext, (i2 & 32) != 0 ? model.type : i, (i2 & 64) != 0 ? model.isDeveloper : z2, (i2 & 128) != 0 ? model.recentEmojis : list, (i2 & 256) != 0 ? model.channel : channel, (i2 & 512) != 0 ? model.permissions : l, (i2 & 1024) != 0 ? model.f2132me : meUser); + public static /* synthetic */ Model copy$default(Model model, Message message, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser, int i2, Object obj) { + return model.copy((i2 & 1) != 0 ? model.message : message, (i2 & 2) != 0 ? model.guildId : j, (i2 & 4) != 0 ? model.messageAuthorName : str, (i2 & 8) != 0 ? model.messageContent : charSequence, (i2 & 16) != 0 ? model.manageMessageContext : manageMessageContext, (i2 & 32) != 0 ? model.type : i, (i2 & 64) != 0 ? model.isDeveloper : z2, (i2 & 128) != 0 ? model.recentEmojis : list, (i2 & 256) != 0 ? model.channel : channel, (i2 & 512) != 0 ? model.permissions : l, (i2 & 1024) != 0 ? model.f2132me : meUser); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -219,13 +228,13 @@ public final class WidgetChatListActions extends AppBottomSheet { return this.channel; } - public final Model copy(ModelMessage modelMessage, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser) { - m.checkNotNullParameter(modelMessage, "message"); + public final Model copy(Message message, long j, String str, CharSequence charSequence, ManageMessageContext manageMessageContext, int i, boolean z2, List list, Channel channel, Long l, MeUser meUser) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(str, "messageAuthorName"); m.checkNotNullParameter(manageMessageContext, "manageMessageContext"); m.checkNotNullParameter(list, "recentEmojis"); m.checkNotNullParameter(meUser, "me"); - return new Model(modelMessage, j, str, charSequence, manageMessageContext, i, z2, list, channel, l, meUser); + return new Model(message, j, str, charSequence, manageMessageContext, i, z2, list, channel, l, meUser); } public boolean equals(Object obj) { @@ -255,7 +264,7 @@ public final class WidgetChatListActions extends AppBottomSheet { return this.f2132me; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -280,9 +289,9 @@ public final class WidgetChatListActions extends AppBottomSheet { } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int a = (b.a(this.guildId) + ((modelMessage != null ? modelMessage.hashCode() : 0) * 31)) * 31; + int a = (b.a(this.guildId) + ((message != null ? message.hashCode() : 0) * 31)) * 31; String str = this.messageAuthorName; int hashCode = (a + (str != null ? str.hashCode() : 0)) * 31; CharSequence charSequence = this.messageContent; @@ -354,16 +363,16 @@ public final class WidgetChatListActions extends AppBottomSheet { widgetChatListActions.configureUI(model); } - public static final /* synthetic */ void access$confirmPublishMessage(WidgetChatListActions widgetChatListActions, ModelMessage modelMessage) { - widgetChatListActions.confirmPublishMessage(modelMessage); + public static final /* synthetic */ void access$confirmPublishMessage(WidgetChatListActions widgetChatListActions, Message message) { + widgetChatListActions.confirmPublishMessage(message); } - public static final /* synthetic */ void access$deleteMessage(WidgetChatListActions widgetChatListActions, ModelMessage modelMessage) { - widgetChatListActions.deleteMessage(modelMessage); + public static final /* synthetic */ void access$deleteMessage(WidgetChatListActions widgetChatListActions, Message message) { + widgetChatListActions.deleteMessage(message); } - public static final /* synthetic */ void access$editMessage(WidgetChatListActions widgetChatListActions, ModelMessage modelMessage) { - widgetChatListActions.editMessage(modelMessage); + public static final /* synthetic */ void access$editMessage(WidgetChatListActions widgetChatListActions, Message message) { + widgetChatListActions.editMessage(message); } public static final /* synthetic */ long access$getChannelId$p(WidgetChatListActions widgetChatListActions) { @@ -378,8 +387,8 @@ public final class WidgetChatListActions extends AppBottomSheet { widgetChatListActions.removeAllReactions(model); } - public static final /* synthetic */ void access$replyMessage(WidgetChatListActions widgetChatListActions, ModelMessage modelMessage, Channel channel) { - widgetChatListActions.replyMessage(modelMessage, channel); + public static final /* synthetic */ void access$replyMessage(WidgetChatListActions widgetChatListActions, Message message, Channel channel) { + widgetChatListActions.replyMessage(message, channel); } public static final /* synthetic */ void access$setChannelId$p(WidgetChatListActions widgetChatListActions, long j) { @@ -390,8 +399,8 @@ public final class WidgetChatListActions extends AppBottomSheet { widgetChatListActions.messageId = j; } - public static final /* synthetic */ void access$toggleMessagePin(WidgetChatListActions widgetChatListActions, ModelMessage modelMessage) { - widgetChatListActions.toggleMessagePin(modelMessage); + public static final /* synthetic */ void access$toggleMessagePin(WidgetChatListActions widgetChatListActions, Message message) { + widgetChatListActions.toggleMessagePin(message); } private final void addReaction(Emoji emoji) { @@ -442,31 +451,31 @@ public final class WidgetChatListActions extends AppBottomSheet { widgetChatListActionsEmojisAdapter.setData(list, min); } - /* JADX WARNING: Removed duplicated region for block: B:102:0x02d1 */ - /* JADX WARNING: Removed duplicated region for block: B:103:0x02d3 */ - /* JADX WARNING: Removed duplicated region for block: B:123:0x0341 */ - /* JADX WARNING: Removed duplicated region for block: B:124:0x0343 */ - /* JADX WARNING: Removed duplicated region for block: B:127:0x037a */ - /* JADX WARNING: Removed duplicated region for block: B:75:0x01f9 */ - /* JADX WARNING: Removed duplicated region for block: B:76:0x01fb */ - /* JADX WARNING: Removed duplicated region for block: B:79:0x0231 */ - /* JADX WARNING: Removed duplicated region for block: B:80:0x0233 */ - /* JADX WARNING: Removed duplicated region for block: B:82:0x0236 */ - /* JADX WARNING: Removed duplicated region for block: B:83:0x0238 */ - /* JADX WARNING: Removed duplicated region for block: B:90:0x0263 */ - /* JADX WARNING: Removed duplicated region for block: B:91:0x0265 */ - /* JADX WARNING: Removed duplicated region for block: B:94:0x028d */ - /* JADX WARNING: Removed duplicated region for block: B:95:0x028f */ - /* JADX WARNING: Removed duplicated region for block: B:98:0x02a4 */ - /* JADX WARNING: Removed duplicated region for block: B:99:0x02a8 */ + /* JADX WARNING: Removed duplicated region for block: B:100:0x0297 */ + /* JADX WARNING: Removed duplicated region for block: B:103:0x02b2 */ + /* JADX WARNING: Removed duplicated region for block: B:104:0x02b6 */ + /* JADX WARNING: Removed duplicated region for block: B:107:0x02df */ + /* JADX WARNING: Removed duplicated region for block: B:108:0x02e1 */ + /* JADX WARNING: Removed duplicated region for block: B:128:0x034f */ + /* JADX WARNING: Removed duplicated region for block: B:129:0x0351 */ + /* JADX WARNING: Removed duplicated region for block: B:132:0x0388 */ + /* JADX WARNING: Removed duplicated region for block: B:78:0x01fe */ + /* JADX WARNING: Removed duplicated region for block: B:79:0x0200 */ + /* JADX WARNING: Removed duplicated region for block: B:87:0x023e */ + /* JADX WARNING: Removed duplicated region for block: B:88:0x0240 */ + /* JADX WARNING: Removed duplicated region for block: B:95:0x026b */ + /* JADX WARNING: Removed duplicated region for block: B:96:0x026d */ + /* JADX WARNING: Removed duplicated region for block: B:99:0x0295 */ private final void configureUI(Model model) { Channel channel; + Integer M; if (model == null) { dismiss(); return; } - boolean isLocal = model.getMessage().isLocal(); - boolean isCrossposted = model.getMessage().isCrossposted(); + boolean isLocal = MessageUtils.isLocal(model.getMessage()); + MessageUtils messageUtils = MessageUtils.INSTANCE; + boolean isCrossposted = messageUtils.isCrossposted(model.getMessage()); boolean z2 = true; int i = 0; boolean z3 = model.getManageMessageContext().getCanEdit() || model.getManageMessageContext().getCanManageMessages(); @@ -484,41 +493,38 @@ public final class WidgetChatListActions extends AppBottomSheet { } TextView textView3 = getBinding().k; m.checkNotNullExpressionValue(textView3, "binding.dialogChatActionsPublish"); - textView3.setVisibility(z3 && (channel = model.getChannel()) != null && channel.z() == 5 && model.getMessage().getType() == 0 && !isCrossposted ? 0 : 8); + textView3.setVisibility(z3 && (channel = model.getChannel()) != null && channel.z() == 5 && (M = model.getMessage().M()) != null && M.intValue() == 0 && !isCrossposted ? 0 : 8); getBinding().k.setOnClickListener(new WidgetChatListActions$configureUI$2(this, model)); TextView textView4 = getBinding().g; m.checkNotNullExpressionValue(textView4, "binding.dialogChatActionsManageReactions"); - Map reactions = model.getMessage().getReactions(); - m.checkNotNullExpressionValue(reactions, "data.message.reactions"); - textView4.setVisibility(reactions.isEmpty() ^ true ? 0 : 8); + textView4.setVisibility(model.getMessage().F().isEmpty() ^ true ? 0 : 8); getBinding().g.setOnClickListener(new WidgetChatListActions$configureUI$3(this)); TextView textView5 = getBinding().l; m.checkNotNullExpressionValue(textView5, "binding.dialogChatActionsRemoveAllReactions"); - Map reactions2 = model.getMessage().getReactions(); - m.checkNotNullExpressionValue(reactions2, "data.message.reactions"); - textView5.setVisibility((reactions2.isEmpty() ^ true) && model.getManageMessageContext().getCanManageMessages() ? 0 : 8); + textView5.setVisibility((model.getMessage().F().isEmpty() ^ true) && model.getManageMessageContext().getCanManageMessages() ? 0 : 8); getBinding().l.setOnClickListener(new WidgetChatListActions$configureUI$4(this, model)); TextView textView6 = getBinding().o; m.checkNotNullExpressionValue(textView6, "binding.dialogChatActionsResend"); - textView6.setVisibility(model.getMessage().canResend() ? 0 : 8); + textView6.setVisibility(messageUtils.canResend(model.getMessage()) ? 0 : 8); getBinding().o.setOnClickListener(new WidgetChatListActions$configureUI$5(this, model)); TextView textView7 = getBinding().h; m.checkNotNullExpressionValue(textView7, "binding.dialogChatActionsMarkUnread"); - textView7.setVisibility(!model.getMessage().isFailed() && model.getManageMessageContext().getCanMarkUnread() ? 0 : 8); + textView7.setVisibility(!messageUtils.isFailed(model.getMessage()) && model.getManageMessageContext().getCanMarkUnread() ? 0 : 8); getBinding().h.setOnClickListener(new WidgetChatListActions$configureUI$6(this, model)); if (model.getMessageContent() != null) { - if ((model.getMessageContent().length() > 0) && !model.getMessage().isLocalApplicationCommand()) { - TextView textView8 = getBinding().f1721c; + if ((model.getMessageContent().length() > 0) && !messageUtils.isLocalApplicationCommand(model.getMessage())) { + TextView textView8 = getBinding().f1723c; m.checkNotNullExpressionValue(textView8, "binding.dialogChatActionsCopy"); textView8.setVisibility(0); - getBinding().f1721c.setOnClickListener(new WidgetChatListActions$configureUI$7(this, model)); + getBinding().f1723c.setOnClickListener(new WidgetChatListActions$configureUI$7(this, model)); TextView textView9 = getBinding().d; m.checkNotNullExpressionValue(textView9, "binding.dialogChatActionsCopyId"); textView9.setVisibility(!(!model.isDeveloper() && !isLocal) ? 0 : 8); getBinding().d.setOnClickListener(new WidgetChatListActions$configureUI$8(this, model)); TextView textView10 = getBinding().n; m.checkNotNullExpressionValue(textView10, "binding.dialogChatActionsReport"); - textView10.setVisibility(!(model.getMessage().getAuthor().i() == model.getMe().getId()) ? 0 : 8); + User g = model.getMessage().g(); + textView10.setVisibility(!(g != null || (g.i() > model.getMe().getId() ? 1 : (g.i() == model.getMe().getId() ? 0 : -1)) != 0) ? 0 : 8); getBinding().n.setOnClickListener(new WidgetChatListActions$configureUI$9(this, model)); TextView textView11 = getBinding().p; m.checkNotNullExpressionValue(textView11, "binding.dialogChatActionsShare"); @@ -527,7 +533,7 @@ public final class WidgetChatListActions extends AppBottomSheet { TextView textView12 = getBinding().i; m.checkNotNullExpressionValue(textView12, "binding.dialogChatActionsPin"); textView12.setVisibility(!model.getManageMessageContext().getCanTogglePinned() ? 0 : 8); - getBinding().i.setText(!model.getMessage().isPinned() ? 2131894031 : 2131891846); + getBinding().i.setText(!m.areEqual(model.getMessage().D(), Boolean.TRUE) ? 2131894070 : 2131891883); getBinding().i.setOnClickListener(new WidgetChatListActions$configureUI$11(this, model)); TextView textView13 = getBinding().e; m.checkNotNullExpressionValue(textView13, "binding.dialogChatActionsDelete"); @@ -535,7 +541,7 @@ public final class WidgetChatListActions extends AppBottomSheet { getBinding().e.setOnClickListener(new WidgetChatListActions$configureUI$12(this, model)); getBinding().j.setOnClickListener(new WidgetChatListActions$configureUI$13(this, model)); boolean z4 = model.getChannel() == null && AnimatableValueParser.r1(model.getChannel()) && !AnimatableValueParser.w1(model.getChannel()); - if (isLocal || model.getType() != 0 || !model.getMessage().isUserMessage() || (!z4 && !PermissionUtils.can(67584, model.getPermissions()))) { + if (isLocal || model.getType() != 0 || !messageUtils.isUserMessage(model.getMessage()) || (!z4 && !PermissionUtils.can(67584, model.getPermissions()))) { z2 = false; } TextView textView14 = getBinding().m; @@ -551,7 +557,7 @@ public final class WidgetChatListActions extends AppBottomSheet { getBinding().q.setOnClickListener(new WidgetChatListActions$configureUI$15(this, model)); } } - TextView textView16 = getBinding().f1721c; + TextView textView16 = getBinding().f1723c; m.checkNotNullExpressionValue(textView16, "binding.dialogChatActionsCopy"); textView16.setVisibility(8); TextView textView9 = getBinding().d; @@ -560,7 +566,8 @@ public final class WidgetChatListActions extends AppBottomSheet { getBinding().d.setOnClickListener(new WidgetChatListActions$configureUI$8(this, model)); TextView textView10 = getBinding().n; m.checkNotNullExpressionValue(textView10, "binding.dialogChatActionsReport"); - textView10.setVisibility(!(model.getMessage().getAuthor().i() == model.getMe().getId()) ? 0 : 8); + User g = model.getMessage().g(); + textView10.setVisibility(!(g != null || (g.i() > model.getMe().getId() ? 1 : (g.i() == model.getMe().getId() ? 0 : -1)) != 0) ? 0 : 8); getBinding().n.setOnClickListener(new WidgetChatListActions$configureUI$9(this, model)); TextView textView11 = getBinding().p; m.checkNotNullExpressionValue(textView11, "binding.dialogChatActionsShare"); @@ -569,7 +576,7 @@ public final class WidgetChatListActions extends AppBottomSheet { TextView textView12 = getBinding().i; m.checkNotNullExpressionValue(textView12, "binding.dialogChatActionsPin"); textView12.setVisibility(!model.getManageMessageContext().getCanTogglePinned() ? 0 : 8); - getBinding().i.setText(!model.getMessage().isPinned() ? 2131894031 : 2131891846); + getBinding().i.setText(!m.areEqual(model.getMessage().D(), Boolean.TRUE) ? 2131894070 : 2131891883); getBinding().i.setOnClickListener(new WidgetChatListActions$configureUI$11(this, model)); TextView textView13 = getBinding().e; m.checkNotNullExpressionValue(textView13, "binding.dialogChatActionsDelete"); @@ -592,27 +599,27 @@ public final class WidgetChatListActions extends AppBottomSheet { } @MainThread - private final void confirmPublishMessage(ModelMessage modelMessage) { + private final void confirmPublishMessage(Message message) { MessageActionDialogs messageActionDialogs = MessageActionDialogs.INSTANCE; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - messageActionDialogs.showPublishMessageConfirmation(parentFragmentManager, modelMessage, new WidgetChatListActions$confirmPublishMessage$1(this)); + messageActionDialogs.showPublishMessageConfirmation(parentFragmentManager, message, new WidgetChatListActions$confirmPublishMessage$1(this)); } @MainThread - private final void deleteMessage(ModelMessage modelMessage) { + private final void deleteMessage(Message message) { MessageActionDialogs messageActionDialogs = MessageActionDialogs.INSTANCE; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - messageActionDialogs.showDeleteMessageConfirmation(parentFragmentManager, requireContext, modelMessage, new WidgetChatListActions$deleteMessage$1(this)); + messageActionDialogs.showDeleteMessageConfirmation(parentFragmentManager, requireContext, message, new WidgetChatListActions$deleteMessage$1(this)); } - private final void editMessage(ModelMessage modelMessage) { - Observable Z = StoreStream.Companion.getChannels().observeGuildAndPrivateChannels().Z(new WidgetChatListActions$editMessage$1(modelMessage)); + private final void editMessage(Message message) { + Observable Z = StoreStream.Companion.getChannels().observeGuildAndPrivateChannels().Z(new WidgetChatListActions$editMessage$1(message)); m.checkNotNullExpressionValue(Z, "StoreStream\n .get… }\n }"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationBuffered(Z), 0, false, 3, null), (Context) null, "editMessage", (Function1) null, new WidgetChatListActions$editMessage$2(modelMessage), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationBuffered(Z), 0, false, 3, null), (Context) null, "editMessage", (Function1) null, new WidgetChatListActions$editMessage$2(message), (Function1) null, (Function0) null, (Function0) null, 117, (Object) null); } private final WidgetChatListActionsBinding getBinding() { @@ -624,24 +631,25 @@ public final class WidgetChatListActions extends AppBottomSheet { WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - String string = getString(2131892519); - String string2 = getString(2131892518); + String string = getString(2131892561); + String string2 = getString(2131892560); m.checkNotNullExpressionValue(string2, "getString(R.string.remov…l_reactions_confirm_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, getString(2131894611), getString(2131891389), g0.mapOf(o.to(2131364030, new WidgetChatListActions$removeAllReactions$1(this, model))), null, null, null, null, null, null, 0, null, 16320, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, getString(2131894658), getString(2131891422), g0.mapOf(o.to(2131364032, new WidgetChatListActions$removeAllReactions$1(this, model))), null, null, null, null, null, null, 0, null, 16320, null); } - private final void replyMessage(ModelMessage modelMessage, Channel channel) { + private final void replyMessage(Message message, Channel channel) { StoreStream.Companion companion = StoreStream.Companion; long id2 = companion.getUsers().getMe().getId(); boolean r1 = AnimatableValueParser.r1(channel); - boolean isWebhook = modelMessage.isWebhook(); + boolean isWebhook = MessageUtils.INSTANCE.isWebhook(message); + User g = message.g(); boolean z2 = true; - boolean z3 = modelMessage.getAuthor().i() == id2; + boolean z3 = g != null && g.i() == id2; boolean z4 = !isWebhook && !z3; if (r1 || isWebhook || z3) { z2 = false; } - companion.getPendingReplies().onCreatePendingReply(channel, modelMessage, z4, z2); + companion.getPendingReplies().onCreatePendingReply(channel, message, z4, z2); } public static final void showForChat(FragmentManager fragmentManager, long j, long j2, CharSequence charSequence) { @@ -653,18 +661,18 @@ public final class WidgetChatListActions extends AppBottomSheet { } @MainThread - private final void toggleMessagePin(ModelMessage modelMessage) { + private final void toggleMessagePin(Message message) { MessageActionDialogs messageActionDialogs = MessageActionDialogs.INSTANCE; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - messageActionDialogs.showPinMessageConfirmation(parentFragmentManager, requireContext, modelMessage, this, new WidgetChatListActions$toggleMessagePin$1(this)); + messageActionDialogs.showPinMessageConfirmation(parentFragmentManager, requireContext, message, this, new WidgetChatListActions$toggleMessagePin$1(this)); } @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131558921; + return 2131558922; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java index 1a4d33db6e..ac1283d576 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$1.java @@ -42,7 +42,7 @@ public final class WidgetChatListAdapter$ScrollToWithHighlight$animateHighlight$ if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(500, this) == coroutine_suspended) { + if (a.n(500, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java index 3379ad24a5..7961a9c54f 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1.java @@ -42,7 +42,7 @@ public final class WidgetChatListAdapter$ScrollToWithHighlight$scheduleRetry$1 e if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(100, this) == coroutine_suspended) { + if (a.n(100, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java index 6e95540c25..d29d0f6443 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter$setHandlers$1.java @@ -50,7 +50,7 @@ public final class WidgetChatListAdapter$setHandlers$1 extends o implements Func if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(250, this) == coroutine_suspended) { + if (a.n(250, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -82,7 +82,7 @@ public final class WidgetChatListAdapter$setHandlers$1 extends o implements Func m.checkNotNullParameter(list2, ""); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(this.this$0.getRecycler()); if (coroutineScope != null) { - a.F(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + a.G(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); } this.this$0.getRecycler().setOnTouchListener(WidgetChatListAdapter.access$getHandlerOfTouches$p(this.this$0)); this.this$0.getRecycler().addOnScrollListener(WidgetChatListAdapter.access$getHandlerOfScrolls$p(this.this$0)); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java index 3efda64b4b..0fa3b36a0b 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapter.java @@ -15,12 +15,12 @@ import c.q.a.k.a; import com.discord.api.activity.Activity; import com.discord.api.application.Application; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.message.reaction.MessageReaction; import com.discord.api.sticker.BaseSticker; import com.discord.api.sticker.Sticker; import com.discord.app.AppPermissionsRequests; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreChat; @@ -198,8 +198,8 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple(2131558948, this); + return new MGRecyclerViewHolder<>(2131558949, this); case 13: - return new MGRecyclerViewHolder<>(2131558946, this); - case 14: return new MGRecyclerViewHolder<>(2131558947, this); + case 14: + return new MGRecyclerViewHolder<>(2131558948, this); case 15: - return new MGRecyclerViewHolder<>(2131558927, this); + return new MGRecyclerViewHolder<>(2131558928, this); case 16: return new WidgetChatListAdapterItemEmptyPins(this); case 17: @@ -732,7 +732,7 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple(2131558962, this); + return new MGRecyclerViewHolder<>(2131558963, this); case 41: return new WidgetChatListAdapterItemStickerGreet(this); case 42: @@ -813,10 +813,10 @@ public final class WidgetChatListAdapter extends MGRecyclerAdapterSimple { +public final class WidgetChatListAdapterEventsHandler$onSendGreetMessageClicked$1 extends o implements Function1 { public static final WidgetChatListAdapterEventsHandler$onSendGreetMessageClicked$1 INSTANCE = new WidgetChatListAdapterEventsHandler$onSendGreetMessageClicked$1(); public WidgetChatListAdapterEventsHandler$onSendGreetMessageClicked$1() { @@ -16,12 +16,12 @@ public final class WidgetChatListAdapterEventsHandler$onSendGreetMessageClicked$ /* 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(ModelMessage modelMessage) { - invoke(modelMessage); + public /* bridge */ /* synthetic */ Unit invoke(Message message) { + invoke(message); return Unit.a; } - public final void invoke(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "it"); + public final void invoke(Message message) { + m.checkNotNullParameter(message, "it"); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java index 3c9957f480..b52de6080d 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onStickerClicked$1.java @@ -1,9 +1,9 @@ package com.discord.widgets.chat.list.adapter; +import com.discord.api.message.Message; import com.discord.api.sticker.BaseSticker; import com.discord.api.sticker.Sticker; import com.discord.api.sticker.StickerPartial; -import com.discord.models.domain.ModelMessage; import com.discord.widgets.stickers.WidgetStickerSheet; import d0.z.d.o; import java.util.Objects; @@ -11,16 +11,16 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListAdapterEventsHandler.kt */ public final class WidgetChatListAdapterEventsHandler$onStickerClicked$1 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ BaseSticker $sticker; public final /* synthetic */ WidgetChatListAdapterEventsHandler this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterEventsHandler$onStickerClicked$1(WidgetChatListAdapterEventsHandler widgetChatListAdapterEventsHandler, BaseSticker baseSticker, ModelMessage modelMessage) { + public WidgetChatListAdapterEventsHandler$onStickerClicked$1(WidgetChatListAdapterEventsHandler widgetChatListAdapterEventsHandler, BaseSticker baseSticker, Message message) { super(1); this.this$0 = widgetChatListAdapterEventsHandler; this.$sticker = baseSticker; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -38,8 +38,8 @@ public final class WidgetChatListAdapterEventsHandler$onStickerClicked$1 extends if (!(baseSticker instanceof StickerPartial)) { Objects.requireNonNull(baseSticker, "null cannot be cast to non-null type com.discord.api.sticker.Sticker"); Sticker sticker = (Sticker) baseSticker; - if (sticker.i().ordinal() == 1) { - WidgetStickerSheet.Companion.show(WidgetChatListAdapterEventsHandler.access$getFragmentManager$p(this.this$0), sticker, this.$message.getChannelId()); + if (sticker.j().ordinal() == 1) { + WidgetStickerSheet.Companion.show(WidgetChatListAdapterEventsHandler.access$getFragmentManager$p(this.this$0), sticker, this.$message.i()); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java index f70c932af8..5d2f132a50 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler$onUserActivityAction$1.java @@ -40,7 +40,7 @@ public final class WidgetChatListAdapterEventsHandler$onUserActivityAction$1 ext join.addFlags(268435456); WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0).startActivity(join); } catch (ActivityNotFoundException unused) { - c.a.d.o.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), b.g(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), 2131894162, new Object[]{this.$application.g()}, null, 4), 0, null, 12); + c.a.d.o.h(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), b.g(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), 2131894201, new Object[]{this.$application.g()}, null, 4), 0, null, 12); String str = (String) u.firstOrNull((List) this.$application.d()); if (str != null) { UriHandler.directToPlayStore$default(WidgetChatListAdapterEventsHandler.access$getContext$p(this.this$0), str, null, 4, null); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java index 1fb6fa00da..76f7dd5627 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterEventsHandler.java @@ -10,6 +10,7 @@ import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.activity.Activity; import com.discord.api.application.Application; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.message.reaction.MessageReaction; @@ -19,7 +20,6 @@ import com.discord.api.sticker.Sticker; import com.discord.api.sticker.StickerType; import com.discord.api.user.User; import com.discord.app.AppFragment; -import com.discord.models.domain.ModelMessage; import com.discord.models.domain.emoji.Emoji; import com.discord.models.user.CoreUser; import com.discord.restapi.RestAPIParams; @@ -33,6 +33,7 @@ import com.discord.utilities.channel.ChannelSelector; import com.discord.utilities.dsti.StickerUtils; import com.discord.utilities.guilds.MemberVerificationUtils; import com.discord.utilities.guilds.PublicGuildUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.widgets.channels.list.WidgetChannelsListItemThreadActions; @@ -361,9 +362,9 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onDismissClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - this.storeMessages.deleteMessage(modelMessage); + public void onDismissClicked(Message message) { + m.checkNotNullParameter(message, "message"); + this.storeMessages.deleteMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -379,42 +380,49 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorAvatarClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - if (PublicGuildUtils.isPublicGuildSystemMessage(modelMessage) || modelMessage.isCrosspost()) { - onMessageAuthorNameClicked(modelMessage, j); - } else { - WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, modelMessage.getAuthor().i(), Long.valueOf(modelMessage.getChannelId()), getFragmentManager(), Long.valueOf(j), null, null, null, 112, null); + public void onMessageAuthorAvatarClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + if (PublicGuildUtils.isPublicGuildSystemMessage(message) || MessageUtils.INSTANCE.isCrosspost(message)) { + onMessageAuthorNameClicked(message, j); + return; + } + User g = message.g(); + if (g != null) { + WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, g.i(), Long.valueOf(message.i()), getFragmentManager(), Long.valueOf(j), null, null, null, 112, null); } } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorLongClicked(ModelMessage modelMessage, Long l) { - m.checkNotNullParameter(modelMessage, "message"); - if (!modelMessage.isWebhook()) { - WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, modelMessage.getAuthor().i(), Long.valueOf(modelMessage.getChannelId()), getFragmentManager(), l, null, null, null, 112, null); - } else { - o.g(getContext(), 2131894203, 0, null, 8); + public void onMessageAuthorLongClicked(Message message, Long l) { + m.checkNotNullParameter(message, "message"); + if (!MessageUtils.INSTANCE.isWebhook(message)) { + User g = message.g(); + if (g != null) { + WidgetUserSheet.Companion.show$default(WidgetUserSheet.Companion, g.i(), Long.valueOf(message.i()), getFragmentManager(), l, null, null, null, 112, null); + return; + } + return; } + o.g(getContext(), 2131894242, 0, null, 8); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorNameClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - if (PublicGuildUtils.isPublicGuildSystemMessage(modelMessage)) { + public void onMessageAuthorNameClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + if (PublicGuildUtils.isPublicGuildSystemMessage(message)) { WidgetPublicAnnouncementProfileSheet.Companion.show(getFragmentManager()); - } else if (!modelMessage.isCrosspost() || modelMessage.getMessageReference() == null) { + } else if (!MessageUtils.INSTANCE.isCrosspost(message) || message.A() == null) { StoreChat storeChat = this.storeChat; - User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - storeChat.appendMention(new CoreUser(author), j); + User g = message.g(); + m.checkNotNull(g); + storeChat.appendMention(new CoreUser(g), j); } else { - MessageReference messageReference = modelMessage.getMessageReference(); + MessageReference A = message.A(); Long l = null; - Long a = messageReference != null ? messageReference.a() : null; - MessageReference messageReference2 = modelMessage.getMessageReference(); - if (messageReference2 != null) { - l = messageReference2.b(); + Long a = A != null ? A.a() : null; + MessageReference A2 = message.A(); + if (A2 != null) { + l = A2.b(); } if (l != null && a != null) { WidgetGuildProfileSheet.Companion.show(getFragmentManager(), false, l.longValue(), a.longValue()); @@ -423,25 +431,25 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageBlockedGroupClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - this.storeChat.toggleBlockedMessageGroup(modelMessage.getId()); + public void onMessageBlockedGroupClicked(Message message) { + m.checkNotNullParameter(message, "message"); + this.storeChat.toggleBlockedMessageGroup(message.r()); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageClicked(ModelMessage modelMessage, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); + public void onMessageClicked(Message message, boolean z2) { + m.checkNotNullParameter(message, "message"); if (z2) { - StoreStream.Companion.getMessagesLoader().jumpToMessage(modelMessage.getChannelId(), modelMessage.getId()); + StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r()); } } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageLongClicked(ModelMessage modelMessage, CharSequence charSequence, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); + public void onMessageLongClicked(Message message, CharSequence charSequence, boolean z2) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(charSequence, "formattedMessage"); if (!z2) { - WidgetChatListActions.Companion.showForChat(getFragmentManager(), modelMessage.getChannelId(), modelMessage.getId(), charSequence); + WidgetChatListActions.Companion.showForChat(getFragmentManager(), message.i(), message.r(), charSequence); } } @@ -450,9 +458,9 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onOpenPinsClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChannelPinnedMessages.Companion.show(getContext(), modelMessage.getChannelId()); + public void onOpenPinsClicked(Message message) { + m.checkNotNullParameter(message, "message"); + WidgetChannelPinnedMessages.Companion.show(getContext(), message.i()); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -492,10 +500,10 @@ public final class WidgetChatListAdapterEventsHandler implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onStickerClicked(ModelMessage modelMessage, BaseSticker baseSticker) { - m.checkNotNullParameter(modelMessage, "message"); + public void onStickerClicked(Message message, BaseSticker baseSticker) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(baseSticker, "sticker"); - WidgetChatListAdapterEventsHandler$onStickerClicked$1 widgetChatListAdapterEventsHandler$onStickerClicked$1 = new WidgetChatListAdapterEventsHandler$onStickerClicked$1(this, baseSticker, modelMessage); + WidgetChatListAdapterEventsHandler$onStickerClicked$1 widgetChatListAdapterEventsHandler$onStickerClicked$1 = new WidgetChatListAdapterEventsHandler$onStickerClicked$1(this, baseSticker, message); if (StickerPickerFeatureFlag.Companion.getINSTANCE().isEnabled()) { this.flexInputViewModel.hideKeyboard(); if (baseSticker instanceof Sticker) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java index c56fb1c1b3..e11db909bc 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1.java @@ -2,9 +2,9 @@ package com.discord.widgets.chat.list.adapter; import android.text.style.StyleSpan; import android.view.View; +import com.discord.api.message.Message; import com.discord.i18n.Hook; import com.discord.i18n.RenderContext; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.spans.ClickableSpan; import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter; import d0.z.d.m; @@ -15,7 +15,7 @@ import kotlin.jvm.functions.Function1; public final class WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1 extends o implements Function1 { public final /* synthetic */ int $authorTextColor; public final /* synthetic */ int $cmdColor; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemApplicationCommand this$0; /* compiled from: WidgetChatListAdapterItemApplicationCommand.kt */ @@ -120,11 +120,11 @@ public final class WidgetChatListAdapterItemApplicationCommand$onConfigure$conte } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(WidgetChatListAdapterItemApplicationCommand widgetChatListAdapterItemApplicationCommand, int i, ModelMessage modelMessage, int i2) { + public WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(WidgetChatListAdapterItemApplicationCommand widgetChatListAdapterItemApplicationCommand, int i, Message message, int i2) { super(1); this.this$0 = widgetChatListAdapterItemApplicationCommand; this.$authorTextColor = i; - this.$message = modelMessage; + this.$message = message; this.$cmdColor = i2; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java index 137f52376a..f26a5a5896 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemApplicationCommand.java @@ -1,5 +1,6 @@ package com.discord.widgets.chat.list.adapter; +import android.content.Context; import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.FrameLayout; @@ -10,8 +11,10 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Guideline; import c.a.l.b; import c.d.b.a.a; +import com.discord.api.message.Message; +import com.discord.api.user.User; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.databinding.WidgetChatListAdapterItemApplicationCommandBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.time.TimeUtils; @@ -28,7 +31,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemApplicationCommand(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558922, widgetChatListAdapter); + super(2131558923, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362530; @@ -52,8 +55,8 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha i = 2131362544; TextView textView3 = (TextView) view.findViewById(2131362544); if (textView3 != null) { - i = 2131365323; - Guideline guideline = (Guideline) view.findViewById(2131365323); + i = 2131365328; + Guideline guideline = (Guideline) view.findViewById(2131365328); if (guideline != null) { WidgetChatListAdapterItemApplicationCommandBinding widgetChatListAdapterItemApplicationCommandBinding = new WidgetChatListAdapterItemApplicationCommandBinding((ConstraintLayout) view, imageView, textView, cardView, frameLayout, constraintLayout, textView2, textView3, guideline); m.checkNotNullExpressionValue(widgetChatListAdapterItemApplicationCommandBinding, "WidgetChatListAdapterIte…andBinding.bind(itemView)"); @@ -94,18 +97,18 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha m.checkNotNullParameter(chatListEntry, "data"); super.onConfigure(i, chatListEntry); MessageEntry messageEntry = (MessageEntry) chatListEntry; - ModelMessage message = messageEntry.getMessage(); + Message message = messageEntry.getMessage(); GuildMember author = messageEntry.getAuthor(); Map nickOrUsernames = messageEntry.getNickOrUsernames(); int authorTextColor = getAuthorTextColor(author); WidgetChatListAdapterItemApplicationCommand$onConfigure$1 widgetChatListAdapterItemApplicationCommand$onConfigure$1 = WidgetChatListAdapterItemApplicationCommand$onConfigure$1.INSTANCE; Pattern compile = Pattern.compile("^<(/[^:]+):([0-9]*)>(.*)"); - String content = message.getContent(); + String k = message.k(); String str3 = ""; - if (content == null) { - content = str3; + if (k == null) { + k = str3; } - Matcher matcher = compile.matcher(content); + Matcher matcher = compile.matcher(k); if (matcher.matches()) { str = matcher.group(1); if (str == null) { @@ -116,7 +119,8 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha str = "/"; } str2 = str3; - String str4 = nickOrUsernames.get(Long.valueOf(message.getAuthor().i())); + User g = message.g(); + String str4 = nickOrUsernames.get(g != null ? Long.valueOf(g.i()) : null); if (str4 != null) { str3 = str4; } @@ -125,7 +129,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha int themedColor = ColorCompat.getThemedColor(view, 2130969007); TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextName"); - CharSequence c2 = b.c(textView, 2131893693, new Object[]{str3, str}, new WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(this, authorTextColor, message, themedColor)); + CharSequence c2 = b.c(textView, 2131893733, new Object[]{str3, str}, new WidgetChatListAdapterItemApplicationCommand$onConfigure$content$1(this, authorTextColor, message, themedColor)); TextView textView2 = this.binding.e; m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemTextName"); textView2.setMovementMethod(LinkMovementMethod.getInstance()); @@ -137,7 +141,7 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha textView4.setMaxLines(1); this.binding.b.setOnClickListener(new WidgetChatListAdapterItemApplicationCommand$onConfigure$2(this)); boolean z2 = !t.isBlank(str2); - CardView cardView = this.binding.f1722c; + CardView cardView = this.binding.f1724c; m.checkNotNullExpressionValue(cardView, "binding.chatListAdapterItemTextDecorator"); int i2 = 8; cardView.setVisibility(z2 ? 0 : 8); @@ -149,12 +153,14 @@ public final class WidgetChatListAdapterItemApplicationCommand extends WidgetCha frameLayout.setVisibility(i2); TextView textView5 = this.binding.b; m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemTextCommand"); - textView5.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131887427, new Object[]{str, str2}, null, 4)); + textView5.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131887429, new Object[]{str, str2}, null, 4)); TextView textView6 = this.binding.b; m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemTextCommand"); widgetChatListAdapterItemApplicationCommand$onConfigure$1.invoke(textView6); TextView textView7 = this.binding.f; m.checkNotNullExpressionValue(textView7, "binding.chatListAdapterItemTextTimestamp"); - textView7.setText(TimeUtils.toReadableTimeString$default(a.T(this.itemView, "itemView", "itemView.context"), message.getTimestamp(), null, 4, null)); + Context T = a.T(this.itemView, "itemView", "itemView.context"); + UtcDateTime K = message.K(); + textView7.setText(TimeUtils.toReadableTimeString$default(T, K != null ? K.f() : 0, null, 4, null)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java index 684c44c20f..bdf918a34c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$3.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter; import com.discord.widgets.chat.list.entries.AttachmentEntry; import d0.z.d.m; @@ -31,11 +31,11 @@ public final class WidgetChatListAdapterItemAttachment$configureUI$3 extends o i public final void invoke(View view) { m.checkNotNullParameter(view, "it"); WidgetChatListAdapter.EventHandler eventHandler = WidgetChatListAdapterItemAttachment.access$getAdapter$p(this.this$0).getEventHandler(); - ModelMessage message = this.$data.getMessage(); - String content = this.$data.getMessage().getContent(); - if (content == null) { - content = ""; + Message message = this.$data.getMessage(); + String k = this.$data.getMessage().k(); + if (k == null) { + k = ""; } - eventHandler.onMessageLongClicked(message, content, this.$data.isThreadStarterMessage()); + eventHandler.onMessageLongClicked(message, k, this.$data.isThreadStarterMessage()); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java index f069ba01cd..f9600ee247 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment$configureUI$5.java @@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemAttachment$configureUI$5 implements @Override // android.view.View.OnClickListener public final void onClick(View view) { if (WidgetChatListAdapterItemAttachment.access$getAdapter$p(this.this$0).getData().isSpoilerClickAllowed()) { - StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getAttachmentEntry().getMessage().getId(), this.$data.getEmbedIndex()); + StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getAttachmentEntry().getMessage().r(), this.$data.getEmbedIndex()); } else { WidgetChatListAdapterItemAttachment.access$getAdapter$p(this.this$0).getEventHandler().onMessageClicked(this.$model.getAttachmentEntry().getMessage(), this.$data.isThreadStarterMessage()); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java index b992480600..b1142c3590 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemAttachment.java @@ -12,11 +12,11 @@ import androidx.constraintlayout.widget.Barrier; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Guideline; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.message.attachment.MessageAttachment; import com.discord.api.message.attachment.MessageAttachmentType; import com.discord.api.role.GuildRole; import com.discord.databinding.WidgetChatListAdapterItemAttachmentBinding; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StoreMessageState; import com.discord.stores.StoreStream; import com.discord.stores.StoreUserSettings; @@ -237,7 +237,7 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemAttachment(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558923, widgetChatListAdapter); + super(2131558924, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE; View view = this.itemView; @@ -276,8 +276,8 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte i = 2131362558; FrameLayout frameLayout = (FrameLayout) view2.findViewById(2131362558); if (frameLayout != null) { - i = 2131365323; - Guideline guideline = (Guideline) view2.findViewById(2131365323); + i = 2131365328; + Guideline guideline = (Guideline) view2.findViewById(2131365328); if (guideline != null) { WidgetChatListAdapterItemAttachmentBinding widgetChatListAdapterItemAttachmentBinding = new WidgetChatListAdapterItemAttachmentBinding((ConstraintLayout) view2, findViewById, findViewById2, barrier, materialCardView, textView, imageView, imageView2, inlineMediaView, textView2, frameLayout, guideline); m.checkNotNullExpressionValue(widgetChatListAdapterItemAttachmentBinding, "WidgetChatListAdapterIte…entBinding.bind(itemView)"); @@ -424,8 +424,8 @@ public final class WidgetChatListAdapterItemAttachment extends WidgetChatListIte m.checkNotNullParameter(chatListEntry, "data"); super.onConfigure(i, chatListEntry); AttachmentEntry attachmentEntry = (AttachmentEntry) chatListEntry; - ModelMessage message = attachmentEntry.getMessage(); - View view = this.binding.f1723c; + Message message = attachmentEntry.getMessage(); + View view = this.binding.f1725c; m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemHighlightedBg"); View view2 = this.binding.b; m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java index 9795cea1b3..d15ff1c1b3 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked$onConfigure$1.java @@ -1,15 +1,15 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; /* compiled from: WidgetChatListAdapterItemBlocked.kt */ public final class WidgetChatListAdapterItemBlocked$onConfigure$1 implements View.OnClickListener { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemBlocked this$0; - public WidgetChatListAdapterItemBlocked$onConfigure$1(WidgetChatListAdapterItemBlocked widgetChatListAdapterItemBlocked, ModelMessage modelMessage) { + public WidgetChatListAdapterItemBlocked$onConfigure$1(WidgetChatListAdapterItemBlocked widgetChatListAdapterItemBlocked, Message message) { this.this$0 = widgetChatListAdapterItemBlocked; - this.$message = modelMessage; + this.$message = message; } @Override // android.view.View.OnClickListener diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java index ed14d54bce..a365d687bb 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBlocked.java @@ -7,8 +7,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; import c.a.l.b; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.databinding.WidgetChatListAdapterItemBlockedBinding; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.resources.StringResourceUtilsKt; import com.discord.widgets.chat.list.entries.BlockedMessagesEntry; import com.discord.widgets.chat.list.entries.ChatListEntry; @@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemBlocked extends WidgetChatListItem { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemBlocked(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558924, widgetChatListAdapter); + super(2131558925, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; TextView textView = (TextView) view.findViewById(2131362506); @@ -37,7 +37,7 @@ public final class WidgetChatListAdapterItemBlocked extends WidgetChatListItem { } private final CharSequence getBlockedText(Resources resources, Context context, int i) { - return b.h(resources, 2131887033, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755042, i, Integer.valueOf(i))}, null, 4); + return b.h(resources, 2131887034, new Object[]{StringResourceUtilsKt.getI18nPluralString(context, 2131755042, i, Integer.valueOf(i))}, null, 4); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem @@ -45,7 +45,7 @@ public final class WidgetChatListAdapterItemBlocked extends WidgetChatListItem { m.checkNotNullParameter(chatListEntry, "data"); super.onConfigure(i, chatListEntry); BlockedMessagesEntry blockedMessagesEntry = (BlockedMessagesEntry) chatListEntry; - ModelMessage component1 = blockedMessagesEntry.component1(); + Message component1 = blockedMessagesEntry.component1(); int component2 = blockedMessagesEntry.component2(); TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemBlocked"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java index 780fb441cc..1cc998a0df 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemBotComponentRow.java @@ -5,9 +5,9 @@ import android.widget.LinearLayout; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.fragment.app.FragmentManager; import com.discord.api.botuikit.SelectItem; +import com.discord.api.message.Message; import com.discord.databinding.WidgetChatListAdapterItemBotComponentRowBinding; import com.discord.models.botuikit.MessageComponent; -import com.discord.models.domain.ModelMessage; import com.discord.restapi.RestAPIParams; import com.discord.widgets.botuikit.ComponentProvider; import com.discord.widgets.botuikit.views.ComponentActionListener; @@ -28,7 +28,7 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemBotComponentRow(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558925, widgetChatListAdapter); + super(2131558926, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362513; @@ -72,12 +72,12 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi if (botUiComponentEntry2 == null) { m.throwUninitializedPropertyAccessException("entry"); } - long id2 = botUiComponentEntry2.getMessage().getId(); + long r = botUiComponentEntry2.getMessage().r(); BotUiComponentEntry botUiComponentEntry3 = this.entry; if (botUiComponentEntry3 == null) { m.throwUninitializedPropertyAccessException("entry"); } - widgetChatListAdapter.onBotUiComponentClicked(applicationId, id2, botUiComponentEntry3.getMessage().getFlags(), i, new RestAPIParams.ComponentInteractionData.ButtonComponentInteractionData(null, str, str2, 1, null)); + widgetChatListAdapter.onBotUiComponentClicked(applicationId, r, botUiComponentEntry3.getMessage().n(), i, new RestAPIParams.ComponentInteractionData.ButtonComponentInteractionData(null, str, str2, 1, null)); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem @@ -89,8 +89,8 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi if (botUiComponentEntry == null) { m.throwUninitializedPropertyAccessException("entry"); } - ModelMessage message = botUiComponentEntry.getMessage(); - View view = this.binding.f1724c; + Message message = botUiComponentEntry.getMessage(); + View view = this.binding.f1726c; m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemGutterBg"); View view2 = this.binding.d; m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemHighlightedBg"); @@ -135,22 +135,22 @@ public final class WidgetChatListAdapterItemBotComponentRow extends WidgetChatLi if (botUiComponentEntry2 == null) { m.throwUninitializedPropertyAccessException("entry"); } - long id2 = botUiComponentEntry2.getMessage().getId(); + long r = botUiComponentEntry2.getMessage().r(); BotUiComponentEntry botUiComponentEntry3 = this.entry; if (botUiComponentEntry3 == null) { m.throwUninitializedPropertyAccessException("entry"); } - long channelId = botUiComponentEntry3.getMessage().getChannelId(); + long i4 = botUiComponentEntry3.getMessage().i(); BotUiComponentEntry botUiComponentEntry4 = this.entry; if (botUiComponentEntry4 == null) { m.throwUninitializedPropertyAccessException("entry"); } - Long flags = botUiComponentEntry4.getMessage().getFlags(); + Long n = botUiComponentEntry4.getMessage().n(); BotUiComponentEntry botUiComponentEntry5 = this.entry; if (botUiComponentEntry5 == null) { m.throwUninitializedPropertyAccessException("entry"); } - companion.show(fragmentManager, new ComponentContext(guildId, id2, channelId, flags, botUiComponentEntry5.getApplicationId()), i, str, str2, str3, i2, i3, list, list2); + companion.show(fragmentManager, new ComponentContext(guildId, r, i4, n, botUiComponentEntry5.getApplicationId()), i, str, str2, str3, i2, i3, list, list2); } public final void setEntry(BotUiComponentEntry botUiComponentEntry) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java index 3e22b58826..e168cdba05 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage$handleState$1.java @@ -1,22 +1,22 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.widgets.chat.list.adapter.WidgetChatListAdapterItemCallMessage; /* compiled from: WidgetChatListAdapterItemCallMessage.kt */ public final class WidgetChatListAdapterItemCallMessage$handleState$1 implements View.OnClickListener { public final /* synthetic */ WidgetChatListAdapterItemCallMessage.CallStatus $callStatus; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemCallMessage this$0; - public WidgetChatListAdapterItemCallMessage$handleState$1(WidgetChatListAdapterItemCallMessage widgetChatListAdapterItemCallMessage, WidgetChatListAdapterItemCallMessage.CallStatus callStatus, ModelMessage modelMessage) { + public WidgetChatListAdapterItemCallMessage$handleState$1(WidgetChatListAdapterItemCallMessage widgetChatListAdapterItemCallMessage, WidgetChatListAdapterItemCallMessage.CallStatus callStatus, Message message) { this.this$0 = widgetChatListAdapterItemCallMessage; this.$callStatus = callStatus; - this.$message = modelMessage; + this.$message = message; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetChatListAdapterItemCallMessage.access$onItemClick(this.this$0, this.$callStatus, this.$message.getChannelId()); + WidgetChatListAdapterItemCallMessage.access$onItemClick(this.this$0, this.$callStatus, this.$message.i()); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java index d0f2ca7743..18c1982098 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemCallMessage.java @@ -12,9 +12,10 @@ import androidx.cardview.widget.CardView; import androidx.recyclerview.widget.RecyclerView; import c.a.l.b; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.message.call.MessageCall; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.databinding.WidgetChatListAdapterItemCallBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.user.CoreUser; import com.discord.models.user.User; import com.discord.stores.StoreStream; @@ -23,6 +24,7 @@ import com.discord.utilities.color.ColorCompat; import com.discord.utilities.color.ColorCompatKt; import com.discord.utilities.dimen.DimenUtils; import com.discord.utilities.duration.DurationUtilsKt; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.time.Clock; @@ -202,7 +204,7 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemCallMessage(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558926, widgetChatListAdapter); + super(2131558927, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362507; @@ -309,9 +311,11 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt if (subscription != null) { subscription.unsubscribe(); } - ModelMessage message = messageEntry.getMessage(); - CharSequence humanizeDuration = DurationUtilsKt.humanizeDuration(context, message.getCallDuration()); - String obj = TimeUtils.toReadableTimeString$default(a.T(this.itemView, "itemView", "itemView.context"), message.getTimestamp(), null, 4, null).toString(); + Message message = messageEntry.getMessage(); + CharSequence humanizeDuration = DurationUtilsKt.humanizeDuration(context, MessageUtils.INSTANCE.getCallDuration(message)); + Context T = a.T(this.itemView, "itemView", "itemView.context"); + UtcDateTime K = message.K(); + String obj = TimeUtils.toReadableTimeString$default(T, K != null ? K.f() : 0, null, 4, null).toString(); LinearLayout linearLayout = this.binding.f; m.checkNotNullExpressionValue(linearLayout, "binding.chatListAdapterI…llUnjoinedOngoingSubtitle"); int i = 8; @@ -326,22 +330,19 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt textView.setVisibility(i); int ordinal = callStatus.ordinal(); if (ordinal == 0 || ordinal == 1) { - Long timestampMilliseconds = message.getTimestampMilliseconds(); - if (timestampMilliseconds != null) { - m.checkNotNullExpressionValue(timestampMilliseconds, "message.timestampMilliseconds ?: return"); - long longValue = timestampMilliseconds.longValue(); - Observable E = Observable.E(0, 1, TimeUnit.SECONDS); - m.checkNotNullExpressionValue(E, "Observable\n .…0L, 1L, TimeUnit.SECONDS)"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(E), WidgetChatListAdapterItemCallMessage.class, (Context) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$1(this, longValue), 58, (Object) null); - } + UtcDateTime K2 = message.K(); + long f = K2 != null ? K2.f() : 0; + Observable E = Observable.E(0, 1, TimeUnit.SECONDS); + m.checkNotNullExpressionValue(E, "Observable\n .…0L, 1L, TimeUnit.SECONDS)"); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(E), WidgetChatListAdapterItemCallMessage.class, (Context) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemCallMessage$configureSubtitle$1(this, f), 58, (Object) null); } else if (ordinal == 2) { TextView textView2 = this.binding.d; m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemCallSubtitle"); - b.n(textView2, 2131887114, new Object[]{humanizeDuration, obj}, null, 4); + b.n(textView2, 2131887115, new Object[]{humanizeDuration, obj}, null, 4); } else if (ordinal == 3) { TextView textView3 = this.binding.d; m.checkNotNullExpressionValue(textView3, "binding.chatListAdapterItemCallSubtitle"); - b.n(textView3, 2131887114, new Object[]{humanizeDuration, obj}, null, 4); + b.n(textView3, 2131887115, new Object[]{humanizeDuration, obj}, null, 4); } } @@ -405,13 +406,12 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt return drawable; } - private final CallStatus getCallStatus(ModelMessage modelMessage, Map map) { + private final CallStatus getCallStatus(Message message, Map map) { boolean z2; - MessageCall call = modelMessage.getCall(); - if (call == null) { + MessageCall h = message.h(); + if (h == null) { return CallStatus.INACTIVE_UNJOINED; } - m.checkNotNullExpressionValue(call, "message.call ?: return C…lStatus.INACTIVE_UNJOINED"); long userId = ((WidgetChatListAdapter) this.adapter).getData().getUserId(); List list = u.toList(map.entrySet()); ArrayList arrayList = new ArrayList(); @@ -433,9 +433,9 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt for (Map.Entry entry : arrayList) { arrayList2.add(Long.valueOf(((Number) entry.getKey()).longValue())); } - boolean contains = call.b().contains(Long.valueOf(userId)); + boolean contains = h.b().contains(Long.valueOf(userId)); boolean contains2 = arrayList2.contains(Long.valueOf(userId)); - if (call.a() != null) { + if (h.a() != null) { z2 = false; } return (!z2 || !contains2) ? z2 ? CallStatus.ACTIVE_UNJOINED : contains ? CallStatus.INACTIVE_JOINED : CallStatus.INACTIVE_UNJOINED : CallStatus.ACTIVE_JOINED; @@ -454,25 +454,25 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt private final CharSequence getTitleString(CallStatus callStatus, Resources resources) { int ordinal = callStatus.ordinal(); if (ordinal == 0 || ordinal == 1) { - return b.h(resources, 2131891637, new Object[0], null, 4); + return b.h(resources, 2131891670, new Object[0], null, 4); } if (ordinal == 2) { - return b.h(resources, 2131891176, new Object[0], null, 4); + return b.h(resources, 2131891207, new Object[0], null, 4); } if (ordinal == 3) { - return b.h(resources, 2131887113, new Object[0], null, 4); + return b.h(resources, 2131887114, new Object[0], null, 4); } throw new NoWhenBranchMatchedException(); } private final void handleState(State state) { MessageEntry messageEntry = state.getMessageEntry(); - ModelMessage message = messageEntry.getMessage(); + Message message = messageEntry.getMessage(); Map voiceParticipants = state.getVoiceParticipants(); CallStatus callStatus = getCallStatus(message, voiceParticipants); - com.discord.api.user.User author = message.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - List createCallParticipantUsers = createCallParticipantUsers(voiceParticipants, callStatus, new CoreUser(author)); + com.discord.api.user.User g = message.g(); + m.checkNotNull(g); + List createCallParticipantUsers = createCallParticipantUsers(voiceParticipants, callStatus, new CoreUser(g)); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemCallSubtitle"); Context context = textView.getContext(); @@ -491,7 +491,7 @@ public final class WidgetChatListAdapterItemCallMessage extends WidgetChatListIt } private final Observable observeState(MessageEntry messageEntry) { - Observable G = StoreStream.Companion.getVoiceParticipants().get(messageEntry.getMessage().getChannelId()).G(new WidgetChatListAdapterItemCallMessage$observeState$1(messageEntry)); + Observable G = StoreStream.Companion.getVoiceParticipants().get(messageEntry.getMessage().i()).G(new WidgetChatListAdapterItemCallMessage$observeState$1(messageEntry)); m.checkNotNullExpressionValue(G, "StoreStream.getVoicePart…, messageEntry)\n }"); return G; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java index f8ea4462b7..f240714965 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureEmbedTitle$1.java @@ -32,10 +32,10 @@ public final class WidgetChatListAdapterItemEmbed$configureEmbedTitle$1 extends public final void invoke(SpoilerNode spoilerNode) { m.checkNotNullParameter(spoilerNode, "node"); StoreMessageState messageState = StoreStream.Companion.getMessageState(); - long id2 = this.$model.getEmbedEntry().getMessage().getId(); + long r = this.$model.getEmbedEntry().getMessage().r(); int i = this.$embedIndex; StringBuilder L = a.L("title:"); L.append(spoilerNode.getId()); - messageState.revealSpoilerEmbedData(id2, i, L.toString()); + messageState.revealSpoilerEmbedData(r, i, L.toString()); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java index 148d9cd6a9..f9deeeb2fb 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed$configureUI$3.java @@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemEmbed$configureUI$3 implements View. @Override // android.view.View.OnClickListener public final void onClick(View view) { if (WidgetChatListAdapterItemEmbed.access$getAdapter$p(this.this$0).getData().isSpoilerClickAllowed()) { - StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getEmbedEntry().getMessage().getId(), this.$data.getEmbedIndex()); + StoreStream.Companion.getMessageState().revealSpoilerEmbed(this.$model.getEmbedEntry().getMessage().r(), this.$data.getEmbedIndex()); } else { WidgetChatListAdapterItemEmbed.access$getAdapter$p(this.this$0).getEventHandler().onMessageClicked(this.$model.getEmbedEntry().getMessage(), this.$data.isThreadStarterMessage()); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java index e864b6f91c..773883b2c7 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmbed.java @@ -17,6 +17,7 @@ import androidx.core.graphics.ColorUtils; import c.a.i.h4; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; +import com.discord.api.message.Message; import com.discord.api.message.embed.EmbedAuthor; import com.discord.api.message.embed.EmbedField; import com.discord.api.message.embed.EmbedFooter; @@ -30,7 +31,6 @@ import com.discord.api.utcdatetime.UtcDateTime; import com.discord.app.AppLog; import com.discord.databinding.WidgetChatListAdapterItemEmbedBinding; import com.discord.embed.RenderableEmbedMedia; -import com.discord.models.domain.ModelMessage; import com.discord.simpleast.core.node.Node; import com.discord.simpleast.core.parser.Parser; import com.discord.stores.StoreMessageState; @@ -342,8 +342,8 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp this.roles = map3; this.myId = j; Parser, MessageParseState> createTitlesParser = WidgetChatListAdapterItemEmbed.Companion.createTitlesParser(); - String content = embedEntry.getMessage().getContent(); - List parse$default = Parser.parse$default(createTitlesParser, content == null ? "" : content, MessageParseState.Companion.getInitialState(), null, 4, null); + String k = embedEntry.getMessage().k(); + List parse$default = Parser.parse$default(createTitlesParser, k == null ? "" : k, MessageParseState.Companion.getInitialState(), null, 4, null); MessagePreprocessor messagePreprocessor = new MessagePreprocessor(j, embedEntry.getMessageState()); messagePreprocessor.process(parse$default); List> spoilers = messagePreprocessor.getSpoilers(); @@ -543,7 +543,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemEmbed(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558928, widgetChatListAdapter); + super(2131558929, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362517; @@ -603,11 +603,11 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp i = 2131362577; LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131362577); if (linkifiedTextView2 != null) { - i = 2131362999; - CardView cardView = (CardView) view.findViewById(2131362999); + i = 2131363001; + CardView cardView = (CardView) view.findViewById(2131363001); if (cardView != null) { - i = 2131363000; - InlineMediaView inlineMediaView = (InlineMediaView) view.findViewById(2131363000); + i = 2131363002; + InlineMediaView inlineMediaView = (InlineMediaView) view.findViewById(2131363002); if (inlineMediaView != null) { WidgetChatListAdapterItemEmbedBinding widgetChatListAdapterItemEmbedBinding = new WidgetChatListAdapterItemEmbedBinding((ConstraintLayout) view, findViewById, findViewById2, simpleDraweeView, textView, barrier, barrier2, materialCardView, constraintLayout, linkifiedTextView, findViewById3, linearLayout, simpleDraweeView2, textView2, simpleDraweeView3, imageView, simpleDraweeView4, textView3, frameLayout, linkifiedTextView2, cardView, inlineMediaView); m.checkNotNullExpressionValue(widgetChatListAdapterItemEmbedBinding, "WidgetChatListAdapterIte…bedBinding.bind(itemView)"); @@ -728,12 +728,12 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp private final void configureEmbedDescription(Model model, MessageRenderContext messageRenderContext) { Map> visibleSpoilerEmbedMap; if (model.getParsedDescription() != null) { - long id2 = model.getEmbedEntry().getMessage().getId(); + long r = model.getEmbedEntry().getMessage().r(); int embedIndex = model.getEmbedEntry().getEmbedIndex(); long myId = model.getMyId(); StoreMessageState.State messageState = model.getEmbedEntry().getMessageState(); new MessagePreprocessor(myId, (messageState == null || (visibleSpoilerEmbedMap = messageState.getVisibleSpoilerEmbedMap()) == null) ? null : Companion.access$getEmbedFieldVisibleIndices(Companion, visibleSpoilerEmbedMap, embedIndex, "desc"), null, false, null, 28, null).process(model.getParsedDescription()); - this.binding.h.setDraweeSpanStringBuilder(AstRenderer.render(model.getParsedDescription(), MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedDescription$1(id2, embedIndex), null, null, 14335, null))); + this.binding.h.setDraweeSpanStringBuilder(AstRenderer.render(model.getParsedDescription(), MessageRenderContext.copy$default(messageRenderContext, null, 0, false, null, null, null, 0, null, null, 0, 0, new WidgetChatListAdapterItemEmbed$configureEmbedDescription$1(r, embedIndex), null, null, 14335, null))); LinkifiedTextView linkifiedTextView = this.binding.h; m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatListItemEmbedDescription"); linkifiedTextView.setVisibility(0); @@ -775,10 +775,10 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp LinearLayout linearLayout3 = this.binding.j; m.checkNotNullExpressionValue(linearLayout3, "binding.chatListItemEmbedFields"); Context context = linearLayout3.getContext(); - long id2 = model.getEmbedEntry().getMessage().getId(); + long r = model.getEmbedEntry().getMessage().r(); int embedIndex = model.getEmbedEntry().getEmbedIndex(); StoreMessageState.State messageState = model.getEmbedEntry().getMessageState(); - WidgetChatListAdapterItemEmbed$configureEmbedFields$1 widgetChatListAdapterItemEmbed$configureEmbedFields$1 = new WidgetChatListAdapterItemEmbed$configureEmbedFields$1(model, messageState != null ? messageState.getVisibleSpoilerEmbedMap() : null, embedIndex, messageRenderContext, id2); + WidgetChatListAdapterItemEmbed$configureEmbedFields$1 widgetChatListAdapterItemEmbed$configureEmbedFields$1 = new WidgetChatListAdapterItemEmbed$configureEmbedFields$1(model, messageState != null ? messageState.getVisibleSpoilerEmbedMap() : null, embedIndex, messageRenderContext, r); int size = parsedFields.size(); for (int i = 0; i < size; i++) { LinearLayout linearLayout4 = this.binding.j; @@ -787,7 +787,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp if (i < linearLayout4.getChildCount()) { r5 = this.binding.j.getChildAt(i); } else { - View inflate = LayoutInflater.from(context).inflate(2131558929, (ViewGroup) this.binding.j, false); + View inflate = LayoutInflater.from(context).inflate(2131558930, (ViewGroup) this.binding.j, false); LinkifiedTextView linkifiedTextView = (LinkifiedTextView) inflate.findViewById(2131362567); if (linkifiedTextView != null) { LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) inflate.findViewById(2131362568); @@ -840,7 +840,7 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp RenderableEmbedMedia previewImage = embedResourceUtils.getPreviewImage(messageEmbed); int i = 8; if (previewImage == null) { - CardView cardView = this.binding.f1727s; + CardView cardView = this.binding.f1729s; m.checkNotNullExpressionValue(cardView, "binding.embedImageContainer"); cardView.setVisibility(8); return; @@ -848,9 +848,9 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp boolean shouldRenderMedia = shouldRenderMedia(); Integer num2 = previewImage.b; boolean z2 = true; - boolean z3 = num2 != null && d0.a0.a.getSign(num2.intValue()) == 1 && (num = previewImage.f2004c) != null && d0.a0.a.getSign(num.intValue()) == 1; + boolean z3 = num2 != null && d0.a0.a.getSign(num2.intValue()) == 1 && (num = previewImage.f2006c) != null && d0.a0.a.getSign(num.intValue()) == 1; if (!shouldRenderMedia || !z3) { - CardView cardView2 = this.binding.f1727s; + CardView cardView2 = this.binding.f1729s; m.checkNotNullExpressionValue(cardView2, "binding.embedImageContainer"); cardView2.setVisibility(8); } else { @@ -860,9 +860,9 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp int i3 = i2 / 2; Integer num3 = previewImage.b; int intValue = num3 != null ? num3.intValue() : 0; - Integer num4 = previewImage.f2004c; + Integer num4 = previewImage.f2006c; configureEmbedImage(simpleDraweeView, i2, intValue, num4 != null ? num4.intValue() : 0, previewImage.a, i3); - CardView cardView3 = this.binding.f1727s; + CardView cardView3 = this.binding.f1729s; m.checkNotNullExpressionValue(cardView3, "binding.embedImageContainer"); cardView3.setVisibility(0); } @@ -1039,14 +1039,14 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp if (renderableEmbedMedia != null) { Integer num = renderableEmbedMedia.b; if ((num != null ? num.intValue() : 0) <= 0) { - Integer num2 = renderableEmbedMedia.f2004c; + Integer num2 = renderableEmbedMedia.f2006c; if ((num2 != null ? num2.intValue() : 0) <= 0) { z3 = false; if (!z3) { EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE; Integer num3 = renderableEmbedMedia.b; int intValue = num3 != null ? num3.intValue() : 0; - Integer num4 = renderableEmbedMedia.f2004c; + Integer num4 = renderableEmbedMedia.f2006c; int intValue2 = num4 != null ? num4.intValue() : 0; int i = this.maxEmbedImageWidth; int i2 = MAX_IMAGE_VIEW_HEIGHT_PX; @@ -1183,8 +1183,8 @@ public final class WidgetChatListAdapterItemEmbed extends WidgetChatListItem imp m.checkNotNullExpressionValue(view, "itemView"); ViewExtensions.setOnLongClickListenerConsumeClick(view, new WidgetChatListAdapterItemEmbed$onConfigure$1(this, chatListEntry)); this.itemView.setOnClickListener(new WidgetChatListAdapterItemEmbed$onConfigure$2(this, chatListEntry)); - ModelMessage message = embedEntry.getMessage(); - View view2 = this.binding.f1726c; + Message message = embedEntry.getMessage(); + View view2 = this.binding.f1728c; m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemHighlightedBg"); View view3 = this.binding.b; m.checkNotNullExpressionValue(view3, "binding.chatListAdapterItemGutterBg"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java index 942e0dcafb..ed199a1163 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEmptyPins.java @@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemEmptyPins extends WidgetChatListItem /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemEmptyPins(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558930, widgetChatListAdapter); + super(2131558931, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362549; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java index 061036a62a..e3d2554a20 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage$onConfigure$2.java @@ -1,9 +1,9 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; +import com.discord.api.message.Message; import com.discord.i18n.Hook; import com.discord.i18n.RenderContext; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.color.ColorCompat; import d0.z.d.m; import d0.z.d.o; @@ -13,7 +13,7 @@ import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; /* compiled from: WidgetChatListAdapterItemEphemeralMessage.kt */ public final class WidgetChatListAdapterItemEphemeralMessage$onConfigure$2 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemEphemeralMessage this$0; /* compiled from: WidgetChatListAdapterItemEphemeralMessage.kt */ @@ -69,15 +69,15 @@ public final class WidgetChatListAdapterItemEphemeralMessage$onConfigure$2 exten AnonymousClass1 r1 = new AnonymousClass1(this); Objects.requireNonNull(hook); m.checkNotNullParameter(r1, "onClick"); - hook.f2009c = new Hook.a(valueOf, r1); + hook.f2011c = new Hook.a(valueOf, r1); } } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(WidgetChatListAdapterItemEphemeralMessage widgetChatListAdapterItemEphemeralMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(WidgetChatListAdapterItemEphemeralMessage widgetChatListAdapterItemEphemeralMessage, Message message) { super(1); this.this$0 = widgetChatListAdapterItemEphemeralMessage; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java index da3a96012f..ca295e144d 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemEphemeralMessage.java @@ -7,8 +7,8 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Guideline; import c.a.l.b; +import com.discord.api.message.Message; import com.discord.databinding.WidgetChatListAdapterItemEphemeralMessageBinding; -import com.discord.models.domain.ModelMessage; import com.discord.widgets.chat.list.entries.ChatListEntry; import com.discord.widgets.chat.list.entries.EphemeralMessageEntry; import d0.z.d.m; @@ -18,7 +18,7 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemEphemeralMessage(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558931, widgetChatListAdapter); + super(2131558932, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362517; @@ -36,8 +36,8 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL i = 2131362547; ImageView imageView2 = (ImageView) view.findViewById(2131362547); if (imageView2 != null) { - i = 2131365323; - Guideline guideline = (Guideline) view.findViewById(2131365323); + i = 2131365328; + Guideline guideline = (Guideline) view.findViewById(2131365328); if (guideline != null) { WidgetChatListAdapterItemEphemeralMessageBinding widgetChatListAdapterItemEphemeralMessageBinding = new WidgetChatListAdapterItemEphemeralMessageBinding((ConstraintLayout) view, findViewById, findViewById2, imageView, textView, imageView2, guideline); m.checkNotNullExpressionValue(widgetChatListAdapterItemEphemeralMessageBinding, "WidgetChatListAdapterIte…ageBinding.bind(itemView)"); @@ -64,20 +64,20 @@ public final class WidgetChatListAdapterItemEphemeralMessage extends WidgetChatL public void onConfigure(int i, ChatListEntry chatListEntry) { m.checkNotNullParameter(chatListEntry, "data"); super.onConfigure(i, chatListEntry); - ModelMessage message = ((EphemeralMessageEntry) chatListEntry).getMessage(); + Message message = ((EphemeralMessageEntry) chatListEntry).getMessage(); View view = this.binding.b; m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemGutterBg"); - View view2 = this.binding.f1728c; + View view2 = this.binding.f1730c; m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemHighlightedBg"); configureCellHighlight(message, view2, view); this.binding.d.setOnClickListener(new WidgetChatListAdapterItemEphemeralMessage$onConfigure$1(this)); TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemTextDismiss"); - String quantityString = textView.getResources().getQuantityString(2131755231, 1); + String quantityString = textView.getResources().getQuantityString(2131755232, 1); m.checkNotNullExpressionValue(quantityString, "itemDismiss.resources.ge…nd_delete_these_count, 1)"); - String quantityString2 = textView.getResources().getQuantityString(2131755232, 1); + String quantityString2 = textView.getResources().getQuantityString(2131755233, 1); m.checkNotNullExpressionValue(quantityString2, "itemDismiss.resources.ge…e_these_countMessages, 1)"); textView.setMovementMethod(LinkMovementMethod.getInstance()); - textView.setText(b.c(textView, 2131891642, new Object[]{quantityString, quantityString2}, new WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(this, message))); + textView.setText(b.c(textView, 2131891675, new Object[]{quantityString, quantityString2}, new WidgetChatListAdapterItemEphemeralMessage$onConfigure$2(this, message))); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java index f2975ff0e5..fcf10b4b0c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGameInvite.java @@ -20,17 +20,17 @@ public final class WidgetChatListAdapterItemGameInvite extends WidgetChatListIte /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemGameInvite(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558933, widgetChatListAdapter); + super(2131558934, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; - ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363646); + ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363649); if (viewEmbedGameInvite != null) { WidgetChatListAdapterItemGameInviteBinding widgetChatListAdapterItemGameInviteBinding = new WidgetChatListAdapterItemGameInviteBinding((CardView) view, viewEmbedGameInvite); m.checkNotNullExpressionValue(widgetChatListAdapterItemGameInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)"); this.binding = widgetChatListAdapterItemGameInviteBinding; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363646))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363649))); } public static final /* synthetic */ WidgetChatListAdapter access$getAdapter$p(WidgetChatListAdapterItemGameInvite widgetChatListAdapterItemGameInvite) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java index 538b190df1..74bc5d8f79 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift$buttons$2.java @@ -19,6 +19,6 @@ public final class WidgetChatListAdapterItemGift$buttons$2 extends o implements @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final List mo1invoke() { - return n.listOf((Object[]) new View[]{WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).b, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).k, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).f1729c, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).h}); + return n.listOf((Object[]) new View[]{WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).b, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).k, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).f1731c, WidgetChatListAdapterItemGift.access$getBinding$p(this.this$0).h}); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java index f0ae9c0d4b..637ebc03cc 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGift.java @@ -319,44 +319,44 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemGift(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558934, widgetChatListAdapter); + super(2131558935, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362092; Barrier barrier = (Barrier) view.findViewById(2131362092); if (barrier != null) { - i = 2131363656; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363656); + i = 2131363659; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363659); if (materialButton != null) { - i = 2131363657; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363657); + i = 2131363660; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363660); if (materialButton2 != null) { - i = 2131363658; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363658); + i = 2131363661; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363661); if (linearLayout != null) { - i = 2131363659; - TextView textView = (TextView) view.findViewById(2131363659); + i = 2131363662; + TextView textView = (TextView) view.findViewById(2131363662); if (textView != null) { - i = 2131363660; - TextView textView2 = (TextView) view.findViewById(2131363660); + i = 2131363663; + TextView textView2 = (TextView) view.findViewById(2131363663); if (textView2 != null) { - i = 2131363661; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363661); + i = 2131363664; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363664); if (simpleDraweeView != null) { - i = 2131363662; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363662); + i = 2131363665; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363665); if (simpleDraweeView2 != null) { - i = 2131363663; - View findViewById = view.findViewById(2131363663); + i = 2131363666; + View findViewById = view.findViewById(2131363666); if (findViewById != null) { - i = 2131363664; - TextView textView3 = (TextView) view.findViewById(2131363664); + i = 2131363667; + TextView textView3 = (TextView) view.findViewById(2131363667); if (textView3 != null) { - i = 2131363665; - TextView textView4 = (TextView) view.findViewById(2131363665); + i = 2131363668; + TextView textView4 = (TextView) view.findViewById(2131363668); if (textView4 != null) { - i = 2131363666; - MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363666); + i = 2131363669; + MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363669); if (materialButton3 != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; WidgetChatListAdapterItemGiftBinding widgetChatListAdapterItemGiftBinding = new WidgetChatListAdapterItemGiftBinding(constraintLayout, barrier, materialButton, materialButton2, linearLayout, textView, textView2, simpleDraweeView, simpleDraweeView2, findViewById, textView3, textView4, materialButton3, constraintLayout); @@ -425,12 +425,12 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { simpleDraweeView.setVisibility(4); TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.itemGiftHeader"); - textView.setText(areEqual ? context.getString(2131889061) : context.getString(2131889060)); - this.binding.i.setText(2131889057); + textView.setText(areEqual ? context.getString(2131889071) : context.getString(2131889070)); + this.binding.i.setText(2131889067); this.binding.i.setTextColor(ColorCompat.getColor(context, 2131100324)); this.binding.i.setBackgroundResource(0); m.checkNotNullExpressionValue(context, "context"); - this.binding.f.setImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969516, 2131232204)); + this.binding.f.setImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969516, 2131232207)); TextView textView2 = this.binding.j; m.checkNotNullExpressionValue(textView2, "binding.itemGiftSubtext"); textView2.setVisibility(8); @@ -440,7 +440,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { MaterialButton materialButton = this.binding.b; m.checkNotNullExpressionValue(materialButton, "binding.itemGiftAcceptButton"); materialButton.setVisibility(8); - MaterialButton materialButton2 = this.binding.f1729c; + MaterialButton materialButton2 = this.binding.f1731c; m.checkNotNullExpressionValue(materialButton2, "binding.itemGiftCannotClaimButton"); materialButton2.setVisibility(8); View view2 = this.binding.h; @@ -453,7 +453,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); Context context = view.getContext(); - this.binding.e.setText(2131889062); + this.binding.e.setText(2131889072); TextView textView = this.binding.i; m.checkNotNullExpressionValue(textView, "binding.itemGiftName"); textView.setText((CharSequence) null); @@ -472,7 +472,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { MaterialButton materialButton = this.binding.b; m.checkNotNullExpressionValue(materialButton, "binding.itemGiftAcceptButton"); materialButton.setVisibility(8); - MaterialButton materialButton2 = this.binding.f1729c; + MaterialButton materialButton2 = this.binding.f1731c; m.checkNotNullExpressionValue(materialButton2, "binding.itemGiftCannotClaimButton"); materialButton2.setVisibility(8); View view2 = this.binding.h; @@ -511,7 +511,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { String giftSplashUrl = iconUtils.getGiftSplashUrl(applicationId, h, Integer.valueOf(view2.getWidth())); if (resolved.getGift().isAnyNitroGift()) { m.checkNotNullExpressionValue(context, "context"); - this.binding.g.setActualImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969336, 2131232188)); + this.binding.g.setActualImageResource(DrawableCompat.getThemedDrawableRes(context, 2130969336, 2131232191)); SimpleDraweeView simpleDraweeView = this.binding.g; m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemGiftImageBackground"); simpleDraweeView.setVisibility(0); @@ -529,7 +529,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { } TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.itemGiftHeader"); - textView.setText(z2 ? context.getString(2131889065) : context.getString(2131889064)); + textView.setText(z2 ? context.getString(2131889075) : context.getString(2131889074)); TextView textView2 = this.binding.i; m.checkNotNullExpressionValue(textView2, "binding.itemGiftName"); ModelStoreListing storeListing3 = resolved.getGift().getStoreListing(); @@ -543,7 +543,7 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { TextView textView4 = this.binding.d; m.checkNotNullExpressionValue(textView4, "binding.itemGiftExpires"); m.checkNotNullExpressionValue(context, "context"); - textView4.setText(c.a.l.b.g(context, 2131889052, new Object[]{GiftingUtils.INSTANCE.getTimeString(resolved.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context)}, null, 4)); + textView4.setText(c.a.l.b.g(context, 2131889062, new Object[]{GiftingUtils.INSTANCE.getTimeString(resolved.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context)}, null, 4)); } if (resolved.getGift().isAnyNitroGift()) { MGImages mGImages = MGImages.INSTANCE; @@ -561,16 +561,16 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { this.binding.f.setImageURI(str); } if (!resolved.getMeUser().isVerified()) { - String string = context.getString(2131888976); + String string = context.getString(2131888986); m.checkNotNullExpressionValue(string, "context.getString(R.stri…xt_verification_required)"); str2 = t.replace$default(t.replace$default(t.replace$default(string, "(onClick)", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null); } else if (isClaimedByMe) { - str2 = context.getString(2131889026); + str2 = context.getString(2131889036); } else if (resolved.getInLibrary()) { m.checkNotNullExpressionValue(context, "context"); - str2 = t.replace$default(t.replace$default(t.replace$default(c.a.l.b.g(context, 2131888975, new Object[]{""}, null, 4).toString(), "()", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null); + str2 = t.replace$default(t.replace$default(t.replace$default(c.a.l.b.g(context, 2131888985, new Object[]{""}, null, 4).toString(), "()", "", false, 4, (Object) null), "[", "", false, 4, (Object) null), "]", "", false, 4, (Object) null); } else if (z3) { - str2 = context.getString(2131888974); + str2 = context.getString(2131888984); } TextView textView5 = this.binding.j; m.checkNotNullExpressionValue(textView5, "binding.itemGiftSubtext"); @@ -582,15 +582,15 @@ public final class WidgetChatListAdapterItemGift extends WidgetChatListItem { this.binding.k.setOnClickListener(WidgetChatListAdapterItemGift$configureResolvedUI$visibleButton$2.INSTANCE); materialButton = this.binding.k; } else { - MaterialButton materialButton2 = this.binding.f1729c; - int i = 2131889048; + MaterialButton materialButton2 = this.binding.f1731c; + int i = 2131889058; if (resolved.getRedeeming()) { - i = 2131889049; + i = 2131889059; } else if (!isClaimedByMe && resolved.getInLibrary()) { - i = 2131889050; + i = 2131889060; } materialButton2.setText(i); - materialButton = this.binding.f1729c; + materialButton = this.binding.f1731c; } m.checkNotNullExpressionValue(materialButton, "if (canAccept) {\n b…ftCannotClaimButton\n }"); for (View view3 : getButtons()) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java index 3425533d68..d87c38e016 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter; import com.discord.widgets.chat.list.entries.ChatListEntry; import com.discord.widgets.chat.list.entries.MessageEntry; @@ -32,10 +32,10 @@ public final class WidgetChatListAdapterItemGuildInviteReminder$onConfigure$2 ex public final void invoke(View view) { m.checkNotNullParameter(view, "it"); WidgetChatListAdapter.EventHandler eventHandler = WidgetChatListAdapterItemGuildInviteReminder.access$getAdapter$p(this.this$0).getEventHandler(); - ModelMessage message = ((MessageEntry) this.$data).getMessage(); + Message message = ((MessageEntry) this.$data).getMessage(); View view2 = this.this$0.itemView; m.checkNotNullExpressionValue(view2, "itemView"); - String string = view2.getContext().getString(2131893738); + String string = view2.getContext().getString(2131893778); m.checkNotNullExpressionValue(string, "itemView.context.getStri…ssage_invite_users_owner)"); eventHandler.onMessageLongClicked(message, string, false); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java index 01b6fb7efd..df427c88e0 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildInviteReminder.java @@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemGuildInviteReminder(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558935, widgetChatListAdapter); + super(2131558936, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362441; @@ -54,10 +54,10 @@ public final class WidgetChatListAdapterItemGuildInviteReminder extends WidgetCh if (chatListEntry instanceof MessageEntry) { Guild guild = ((WidgetChatListAdapter) this.adapter).getData().getGuild(); boolean isOwner = guild != null ? guild.isOwner(((WidgetChatListAdapter) this.adapter).getData().getUserId()) : false; - int i2 = isOwner ? 2131893738 : 2131893733; - int i3 = isOwner ? 2131893737 : 2131893736; + int i2 = isOwner ? 2131893778 : 2131893773; + int i3 = isOwner ? 2131893777 : 2131893776; this.binding.d.setText(i2); - this.binding.f1730c.setText(i3); + this.binding.f1732c.setText(i3); this.binding.b.setOnClickListener(new WidgetChatListAdapterItemGuildInviteReminder$onConfigure$1(this)); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java index 0ff2586628..3c64f9ae74 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildTemplate.java @@ -128,23 +128,23 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemGuildTemplate(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558936, widgetChatListAdapter); + super(2131558937, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; - int i = 2131363668; - TextView textView = (TextView) view.findViewById(2131363668); + int i = 2131363671; + TextView textView = (TextView) view.findViewById(2131363671); if (textView != null) { - i = 2131363669; - ImageView imageView = (ImageView) view.findViewById(2131363669); + i = 2131363672; + ImageView imageView = (ImageView) view.findViewById(2131363672); if (imageView != null) { - i = 2131363670; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363670); + i = 2131363673; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363673); if (materialButton != null) { - i = 2131363671; - TextView textView2 = (TextView) view.findViewById(2131363671); + i = 2131363674; + TextView textView2 = (TextView) view.findViewById(2131363674); if (textView2 != null) { - i = 2131363672; - TextView textView3 = (TextView) view.findViewById(2131363672); + i = 2131363675; + TextView textView3 = (TextView) view.findViewById(2131363675); if (textView3 != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; WidgetChatListAdapterItemGuildTemplateBinding widgetChatListAdapterItemGuildTemplateBinding = new WidgetChatListAdapterItemGuildTemplateBinding(constraintLayout, textView, imageView, materialButton, textView2, textView3, constraintLayout); @@ -180,8 +180,8 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList } private final void configureInvalidUI() { - this.binding.f1731c.setText(2131889980); - this.binding.d.setText(2131889979); + this.binding.f1733c.setText(2131889991); + this.binding.d.setText(2131889990); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext"); textView.setVisibility(0); @@ -191,7 +191,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList } private final void configureLoadingUI() { - this.binding.f1731c.setText(2131890052); + this.binding.f1733c.setText(2131890065); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateSubtext"); textView.setVisibility(8); @@ -202,7 +202,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList private final void configureResolvedUI(Model.Resolved resolved) { ModelGuildTemplate component1 = resolved.component1(); - TextView textView = this.binding.f1731c; + TextView textView = this.binding.f1733c; m.checkNotNullExpressionValue(textView, "binding.itemGuildTemplateName"); textView.setText(component1.getName()); TextView textView2 = this.binding.d; @@ -211,7 +211,7 @@ public final class WidgetChatListAdapterItemGuildTemplate extends WidgetChatList m.checkNotNullExpressionValue(textView3, "binding.itemGuildTemplateSubtext"); Context context = textView3.getContext(); m.checkNotNullExpressionValue(context, "binding.itemGuildTemplateSubtext.context"); - ViewExtensions.setTextAndVisibilityBy(textView2, StringResourceUtilsKt.getI18nPluralString(context, 2131755182, component1.getUsageCount(), Integer.valueOf(component1.getUsageCount()))); + ViewExtensions.setTextAndVisibilityBy(textView2, StringResourceUtilsKt.getI18nPluralString(context, 2131755183, component1.getUsageCount(), Integer.valueOf(component1.getUsageCount()))); MaterialButton materialButton = this.binding.b; m.checkNotNullExpressionValue(materialButton, "binding.itemGuildTemplateJoinButton"); materialButton.setVisibility(0); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java index 939eb46bef..592440b734 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemGuildWelcome.java @@ -22,25 +22,25 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemGuildWelcome(WidgetChatListAdapter widgetChatListAdapter, Clock clock) { - super(2131558937, widgetChatListAdapter); + super(2131558938, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); m.checkNotNullParameter(clock, "clock"); this.clock = clock; View view = this.itemView; - int i = 2131363673; - TextView textView = (TextView) view.findViewById(2131363673); + int i = 2131363676; + TextView textView = (TextView) view.findViewById(2131363676); if (textView != null) { - i = 2131363674; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363674); + i = 2131363677; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363677); if (linkifiedTextView != null) { - i = 2131363675; - LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131363675); + i = 2131363678; + LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131363678); if (linkifiedTextView2 != null) { - i = 2131365566; - ChatActionItem chatActionItem = (ChatActionItem) view.findViewById(2131365566); + i = 2131365572; + ChatActionItem chatActionItem = (ChatActionItem) view.findViewById(2131365572); if (chatActionItem != null) { - i = 2131365567; - ChatActionItem chatActionItem2 = (ChatActionItem) view.findViewById(2131365567); + i = 2131365573; + ChatActionItem chatActionItem2 = (ChatActionItem) view.findViewById(2131365573); if (chatActionItem2 != null) { WidgetChatListAdapterItemGuildWelcomeBinding widgetChatListAdapterItemGuildWelcomeBinding = new WidgetChatListAdapterItemGuildWelcomeBinding((LinearLayout) view, textView, linkifiedTextView, linkifiedTextView2, chatActionItem, chatActionItem2); m.checkNotNullExpressionValue(widgetChatListAdapterItemGuildWelcomeBinding, "WidgetChatListAdapterIte…omeBinding.bind(itemView)"); @@ -72,7 +72,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI m.checkNotNullExpressionValue(textView, "binding.itemGuildWelcomeHeader"); boolean z2 = true; GuildWelcomeEntry guildWelcomeEntry = (GuildWelcomeEntry) chatListEntry; - b.n(textView, 2131894553, new Object[]{guildWelcomeEntry.getGuildName()}, null, 4); + b.n(textView, 2131894600, new Object[]{guildWelcomeEntry.getGuildName()}, null, 4); boolean z3 = (guildWelcomeEntry.getGuildId() >>> 22) + 1420070400000L < this.clock.currentTimeMillis() - 2592000000L; ChatActionItem chatActionItem = this.binding.f; m.checkNotNullExpressionValue(chatActionItem, "binding.welcomeCardUploadIcon"); @@ -86,7 +86,7 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI String D = a.D(new StringBuilder(), f.a.a(360045138571L, null), "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-new-user&utm_content=--t%3Apm"); LinkifiedTextView linkifiedTextView = this.binding.d; m.checkNotNullExpressionValue(linkifiedTextView, "binding.itemGuildWelcomeSubheaderIntro"); - b.n(linkifiedTextView, 2131894548, new Object[]{D}, null, 4); + b.n(linkifiedTextView, 2131894595, new Object[]{D}, null, 4); LinkifiedTextView linkifiedTextView2 = this.binding.d; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.itemGuildWelcomeSubheaderIntro"); ChatActionItem chatActionItem3 = this.binding.f; @@ -102,9 +102,9 @@ public final class WidgetChatListAdapterItemGuildWelcome extends WidgetChatListI i2 = 0; } linkifiedTextView2.setVisibility(i2); - LinkifiedTextView linkifiedTextView3 = this.binding.f1732c; + LinkifiedTextView linkifiedTextView3 = this.binding.f1734c; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.itemGuildWelcomeSubheader"); - b.n(linkifiedTextView3, z3 ? 2131894549 : guildWelcomeEntry.isOwner() ? 2131894551 : 2131894550, new Object[0], null, 4); + b.n(linkifiedTextView3, z3 ? 2131894596 : guildWelcomeEntry.isOwner() ? 2131894598 : 2131894597, new Object[0], null, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java index 6ee5fa441c..99eec99c74 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java @@ -349,50 +349,50 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemInvite(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558938, widgetChatListAdapter); + super(2131558939, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; - int i = 2131363681; - TextView textView = (TextView) view.findViewById(2131363681); + int i = 2131363684; + TextView textView = (TextView) view.findViewById(2131363684); if (textView != null) { - i = 2131363684; - TextView textView2 = (TextView) view.findViewById(2131363684); + i = 2131363687; + TextView textView2 = (TextView) view.findViewById(2131363687); if (textView2 != null) { - i = 2131363685; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363685); + i = 2131363688; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363688); if (simpleDraweeView != null) { - i = 2131363686; - TextView textView3 = (TextView) view.findViewById(2131363686); + i = 2131363689; + TextView textView3 = (TextView) view.findViewById(2131363689); if (textView3 != null) { - i = 2131363687; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363687); + i = 2131363690; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363690); if (materialButton != null) { - i = 2131363688; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363688); + i = 2131363691; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363691); if (materialButton2 != null) { - i = 2131363689; - View findViewById = view.findViewById(2131363689); + i = 2131363692; + View findViewById = view.findViewById(2131363692); if (findViewById != null) { - i = 2131363690; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363690); + i = 2131363693; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363693); if (linearLayout != null) { - i = 2131363691; - MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363691); + i = 2131363694; + MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363694); if (materialButton3 != null) { - i = 2131363692; - TextView textView4 = (TextView) view.findViewById(2131363692); + i = 2131363695; + TextView textView4 = (TextView) view.findViewById(2131363695); if (textView4 != null) { - i = 2131363693; - ImageView imageView = (ImageView) view.findViewById(2131363693); + i = 2131363696; + ImageView imageView = (ImageView) view.findViewById(2131363696); if (imageView != null) { - i = 2131363694; - TextView textView5 = (TextView) view.findViewById(2131363694); + i = 2131363697; + TextView textView5 = (TextView) view.findViewById(2131363697); if (textView5 != null) { - i = 2131363695; - ImageView imageView2 = (ImageView) view.findViewById(2131363695); + i = 2131363698; + ImageView imageView2 = (ImageView) view.findViewById(2131363698); if (imageView2 != null) { - i = 2131363696; - TextView textView6 = (TextView) view.findViewById(2131363696); + i = 2131363699; + TextView textView6 = (TextView) view.findViewById(2131363699); if (textView6 != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; WidgetChatListAdapterItemInviteBinding widgetChatListAdapterItemInviteBinding = new WidgetChatListAdapterItemInviteBinding(constraintLayout, textView, textView2, simpleDraweeView, textView3, materialButton, materialButton2, findViewById, linearLayout, materialButton3, textView4, imageView, textView5, imageView2, textView6, constraintLayout); @@ -458,7 +458,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter imageView.setVisibility(z2 ^ true ? 0 : 8); TextView textView = this.binding.m; m.checkNotNullExpressionValue(textView, "binding.itemInviteOnlineText"); - c.a.l.b.n(textView, 2131890339, new Object[]{StringUtilsKt.format(modelInvite.getApproximatePresenceCount(), context)}, null, 4); + c.a.l.b.n(textView, 2131890369, new Object[]{StringUtilsKt.format(modelInvite.getApproximatePresenceCount(), context)}, null, 4); TextView textView2 = this.binding.m; m.checkNotNullExpressionValue(textView2, "binding.itemInviteOnlineText"); if (!z2) { @@ -474,7 +474,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter m.checkNotNullExpressionValue(textView4, "binding.itemInviteTotalMemberText"); Resources resources = textView4.getResources(); m.checkNotNullExpressionValue(resources, "binding.itemInviteTotalMemberText.resources"); - ViewExtensions.setTextAndVisibilityBy(textView3, StringResourceUtilsKt.getQuantityString(resources, context, 2131755190, modelInvite.getApproximateMemberCount(), Integer.valueOf(modelInvite.getApproximateMemberCount()))); + ViewExtensions.setTextAndVisibilityBy(textView3, StringResourceUtilsKt.getQuantityString(resources, context, 2131755191, modelInvite.getApproximateMemberCount(), Integer.valueOf(modelInvite.getApproximateMemberCount()))); } private final void configureForVocalChannel(Channel channel, Context context) { @@ -523,16 +523,16 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter Context context = view.getContext(); Long l = null; boolean areEqual = m.areEqual((invalid == null || (authorUser = invalid.getAuthorUser()) == null) ? null : Long.valueOf(authorUser.getId()), invalid != null ? Long.valueOf(invalid.getMeId()) : null); - TextView textView = this.binding.f1733c; + TextView textView = this.binding.f1735c; m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader"); int i = 0; - c.a.l.b.n(textView, areEqual ? 2131890470 : 2131890464, new Object[0], null, 4); + c.a.l.b.n(textView, areEqual ? 2131890500 : 2131890494, new Object[0], null, 4); TextView textView2 = this.binding.k; m.checkNotNullExpressionValue(textView2, "binding.itemInviteName"); - c.a.l.b.n(textView2, 2131890453, new Object[0], null, 4); + c.a.l.b.n(textView2, 2131890483, new Object[0], null, 4); this.binding.k.setTextColor(ColorCompat.getColor(context, 2131100324)); this.binding.k.setBackgroundResource(0); - this.binding.d.setActualImageResource(2131232245); + this.binding.d.setActualImageResource(2131232248); TextView textView3 = this.binding.e; m.checkNotNullExpressionValue(textView3, "binding.itemInviteImageText"); textView3.setVisibility(8); @@ -540,7 +540,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter if (!areEqual) { if ((invalid != null ? invalid.getAuthorUser() : null) != null) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890329, new Object[]{invalid.getAuthorUser().getUsername()}, null, 4); + charSequence = c.a.l.b.g(context, 2131890359, new Object[]{invalid.getAuthorUser().getUsername()}, null, 4); LinearLayout linearLayout = this.binding.i; m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer"); linearLayout.setVisibility(0); @@ -559,7 +559,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter imageView2.setVisibility(8); MaterialButton materialButton = this.binding.j; m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton"); - c.a.l.b.n(materialButton, areEqual ? 2131887912 : 2131891110, new Object[0], null, 4); + c.a.l.b.n(materialButton, areEqual ? 2131887913 : 2131891141, new Object[0], null, 4); MaterialButton materialButton2 = this.binding.j; m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton"); if (areEqual) { @@ -589,7 +589,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter if (!areEqual) { if ((invalid != null ? invalid.getAuthorUser() : null) == null) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890328, new Object[0], null, 4); + charSequence = c.a.l.b.g(context, 2131890358, new Object[0], null, 4); LinearLayout linearLayout = this.binding.i; m.checkNotNullExpressionValue(linearLayout, "binding.itemInviteMemberContainer"); linearLayout.setVisibility(0); @@ -608,7 +608,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter imageView2.setVisibility(8); MaterialButton materialButton = this.binding.j; m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton"); - c.a.l.b.n(materialButton, areEqual ? 2131887912 : 2131891110, new Object[0], null, 4); + c.a.l.b.n(materialButton, areEqual ? 2131887913 : 2131891141, new Object[0], null, 4); MaterialButton materialButton2 = this.binding.j; m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton"); if (areEqual) { @@ -630,7 +630,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter } if (areEqual) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890454, new Object[0], null, 4); + charSequence = c.a.l.b.g(context, 2131890484, new Object[0], null, 4); } else { charSequence = null; } @@ -652,7 +652,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter imageView2.setVisibility(8); MaterialButton materialButton = this.binding.j; m.checkNotNullExpressionValue(materialButton, "binding.itemInviteMentionButton"); - c.a.l.b.n(materialButton, areEqual ? 2131887912 : 2131891110, new Object[0], null, 4); + c.a.l.b.n(materialButton, areEqual ? 2131887913 : 2131891141, new Object[0], null, 4); MaterialButton materialButton2 = this.binding.j; m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteMentionButton"); if (areEqual) { @@ -676,7 +676,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); Context context = view.getContext(); - this.binding.f1733c.setText(2131890348); + this.binding.f1735c.setText(2131890378); TextView textView = this.binding.k; m.checkNotNullExpressionValue(textView, "binding.itemInviteName"); textView.setText((CharSequence) null); @@ -747,27 +747,27 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter boolean z4 = (guild2 != null ? guild2.r() : 0) < 200; Channel channel = component1.getChannel(); boolean p1 = channel != null ? AnimatableValueParser.p1(channel) : false; - TextView textView = this.binding.f1733c; + TextView textView = this.binding.f1735c; m.checkNotNullExpressionValue(textView, "binding.itemInviteHeader"); String str2 = null; if (p1 && z3) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890469, new Object[0], null, 4); + charSequence = c.a.l.b.g(context, 2131890499, new Object[0], null, 4); } else if (z3) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890468, new Object[0], null, 4); + charSequence = c.a.l.b.g(context, 2131890498, new Object[0], null, 4); } else if (p1 && !z3) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890463, new Object[0], null, 4); + charSequence = c.a.l.b.g(context, 2131890493, new Object[0], null, 4); } else if (!z4 || component1.getInviter() == null) { m.checkNotNullExpressionValue(context, "context"); - charSequence = c.a.l.b.g(context, 2131890462, new Object[0], null, 4); + charSequence = c.a.l.b.g(context, 2131890492, new Object[0], null, 4); } else { m.checkNotNullExpressionValue(context, "context"); Object[] objArr = new Object[1]; com.discord.api.user.User inviter = component1.getInviter(); objArr[0] = inviter != null ? inviter.r() : null; - charSequence = c.a.l.b.g(context, 2131890352, objArr, null, 4); + charSequence = c.a.l.b.g(context, 2131890382, objArr, null, 4); } textView.setText(charSequence); TextView textView2 = this.binding.k; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java index 6f6b4cfb55..797f52cfdd 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInviteBase.java @@ -11,6 +11,7 @@ import com.discord.api.guild.GuildFeature; import com.discord.models.domain.ModelInvite; import com.discord.stores.StoreStream; import com.discord.utilities.channel.ChannelSelector; +import com.discord.utilities.features.GrowthTeamFeatures; import com.discord.utilities.guilds.MemberVerificationUtils; import d0.z.d.m; import java.util.List; @@ -49,8 +50,8 @@ public abstract class WidgetChatListAdapterItemInviteBase extends WidgetChatList } } - /* JADX WARNING: Removed duplicated region for block: B:34:0x006e */ - /* JADX WARNING: Removed duplicated region for block: B:35:0x0078 */ + /* JADX WARNING: Removed duplicated region for block: B:38:0x0082 */ + /* JADX WARNING: Removed duplicated region for block: B:39:0x0094 */ public final void joinServerOrDM(Context context, ModelInvite modelInvite, boolean z2) { boolean z3; List l; @@ -71,10 +72,10 @@ public abstract class WidgetChatListAdapterItemInviteBase extends WidgetChatList if (guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.HUB)) { z4 = false; } - if (!z4) { - o.g(context, 2131888144, 0, null, 12); + if (!z4 && !GrowthTeamFeatures.INSTANCE.isDiscordUEnabled()) { + o.g(context, 2131888154, 0, null, 12); return; - } else if (z3) { + } else if (!z3) { ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), modelInvite.getChannel(), null, null, 6, null); return; } else if (!z5 || !z6) { @@ -100,5 +101,7 @@ public abstract class WidgetChatListAdapterItemInviteBase extends WidgetChatList z4 = false; if (!z4) { } + if (!z3) { + } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java index 47e79480fc..26c6f95e16 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMentionFooter.java @@ -17,7 +17,7 @@ public final class WidgetChatListAdapterItemMentionFooter extends WidgetChatList /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemMentionFooter(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558940, widgetChatListAdapter); + super(2131558941, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362578; @@ -29,8 +29,8 @@ public final class WidgetChatListAdapterItemMentionFooter extends WidgetChatList i = 2131362580; TextView textView = (TextView) view.findViewById(2131362580); if (textView != null) { - i = 2131365279; - View findViewById2 = view.findViewById(2131365279); + i = 2131365284; + View findViewById2 = view.findViewById(2131365284); if (findViewById2 != null) { WidgetChatListAdapterItemMentionFooterBinding widgetChatListAdapterItemMentionFooterBinding = new WidgetChatListAdapterItemMentionFooterBinding((LinearLayout) view, findViewById, imageView, textView, findViewById2); m.checkNotNullExpressionValue(widgetChatListAdapterItemMentionFooterBinding, "WidgetChatListAdapterIte…terBinding.bind(itemView)"); @@ -44,7 +44,7 @@ public final class WidgetChatListAdapterItemMentionFooter extends WidgetChatList } private final void tileBackgroundBitmapDrawable(WidgetChatListAdapterItemMentionFooterBinding widgetChatListAdapterItemMentionFooterBinding) { - View view = widgetChatListAdapterItemMentionFooterBinding.f1734c; + View view = widgetChatListAdapterItemMentionFooterBinding.f1736c; m.checkNotNullExpressionValue(view, "tile"); Drawable background = view.getBackground(); Objects.requireNonNull(background, "null cannot be cast to non-null type android.graphics.drawable.BitmapDrawable"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java index a84bfc6a58..32738ac1ba 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$1.java @@ -1,15 +1,15 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$1 implements View.OnClickListener { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; - public WidgetChatListAdapterItemMessage$configureReplyInteraction$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemMessage$configureReplyInteraction$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message) { this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; } @Override // android.view.View.OnClickListener diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java index c7a1c93446..03d6d941d8 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1.java @@ -3,13 +3,15 @@ package com.discord.widgets.chat.list.adapter; import android.text.style.StyleSpan; import android.view.View; import com.discord.api.interaction.Interaction; +import com.discord.api.message.Message; import com.discord.api.user.User; import com.discord.i18n.Hook; import com.discord.i18n.RenderContext; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.utilities.color.ColorCompat; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.spans.ClickableSpan; +import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; @@ -18,7 +20,7 @@ import kotlin.jvm.functions.Function1; public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1 extends o implements Function1 { public final /* synthetic */ Interaction $interaction; public final /* synthetic */ User $interactionUser; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; /* compiled from: WidgetChatListAdapterItemMessage.kt */ @@ -52,8 +54,15 @@ public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$co Long a = this.this$0.this$0.$interaction.a(); if (a != null) { long longValue = a.longValue(); - if (!this.this$0.this$0.$message.isLocalApplicationCommand() || this.this$0.this$0.$message.isFailed()) { - WidgetChatListAdapterItemMessage.access$getAdapter$p(this.this$0.this$0.this$0).getEventHandler().onCommandClicked(longValue, valueOf, this.this$0.this$0.$message.getChannelId(), this.this$0.this$0.$message.getId(), this.this$0.this$0.$interactionUser.i(), this.this$0.this$0.$message.getAuthor().i(), this.this$0.this$0.$message.getNonce()); + MessageUtils messageUtils = MessageUtils.INSTANCE; + if (!messageUtils.isLocalApplicationCommand(this.this$0.this$0.$message) || messageUtils.isFailed(this.this$0.this$0.$message)) { + WidgetChatListAdapter.EventHandler eventHandler = WidgetChatListAdapterItemMessage.access$getAdapter$p(this.this$0.this$0.this$0).getEventHandler(); + long i = this.this$0.this$0.$message.i(); + long r = this.this$0.this$0.$message.r(); + long i2 = this.this$0.this$0.$interactionUser.i(); + User g = this.this$0.this$0.$message.g(); + m.checkNotNull(g); + eventHandler.onCommandClicked(longValue, valueOf, i, r, i2, g.i(), this.this$0.this$0.$message.B()); } } } @@ -81,11 +90,11 @@ public final class WidgetChatListAdapterItemMessage$configureReplyInteraction$co } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Interaction interaction, ModelMessage modelMessage, User user) { + public WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Interaction interaction, Message message, User user) { super(1); this.this$0 = widgetChatListAdapterItemMessage; this.$interaction = interaction; - this.$message = modelMessage; + this.$message = message; this.$interactionUser = user; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java index 9515e356d9..4671c3da1f 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$configureReplyPreview$1.java @@ -1,18 +1,18 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreStream; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$configureReplyPreview$1 implements View.OnClickListener { - public final /* synthetic */ ModelMessage $repliedMessage; + public final /* synthetic */ Message $repliedMessage; - public WidgetChatListAdapterItemMessage$configureReplyPreview$1(ModelMessage modelMessage) { - this.$repliedMessage = modelMessage; + public WidgetChatListAdapterItemMessage$configureReplyPreview$1(Message message) { + this.$repliedMessage = message; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - StoreStream.Companion.getMessagesLoader().jumpToMessage(this.$repliedMessage.getChannelId(), this.$repliedMessage.getId()); + StoreStream.Companion.getMessagesLoader().jumpToMessage(this.$repliedMessage.i(), this.$repliedMessage.r()); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java index f54b15a864..eb581ccc2c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1.java @@ -1,6 +1,6 @@ package com.discord.widgets.chat.list.adapter; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.stores.StoreStream; import com.discord.utilities.textprocessing.node.SpoilerNode; import d0.z.d.m; @@ -9,14 +9,14 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1 extends o implements Function1, Unit> { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message) { super(1); this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -29,7 +29,7 @@ public final class WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1 ext public final void invoke(SpoilerNode spoilerNode) { m.checkNotNullParameter(spoilerNode, "spoilerNode"); - StoreStream.Companion.getMessageState().revealSpoiler(this.$message.getId(), spoilerNode.getId()); + StoreStream.Companion.getMessageState().revealSpoiler(this.$message.r(), spoilerNode.getId()); this.this$0.itemView.sendAccessibilityEvent(16); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java index 7e65ffa7b3..7a19e18452 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$1.java @@ -1,15 +1,15 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$onConfigure$1 implements View.OnClickListener { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; - public WidgetChatListAdapterItemMessage$onConfigure$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemMessage$onConfigure$1(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message) { this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; } @Override // android.view.View.OnClickListener diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java index 618ebd40d9..e11e62a1b3 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$2.java @@ -1,21 +1,21 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$onConfigure$2 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemMessage$onConfigure$2(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemMessage$onConfigure$2(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message) { super(1); this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java index fe9a08c76a..ef2ac25bf3 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$3.java @@ -1,16 +1,16 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$onConfigure$3 implements View.OnClickListener { public final /* synthetic */ boolean $isThreadStarterMessage; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; - public WidgetChatListAdapterItemMessage$onConfigure$3(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage, boolean z2) { + public WidgetChatListAdapterItemMessage$onConfigure$3(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message, boolean z2) { this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; this.$isThreadStarterMessage = z2; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java index 147dd20c10..0afe9e3700 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$4.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; @@ -9,14 +9,14 @@ import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$onConfigure$4 extends o implements Function1 { public final /* synthetic */ boolean $isThreadStarterMessage; - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemMessage$onConfigure$4(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage, boolean z2) { + public WidgetChatListAdapterItemMessage$onConfigure$4(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message, boolean z2) { super(1); this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; this.$isThreadStarterMessage = z2; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java index 1d0b1f1579..a9f48bd4ec 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$5.java @@ -1,15 +1,15 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$onConfigure$5 implements View.OnClickListener { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; - public WidgetChatListAdapterItemMessage$onConfigure$5(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemMessage$onConfigure$5(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message) { this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; } @Override // android.view.View.OnClickListener diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java index 3ed0e26fb4..b733b4744c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage$onConfigure$6.java @@ -1,21 +1,21 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListAdapterItemMessage.kt */ public final class WidgetChatListAdapterItemMessage$onConfigure$6 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemMessage this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemMessage$onConfigure$6(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemMessage$onConfigure$6(WidgetChatListAdapterItemMessage widgetChatListAdapterItemMessage, Message message) { super(1); this.this$0 = widgetChatListAdapterItemMessage; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java index 657ce8a2e5..561108f81a 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessage.java @@ -18,10 +18,11 @@ import androidx.core.view.ViewKt; import c.a.l.b; import c.d.b.a.a; import com.discord.api.interaction.Interaction; +import com.discord.api.message.LocalAttachment; +import com.discord.api.message.Message; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.models.member.GuildMember; -import com.discord.models.messages.LocalAttachment; import com.discord.models.user.CoreUser; import com.discord.stores.StoreMessageReplies; import com.discord.stores.StoreMessageState; @@ -30,10 +31,10 @@ import com.discord.stores.StoreUserSettings; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.guilds.PublicGuildUtils; import com.discord.utilities.icon.IconUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.textprocessing.DiscordParser; import com.discord.utilities.textprocessing.MessagePreprocessor; import com.discord.utilities.textprocessing.MessageRenderContext; -import com.discord.utilities.textprocessing.MessageUtils; import com.discord.utilities.textprocessing.node.SpoilerNode; import com.discord.utilities.time.TimeUtils; import com.discord.utilities.user.UserUtils; @@ -48,6 +49,7 @@ import com.discord.widgets.chat.list.utils.EmbeddedMessageParser; import com.facebook.drawee.span.DraweeSpanStringBuilder; import d0.z.d.m; import java.util.List; +import java.util.Map; import kotlin.Unit; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -75,7 +77,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { private final SimpleDraweeSpanTextView replyText = ((SimpleDraweeSpanTextView) this.itemView.findViewById(2131362542)); private final ImageView sendError = ((ImageView) this.itemView.findViewById(2131362538)); private final ImageView threadEmbedSpine = ((ImageView) this.itemView.findViewById(2131362545)); - private final View threadStarterMessageHeader = this.itemView.findViewById(2131365269); + private final View threadStarterMessageHeader = this.itemView.findViewById(2131365273); /* compiled from: WidgetChatListAdapterItemMessage.kt */ public static final class Companion { @@ -108,9 +110,14 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { return widgetChatListAdapterItemMessage.replyText; } + /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x00ae: APUT + (r3v4 java.lang.Object[]) + (0 ??[int, short, byte, char]) + (wrap: java.lang.String : 0x00aa: INVOKE (r10v14 java.lang.String) = (r10v13 java.util.Map), (r0v4 java.lang.Long) type: INTERFACE call: java.util.Map.get(java.lang.Object):java.lang.Object) + */ private final TextView configureInteractionMessage(MessageEntry messageEntry) { int i; - ModelMessage message = messageEntry.getMessage(); + Message message = messageEntry.getMessage(); boolean shouldShowInteractionMessage = shouldShowInteractionMessage(message); TypingDots typingDots = this.loadingDots; if (typingDots != null) { @@ -144,7 +151,8 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { if (textView2 != null) { ViewKt.setVisible(textView2, true); } - if (message.isFailed()) { + MessageUtils messageUtils = MessageUtils.INSTANCE; + if (messageUtils.isFailed(message)) { View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); i = ColorCompat.getThemedColor(view, 2130968930); @@ -157,18 +165,22 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { if (textView3 != null) { textView3.setTextColor(i); } - if (message.isLocalApplicationCommand() && message.isLoading()) { + if (messageUtils.isLocalApplicationCommand(message) && messageUtils.isLoading(message)) { TextView textView4 = this.itemLoadingText; if (textView4 != null) { Context context = this.itemText.getContext(); m.checkNotNullExpressionValue(context, "itemText.context"); - textView4.setText(b.g(context, 2131886389, new Object[]{messageEntry.getNickOrUsernames().get(Long.valueOf(message.getAuthor().i()))}, null, 4)); + Object[] objArr = new Object[1]; + Map nickOrUsernames = messageEntry.getNickOrUsernames(); + User g = message.g(); + objArr[0] = nickOrUsernames.get(g != null ? Long.valueOf(g.i()) : null); + textView4.setText(b.g(context, 2131886389, objArr, null, 4)); } ImageView imageView2 = this.sendError; if (imageView2 != null) { ViewKt.setVisible(imageView2, false); } - } else if (message.isLocalApplicationCommand() && message.isFailed()) { + } else if (messageUtils.isLocalApplicationCommand(message) && messageUtils.isFailed(message)) { TextView textView5 = this.itemLoadingText; if (textView5 != null) { textView5.setText(2131886379); @@ -185,7 +197,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { if (typingDots5 != null) { typingDots5.b(); } - } else if (message.isLocalApplicationCommand()) { + } else if (messageUtils.isLocalApplicationCommand(message)) { TextView textView6 = this.itemLoadingText; if (textView6 != null) { textView6.setText(2131886380); @@ -199,15 +211,15 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { return textView7 != null ? textView7 : this.itemText; } - private final void configureItemTag(ModelMessage modelMessage) { + private final void configureItemTag(Message message) { if (this.itemTag != null) { - User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - CoreUser coreUser = new CoreUser(author); - boolean isPublicGuildSystemMessage = PublicGuildUtils.isPublicGuildSystemMessage(modelMessage); + User g = message.g(); + m.checkNotNull(g); + CoreUser coreUser = new CoreUser(g); + boolean isPublicGuildSystemMessage = PublicGuildUtils.isPublicGuildSystemMessage(message); this.itemTag.setVisibility(coreUser.isBot() || coreUser.isSystemUser() || isPublicGuildSystemMessage ? 0 : 8); - this.itemTag.setText((coreUser.isSystemUser() || isPublicGuildSystemMessage) ? 2131893685 : 2131887050); - this.itemTag.setCompoundDrawablesWithIntrinsicBounds(UserUtils.INSTANCE.isVerifiedBot(coreUser) ? 2131232032 : 0, 0, 0, 0); + this.itemTag.setText((coreUser.isSystemUser() || isPublicGuildSystemMessage) ? 2131893725 : 2131887051); + this.itemTag.setCompoundDrawablesWithIntrinsicBounds(UserUtils.INSTANCE.isVerifiedBot(coreUser) ? 2131232035 : 0, 0, 0, 0); } } @@ -218,11 +230,12 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { str = user.getUsername(); } boolean z2 = false; - List mentions = messageEntry.getMessage().getMentions(); - m.checkNotNullExpressionValue(mentions, "messageEntry.message.mentions"); - for (User user2 : mentions) { - if (user2.i() == user.getId()) { - z2 = true; + List z3 = messageEntry.getMessage().z(); + if (z3 != null) { + for (User user2 : z3) { + if (user2.i() == user.getId()) { + z2 = true; + } } } configureReplyName(str, getAuthorTextColor(guildMember), z2); @@ -253,37 +266,34 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { } private final void configureReplyInteraction(MessageEntry messageEntry) { - ModelMessage message = messageEntry.getMessage(); - Interaction interaction = message.getInteraction(); - if (interaction != null) { - m.checkNotNullExpressionValue(interaction, "message.interaction ?: return"); - User c2 = interaction.c(); - if (c2 != null) { - GuildMember interactionAuthor = messageEntry.getInteractionAuthor(); - CoreUser coreUser = new CoreUser(c2); - configureReplyAvatar(new CoreUser(c2), messageEntry.getAuthor()); - configureReplyAuthor(coreUser, interactionAuthor, messageEntry); - TextView textView = this.replyName; - if (textView != null) { - textView.setOnClickListener(new WidgetChatListAdapterItemMessage$configureReplyInteraction$1(this, message)); + User c2; + Message message = messageEntry.getMessage(); + Interaction t = message.t(); + if (t != null && (c2 = t.c()) != null) { + GuildMember interactionAuthor = messageEntry.getInteractionAuthor(); + CoreUser coreUser = new CoreUser(c2); + configureReplyAvatar(new CoreUser(c2), messageEntry.getAuthor()); + configureReplyAuthor(coreUser, interactionAuthor, messageEntry); + TextView textView = this.replyName; + if (textView != null) { + textView.setOnClickListener(new WidgetChatListAdapterItemMessage$configureReplyInteraction$1(this, message)); + } + SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.replyText; + if (simpleDraweeSpanTextView != null) { + MovementMethod instance = LinkMovementMethod.getInstance(); + if (instance != null) { + simpleDraweeSpanTextView.setMovementMethod(instance); + } else { + return; } - SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.replyText; - if (simpleDraweeSpanTextView != null) { - MovementMethod instance = LinkMovementMethod.getInstance(); - if (instance != null) { - simpleDraweeSpanTextView.setMovementMethod(instance); - } else { - return; - } - } - SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.replyText; - CharSequence c3 = simpleDraweeSpanTextView2 != null ? b.c(simpleDraweeSpanTextView2, 2131893689, new Object[]{interaction.b()}, new WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(this, interaction, message, c2)) : null; - if (c3 != null) { - SpannableString valueOf = SpannableString.valueOf(c3); - m.checkExpressionValueIsNotNull(valueOf, "SpannableString.valueOf(this)"); - if (valueOf != null) { - configureReplyText(valueOf, 1.0f); - } + } + SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.replyText; + CharSequence c3 = simpleDraweeSpanTextView2 != null ? b.c(simpleDraweeSpanTextView2, 2131893729, new Object[]{t.b()}, new WidgetChatListAdapterItemMessage$configureReplyInteraction$content$1(this, t, message, c2)) : null; + if (c3 != null) { + SpannableString valueOf = SpannableString.valueOf(c3); + m.checkExpressionValueIsNotNull(valueOf, "SpannableString.valueOf(this)"); + if (valueOf != null) { + configureReplyText(valueOf, 1.0f); } } } @@ -311,11 +321,13 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { } private final void configureReplyPreview(MessageEntry messageEntry) { + Integer M; if (this.replyHolder != null && this.replyLinkItem != null) { - ModelMessage message = messageEntry.getMessage(); + Message message = messageEntry.getMessage(); MessageEntry.ReplyData replyData = messageEntry.getReplyData(); - boolean isInteraction = message.isInteraction(); - if (isInteraction || (replyData != null && messageEntry.getMessage().getType() == 19)) { + MessageUtils messageUtils = MessageUtils.INSTANCE; + boolean isInteraction = messageUtils.isInteraction(message); + if (isInteraction || !(replyData == null || (M = messageEntry.getMessage().M()) == null || M.intValue() != 19)) { this.replyHolder.setVisibility(0); this.replyLinkItem.setVisibility(0); if (isInteraction) { @@ -324,27 +336,28 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { MessageEntry messageEntry2 = replyData.getMessageEntry(); StoreMessageReplies.MessageState messageState = replyData.getMessageState(); if (replyData.isRepliedUserBlocked()) { - configureReplySystemMessage(2131892545); + configureReplySystemMessage(2131892587); } else if (messageState instanceof StoreMessageReplies.MessageState.Unloaded) { - configureReplySystemMessage(2131892547); + configureReplySystemMessage(2131892589); } else if (messageState instanceof StoreMessageReplies.MessageState.Deleted) { - configureReplySystemMessage(2131892546); + configureReplySystemMessage(2131892588); } else if ((messageState instanceof StoreMessageReplies.MessageState.Loaded) && messageEntry2 != null) { - ModelMessage message2 = messageEntry2.getMessage(); + Message message2 = messageEntry2.getMessage(); this.replyHolder.setOnClickListener(new WidgetChatListAdapterItemMessage$configureReplyPreview$1(message2)); - if (message2.getType() == 7) { + Integer M2 = message2.M(); + if (M2 != null && M2.intValue() == 7) { configureReplySystemMessageUserJoin(message2); return; } - User author = message2.getAuthor(); - m.checkNotNullExpressionValue(author, "repliedMessage.author"); - configureReplyAuthor(new CoreUser(author), messageEntry2.getAuthor(), messageEntry2); + User g = message2.g(); + m.checkNotNull(g); + configureReplyAuthor(new CoreUser(g), messageEntry2.getAuthor(), messageEntry2); if (this.replyText != null && this.replyLeadingViewsHolder != null) { - String content = message2.getContent(); - if (content == null) { - content = ""; + String k = message2.k(); + if (k == null) { + k = ""; } - if (!(content.length() == 0)) { + if (!(k.length() == 0)) { Context context = this.replyText.getContext(); EmbeddedMessageParser embeddedMessageParser = EmbeddedMessageParser.INSTANCE; m.checkNotNullExpressionValue(context, "context"); @@ -352,10 +365,10 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { parse.setSpan(getLeadingEdgeSpan(), 0, parse.length(), 33); this.replyText.setDraweeSpanStringBuilder(parse); configureReplyLayoutDirection(); - } else if (message2.hasStickers()) { - configureReplyContentWithResourceId(2131892551); - } else if (message2.hasAttachments() || message2.hasEmbeds()) { - configureReplyContentWithResourceId(2131892549); + } else if (messageUtils.hasStickers(message2)) { + configureReplyContentWithResourceId(2131892593); + } else if (messageUtils.hasAttachments(message2) || messageUtils.hasEmbeds(message2)) { + configureReplyContentWithResourceId(2131892591); } } } @@ -373,16 +386,19 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { configureReplyContentWithResourceId(i); } - private final void configureReplySystemMessageUserJoin(ModelMessage modelMessage) { + private final void configureReplySystemMessageUserJoin(Message message) { ImageView imageView = this.replyIcon; if (imageView != null && this.replyAvatar != null && this.replyText != null) { imageView.setVisibility(8); this.replyAvatar.setVisibility(0); - this.replyAvatar.setImageResource(2131231655); + this.replyAvatar.setImageResource(2131231658); configureReplyName("", 0, false); Context context = this.replyText.getContext(); m.checkNotNullExpressionValue(context, "context"); - configureReplyText(new SpannableString(b.g(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(context, modelMessage.getId()), new Object[]{modelMessage.getAuthor().r()}, null, 4).toString()), 0.64f); + int systemMessageUserJoin = MessageUtils.INSTANCE.getSystemMessageUserJoin(context, message.r()); + User g = message.g(); + m.checkNotNull(g); + configureReplyText(new SpannableString(b.g(context, systemMessageUserJoin, new Object[]{g.r()}, null, 4).toString()), 0.64f); } } @@ -402,10 +418,10 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { widgetChatListAdapterItemMessage.configureReplyText(spannable, f); } - private final void configureThreadSpine(ModelMessage modelMessage, boolean z2) { + private final void configureThreadSpine(Message message, boolean z2) { ImageView imageView = this.threadEmbedSpine; if (imageView != null) { - ViewKt.setVisible(imageView, modelMessage.hasThread() && !z2); + ViewKt.setVisible(imageView, MessageUtils.INSTANCE.hasThread(message) && !z2); } } @@ -427,35 +443,37 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { return new LeadingMarginSpan.Standard(i, 0); } - private final MessagePreprocessor getMessagePreprocessor(long j, ModelMessage modelMessage, StoreMessageState.State state) { + private final MessagePreprocessor getMessagePreprocessor(long j, Message message, StoreMessageState.State state) { StoreUserSettings userSettings = StoreStream.Companion.getUserSettings(); - return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : modelMessage.getEmbeds(), true, (Integer) null); + return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : message.m(), true, (Integer) null); } private final MessageRenderContext getMessageRenderContext(Context context, MessageEntry messageEntry, Function1, Unit> function1) { return new MessageRenderContext(context, ((WidgetChatListAdapter) this.adapter).getData().getUserId(), messageEntry.getAnimateEmojis(), messageEntry.getNickOrUsernames(), ((WidgetChatListAdapter) this.adapter).getData().getChannelNames(), messageEntry.getRoles(), 2130968986, WidgetChatListAdapterItemMessage$getMessageRenderContext$1.INSTANCE, new WidgetChatListAdapterItemMessage$getMessageRenderContext$2(this), ColorCompat.getThemedColor(context, 2130970178), ColorCompat.getThemedColor(context, 2130970179), function1, new WidgetChatListAdapterItemMessage$getMessageRenderContext$3(this), new WidgetChatListAdapterItemMessage$getMessageRenderContext$4(context)); } - private final Function1, Unit> getSpoilerClickHandler(ModelMessage modelMessage) { + private final Function1, Unit> getSpoilerClickHandler(Message message) { if (!((WidgetChatListAdapter) this.adapter).getData().isSpoilerClickAllowed()) { return null; } - return new WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1(this, modelMessage); + return new WidgetChatListAdapterItemMessage$getSpoilerClickHandler$1(this, message); } private final void processMessageText(SimpleDraweeSpanTextView simpleDraweeSpanTextView, MessageEntry messageEntry) { String str; Context context = simpleDraweeSpanTextView.getContext(); - ModelMessage message = messageEntry.getMessage(); - boolean isWebhook = message.isWebhook(); + Message message = messageEntry.getMessage(); + MessageUtils messageUtils = MessageUtils.INSTANCE; + boolean isWebhook = messageUtils.isWebhook(message); + UtcDateTime l = message.l(); boolean z2 = true; int i = 0; - boolean z3 = message.getEditedTimestamp() > 0; - if (message.isSourceDeleted()) { + boolean z3 = (l != null ? l.f() : 0) > 0; + if (messageUtils.isSourceDeleted(message)) { m.checkNotNullExpressionValue(context, "context"); - str = context.getResources().getString(2131893252); + str = context.getResources().getString(2131893294); } else { - str = message.getContent(); + str = message.k(); if (str == null) { str = ""; } @@ -464,7 +482,7 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { MessagePreprocessor messagePreprocessor = getMessagePreprocessor(((WidgetChatListAdapter) this.adapter).getData().getUserId(), message, messageEntry.getMessageState()); m.checkNotNullExpressionValue(context, "context"); DraweeSpanStringBuilder parseChannelMessage = DiscordParser.parseChannelMessage(context, str, getMessageRenderContext(context, messageEntry, getSpoilerClickHandler(message)), messagePreprocessor, isWebhook ? DiscordParser.ParserOptions.ALLOW_MASKED_LINKS : DiscordParser.ParserOptions.DEFAULT, z3); - simpleDraweeSpanTextView.setAutoLinkMask((messagePreprocessor.isLinkifyConflicting() || !shouldLinkify(message.getContent())) ? 0 : 6); + simpleDraweeSpanTextView.setAutoLinkMask((messagePreprocessor.isLinkifyConflicting() || !shouldLinkify(message.k())) ? 0 : 6); if (parseChannelMessage.length() <= 0) { z2 = false; } @@ -473,7 +491,8 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { } simpleDraweeSpanTextView.setVisibility(i); simpleDraweeSpanTextView.setDraweeSpanStringBuilder(parseChannelMessage); - simpleDraweeSpanTextView.setAlpha(messageEntry.getMessage().getType() == -1 ? 0.5f : 1.0f); + Integer M = messageEntry.getMessage().M(); + simpleDraweeSpanTextView.setAlpha((M != null && M.intValue() == -1) ? 0.5f : 1.0f); } private final boolean shouldLinkify(String str) { @@ -493,8 +512,9 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { return true; } - private final boolean shouldShowInteractionMessage(ModelMessage modelMessage) { - return modelMessage.isLocalApplicationCommand() || modelMessage.isLoading(); + private final boolean shouldShowInteractionMessage(Message message) { + MessageUtils messageUtils = MessageUtils.INSTANCE; + return messageUtils.isLocalApplicationCommand(message) || messageUtils.isLoading(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem @@ -504,8 +524,9 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { m.checkNotNullParameter(chatListEntry, "data"); super.onConfigure(i, chatListEntry); MessageEntry messageEntry = (MessageEntry) chatListEntry; + long j = 0; if (((WidgetChatListAdapter) this.adapter).getData().getUserId() != 0) { - ModelMessage message = messageEntry.getMessage(); + Message message = messageEntry.getMessage(); boolean isThreadStarterMessage = messageEntry.isThreadStarterMessage(); configureItemTag(message); View view2 = this.backgroundHighlight; @@ -514,14 +535,21 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { } TextView textView2 = this.itemName; if (textView2 != null) { - textView2.setText(messageEntry.getNickOrUsernames().get(Long.valueOf(message.getAuthor().i()))); + Map nickOrUsernames = messageEntry.getNickOrUsernames(); + User g = message.g(); + textView2.setText(nickOrUsernames.get(g != null ? Long.valueOf(g.i()) : null)); this.itemName.setTextColor(getAuthorTextColor(messageEntry.getAuthor())); this.itemName.setOnClickListener(new WidgetChatListAdapterItemMessage$onConfigure$1(this, message)); ViewExtensions.setOnLongClickListenerConsumeClick(this.itemName, new WidgetChatListAdapterItemMessage$onConfigure$2(this, message)); } TextView textView3 = this.itemTimestamp; if (textView3 != null) { - textView3.setText(TimeUtils.toReadableTimeString$default(a.T(this.itemView, "itemView", "itemView.context"), message.getTimestamp(), null, 4, null)); + Context T = a.T(this.itemView, "itemView", "itemView.context"); + UtcDateTime K = message.K(); + if (K != null) { + j = K.f(); + } + textView3.setText(TimeUtils.toReadableTimeString$default(T, j, null, 4, null)); } configureInteractionMessage(messageEntry); if (!shouldShowInteractionMessage(message) || (textView = this.itemLoadingText) == null) { @@ -543,27 +571,28 @@ public final class WidgetChatListAdapterItemMessage extends WidgetChatListItem { imageView.setOnClickListener(new WidgetChatListAdapterItemMessage$onConfigure$5(this, message)); ViewExtensions.setOnLongClickListenerConsumeClick(this.itemAvatar, new WidgetChatListAdapterItemMessage$onConfigure$6(this, message)); ImageView imageView2 = this.itemAvatar; - User author = message.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - IconUtils.setIcon$default(imageView2, new CoreUser(author), 2131165285, null, null, messageEntry.getAuthor(), 24, null); + User g2 = message.g(); + m.checkNotNull(g2); + IconUtils.setIcon$default(imageView2, new CoreUser(g2), 2131165285, null, null, messageEntry.getAuthor(), 24, null); } boolean z2 = true; if (this.failedUploadList != null) { - List list = message.localAttachments; - if (!message.isFailed() || list == null || !(!list.isEmpty())) { + List v = message.v(); + if (!MessageUtils.INSTANCE.isFailed(message) || v == null || !(!v.isEmpty())) { this.failedUploadList.setVisibility(8); } else { this.failedUploadList.setVisibility(0); - this.failedUploadList.setUp(list); + this.failedUploadList.setUp(v); } } if (this.itemAlertText != null) { - if (message.isFailed()) { + if (MessageUtils.INSTANCE.isFailed(message)) { this.itemAlertText.setVisibility(0); - if (message.getType() != -3) { + Integer M = message.M(); + if (M == null || M.intValue() != -3) { z2 = false; } - this.itemAlertText.setText(z2 ? 2131890436 : 2131893117); + this.itemAlertText.setText(z2 ? 2131890466 : 2131893159); } else { this.itemAlertText.setVisibility(8); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java index adf2f20e7b..d84a157caf 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemMessageHeader.java @@ -14,7 +14,7 @@ public final class WidgetChatListAdapterItemMessageHeader extends WidgetChatList /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemMessageHeader(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558941, widgetChatListAdapter); + super(2131558942, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362580; @@ -47,7 +47,7 @@ public final class WidgetChatListAdapterItemMessageHeader extends WidgetChatList MessageHeaderEntry messageHeaderEntry = (MessageHeaderEntry) chatListEntry; String component2 = messageHeaderEntry.component2(); String component3 = messageHeaderEntry.component3(); - View view = this.binding.f1735c; + View view = this.binding.f1737c; m.checkNotNullExpressionValue(view, "binding.chatListItemMessageHeaderDivider"); boolean z2 = true; int i2 = 0; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java index bd711790e1..7dc2bd156a 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemNewMessages.java @@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemNewMessages(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558959, widgetChatListAdapter); + super(2131558960, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); WidgetChatListAdapterItemTextDividerBinding a = WidgetChatListAdapterItemTextDividerBinding.a(this.itemView); m.checkNotNullExpressionValue(a, "WidgetChatListAdapterIte…derBinding.bind(itemView)"); @@ -26,7 +26,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); view.setBackgroundColor(ColorCompat.getColor(view2.getContext(), 2131100324)); - View view3 = a.f1744c; + View view3 = a.f1746c; View view4 = this.itemView; m.checkNotNullExpressionValue(view4, "itemView"); view3.setBackgroundColor(ColorCompat.getColor(view4.getContext(), 2131100324)); @@ -38,7 +38,7 @@ public final class WidgetChatListAdapterItemNewMessages extends WidgetChatListIt m.checkNotNullExpressionValue(textView2, "binding.dividerText"); View view6 = this.itemView; m.checkNotNullExpressionValue(view6, "itemView"); - String string = view6.getContext().getString(2131891310); + String string = view6.getContext().getString(2131891343); m.checkNotNullExpressionValue(string, "itemView.context.getStri…ing.new_messages_divider)"); TextView textView3 = a.d; m.checkNotNullExpressionValue(textView3, "binding.dividerText"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java index b163efcd26..25fbf5a422 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemPrivateChannelStart.java @@ -20,17 +20,17 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemPrivateChannelStart(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558943, widgetChatListAdapter); + super(2131558944, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362521; TextView textView = (TextView) view.findViewById(2131362521); if (textView != null) { - i = 2131364347; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364347); + i = 2131364350; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364350); if (simpleDraweeView != null) { - i = 2131364348; - TextView textView2 = (TextView) view.findViewById(2131364348); + i = 2131364351; + TextView textView2 = (TextView) view.findViewById(2131364351); if (textView2 != null) { WidgetChatListAdapterItemPrivateChannelStartBinding widgetChatListAdapterItemPrivateChannelStartBinding = new WidgetChatListAdapterItemPrivateChannelStartBinding((LinearLayout) view, textView, simpleDraweeView, textView2); m.checkNotNullExpressionValue(widgetChatListAdapterItemPrivateChannelStartBinding, "WidgetChatListAdapterIte…artBinding.bind(itemView)"); @@ -59,23 +59,23 @@ public final class WidgetChatListAdapterItemPrivateChannelStart extends WidgetCh if (!(!t.isBlank(component2))) { TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterI…PrivateChannelStartHeader"); - component2 = textView.getContext().getString(2131894030); + component2 = textView.getContext().getString(2131894069); m.checkNotNullExpressionValue(component2, "binding.chatListAdapterI…tString(R.string.unnamed)"); } TextView textView2 = this.binding.b; m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterI…PrivateChannelStartHeader"); textView2.setText(component2); if (component4 != null) { - SimpleDraweeView simpleDraweeView = this.binding.f1736c; + SimpleDraweeView simpleDraweeView = this.binding.f1738c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.privateChannelStartImage"); IconUtils.setIcon$default(simpleDraweeView, component4, 2131165298, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); } else { - SimpleDraweeView simpleDraweeView2 = this.binding.f1736c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1738c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.privateChannelStartImage"); IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon.jpg", 2131165298, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); } if (component5) { - this.binding.d.setText(2131893684); + this.binding.d.setText(2131893724); return; } TextView textView3 = this.binding.d; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java index 8ec45694db..ee20f151e7 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemReactions.java @@ -7,9 +7,9 @@ import android.widget.ImageView; import androidx.constraintlayout.widget.ConstraintLayout; import c.a.i.b1; import c.a.z.z; +import com.discord.api.message.Message; import com.discord.api.message.reaction.MessageReaction; import com.discord.databinding.WidgetChatListAdapterItemReactionsBinding; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.view.extensions.ViewExtensions; import com.discord.widgets.chat.list.entries.ChatListEntry; import com.discord.widgets.chat.list.entries.ReactionsEntry; @@ -37,7 +37,7 @@ public final class WidgetChatListAdapterItemReactions extends WidgetChatListItem /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemReactions(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558944, widgetChatListAdapter); + super(2131558945, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362517; @@ -113,13 +113,13 @@ public final class WidgetChatListAdapterItemReactions extends WidgetChatListItem } private final void processReactions(ReactionsEntry reactionsEntry) { - ModelMessage message = reactionsEntry.getMessage(); - View view = this.binding.f1737c; + Message message = reactionsEntry.getMessage(); + View view = this.binding.f1739c; m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemHighlightedBg"); View view2 = this.binding.b; m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg"); configureCellHighlight(message, view, view2); - displayReactions(reactionsEntry.getMessage().getReactions().values(), reactionsEntry.getMessage().getId(), reactionsEntry.getCanAddReactions(), reactionsEntry.getCanCreateReactions(), reactionsEntry.getAnimateEmojis()); + displayReactions(reactionsEntry.getMessage().F().values(), reactionsEntry.getMessage().r(), reactionsEntry.getCanAddReactions(), reactionsEntry.getCanCreateReactions(), reactionsEntry.getAnimateEmojis()); } private final void removeQuickAddReactionView() { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java index 5a2a37c894..fa9eb86da2 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSearchResultCount.java @@ -16,7 +16,7 @@ public final class WidgetChatListAdapterItemSearchResultCount extends WidgetChat /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemSearchResultCount(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558945, widgetChatListAdapter); + super(2131558946, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -41,6 +41,6 @@ public final class WidgetChatListAdapterItemSearchResultCount extends WidgetChat m.checkNotNullExpressionValue(textView3, "binding.resultCount"); Context context = textView3.getContext(); m.checkNotNullExpressionValue(context, "binding.resultCount.context"); - textView.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755339, totalResults, Integer.valueOf(totalResults))); + textView.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755340, totalResults, Integer.valueOf(totalResults))); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java index b600c18cd6..4811e0366e 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSpotifyListenTogether.java @@ -229,33 +229,33 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemSpotifyListenTogether(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558951, widgetChatListAdapter); + super(2131558952, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362092; Barrier barrier = (Barrier) view.findViewById(2131362092); if (barrier != null) { - i = 2131363697; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363697); + i = 2131363700; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363700); if (simpleDraweeView != null) { - i = 2131363698; - TextView textView = (TextView) view.findViewById(2131363698); + i = 2131363701; + TextView textView = (TextView) view.findViewById(2131363701); if (textView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131363700; - TextView textView2 = (TextView) view.findViewById(2131363700); + i = 2131363703; + TextView textView2 = (TextView) view.findViewById(2131363703); if (textView2 != null) { - i = 2131363701; - TextView textView3 = (TextView) view.findViewById(2131363701); + i = 2131363704; + TextView textView3 = (TextView) view.findViewById(2131363704); if (textView3 != null) { - i = 2131363702; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363702); + i = 2131363705; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363705); if (recyclerView != null) { - i = 2131363703; - TextView textView4 = (TextView) view.findViewById(2131363703); + i = 2131363706; + TextView textView4 = (TextView) view.findViewById(2131363706); if (textView4 != null) { - i = 2131363704; - TextView textView5 = (TextView) view.findViewById(2131363704); + i = 2131363707; + TextView textView5 = (TextView) view.findViewById(2131363707); if (textView5 != null) { WidgetChatListAdapterItemSpotifyListenTogetherBinding widgetChatListAdapterItemSpotifyListenTogetherBinding = new WidgetChatListAdapterItemSpotifyListenTogetherBinding(constraintLayout, barrier, simpleDraweeView, textView, constraintLayout, textView2, textView3, recyclerView, textView4, textView5); m.checkNotNullExpressionValue(widgetChatListAdapterItemSpotifyListenTogetherBinding, "WidgetChatListAdapterIte…herBinding.bind(itemView)"); @@ -303,7 +303,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget Context context2 = textView3.getContext(); m.checkNotNullExpressionValue(context2, "binding.itemListenTogetherHeader.context"); String str = null; - textView.setText(b.g(context, 2131890485, new Object[]{getActivityName(context2, model.getItem())}, null, 4)); + textView.setText(b.g(context, 2131890515, new Object[]{getActivityName(context2, model.getItem())}, null, 4)); boolean isDeadInvite = isDeadInvite(model.getPresence(), model.getItem()); Presence presence = model.getPresence(); Activity spotifyListeningActivity = presence != null ? PresenceUtils.INSTANCE.getSpotifyListeningActivity(presence) : null; @@ -317,7 +317,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget TextView textView5 = this.binding.h; m.checkNotNullExpressionValue(textView5, "binding.itemListenTogetherTrack"); textView5.setVisibility(isDeadInvite ^ true ? 0 : 8); - TextView textView6 = this.binding.f1738c; + TextView textView6 = this.binding.f1740c; m.checkNotNullExpressionValue(textView6, "binding.itemListenTogetherArtist"); textView6.setVisibility(isDeadInvite ^ true ? 0 : 8); SimpleDraweeView simpleDraweeView = this.binding.b; @@ -334,11 +334,11 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget TextView textView7 = this.binding.h; m.checkNotNullExpressionValue(textView7, "binding.itemListenTogetherTrack"); textView7.setText(spotifyListeningActivity != null ? spotifyListeningActivity.e() : null); - TextView textView8 = this.binding.f1738c; + TextView textView8 = this.binding.f1740c; m.checkNotNullExpressionValue(textView8, "binding.itemListenTogetherArtist"); Object[] objArr = new Object[1]; objArr[0] = spotifyListeningActivity != null ? spotifyListeningActivity.l() : null; - b.n(textView8, 2131894160, objArr, null, 4); + b.n(textView8, 2131894199, objArr, null, 4); ActivityAssets b = spotifyListeningActivity != null ? spotifyListeningActivity.b() : null; if (!(b == null || (a = b.a()) == null)) { SimpleDraweeView simpleDraweeView2 = this.binding.b; @@ -362,7 +362,7 @@ public final class WidgetChatListAdapterItemSpotifyListenTogether extends Widget if (w.contains((CharSequence) a, (CharSequence) platform.getPlatformId(), true)) { return platform.getProperName(); } - String string = context.getString(2131888629); + String string = context.getString(2131888639); m.checkNotNullExpressionValue(string, "context.getString(R.stri….form_label_desktop_only)"); return string; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java index 2a140904c6..1d95b1358b 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java @@ -305,33 +305,33 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemStageInvite(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558952, widgetChatListAdapter); + super(2131558953, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; - int i = 2131363682; - TextView textView = (TextView) view.findViewById(2131363682); + int i = 2131363685; + TextView textView = (TextView) view.findViewById(2131363685); if (textView != null) { - i = 2131363683; - TextView textView2 = (TextView) view.findViewById(2131363683); + i = 2131363686; + TextView textView2 = (TextView) view.findViewById(2131363686); if (textView2 != null) { - i = 2131363684; - TextView textView3 = (TextView) view.findViewById(2131363684); + i = 2131363687; + TextView textView3 = (TextView) view.findViewById(2131363687); if (textView3 != null) { - i = 2131363685; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363685); + i = 2131363688; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363688); if (simpleDraweeView != null) { - i = 2131363686; - TextView textView4 = (TextView) view.findViewById(2131363686); + i = 2131363689; + TextView textView4 = (TextView) view.findViewById(2131363689); if (textView4 != null) { - i = 2131363687; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363687); + i = 2131363690; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363690); if (materialButton != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131363705; - TextView textView5 = (TextView) view.findViewById(2131363705); + i = 2131363708; + TextView textView5 = (TextView) view.findViewById(2131363708); if (textView5 != null) { - i = 2131365003; - DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) view.findViewById(2131365003); + i = 2131365007; + DiscoveryStageCardSpeakersView discoveryStageCardSpeakersView = (DiscoveryStageCardSpeakersView) view.findViewById(2131365007); if (discoveryStageCardSpeakersView != null) { WidgetChatListAdapterItemStageInviteBinding widgetChatListAdapterItemStageInviteBinding = new WidgetChatListAdapterItemStageInviteBinding(constraintLayout, textView, textView2, textView3, simpleDraweeView, textView4, materialButton, constraintLayout, textView5, discoveryStageCardSpeakersView); m.checkNotNullExpressionValue(widgetChatListAdapterItemStageInviteBinding, "WidgetChatListAdapterIte…iteBinding.bind(itemView)"); @@ -396,7 +396,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.itemInviteImageText"); ViewExtensions.setTextAndVisibilityBy(textView, (z2 || (guild = model.getInvite().getGuild()) == null || (u = guild.u()) == null) ? null : GuildUtilsKt.computeShortName(u)); - TextView textView2 = this.binding.f1739c; + TextView textView2 = this.binding.f1741c; m.checkNotNullExpressionValue(textView2, "binding.itemInviteGuildName"); Guild guild5 = model.getInvite().getGuild(); if (guild5 == null || (str = guild5.u()) == null) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java index fec78896c7..def1bab2c4 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java @@ -19,7 +19,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemStart(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558953, widgetChatListAdapter); + super(2131558954, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362514; @@ -58,7 +58,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { } private final void configureChannel(long j, String str, boolean z2, boolean z3) { - TextView textView = this.binding.f1740c; + TextView textView = this.binding.f1742c; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader"); int i = 0; b.n(textView, 2131886351, new Object[]{str}, null, 4); @@ -80,7 +80,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { this.binding.b.setOnClickListener(new WidgetChatListAdapterItemStart$configureChannel$1(this, j)); TextView textView5 = this.binding.b; m.checkNotNullExpressionValue(textView5, "binding.chatListAdapterItemEditChannel"); - b.n(textView5, 2131888191, new Object[0], null, 4); + b.n(textView5, 2131888201, new Object[0], null, 4); TextView textView6 = this.binding.b; m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemEditChannel"); if (!z3) { @@ -91,10 +91,10 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0043: APUT (r4v1 java.lang.Object[]), (0 ??[int, short, byte, char]), (r6v0 java.lang.String) */ private final void configureThread(long j, String str, boolean z2, boolean z3, GuildMember guildMember, Integer num) { - TextView textView = this.binding.f1740c; + TextView textView = this.binding.f1742c; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader"); Context context = textView.getContext(); - TextView textView2 = this.binding.f1740c; + TextView textView2 = this.binding.f1742c; m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemHeader"); textView2.setText(str); TextView textView3 = this.binding.d; @@ -108,7 +108,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { m.checkNotNullExpressionValue(textView4, "binding.chatListAdapterItemSubheader1"); Object[] objArr = new Object[1]; objArr[0] = guildMember != null ? guildMember.getNick() : null; - b.m(textView4, 2131893850, objArr, new WidgetChatListAdapterItemStart$configureThread$1(this, guildMember, context)); + b.m(textView4, 2131893889, objArr, new WidgetChatListAdapterItemStart$configureThread$1(this, guildMember, context)); if (z2) { ThreadUtils threadUtils = ThreadUtils.INSTANCE; m.checkNotNullExpressionValue(context, "context"); @@ -124,7 +124,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { this.binding.b.setOnClickListener(new WidgetChatListAdapterItemStart$configureThread$3(this, j)); TextView textView7 = this.binding.b; m.checkNotNullExpressionValue(textView7, "binding.chatListAdapterItemEditChannel"); - b.n(textView7, 2131888202, new Object[0], null, 4); + b.n(textView7, 2131888212, new Object[0], null, 4); TextView textView8 = this.binding.b; m.checkNotNullExpressionValue(textView8, "binding.chatListAdapterItemEditChannel"); if (!z3) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java index c7c3ac43d8..ec8304bdcc 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSticker.java @@ -20,7 +20,7 @@ public final class WidgetChatListAdapterItemSticker extends WidgetChatListItem { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemSticker(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558954, widgetChatListAdapter); + super(2131558955, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; StickerView stickerView = (StickerView) view.findViewById(2131362524); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java index 09012b0a44..cd414c23cd 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreet.java @@ -17,14 +17,14 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemStickerGreet(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558955, widgetChatListAdapter); + super(2131558956, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362525; StickerView stickerView = (StickerView) view.findViewById(2131362525); if (stickerView != null) { - i = 2131364580; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364580); + i = 2131364583; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364583); if (materialButton != null) { WidgetChatListAdapterItemStickerGreetBinding widgetChatListAdapterItemStickerGreetBinding = new WidgetChatListAdapterItemStickerGreetBinding((LinearLayout) view, stickerView, materialButton); m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerGreetBinding, "WidgetChatListAdapterIte…eetBinding.bind(itemView)"); @@ -54,9 +54,9 @@ public final class WidgetChatListAdapterItemStickerGreet extends WidgetChatListI String component3 = stickerGreetEntry.component3(); int component4 = stickerGreetEntry.component4(); StickerView.d(this.binding.b, component1, null, 2); - this.binding.f1741c.setOnClickListener(new WidgetChatListAdapterItemStickerGreet$onConfigure$1(this, component2, component4, component1)); - MaterialButton materialButton = this.binding.f1741c; + this.binding.f1743c.setOnClickListener(new WidgetChatListAdapterItemStickerGreet$onConfigure$1(this, component2, component4, component1)); + MaterialButton materialButton = this.binding.f1743c; m.checkNotNullExpressionValue(materialButton, "binding.sendStickerGreetButton"); - b.n(materialButton, 2131894510, new Object[]{component3}, null, 4); + b.n(materialButton, 2131894557, new Object[]{component3}, null, 4); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java index 43602c702e..7bacbf79ac 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStickerGreetCompact.java @@ -18,7 +18,7 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemStickerGreetCompact(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558956, widgetChatListAdapter); + super(2131558957, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362525; @@ -27,8 +27,8 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh i = 2131362526; TextView textView = (TextView) view.findViewById(2131362526); if (textView != null) { - i = 2131364580; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364580); + i = 2131364583; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364583); if (linearLayout != null) { WidgetChatListAdapterItemStickerGreetCompactBinding widgetChatListAdapterItemStickerGreetCompactBinding = new WidgetChatListAdapterItemStickerGreetCompactBinding((ConstraintLayout) view, stickerView, textView, linearLayout); m.checkNotNullExpressionValue(widgetChatListAdapterItemStickerGreetCompactBinding, "WidgetChatListAdapterIte…actBinding.bind(itemView)"); @@ -60,8 +60,8 @@ public final class WidgetChatListAdapterItemStickerGreetCompact extends WidgetCh int component4 = stickerGreetCompactEntry.component4(); StickerView.d(this.binding.b, component1, null, 2); this.binding.d.setOnClickListener(new WidgetChatListAdapterItemStickerGreetCompact$onConfigure$1(this, component2, component4, component1)); - TextView textView = this.binding.f1742c; + TextView textView = this.binding.f1744c; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemStickerGreetText"); - b.n(textView, 2131894510, new Object[]{component3}, null, 4); + b.n(textView, 2131894557, new Object[]{component3}, null, 4); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java index 2051439b40..4da9a25b4a 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.java @@ -2,8 +2,9 @@ package com.discord.widgets.chat.list.adapter; import android.content.Context; import c.a.l.b; -import com.discord.models.domain.ModelMessage; -import com.discord.utilities.textprocessing.MessageUtils; +import com.discord.api.message.Message; +import com.discord.api.user.User; +import com.discord.utilities.message.MessageUtils; import d0.z.d.m; import d0.z.d.o; import kotlin.jvm.functions.Function1; @@ -15,13 +16,13 @@ public final class WidgetChatListAdapterItemSystemMessage$getSystemMessage$1 ext public final /* synthetic */ Long $firstMentionedUserId; public final /* synthetic */ String $firstMentionedUserName; public final /* synthetic */ String $guildName; - public final /* synthetic */ ModelMessage $this_getSystemMessage; + public final /* synthetic */ Message $this_getSystemMessage; public final /* synthetic */ Function1 $usernameRenderContext; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemSystemMessage$getSystemMessage$1(ModelMessage modelMessage, String str, String str2, Function1 function1, Long l, Context context, String str3, Function1 function12) { + public WidgetChatListAdapterItemSystemMessage$getSystemMessage$1(Message message, String str, String str2, Function1 function1, Long l, Context context, String str3, Function1 function12) { super(1); - this.$this_getSystemMessage = modelMessage; + this.$this_getSystemMessage = message; this.$authorName = str; this.$firstMentionedUserName = str2; this.$usernameRenderContext = function1; @@ -33,50 +34,19 @@ public final class WidgetChatListAdapterItemSystemMessage$getSystemMessage$1 ext public final CharSequence invoke(Context context) { m.checkNotNullParameter(context, "$this$getString"); - switch (this.$this_getSystemMessage.getType()) { - case 1: - return b.a(context, 2131893748, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext); - case 2: - Long l = this.$firstMentionedUserId; - return (l != null && l.longValue() == this.$this_getSystemMessage.getAuthor().i()) ? b.a(context, 2131893750, new Object[]{this.$authorName}, this.$usernameRenderContext) : b.a(context, 2131893749, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext); - case 3: - case 13: - case 19: - case 20: - case 21: - case 22: - default: - return b.g(context, 2131892547, new Object[0], null, 4); - case 4: - return b.a(context, 2131893701, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext); - case 5: - return b.a(context, 2131893700, new Object[]{this.$authorName}, this.$usernameRenderContext); - case 6: - return b.a(context, 2131893744, new Object[]{this.$authorName}, this.$usernameRenderContext); - case 7: - return b.a(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(this.$context, this.$this_getSystemMessage.getId()), new Object[]{this.$authorName}, this.$usernameRenderContext); - case 8: - return b.a(context, 2131893722, new Object[]{this.$authorName}, this.$usernameRenderContext); - case 9: - return b.a(context, 2131893723, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892116, new Object[0], null, 4)}, this.$usernameRenderContext); - case 10: - return b.a(context, 2131893723, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892117, new Object[0], null, 4)}, this.$usernameRenderContext); - case 11: - return b.a(context, 2131893723, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892118, new Object[0], null, 4)}, this.$usernameRenderContext); - case 12: - return b.a(context, 2131893698, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$usernameRenderContext); - case 14: - return b.g(context, 2131893705, new Object[0], null, 4); - case 15: - return b.g(context, 2131893708, new Object[0], null, 4); - case 16: - return b.g(context, 2131893707, new Object[0], null, 4); - case 17: - return b.g(context, 2131893706, new Object[0], null, 4); - case 18: - return b.a(context, 2131893751, new Object[]{this.$authorName, this.$this_getSystemMessage.getContent()}, this.$actorRenderContext); - case 23: - return b.g(context, 2131893851, new Object[0], null, 4); + Integer M = this.$this_getSystemMessage.M(); + if (M != null && M.intValue() == 1) { + return b.a(context, 2131893788, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext); } + Long l = null; + if (M == null || M.intValue() != 2) { + return (M != null && M.intValue() == 4) ? b.a(context, 2131893741, new Object[]{this.$authorName, this.$this_getSystemMessage.k()}, this.$usernameRenderContext) : (M != null && M.intValue() == 5) ? b.a(context, 2131893740, new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 6) ? b.a(context, 2131893784, new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 7) ? b.a(context, MessageUtils.INSTANCE.getSystemMessageUserJoin(this.$context, this.$this_getSystemMessage.r()), new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 8) ? b.a(context, 2131893762, new Object[]{this.$authorName}, this.$usernameRenderContext) : (M != null && M.intValue() == 9) ? b.a(context, 2131893763, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892154, new Object[0], null, 4)}, this.$usernameRenderContext) : (M != null && M.intValue() == 10) ? b.a(context, 2131893763, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892155, new Object[0], null, 4)}, this.$usernameRenderContext) : (M != null && M.intValue() == 11) ? b.a(context, 2131893763, new Object[]{this.$authorName, this.$guildName, b.g(context, 2131892156, new Object[0], null, 4)}, this.$usernameRenderContext) : (M != null && M.intValue() == 12) ? b.a(context, 2131893738, new Object[]{this.$authorName, this.$this_getSystemMessage.k()}, this.$usernameRenderContext) : (M != null && M.intValue() == 14) ? b.g(context, 2131893745, new Object[0], null, 4) : (M != null && M.intValue() == 15) ? b.g(context, 2131893748, new Object[0], null, 4) : (M != null && M.intValue() == 16) ? b.g(context, 2131893747, new Object[0], null, 4) : (M != null && M.intValue() == 17) ? b.g(context, 2131893746, new Object[0], null, 4) : (M != null && M.intValue() == 18) ? b.a(context, 2131893791, new Object[]{this.$authorName, this.$this_getSystemMessage.k()}, this.$actorRenderContext) : (M != null && M.intValue() == 23) ? b.g(context, 2131893890, new Object[0], null, 4) : b.g(context, 2131892589, new Object[0], null, 4); + } + Long l2 = this.$firstMentionedUserId; + User g = this.$this_getSystemMessage.g(); + if (g != null) { + l = Long.valueOf(g.i()); + } + return m.areEqual(l2, l) ? b.a(context, 2131893790, new Object[]{this.$authorName}, this.$usernameRenderContext) : b.a(context, 2131893789, new Object[]{this.$authorName, this.$firstMentionedUserName}, this.$usernameRenderContext); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java index 4408b4664c..ab0ae12c8c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java @@ -1,43 +1,31 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; -import com.discord.models.domain.ModelMessage; import com.discord.utilities.channel.ChannelSelector; /* compiled from: WidgetChatListAdapterItemSystemMessage.kt */ public final class WidgetChatListAdapterItemSystemMessage$onConfigure$1 implements View.OnClickListener { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemSystemMessage this$0; - public WidgetChatListAdapterItemSystemMessage$onConfigure$1(WidgetChatListAdapterItemSystemMessage widgetChatListAdapterItemSystemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemSystemMessage$onConfigure$1(WidgetChatListAdapterItemSystemMessage widgetChatListAdapterItemSystemMessage, Message message) { this.this$0 = widgetChatListAdapterItemSystemMessage; - this.$message = modelMessage; + this.$message = message; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - int type = this.$message.getType(); - if (type != 18) { - switch (type) { - case 6: - WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onOpenPinsClicked(this.$message); - return; - case 7: - case 8: - case 9: - case 10: - case 11: - WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId()); - return; - case 12: - WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId()); - return; - default: - return; - } - } else { - MessageReference messageReference = this.$message.getMessageReference(); - Long a = messageReference != null ? messageReference.a() : null; + Integer M = this.$message.M(); + if ((M != null && M.intValue() == 7) || ((M != null && M.intValue() == 8) || ((M != null && M.intValue() == 9) || ((M != null && M.intValue() == 10) || (M != null && M.intValue() == 11))))) { + WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId()); + } else if (M != null && M.intValue() == 12) { + WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId()); + } else if (M != null && M.intValue() == 6) { + WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onOpenPinsClicked(this.$message); + } else if (M != null && M.intValue() == 18) { + MessageReference A = this.$message.A(); + Long a = A != null ? A.a() : null; if (a != null) { ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId(), a.longValue(), null, null, 12, null); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java index 4939d283e6..fe6371cd72 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$2.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.adapter; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.utilities.view.text.LinkifiedTextView; import com.discord.widgets.chat.list.adapter.WidgetChatListAdapter; import d0.z.d.m; @@ -10,14 +10,14 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChatListAdapterItemSystemMessage.kt */ public final class WidgetChatListAdapterItemSystemMessage$onConfigure$2 extends o implements Function1 { - public final /* synthetic */ ModelMessage $message; + public final /* synthetic */ Message $message; public final /* synthetic */ WidgetChatListAdapterItemSystemMessage this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChatListAdapterItemSystemMessage$onConfigure$2(WidgetChatListAdapterItemSystemMessage widgetChatListAdapterItemSystemMessage, ModelMessage modelMessage) { + public WidgetChatListAdapterItemSystemMessage$onConfigure$2(WidgetChatListAdapterItemSystemMessage widgetChatListAdapterItemSystemMessage, Message message) { super(1); this.this$0 = widgetChatListAdapterItemSystemMessage; - this.$message = modelMessage; + this.$message = message; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -31,11 +31,11 @@ public final class WidgetChatListAdapterItemSystemMessage$onConfigure$2 extends public final void invoke(View view) { m.checkNotNullParameter(view, "it"); WidgetChatListAdapter.EventHandler eventHandler = WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler(); - ModelMessage modelMessage = this.$message; - LinkifiedTextView linkifiedTextView = WidgetChatListAdapterItemSystemMessage.access$getBinding$p(this.this$0).f1743c; + Message message = this.$message; + LinkifiedTextView linkifiedTextView = WidgetChatListAdapterItemSystemMessage.access$getBinding$p(this.this$0).f1745c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.systemText"); CharSequence text = linkifiedTextView.getText(); m.checkNotNullExpressionValue(text, "binding.systemText.text"); - eventHandler.onMessageLongClicked(modelMessage, text, false); + eventHandler.onMessageLongClicked(message, text, false); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java index b6dcfcbc0c..e0a3c9c35f 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage.java @@ -6,9 +6,10 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.user.User; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.databinding.WidgetChatListAdapterItemSystemBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.utilities.color.ColorCompat; @@ -27,17 +28,17 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemSystemMessage(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558957, widgetChatListAdapter); + super(2131558958, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; - int i = 2131365162; - ImageView imageView = (ImageView) view.findViewById(2131365162); + int i = 2131365166; + ImageView imageView = (ImageView) view.findViewById(2131365166); if (imageView != null) { - i = 2131365163; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365163); + i = 2131365167; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365167); if (linkifiedTextView != null) { - i = 2131365164; - TextView textView = (TextView) view.findViewById(2131365164); + i = 2131365168; + TextView textView = (TextView) view.findViewById(2131365168); if (textView != null) { WidgetChatListAdapterItemSystemBinding widgetChatListAdapterItemSystemBinding = new WidgetChatListAdapterItemSystemBinding((RelativeLayout) view, imageView, linkifiedTextView, textView); m.checkNotNullExpressionValue(widgetChatListAdapterItemSystemBinding, "WidgetChatListAdapterIte…temBinding.bind(itemView)"); @@ -57,72 +58,75 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList return widgetChatListAdapterItemSystemMessage.binding; } - private final int getIcon(ModelMessage modelMessage) { - switch (modelMessage.getType()) { - case 1: - case 7: - case 12: - return 2131231655; - case 2: - return 2131231656; - case 3: - case 13: - case 14: - case 19: - case 20: - case 21: - case 22: - case 23: - default: - return 2131232056; - case 4: - case 5: - return 2131231654; - case 6: + private final int getIcon(Message message) { + Integer M = message.M(); + if (M == null || M.intValue() != 1) { + if (M != null && M.intValue() == 2) { + return 2131231659; + } + if ((M != null && M.intValue() == 4) || (M != null && M.intValue() == 5)) { + return 2131231657; + } + if (M != null && M.intValue() == 6) { return 2131231476; - case 8: - case 9: - case 10: - case 11: - return 2131232023; - case 15: - return 2131231504; - case 16: - case 17: - return 2131232055; - case 18: - return 2131231988; + } + if (M == null || M.intValue() != 7) { + if ((M != null && M.intValue() == 8) || ((M != null && M.intValue() == 9) || ((M != null && M.intValue() == 10) || (M != null && M.intValue() == 11)))) { + return 2131232026; + } + if (M == null || M.intValue() != 12) { + if (M == null || M.intValue() != 14) { + if (M != null && M.intValue() == 15) { + return 2131231504; + } + if (M != null && M.intValue() == 16) { + return 2131232058; + } + if (M != null && M.intValue() == 17) { + return 2131232058; + } + if (M != null && M.intValue() == 18) { + return 2131231991; + } + if (M != null) { + M.intValue(); + } + } + return 2131232059; + } + } } + return 2131231658; } - private final CharSequence getSystemMessage(ModelMessage modelMessage, Context context, String str, int i, Long l, String str2, int i2, String str3) { - return new WidgetChatListAdapterItemSystemMessage$getSystemMessage$1(modelMessage, str, str2, new WidgetChatListAdapterItemSystemMessage$getSystemMessage$usernameRenderContext$1(i, i2), l, context, str3, new WidgetChatListAdapterItemSystemMessage$getSystemMessage$actorRenderContext$1(i)).invoke(context); + private final CharSequence getSystemMessage(Message message, Context context, String str, int i, Long l, String str2, int i2, String str3) { + return new WidgetChatListAdapterItemSystemMessage$getSystemMessage$1(message, str, str2, new WidgetChatListAdapterItemSystemMessage$getSystemMessage$usernameRenderContext$1(i, i2), l, context, str3, new WidgetChatListAdapterItemSystemMessage$getSystemMessage$actorRenderContext$1(i)).invoke(context); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem public void onConfigure(int i, ChatListEntry chatListEntry) { + User user; m.checkNotNullParameter(chatListEntry, "data"); super.onConfigure(i, chatListEntry); MessageEntry messageEntry = (MessageEntry) chatListEntry; - ModelMessage component1 = messageEntry.component1(); + Message component1 = messageEntry.component1(); GuildMember component3 = messageEntry.component3(); GuildMember component4 = messageEntry.component4(); Map component6 = messageEntry.component6(); - String str = component6.get(Long.valueOf(component1.getAuthor().i())); + User g = component1.g(); + String str = component6.get(g != null ? Long.valueOf(g.i()) : null); Guild guild = ((WidgetChatListAdapter) this.adapter).getData().getGuild(); String name = guild != null ? guild.getName() : null; - List mentions = component1.getMentions(); - m.checkNotNullExpressionValue(mentions, "message.mentions"); - User user = (User) u.firstOrNull((List) mentions); - Long valueOf = user != null ? Long.valueOf(user.i()) : null; + List z2 = component1.z(); + Long valueOf = (z2 == null || (user = (User) u.firstOrNull(z2)) == null) ? null : Long.valueOf(user.i()); String str2 = valueOf != null ? component6.get(Long.valueOf(valueOf.longValue())) : null; - LinkifiedTextView linkifiedTextView = this.binding.f1743c; + LinkifiedTextView linkifiedTextView = this.binding.f1745c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.systemText"); int themedColor = ColorCompat.getThemedColor(linkifiedTextView.getContext(), 2130968932); GuildMember.Companion companion = GuildMember.Companion; int color = companion.getColor(component3, themedColor); int color2 = companion.getColor(component4, themedColor); - LinkifiedTextView linkifiedTextView2 = this.binding.f1743c; + LinkifiedTextView linkifiedTextView2 = this.binding.f1745c; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.systemText"); Context context = linkifiedTextView2.getContext(); m.checkNotNullExpressionValue(context, "binding.systemText.context"); @@ -133,8 +137,10 @@ public final class WidgetChatListAdapterItemSystemMessage extends WidgetChatList ViewExtensions.setOnLongClickListenerConsumeClick(relativeLayout, new WidgetChatListAdapterItemSystemMessage$onConfigure$2(this, component1)); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.systemTimestamp"); - textView.setText(TimeUtils.toReadableTimeString$default(a.T(this.itemView, "itemView", "itemView.context"), component1.getTimestamp(), null, 4, null)); - LinkifiedTextView linkifiedTextView3 = this.binding.f1743c; + Context T = a.T(this.itemView, "itemView", "itemView.context"); + UtcDateTime K = component1.K(); + textView.setText(TimeUtils.toReadableTimeString$default(T, K != null ? K.f() : 0, null, 4, null)); + LinkifiedTextView linkifiedTextView3 = this.binding.f1745c; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.systemText"); linkifiedTextView3.setText(systemMessage); this.binding.b.setImageResource(getIcon(component1)); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java index cb4bfcf3bb..b7eae5ece8 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadDraftForm.java @@ -25,24 +25,24 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemThreadDraftForm(WidgetChatListAdapter widgetChatListAdapter, AppFlexInputViewModel appFlexInputViewModel) { - super(2131558960, widgetChatListAdapter); + super(2131558961, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); this.flexInputViewModel = appFlexInputViewModel; View view = this.itemView; int i = 2131362070; TextView textView = (TextView) view.findViewById(2131362070); if (textView != null) { - i = 2131362938; - View findViewById = view.findViewById(2131362938); + i = 2131362940; + View findViewById = view.findViewById(2131362940); if (findViewById != null) { - i = 2131364349; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364349); + i = 2131364352; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364352); if (checkedSetting != null) { - i = 2131365257; - ImageView imageView = (ImageView) view.findViewById(2131365257); + i = 2131365261; + ImageView imageView = (ImageView) view.findViewById(2131365261); if (imageView != null) { - i = 2131365261; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365261); + i = 2131365265; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365265); if (textInputLayout != null) { WidgetChatListAdapterItemThreadDraftFormBinding widgetChatListAdapterItemThreadDraftFormBinding = new WidgetChatListAdapterItemThreadDraftFormBinding((LinearLayout) view, textView, findViewById, checkedSetting, imageView, textInputLayout); m.checkNotNullExpressionValue(widgetChatListAdapterItemThreadDraftFormBinding, "WidgetChatListAdapterIte…ormBinding.bind(itemView)"); @@ -71,7 +71,7 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi StoreThreadDraft threadDraft = StoreStream.Companion.getThreadDraft(); ThreadDraftFormEntry threadDraftFormEntry = (ThreadDraftFormEntry) chatListEntry; StoreThreadDraft.ThreadDraftState threadDraftState = threadDraftFormEntry.getThreadDraftState(); - this.binding.d.setImageResource(threadDraftState.isPrivate() ? 2131231989 : 2131231988); + this.binding.d.setImageResource(threadDraftState.isPrivate() ? 2131231992 : 2131231991); TextInputLayout textInputLayout = this.binding.e; m.checkNotNullExpressionValue(textInputLayout, "binding.threadNameInput"); EditText editText = textInputLayout.getEditText(); @@ -100,24 +100,24 @@ public final class WidgetChatListAdapterItemThreadDraftForm extends WidgetChatLi } ViewExtensions.setText(textInputLayout3, str); } - CheckedSetting checkedSetting = this.binding.f1745c; + CheckedSetting checkedSetting = this.binding.f1747c; m.checkNotNullExpressionValue(checkedSetting, "binding.privateThreadToggle"); if (threadDraftFormEntry.getParentMessageId() != null || !threadDraftFormEntry.getCanCreatePrivateThread()) { z2 = false; } checkedSetting.setVisibility(z2 ? 0 : 8); if (threadDraftFormEntry.getCanCreatePublicThread() || threadDraftState.isPrivate()) { - this.binding.f1745c.setOnCheckedListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$2(threadDraft, threadDraftState)); + this.binding.f1747c.setOnCheckedListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$2(threadDraft, threadDraftState)); } else { threadDraft.setDraftState(StoreThreadDraft.ThreadDraftState.copy$default(threadDraftState, true, 0, null, false, 14, null)); - this.binding.f1745c.setOnCheckedListener(null); + this.binding.f1747c.setOnCheckedListener(null); } - CheckedSetting checkedSetting2 = this.binding.f1745c; + CheckedSetting checkedSetting2 = this.binding.f1747c; m.checkNotNullExpressionValue(checkedSetting2, "binding.privateThreadToggle"); checkedSetting2.setChecked(threadDraftState.isPrivate()); TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.autoArchiveDuration"); - b.m(textView, 2131887965, new Object[0], new WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(this, threadDraftState)); + b.m(textView, 2131887966, new Object[0], new WidgetChatListAdapterItemThreadDraftForm$onConfigure$3(this, threadDraftState)); this.binding.b.setOnClickListener(new WidgetChatListAdapterItemThreadDraftForm$onConfigure$4(this)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java index 2a1b28bd5b..d6f6d68036 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemThreadEmbed.java @@ -12,11 +12,11 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Guideline; import androidx.core.content.ContextCompat; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; import com.discord.api.thread.ThreadMetadata; import com.discord.api.user.User; import com.discord.databinding.WidgetChatListAdapterItemThreadEmbedBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.models.user.CoreUser; import com.discord.stores.StoreMessageState; @@ -24,6 +24,7 @@ import com.discord.utilities.color.ColorCompat; import com.discord.utilities.drawable.DrawableCompat; import com.discord.utilities.font.FontUtils; import com.discord.utilities.icon.IconUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.view.text.SimpleDraweeSpanTextView; import com.discord.widgets.chat.list.ViewReplySpline; import com.discord.widgets.chat.list.entries.ChatListEntry; @@ -52,7 +53,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemThreadEmbed(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558961, widgetChatListAdapter); + super(2131558962, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; int i = 2131362517; @@ -62,41 +63,41 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt View findViewById2 = view.findViewById(2131362519); if (findViewById2 != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131365246; - ImageView imageView = (ImageView) view.findViewById(2131365246); + i = 2131365250; + ImageView imageView = (ImageView) view.findViewById(2131365250); if (imageView != null) { - i = 2131365247; - View findViewById3 = view.findViewById(2131365247); + i = 2131365251; + View findViewById3 = view.findViewById(2131365251); if (findViewById3 != null) { - i = 2131365248; - TextView textView = (TextView) view.findViewById(2131365248); + i = 2131365252; + TextView textView = (TextView) view.findViewById(2131365252); if (textView != null) { - i = 2131365249; - ImageView imageView2 = (ImageView) view.findViewById(2131365249); + i = 2131365253; + ImageView imageView2 = (ImageView) view.findViewById(2131365253); if (imageView2 != null) { - i = 2131365250; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365250); + i = 2131365254; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365254); if (simpleDraweeView != null) { - i = 2131365251; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365251); + i = 2131365255; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365255); if (simpleDraweeSpanTextView != null) { - i = 2131365252; - ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131365252); + i = 2131365256; + ConstraintLayout constraintLayout2 = (ConstraintLayout) view.findViewById(2131365256); if (constraintLayout2 != null) { - i = 2131365253; - TextView textView2 = (TextView) view.findViewById(2131365253); + i = 2131365257; + TextView textView2 = (TextView) view.findViewById(2131365257); if (textView2 != null) { - i = 2131365254; - TextView textView3 = (TextView) view.findViewById(2131365254); + i = 2131365258; + TextView textView3 = (TextView) view.findViewById(2131365258); if (textView3 != null) { - i = 2131365255; - ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131365255); + i = 2131365259; + ConstraintLayout constraintLayout3 = (ConstraintLayout) view.findViewById(2131365259); if (constraintLayout3 != null) { - i = 2131365256; - ViewReplySpline viewReplySpline = (ViewReplySpline) view.findViewById(2131365256); + i = 2131365260; + ViewReplySpline viewReplySpline = (ViewReplySpline) view.findViewById(2131365260); if (viewReplySpline != null) { - i = 2131365323; - Guideline guideline = (Guideline) view.findViewById(2131365323); + i = 2131365328; + Guideline guideline = (Guideline) view.findViewById(2131365328); if (guideline != null) { WidgetChatListAdapterItemThreadEmbedBinding widgetChatListAdapterItemThreadEmbedBinding = new WidgetChatListAdapterItemThreadEmbedBinding(constraintLayout, findViewById, findViewById2, constraintLayout, imageView, findViewById3, textView, imageView2, simpleDraweeView, simpleDraweeSpanTextView, constraintLayout2, textView2, textView3, constraintLayout3, viewReplySpline, guideline); m.checkNotNullExpressionValue(widgetChatListAdapterItemThreadEmbedBinding, "WidgetChatListAdapterIte…bedBinding.bind(itemView)"); @@ -139,7 +140,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt ConstraintLayout constraintLayout = this.binding.d; m.checkNotNullExpressionValue(constraintLayout, "binding.threadEmbedContainer"); Context context = constraintLayout.getContext(); - ModelMessage mostRecentMessage = threadEmbedEntry.getMostRecentMessage(); + Message mostRecentMessage = threadEmbedEntry.getMostRecentMessage(); ConstraintLayout constraintLayout2 = this.binding.j; m.checkNotNullExpressionValue(constraintLayout2, "binding.threadEmbedMostRecentMessageHeader"); constraintLayout2.setVisibility(8); @@ -149,34 +150,37 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt Drawable drawable = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, 2130969461, 0)); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - String string = view.getResources().getString(2131893809); + String string = view.getResources().getString(2131893849); m.checkNotNullExpressionValue(string, "itemView.resources.getSt…R.string.thread_archived)"); setNoMostRecentMessage$default(this, string, null, null, drawable, 6, null); } else if (threadEmbedEntry.getThreadMessageCount() == 0) { View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); - String string2 = view2.getResources().getString(2131891391); + String string2 = view2.getResources().getString(2131891424); m.checkNotNullExpressionValue(string2, "itemView.resources.getSt…tring.no_thread_messages)"); setNoMostRecentMessage$default(this, string2, null, null, null, 14, null); } else { - if ((mostRecentMessage != null ? mostRecentMessage.getContent() : null) == null || mostRecentMessage.getAuthor() == null || threadEmbedEntry.getMostRecentMessageGuildMember() == null) { + if ((mostRecentMessage != null ? mostRecentMessage.k() : null) == null || mostRecentMessage.g() == null || threadEmbedEntry.getMostRecentMessageGuildMember() == null) { View view3 = this.itemView; m.checkNotNullExpressionValue(view3, "itemView"); - String string3 = view3.getResources().getString(2131891380); + String string3 = view3.getResources().getString(2131891413); m.checkNotNullExpressionValue(string3, "itemView.resources.getSt…o_recent_thread_messages)"); setNoMostRecentMessage$default(this, string3, null, null, null, 14, null); - } else if (mostRecentMessage.hasStickers()) { + return; + } + MessageUtils messageUtils = MessageUtils.INSTANCE; + if (messageUtils.hasStickers(mostRecentMessage)) { View view4 = this.itemView; m.checkNotNullExpressionValue(view4, "itemView"); - String string4 = view4.getResources().getString(2131892551); + String string4 = view4.getResources().getString(2131892593); m.checkNotNullExpressionValue(string4, "itemView.resources.getSt…ply_quote_sticker_mobile)"); setNoMostRecentMessage$default(this, string4, mostRecentMessage, threadEmbedEntry.getMostRecentMessageGuildMember(), null, 8, null); - } else if (mostRecentMessage.hasAttachments() || mostRecentMessage.hasEmbeds()) { + } else if (messageUtils.hasAttachments(mostRecentMessage) || messageUtils.hasEmbeds(mostRecentMessage)) { m.checkNotNullExpressionValue(context, "context"); Drawable drawable2 = ContextCompat.getDrawable(context, DrawableCompat.getThemedDrawableRes(context, 2130969408, 0)); View view5 = this.itemView; m.checkNotNullExpressionValue(view5, "itemView"); - String string5 = view5.getResources().getString(2131892549); + String string5 = view5.getResources().getString(2131892591); m.checkNotNullExpressionValue(string5, "itemView.resources.getSt…e_no_text_content_mobile)"); setNoMostRecentMessage(string5, mostRecentMessage, threadEmbedEntry.getMostRecentMessageGuildMember(), drawable2); } else { @@ -211,8 +215,8 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt return widgetChatListAdapterItemThreadEmbed.getLeadingMarginSpan(z2); } - private final void setAuthorAndAvatar(ModelMessage modelMessage, GuildMember guildMember) { - if (modelMessage != null && guildMember != null) { + private final void setAuthorAndAvatar(Message message, GuildMember guildMember) { + if (message != null && guildMember != null) { ConstraintLayout constraintLayout = this.binding.j; m.checkNotNullExpressionValue(constraintLayout, "binding.threadEmbedMostRecentMessageHeader"); constraintLayout.setVisibility(0); @@ -220,9 +224,9 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt m.checkNotNullExpressionValue(textView, "binding.threadEmbedMostRecentMessageName"); textView.setText(guildMember.getNick()); this.binding.k.setTextColor(getAuthorTextColor(guildMember)); - User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "mostRecentMessage.author"); - CoreUser coreUser = new CoreUser(author); + User g = message.g(); + m.checkNotNull(g); + CoreUser coreUser = new CoreUser(g); SimpleDraweeView simpleDraweeView = this.binding.h; m.checkNotNullExpressionValue(simpleDraweeView, "binding.threadEmbedMostRecentMessageAvatar"); IconUtils.setIcon$default(simpleDraweeView, coreUser, 2131165295, null, null, guildMember, 24, null); @@ -247,9 +251,9 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt widgetChatListAdapterItemThreadEmbed.setIcon(drawable); } - private final void setMostRecentMessage(ModelMessage modelMessage, Map map, Map map2, boolean z2, GuildMember guildMember) { - DraweeSpanStringBuilder parse = EmbeddedMessageParser.INSTANCE.parse(new EmbeddedMessageParser.ParserData(a.T(this.itemView, "itemView", "itemView.context"), map, map2, z2, new StoreMessageState.State(null, null, 3, null), 50, modelMessage, (WidgetChatListAdapter) this.adapter)); - setAuthorAndAvatar(modelMessage, guildMember); + private final void setMostRecentMessage(Message message, Map map, Map map2, boolean z2, GuildMember guildMember) { + DraweeSpanStringBuilder parse = EmbeddedMessageParser.INSTANCE.parse(new EmbeddedMessageParser.ParserData(a.T(this.itemView, "itemView", "itemView.context"), map, map2, z2, new StoreMessageState.State(null, null, 3, null), 50, message, (WidgetChatListAdapter) this.adapter)); + setAuthorAndAvatar(message, guildMember); parse.setSpan(getLeadingMarginSpan$default(this, false, 1, null), 0, parse.length(), 33); this.binding.i.setDraweeSpanStringBuilder(parse); SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.i; @@ -260,10 +264,10 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt setIcon$default(this, null, 1, null); } - private final void setNoMostRecentMessage(String str, ModelMessage modelMessage, GuildMember guildMember, Drawable drawable) { + private final void setNoMostRecentMessage(String str, Message message, GuildMember guildMember, Drawable drawable) { SpannableString spannableString = new SpannableString(str + (char) 160); - setAuthorAndAvatar(modelMessage, guildMember); - spannableString.setSpan(getLeadingMarginSpan((modelMessage == null || guildMember == null) ? false : true), 0, spannableString.length(), 33); + setAuthorAndAvatar(message, guildMember); + spannableString.setSpan(getLeadingMarginSpan((message == null || guildMember == null) ? false : true), 0, spannableString.length(), 33); SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.i; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.threadEmbedMostRecentMessageContent"); simpleDraweeSpanTextView.setText(spannableString); @@ -275,9 +279,9 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt setIcon(drawable); } - public static /* synthetic */ void setNoMostRecentMessage$default(WidgetChatListAdapterItemThreadEmbed widgetChatListAdapterItemThreadEmbed, String str, ModelMessage modelMessage, GuildMember guildMember, Drawable drawable, int i, Object obj) { + public static /* synthetic */ void setNoMostRecentMessage$default(WidgetChatListAdapterItemThreadEmbed widgetChatListAdapterItemThreadEmbed, String str, Message message, GuildMember guildMember, Drawable drawable, int i, Object obj) { if ((i & 2) != 0) { - modelMessage = null; + message = null; } if ((i & 4) != 0) { guildMember = null; @@ -285,7 +289,7 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt if ((i & 8) != 0) { drawable = null; } - widgetChatListAdapterItemThreadEmbed.setNoMostRecentMessage(str, modelMessage, guildMember, drawable); + widgetChatListAdapterItemThreadEmbed.setNoMostRecentMessage(str, message, guildMember, drawable); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListItem @@ -301,8 +305,8 @@ public final class WidgetChatListAdapterItemThreadEmbed extends WidgetChatListIt this.binding.a.setOnLongClickListener(new WidgetChatListAdapterItemThreadEmbed$onConfigure$2(this, chatListEntry)); configureMessageCount(threadEmbedEntry.getThreadMessageCount()); configureMostRecentMessageText(threadEmbedEntry); - ModelMessage parentMessage = threadEmbedEntry.getParentMessage(); - View view = this.binding.f1746c; + Message parentMessage = threadEmbedEntry.getParentMessage(); + View view = this.binding.f1748c; m.checkNotNullExpressionValue(view, "binding.chatListAdapterItemHighlightedBg"); View view2 = this.binding.b; m.checkNotNullExpressionValue(view2, "binding.chatListAdapterItemGutterBg"); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java index 3d9a20f430..d8668f22b2 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemTimestamp.java @@ -15,7 +15,7 @@ public final class WidgetChatListAdapterItemTimestamp extends WidgetChatListItem /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemTimestamp(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558959, widgetChatListAdapter); + super(2131558960, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); WidgetChatListAdapterItemTextDividerBinding a = WidgetChatListAdapterItemTextDividerBinding.a(this.itemView); m.checkNotNullExpressionValue(a, "WidgetChatListAdapterIte…derBinding.bind(itemView)"); @@ -23,7 +23,7 @@ public final class WidgetChatListAdapterItemTimestamp extends WidgetChatListItem View view = a.b; m.checkNotNullExpressionValue(view, "binding.dividerStrokeLeft"); view.setBackgroundColor(ColorCompat.getThemedColor(view, 2130968988)); - View view2 = a.f1744c; + View view2 = a.f1746c; m.checkNotNullExpressionValue(view2, "binding.dividerStrokeRight"); view2.setBackgroundColor(ColorCompat.getThemedColor(view2, 2130968988)); TextView textView = a.d; diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java index c1d8c29032..1d4bd3fc37 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemUploadProgress.java @@ -500,23 +500,23 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetChatListAdapterItemUploadProgress(WidgetChatListAdapter widgetChatListAdapter) { - super(2131558963, widgetChatListAdapter); + super(2131558964, widgetChatListAdapter); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); View view = this.itemView; - int i = 2131364352; - ImageView imageView = (ImageView) view.findViewById(2131364352); + int i = 2131364355; + ImageView imageView = (ImageView) view.findViewById(2131364355); if (imageView != null) { - i = 2131364353; - ImageView imageView2 = (ImageView) view.findViewById(2131364353); + i = 2131364356; + ImageView imageView2 = (ImageView) view.findViewById(2131364356); if (imageView2 != null) { - i = 2131365348; - UploadProgressView uploadProgressView = (UploadProgressView) view.findViewById(2131365348); + i = 2131365353; + UploadProgressView uploadProgressView = (UploadProgressView) view.findViewById(2131365353); if (uploadProgressView != null) { - i = 2131365349; - UploadProgressView uploadProgressView2 = (UploadProgressView) view.findViewById(2131365349); + i = 2131365354; + UploadProgressView uploadProgressView2 = (UploadProgressView) view.findViewById(2131365354); if (uploadProgressView2 != null) { - i = 2131365350; - UploadProgressView uploadProgressView3 = (UploadProgressView) view.findViewById(2131365350); + i = 2131365355; + UploadProgressView uploadProgressView3 = (UploadProgressView) view.findViewById(2131365355); if (uploadProgressView3 != null) { WidgetChatListAdapterItemUploadProgressBinding widgetChatListAdapterItemUploadProgressBinding = new WidgetChatListAdapterItemUploadProgressBinding((LinearLayout) view, imageView, imageView2, uploadProgressView, uploadProgressView2, uploadProgressView3); m.checkNotNullExpressionValue(widgetChatListAdapterItemUploadProgressBinding, "WidgetChatListAdapterIte…essBinding.bind(itemView)"); @@ -614,7 +614,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis if (!(model instanceof Model.Many) || ((Model.Many) model).getProgress() >= 100) { z2 = false; if (!z2) { - ImageView imageView = this.binding.f1747c; + ImageView imageView = this.binding.f1749c; m.checkNotNullExpressionValue(imageView, "binding.progressCancelTop"); imageView.setVisibility(z5 ? 0 : 8); ImageView imageView2 = this.binding.b; @@ -625,7 +625,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis imageView2.setVisibility(i); return; } - ImageView imageView3 = this.binding.f1747c; + ImageView imageView3 = this.binding.f1749c; m.checkNotNullExpressionValue(imageView3, "binding.progressCancelTop"); imageView3.setVisibility(8); ImageView imageView4 = this.binding.b; @@ -641,7 +641,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis private final void setUploadState(UploadProgressView uploadProgressView, Model model) { if (m.areEqual(model, Model.None.INSTANCE)) { - CharSequence i = c.a.l.b.i(uploadProgressView, 2131894101, new Object[0], null, 4); + CharSequence i = c.a.l.b.i(uploadProgressView, 2131894140, new Object[0], null, 4); int i2 = UploadProgressView.i; uploadProgressView.a(i, 0, null); Context context = uploadProgressView.getContext(); @@ -658,7 +658,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis m.checkNotNullExpressionValue(resources, "resources"); Context context2 = uploadProgressView.getContext(); m.checkNotNullExpressionValue(context2, "context"); - displayName = StringResourceUtilsKt.getQuantityString(resources, context2, 2131755340, preprocessing.getNumFiles(), Integer.valueOf(preprocessing.getNumFiles())); + displayName = StringResourceUtilsKt.getQuantityString(resources, context2, 2131755341, preprocessing.getNumFiles(), Integer.valueOf(preprocessing.getNumFiles())); } int i4 = UploadProgressView.i; uploadProgressView.a(displayName, -1, null); @@ -687,7 +687,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis Context context6 = uploadProgressView.getContext(); m.checkNotNullExpressionValue(context6, "context"); Model.Many many = (Model.Many) model; - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, context6, 2131755340, many.getNumFiles(), Integer.valueOf(many.getNumFiles())); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, context6, 2131755341, many.getNumFiles(), Integer.valueOf(many.getNumFiles())); if (many.getProgress() != -1) { i3 = many.getProgress(); } @@ -711,7 +711,7 @@ public final class WidgetChatListAdapterItemUploadProgress extends WidgetChatLis m.checkNotNullExpressionValue(L, "ModelProvider.get(data.m… .onBackpressureLatest()"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(L), WidgetChatListAdapterItemUploadProgress.class, (Context) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$2(this), (Function1) null, (Function0) null, (Function0) null, new WidgetChatListAdapterItemUploadProgress$onConfigure$1(this), 58, (Object) null); WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1 widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1 = new WidgetChatListAdapterItemUploadProgress$onConfigure$cancel$1(chatListEntry); - this.binding.f1747c.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$3(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1)); + this.binding.f1749c.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$3(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1)); this.binding.b.setOnClickListener(new WidgetChatListAdapterItemUploadProgress$onConfigure$4(widgetChatListAdapterItemUploadProgress$onConfigure$cancel$1)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java index d4b32a5af3..4d17123971 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListItem.java @@ -5,8 +5,9 @@ import android.graphics.drawable.Drawable; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.utilities.color.ColorCompat; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.mg_recycler.MGRecyclerViewHolder; import com.discord.widgets.chat.list.entries.ChatListEntry; import d0.z.d.m; @@ -49,18 +50,19 @@ public class WidgetChatListItem extends MGRecyclerViewHolder z3 = message.z(); + if (z3 != null) { + for (User user : z3) { + if (user.i() == widgetChatListAdapter.getData().getUserId()) { + return true; + } } } - if (modelMessage.getMentionRoles() != null) { - List mentionRoles = modelMessage.getMentionRoles(); - m.checkNotNullExpressionValue(mentionRoles, "message.mentionRoles"); - if (!(mentionRoles instanceof Collection) || !mentionRoles.isEmpty()) { - Iterator it = mentionRoles.iterator(); + List y2 = message.y(); + if (y2 != null) { + if (!y2.isEmpty()) { + Iterator it = y2.iterator(); while (true) { if (!it.hasNext()) { break; } - if (widgetChatListAdapter.getData().getMyRoleIds().contains((Long) it.next())) { + if (widgetChatListAdapter.getData().getMyRoleIds().contains(Long.valueOf(((Number) it.next()).longValue()))) { z2 = true; break; } } - if (!z2) { - return true; - } } z2 = false; - if (!z2) { + if (z2) { + return true; } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java index 556514f46c..68a32ba837 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/AttachmentEntry.java @@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.entries; import a0.a.a.b; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.message.attachment.MessageAttachment; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StoreMessageState; import d0.z.d.m; /* compiled from: AttachmentEntry.kt */ @@ -16,17 +16,17 @@ public final class AttachmentEntry extends ChatListEntry { private final boolean isBlockedExpanded; private final boolean isThreadStarterMessage; private final String key; - private final ModelMessage message; + private final Message message; private final StoreMessageState.State messageState; private final int type = 28; - /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.AttachmentEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.AttachmentEntry.getType():int), (wrap: long : 0x002f: INVOKE (r3v2 long) = (r5v0 com.discord.models.domain.ModelMessage) type: VIRTUAL call: com.discord.models.domain.ModelMessage.getId():long)] */ - public AttachmentEntry(int i, long j, ModelMessage modelMessage, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5) { - m.checkNotNullParameter(modelMessage, "message"); + /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.AttachmentEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.AttachmentEntry.getType():int), (wrap: long : 0x002f: INVOKE (r3v2 long) = (r5v0 com.discord.api.message.Message) type: VIRTUAL call: com.discord.api.message.Message.r():long)] */ + public AttachmentEntry(int i, long j, Message message, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(messageAttachment, "attachment"); this.embedIndex = i; this.guildId = j; - this.message = modelMessage; + this.message = message; this.messageState = state; this.attachment = messageAttachment; this.isBlockedExpanded = z2; @@ -35,12 +35,12 @@ public final class AttachmentEntry extends ChatListEntry { this.isThreadStarterMessage = z5; StringBuilder sb = new StringBuilder(); sb.append(getType()); - sb.append(modelMessage.getId()); + sb.append(message.r()); this.key = sb.toString(); } - public static /* synthetic */ AttachmentEntry copy$default(AttachmentEntry attachmentEntry, int i, long j, ModelMessage modelMessage, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5, int i2, Object obj) { - return attachmentEntry.copy((i2 & 1) != 0 ? attachmentEntry.embedIndex : i, (i2 & 2) != 0 ? attachmentEntry.guildId : j, (i2 & 4) != 0 ? attachmentEntry.message : modelMessage, (i2 & 8) != 0 ? attachmentEntry.messageState : state, (i2 & 16) != 0 ? attachmentEntry.attachment : messageAttachment, (i2 & 32) != 0 ? attachmentEntry.isBlockedExpanded : z2, (i2 & 64) != 0 ? attachmentEntry.allowAnimatedEmojis : z3, (i2 & 128) != 0 ? attachmentEntry.autoPlayGifs : z4, (i2 & 256) != 0 ? attachmentEntry.isThreadStarterMessage : z5); + public static /* synthetic */ AttachmentEntry copy$default(AttachmentEntry attachmentEntry, int i, long j, Message message, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5, int i2, Object obj) { + return attachmentEntry.copy((i2 & 1) != 0 ? attachmentEntry.embedIndex : i, (i2 & 2) != 0 ? attachmentEntry.guildId : j, (i2 & 4) != 0 ? attachmentEntry.message : message, (i2 & 8) != 0 ? attachmentEntry.messageState : state, (i2 & 16) != 0 ? attachmentEntry.attachment : messageAttachment, (i2 & 32) != 0 ? attachmentEntry.isBlockedExpanded : z2, (i2 & 64) != 0 ? attachmentEntry.allowAnimatedEmojis : z3, (i2 & 128) != 0 ? attachmentEntry.autoPlayGifs : z4, (i2 & 256) != 0 ? attachmentEntry.isThreadStarterMessage : z5); } public final int component1() { @@ -51,7 +51,7 @@ public final class AttachmentEntry extends ChatListEntry { return this.guildId; } - public final ModelMessage component3() { + public final Message component3() { return this.message; } @@ -79,10 +79,10 @@ public final class AttachmentEntry extends ChatListEntry { return this.isThreadStarterMessage; } - public final AttachmentEntry copy(int i, long j, ModelMessage modelMessage, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5) { - m.checkNotNullParameter(modelMessage, "message"); + public final AttachmentEntry copy(int i, long j, Message message, StoreMessageState.State state, MessageAttachment messageAttachment, boolean z2, boolean z3, boolean z4, boolean z5) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(messageAttachment, "attachment"); - return new AttachmentEntry(i, j, modelMessage, state, messageAttachment, z2, z3, z4, z5); + return new AttachmentEntry(i, j, message, state, messageAttachment, z2, z3, z4, z5); } public boolean equals(Object obj) { @@ -121,7 +121,7 @@ public final class AttachmentEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -136,9 +136,9 @@ public final class AttachmentEntry extends ChatListEntry { public int hashCode() { int a = (b.a(this.guildId) + (this.embedIndex * 31)) * 31; - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (a + (modelMessage != null ? modelMessage.hashCode() : 0)) * 31; + int hashCode = (a + (message != null ? message.hashCode() : 0)) * 31; StoreMessageState.State state = this.messageState; int hashCode2 = (hashCode + (state != null ? state.hashCode() : 0)) * 31; MessageAttachment messageAttachment = this.attachment; diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java index b343350ddc..26c2287952 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/BlockedMessagesEntry.java @@ -1,19 +1,19 @@ package com.discord.widgets.chat.list.entries; import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; /* compiled from: BlockedMessagesEntry.kt */ public final class BlockedMessagesEntry extends ChatListEntry { private final int blockedCount; private final boolean isExpandedBlock; private final String key = String.valueOf(getType()); - private final ModelMessage message; + private final Message message; private final int type = 10; - public BlockedMessagesEntry(ModelMessage modelMessage, int i, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); - this.message = modelMessage; + public BlockedMessagesEntry(Message message, int i, boolean z2) { + m.checkNotNullParameter(message, "message"); + this.message = message; this.blockedCount = i; this.isExpandedBlock = z2; } @@ -22,9 +22,9 @@ public final class BlockedMessagesEntry extends ChatListEntry { return this.isExpandedBlock; } - public static /* synthetic */ BlockedMessagesEntry copy$default(BlockedMessagesEntry blockedMessagesEntry, ModelMessage modelMessage, int i, boolean z2, int i2, Object obj) { + public static /* synthetic */ BlockedMessagesEntry copy$default(BlockedMessagesEntry blockedMessagesEntry, Message message, int i, boolean z2, int i2, Object obj) { if ((i2 & 1) != 0) { - modelMessage = blockedMessagesEntry.message; + message = blockedMessagesEntry.message; } if ((i2 & 2) != 0) { i = blockedMessagesEntry.blockedCount; @@ -32,10 +32,10 @@ public final class BlockedMessagesEntry extends ChatListEntry { if ((i2 & 4) != 0) { z2 = blockedMessagesEntry.isExpandedBlock; } - return blockedMessagesEntry.copy(modelMessage, i, z2); + return blockedMessagesEntry.copy(message, i, z2); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -43,9 +43,9 @@ public final class BlockedMessagesEntry extends ChatListEntry { return this.blockedCount; } - public final BlockedMessagesEntry copy(ModelMessage modelMessage, int i, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); - return new BlockedMessagesEntry(modelMessage, i, z2); + public final BlockedMessagesEntry copy(Message message, int i, boolean z2) { + m.checkNotNullParameter(message, "message"); + return new BlockedMessagesEntry(message, i, z2); } public boolean equals(Object obj) { @@ -68,7 +68,7 @@ public final class BlockedMessagesEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -78,8 +78,8 @@ public final class BlockedMessagesEntry extends ChatListEntry { } public int hashCode() { - ModelMessage modelMessage = this.message; - int hashCode = (((modelMessage != null ? modelMessage.hashCode() : 0) * 31) + this.blockedCount) * 31; + Message message = this.message; + int hashCode = (((message != null ? message.hashCode() : 0) * 31) + this.blockedCount) * 31; boolean z2 = this.isExpandedBlock; if (z2) { z2 = true; diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java index 7a97a42dec..711b8abb93 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/BotUiComponentEntry.java @@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.entries; import a0.a.a.b; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.models.botuikit.MessageComponent; -import com.discord.models.domain.ModelMessage; import d0.z.d.m; import java.util.List; /* compiled from: BotUiComponentEntry.kt */ @@ -11,32 +11,32 @@ public final class BotUiComponentEntry extends ChatListEntry { private final long applicationId; private final Long guildId; private final String key; - private final ModelMessage message; + private final Message message; private final List messageComponents; private final int type = 36; /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: java.util.List */ /* JADX WARN: Multi-variable type inference failed */ - public BotUiComponentEntry(ModelMessage modelMessage, long j, Long l, List list) { - m.checkNotNullParameter(modelMessage, "message"); + public BotUiComponentEntry(Message message, long j, Long l, List list) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(list, "messageComponents"); - this.message = modelMessage; + this.message = message; this.applicationId = j; this.guildId = l; this.messageComponents = list; StringBuilder sb = new StringBuilder(); sb.append(getType()); sb.append(" -- "); - Object nonce = modelMessage.getNonce(); - sb.append(nonce == null ? Long.valueOf(modelMessage.getId()) : nonce); + Object B = message.B(); + sb.append(B == null ? Long.valueOf(message.r()) : B); this.key = sb.toString(); } /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.chat.list.entries.BotUiComponentEntry */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ BotUiComponentEntry copy$default(BotUiComponentEntry botUiComponentEntry, ModelMessage modelMessage, long j, Long l, List list, int i, Object obj) { + public static /* synthetic */ BotUiComponentEntry copy$default(BotUiComponentEntry botUiComponentEntry, Message message, long j, Long l, List list, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = botUiComponentEntry.message; + message = botUiComponentEntry.message; } if ((i & 2) != 0) { j = botUiComponentEntry.applicationId; @@ -47,10 +47,10 @@ public final class BotUiComponentEntry extends ChatListEntry { if ((i & 8) != 0) { list = botUiComponentEntry.messageComponents; } - return botUiComponentEntry.copy(modelMessage, j, l, list); + return botUiComponentEntry.copy(message, j, l, list); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -66,10 +66,10 @@ public final class BotUiComponentEntry extends ChatListEntry { return this.messageComponents; } - public final BotUiComponentEntry copy(ModelMessage modelMessage, long j, Long l, List list) { - m.checkNotNullParameter(modelMessage, "message"); + public final BotUiComponentEntry copy(Message message, long j, Long l, List list) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(list, "messageComponents"); - return new BotUiComponentEntry(modelMessage, j, l, list); + return new BotUiComponentEntry(message, j, l, list); } public boolean equals(Object obj) { @@ -96,7 +96,7 @@ public final class BotUiComponentEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -110,9 +110,9 @@ public final class BotUiComponentEntry extends ChatListEntry { } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int a = (b.a(this.applicationId) + ((modelMessage != null ? modelMessage.hashCode() : 0) * 31)) * 31; + int a = (b.a(this.applicationId) + ((message != null ? message.hashCode() : 0) * 31)) * 31; Long l = this.guildId; int hashCode = (a + (l != null ? l.hashCode() : 0)) * 31; List list = this.messageComponents; diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java index aa2ed40209..3de0deaf7b 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ChatListEntry.java @@ -4,6 +4,7 @@ import c.a.d.r0.b; import com.discord.api.application.Application; import com.discord.api.botuikit.Component; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivity; import com.discord.api.message.attachment.MessageAttachment; import com.discord.api.message.embed.EmbedType; @@ -14,15 +15,14 @@ import com.discord.api.sticker.StickerPartial; import com.discord.api.user.User; import com.discord.models.botuikit.MessageComponent; import com.discord.models.domain.ModelInvite; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.stores.StoreMessageState; import com.discord.stores.StoreStream; import com.discord.stores.StoreThreadMessages; import com.discord.utilities.embed.InviteEmbedModel; import com.discord.utilities.guilds.RoleUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.mg_recycler.MGRecyclerDataPayload; -import com.discord.utilities.textprocessing.MessageUtils; import com.discord.widgets.botuikit.BotComponentExperiments; import com.discord.widgets.botuikit.ComponentChatListState; import com.discord.widgets.botuikit.ComponentStateMapper; @@ -94,99 +94,138 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload { this(); } - private final ChatListEntry createEntryForInvite(ModelMessage modelMessage, String str, InviteEmbedModel inviteEmbedModel) { + private final ChatListEntry createEntryForInvite(Message message, String str, InviteEmbedModel inviteEmbedModel) { ModelInvite resolveInviteCodeForPublicStage = inviteEmbedModel.resolveInviteCodeForPublicStage(str); - Long l = 0L; + long j = 0; if (resolveInviteCodeForPublicStage != null) { - long i = modelMessage.getAuthor().i(); - long id2 = modelMessage.getId(); - Long guildId = modelMessage.getGuildId(); - if (guildId != null) { - l = guildId; + User g = message.g(); + m.checkNotNull(g); + long i = g.i(); + long r = message.r(); + Long o = message.o(); + if (o != null) { + j = o.longValue(); } - m.checkNotNullExpressionValue(l, "message.guildId ?: 0L"); - return new StageInviteEntry(i, id2, str, resolveInviteCodeForPublicStage, l.longValue()); + return new StageInviteEntry(i, r, str, resolveInviteCodeForPublicStage, j); } - long i2 = modelMessage.getAuthor().i(); - long id3 = modelMessage.getId(); - Long guildId2 = modelMessage.getGuildId(); - if (guildId2 != null) { - l = guildId2; + User g2 = message.g(); + m.checkNotNull(g2); + long i2 = g2.i(); + long r2 = message.r(); + Long o2 = message.o(); + if (o2 != null) { + j = o2.longValue(); } - m.checkNotNullExpressionValue(l, "message.guildId ?: 0L"); - return new InviteEntry(i2, id3, str, l.longValue()); + return new InviteEntry(i2, r2, str, j); } - public final Collection createBotComponentEntries(ModelMessage modelMessage, long j, ComponentChatListState.ComponentStoreState componentStoreState) { - m.checkNotNullParameter(modelMessage, "message"); - List components = modelMessage.getComponents(); - if (components == null || !(!components.isEmpty())) { + public final Collection createBotComponentEntries(Message message, long j, ComponentChatListState.ComponentStoreState componentStoreState) { + long j2; + m.checkNotNullParameter(message, "message"); + List j3 = message.j(); + if (j3 == null || !(!j3.isEmpty())) { return n.emptyList(); } - List components2 = modelMessage.getComponents(); - if (components2 == null) { - components2 = n.emptyList(); + List j4 = message.j(); + if (j4 == null) { + j4 = n.emptyList(); } - List processComponentsToMessageComponents = ComponentStateMapper.INSTANCE.processComponentsToMessageComponents(components2, componentStoreState, BotComponentExperiments.Companion.get(StoreStream.Companion.getExperiments())); - Long applicationId = modelMessage.getApplicationId(); - if (applicationId == null) { - applicationId = Long.valueOf(modelMessage.getAuthor().i()); + List processComponentsToMessageComponents = ComponentStateMapper.INSTANCE.processComponentsToMessageComponents(j4, componentStoreState, BotComponentExperiments.Companion.get(StoreStream.Companion.getExperiments())); + Long e = message.e(); + if (e != null) { + j2 = e.longValue(); + } else { + User g = message.g(); + m.checkNotNull(g); + j2 = g.i(); } - m.checkNotNullExpressionValue(applicationId, "message.applicationId ?: message.author.id"); - return d0.t.m.listOf(new BotUiComponentEntry(modelMessage, applicationId.longValue(), Long.valueOf(j), processComponentsToMessageComponents)); + return d0.t.m.listOf(new BotUiComponentEntry(message, j2, Long.valueOf(j), processComponentsToMessageComponents)); } - public final List createEmbedEntries(ModelMessage modelMessage, StoreMessageState.State state, boolean z2, boolean z3, boolean z4, boolean z5, long j, boolean z6) { - m.checkNotNullParameter(modelMessage, "message"); - if (modelMessage.getAttachments().isEmpty() && (modelMessage.getEmbeds().isEmpty() || !z5)) { + public final List createEmbedEntries(Message message, StoreMessageState.State state, boolean z2, boolean z3, boolean z4, boolean z5, long j, boolean z6) { + m.checkNotNullParameter(message, "message"); + MessageUtils messageUtils = MessageUtils.INSTANCE; + if (!(messageUtils.hasAttachments(message) || (messageUtils.hasEmbeds(message) && z5))) { return n.emptyList(); } HashSet hashSet = new HashSet(); ArrayList arrayList = new ArrayList(); - for (MessageEmbed messageEmbed : modelMessage.getEmbeds()) { - if (!hashSet.contains(messageEmbed.l())) { - hashSet.add(messageEmbed.l()); - m.checkNotNullExpressionValue(messageEmbed, "embed"); - arrayList.add(messageEmbed); - } else if (messageEmbed.l() == null) { - m.checkNotNullExpressionValue(messageEmbed, "embed"); - arrayList.add(messageEmbed); + List m = message.m(); + if (m != null) { + for (MessageEmbed messageEmbed : m) { + if (!hashSet.contains(messageEmbed.l())) { + hashSet.add(messageEmbed.l()); + arrayList.add(messageEmbed); + } else if (messageEmbed.l() == null) { + arrayList.add(messageEmbed); + } } } - ArrayList arrayList2 = new ArrayList(arrayList.size() + modelMessage.getAttachments().size()); + List f = message.f(); int i = 0; - for (MessageAttachment messageAttachment : modelMessage.getAttachments()) { - m.checkNotNullExpressionValue(messageAttachment, "attachment"); - arrayList2.add(new AttachmentEntry(i, j, modelMessage, state, messageAttachment, z2, z3, z4, z6)); - i++; + ArrayList arrayList2 = new ArrayList(arrayList.size() + (f != null ? f.size() : 0)); + List f2 = message.f(); + if (f2 != null) { + for (MessageAttachment messageAttachment : f2) { + arrayList2.add(new AttachmentEntry(i, j, message, state, messageAttachment, z2, z3, z4, z6)); + i++; + } } for (MessageEmbed messageEmbed2 : arrayList) { if (messageEmbed2.k() != EmbedType.APPLICATION_NEWS) { - arrayList2.add(new EmbedEntry(i, j, modelMessage, state, messageEmbed2, z2, z3, z4, z6)); + arrayList2.add(new EmbedEntry(i, j, message, state, messageEmbed2, z2, z3, z4, z6)); i++; } } return arrayList2; } - public final List createGameInviteEntries(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - Application application = modelMessage.getApplication(); - MessageActivity activity = modelMessage.getActivity(); - return (application == null || activity == null) ? n.emptyList() : d0.t.m.listOf(new GameInviteEntry(modelMessage.getAuthor().i(), modelMessage.getId(), activity, application)); + public final List createGameInviteEntries(Message message) { + m.checkNotNullParameter(message, "message"); + Application d = message.d(); + MessageActivity b = message.b(); + if (d == null || b == null) { + return n.emptyList(); + } + User g = message.g(); + m.checkNotNull(g); + return d0.t.m.listOf(new GameInviteEntry(g.i(), message.r(), b, d)); } - public final Collection createGiftEntries(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - String content = modelMessage.getContent(); - if (content != null) { - if (!(content.length() == 0)) { + public final Collection createGiftEntries(Message message) { + m.checkNotNullParameter(message, "message"); + String k = message.k(); + if (k == null || k.length() == 0) { + return n.emptyList(); + } + HashMap hashMap = new HashMap(); + for (MatchResult matchResult : b.r.findAll(k, 0)) { + List groupValues = matchResult.getGroupValues(); + if (!groupValues.isEmpty()) { + String str = groupValues.get(groupValues.size() - 1); + User g = message.g(); + m.checkNotNull(g); + hashMap.put(str, new GiftEntry(g.i(), message.r(), message.i(), str)); + } + } + Collection values = hashMap.values(); + m.checkNotNullExpressionValue(values, "entries.values"); + return values; + } + + public final Collection createGuildTemplateEntries(Message message) { + m.checkNotNullParameter(message, "message"); + String k = message.k(); + if (k != null) { + if (!(k.length() == 0)) { HashMap hashMap = new HashMap(); - for (MatchResult matchResult : b.r.findAll(content, 0)) { + for (MatchResult matchResult : b.q.findAll(k, 0)) { List groupValues = matchResult.getGroupValues(); if (!groupValues.isEmpty()) { String str = groupValues.get(groupValues.size() - 1); - hashMap.put(str, new GiftEntry(modelMessage.getAuthor().i(), modelMessage.getId(), modelMessage.getChannelId(), str)); + User g = message.g(); + m.checkNotNull(g); + hashMap.put(str, new GuildTemplateEntry(g.i(), message.r(), str)); } } Collection values = hashMap.values(); @@ -197,105 +236,84 @@ public abstract class ChatListEntry implements MGRecyclerDataPayload { return n.emptyList(); } - public final Collection createGuildTemplateEntries(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - String content = modelMessage.getContent(); - if (content != null) { - if (!(content.length() == 0)) { - HashMap hashMap = new HashMap(); - for (MatchResult matchResult : b.q.findAll(content, 0)) { - List groupValues = matchResult.getGroupValues(); - if (!groupValues.isEmpty()) { - String str = groupValues.get(groupValues.size() - 1); - hashMap.put(str, new GuildTemplateEntry(modelMessage.getAuthor().i(), modelMessage.getId(), str)); - } - } - Collection values = hashMap.values(); - m.checkNotNullExpressionValue(values, "entries.values"); - return values; - } - } - return n.emptyList(); - } - - public final Collection createInviteEntries(ModelMessage modelMessage, InviteEmbedModel inviteEmbedModel) { - m.checkNotNullParameter(modelMessage, "message"); + public final Collection createInviteEntries(Message message, InviteEmbedModel inviteEmbedModel) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel"); - String content = modelMessage.getContent(); - if (content != null) { - if (!(content.length() == 0)) { - HashMap hashMap = new HashMap(); - for (MatchResult matchResult : b.o.findAll(content, 0)) { - List groupValues = matchResult.getGroupValues(); - if (!groupValues.isEmpty()) { - String str = groupValues.get(groupValues.size() - 1); - hashMap.put(str, createEntryForInvite(modelMessage, str, inviteEmbedModel)); - } - } - Collection values = hashMap.values(); - m.checkNotNullExpressionValue(values, "entries.values"); - return values; + String k = message.k(); + if (k == null || k.length() == 0) { + return n.emptyList(); + } + HashMap hashMap = new HashMap(); + for (MatchResult matchResult : b.o.findAll(k, 0)) { + List groupValues = matchResult.getGroupValues(); + if (!groupValues.isEmpty()) { + String str = groupValues.get(groupValues.size() - 1); + hashMap.put(str, createEntryForInvite(message, str, inviteEmbedModel)); } } - return n.emptyList(); + Collection values = hashMap.values(); + m.checkNotNullExpressionValue(values, "entries.values"); + return values; } - public final List createSpotifyListenTogetherEntries(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - MessageActivity activity = modelMessage.getActivity(); - return (activity == null || !modelMessage.isSpotifyListeningActivity()) ? n.emptyList() : d0.t.m.listOf(new SpotifyListenTogetherEntry(modelMessage.getAuthor().i(), modelMessage.getId(), activity)); + public final List createSpotifyListenTogetherEntries(Message message) { + m.checkNotNullParameter(message, "message"); + MessageActivity b = message.b(); + if (b == null || !MessageUtils.INSTANCE.isSpotifyListeningActivity(message)) { + return n.emptyList(); + } + User g = message.g(); + m.checkNotNull(g); + return d0.t.m.listOf(new SpotifyListenTogetherEntry(g.i(), message.r(), b)); } - public final List createStickerEntries(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - List stickerItems = modelMessage.getStickerItems(); + public final List createStickerEntries(Message message) { + m.checkNotNullParameter(message, "message"); ArrayList arrayList = null; - if (!(stickerItems == null || stickerItems.isEmpty())) { - List stickerItems2 = modelMessage.getStickerItems(); - if (stickerItems2 != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(stickerItems2, 10)); - for (StickerPartial stickerPartial : stickerItems2) { - m.checkNotNullExpressionValue(stickerPartial, "it"); - arrayList.add(new StickerEntry(modelMessage, stickerPartial)); + if (MessageUtils.INSTANCE.hasStickerItems(message)) { + List H = message.H(); + if (H != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(H, 10)); + for (StickerPartial stickerPartial : H) { + arrayList.add(new StickerEntry(message, stickerPartial)); } } } else { - List stickers = modelMessage.getStickers(); - if (stickers != null) { - arrayList = new ArrayList(o.collectionSizeOrDefault(stickers, 10)); - for (Sticker sticker : stickers) { - m.checkNotNullExpressionValue(sticker, "sticker"); - arrayList.add(new StickerEntry(modelMessage, sticker)); + List I = message.I(); + if (I != null) { + arrayList = new ArrayList(o.collectionSizeOrDefault(I, 10)); + for (Sticker sticker : I) { + arrayList.add(new StickerEntry(message, sticker)); } } } return arrayList != null ? arrayList : n.emptyList(); } - public final Collection createThreadEmbedEntries(Channel channel, Map map, ModelMessage modelMessage, Channel channel2, StoreThreadMessages.ThreadState threadState, Map map2, boolean z2, boolean z3) { + public final Collection createThreadEmbedEntries(Channel channel, Map map, Message message, Channel channel2, StoreThreadMessages.ThreadState threadState, Map map2, boolean z2, boolean z3) { Map map3; - ModelMessage mostRecentMessage; - User author; - ModelMessage mostRecentMessage2; + Message mostRecentMessage; + User g; + Message mostRecentMessage2; m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(map, "channelMembers"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(channel2, "thread"); if (!z3) { return n.emptyList(); } - long id2 = modelMessage.getId(); + long r = message.r(); int count = threadState != null ? threadState.getCount() : 0; Long l = null; - ModelMessage mostRecentMessage3 = threadState != null ? threadState.getMostRecentMessage() : null; - Map map4 = RoleUtils.containsRoleMentions(modelMessage.getContent()) ? map2 : null; + Message mostRecentMessage3 = threadState != null ? threadState.getMostRecentMessage() : null; + Map map4 = RoleUtils.containsRoleMentions(message.k()) ? map2 : null; if (threadState == null || (mostRecentMessage2 = threadState.getMostRecentMessage()) == null || (map3 = MessageUtils.getNickOrUsernames(mostRecentMessage2, channel, map, channel.m())) == null) { map3 = h0.emptyMap(); } - if (!(threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null || (author = mostRecentMessage.getAuthor()) == null)) { - l = Long.valueOf(author.i()); + if (!(threadState == null || (mostRecentMessage = threadState.getMostRecentMessage()) == null || (g = mostRecentMessage.g()) == null)) { + l = Long.valueOf(g.i()); } - return d0.t.m.listOf(new ThreadEmbedEntry(id2, channel2, count, mostRecentMessage3, map4, map3, z2, map.get(l), modelMessage)); + return d0.t.m.listOf(new ThreadEmbedEntry(r, channel2, count, mostRecentMessage3, map4, map3, z2, map.get(l), message)); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java index 2e6166f1c8..a16c99b30c 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/EmbedEntry.java @@ -2,8 +2,8 @@ package com.discord.widgets.chat.list.entries; import a0.a.a.b; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.message.embed.MessageEmbed; -import com.discord.models.domain.ModelMessage; import com.discord.stores.StoreMessageState; import d0.z.d.m; /* compiled from: EmbedEntry.kt */ @@ -16,17 +16,17 @@ public final class EmbedEntry extends ChatListEntry { private final boolean isBlockedExpanded; private final boolean isThreadStarterMessage; private final String key; - private final ModelMessage message; + private final Message message; private final StoreMessageState.State messageState; private final int type = 21; - /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.EmbedEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.EmbedEntry.getType():int), (wrap: long : 0x002f: INVOKE (r3v2 long) = (r5v0 com.discord.models.domain.ModelMessage) type: VIRTUAL call: com.discord.models.domain.ModelMessage.getId():long)] */ - public EmbedEntry(int i, long j, ModelMessage modelMessage, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5) { - m.checkNotNullParameter(modelMessage, "message"); + /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0028: INVOKE (r3v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.EmbedEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.EmbedEntry.getType():int), (wrap: long : 0x002f: INVOKE (r3v2 long) = (r5v0 com.discord.api.message.Message) type: VIRTUAL call: com.discord.api.message.Message.r():long)] */ + public EmbedEntry(int i, long j, Message message, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(messageEmbed, "embed"); this.embedIndex = i; this.guildId = j; - this.message = modelMessage; + this.message = message; this.messageState = state; this.embed = messageEmbed; this.isBlockedExpanded = z2; @@ -35,12 +35,12 @@ public final class EmbedEntry extends ChatListEntry { this.isThreadStarterMessage = z5; StringBuilder sb = new StringBuilder(); sb.append(getType()); - sb.append(modelMessage.getId()); + sb.append(message.r()); this.key = sb.toString(); } - public static /* synthetic */ EmbedEntry copy$default(EmbedEntry embedEntry, int i, long j, ModelMessage modelMessage, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5, int i2, Object obj) { - return embedEntry.copy((i2 & 1) != 0 ? embedEntry.embedIndex : i, (i2 & 2) != 0 ? embedEntry.guildId : j, (i2 & 4) != 0 ? embedEntry.message : modelMessage, (i2 & 8) != 0 ? embedEntry.messageState : state, (i2 & 16) != 0 ? embedEntry.embed : messageEmbed, (i2 & 32) != 0 ? embedEntry.isBlockedExpanded : z2, (i2 & 64) != 0 ? embedEntry.allowAnimatedEmojis : z3, (i2 & 128) != 0 ? embedEntry.autoPlayGifs : z4, (i2 & 256) != 0 ? embedEntry.isThreadStarterMessage : z5); + public static /* synthetic */ EmbedEntry copy$default(EmbedEntry embedEntry, int i, long j, Message message, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5, int i2, Object obj) { + return embedEntry.copy((i2 & 1) != 0 ? embedEntry.embedIndex : i, (i2 & 2) != 0 ? embedEntry.guildId : j, (i2 & 4) != 0 ? embedEntry.message : message, (i2 & 8) != 0 ? embedEntry.messageState : state, (i2 & 16) != 0 ? embedEntry.embed : messageEmbed, (i2 & 32) != 0 ? embedEntry.isBlockedExpanded : z2, (i2 & 64) != 0 ? embedEntry.allowAnimatedEmojis : z3, (i2 & 128) != 0 ? embedEntry.autoPlayGifs : z4, (i2 & 256) != 0 ? embedEntry.isThreadStarterMessage : z5); } public final int component1() { @@ -51,7 +51,7 @@ public final class EmbedEntry extends ChatListEntry { return this.guildId; } - public final ModelMessage component3() { + public final Message component3() { return this.message; } @@ -79,10 +79,10 @@ public final class EmbedEntry extends ChatListEntry { return this.isThreadStarterMessage; } - public final EmbedEntry copy(int i, long j, ModelMessage modelMessage, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5) { - m.checkNotNullParameter(modelMessage, "message"); + public final EmbedEntry copy(int i, long j, Message message, StoreMessageState.State state, MessageEmbed messageEmbed, boolean z2, boolean z3, boolean z4, boolean z5) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(messageEmbed, "embed"); - return new EmbedEntry(i, j, modelMessage, state, messageEmbed, z2, z3, z4, z5); + return new EmbedEntry(i, j, message, state, messageEmbed, z2, z3, z4, z5); } public boolean equals(Object obj) { @@ -121,7 +121,7 @@ public final class EmbedEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -136,9 +136,9 @@ public final class EmbedEntry extends ChatListEntry { public int hashCode() { int a = (b.a(this.guildId) + (this.embedIndex * 31)) * 31; - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (a + (modelMessage != null ? modelMessage.hashCode() : 0)) * 31; + int hashCode = (a + (message != null ? message.hashCode() : 0)) * 31; StoreMessageState.State state = this.messageState; int hashCode2 = (hashCode + (state != null ? state.hashCode() : 0)) * 31; MessageEmbed messageEmbed = this.embed; diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java index ed020415a0..372d38451f 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/EphemeralMessageEntry.java @@ -1,54 +1,30 @@ package com.discord.widgets.chat.list.entries; -import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; /* compiled from: EphemeralMessageEntry.kt */ public final class EphemeralMessageEntry extends ChatListEntry { private final String key; - private final ModelMessage message; + private final Message message; private final int type = 34; - public EphemeralMessageEntry(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - this.message = modelMessage; + public EphemeralMessageEntry(Message message) { + m.checkNotNullParameter(message, "message"); + this.message = message; StringBuilder sb = new StringBuilder(); sb.append(getType()); sb.append(' '); - Object nonce = modelMessage.getNonce(); - sb.append(nonce == null ? Long.valueOf(modelMessage.getId()) : nonce); + Object B = message.B(); + sb.append(B == null ? Long.valueOf(message.r()) : B); this.key = sb.toString(); } - public static /* synthetic */ EphemeralMessageEntry copy$default(EphemeralMessageEntry ephemeralMessageEntry, ModelMessage modelMessage, int i, Object obj) { - if ((i & 1) != 0) { - modelMessage = ephemeralMessageEntry.message; - } - return ephemeralMessageEntry.copy(modelMessage); - } - - public final ModelMessage component1() { - return this.message; - } - - public final EphemeralMessageEntry copy(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - return new EphemeralMessageEntry(modelMessage); - } - - public boolean equals(Object obj) { - if (this != obj) { - return (obj instanceof EphemeralMessageEntry) && m.areEqual(this.message, ((EphemeralMessageEntry) obj).message); - } - return true; - } - @Override // com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider public String getKey() { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -56,19 +32,4 @@ public final class EphemeralMessageEntry extends ChatListEntry { public int getType() { return this.type; } - - public int hashCode() { - ModelMessage modelMessage = this.message; - if (modelMessage != null) { - return modelMessage.hashCode(); - } - return 0; - } - - public String toString() { - StringBuilder L = a.L("EphemeralMessageEntry(message="); - L.append(this.message); - L.append(")"); - return L.toString(); - } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java index 33068c4554..0c6c14f42e 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageEntry.java @@ -1,11 +1,12 @@ package com.discord.widgets.chat.list.entries; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.stores.StoreMessageReplies; import com.discord.stores.StoreMessageState; +import com.discord.utilities.message.MessageUtils; import d0.z.d.m; import java.util.Map; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -19,7 +20,7 @@ public final class MessageEntry extends ChatListEntry { private final boolean isMinimal; private final boolean isThreadStarterMessage; private final String key; - private final ModelMessage message; + private final Message message; private final StoreMessageState.State messageState; private final Map nickOrUsernames; private final ReplyData replyData; @@ -126,10 +127,14 @@ public final class MessageEntry extends ChatListEntry { } } - public MessageEntry(ModelMessage modelMessage, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5) { - m.checkNotNullParameter(modelMessage, "message"); + public MessageEntry(Message message, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5) { + Integer M; + Integer M2; + Integer M3; + Integer M4; + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(map2, "nickOrUsernames"); - this.message = modelMessage; + this.message = message; this.messageState = state; this.author = guildMember; this.firstMentionedUser = guildMember2; @@ -144,25 +149,42 @@ public final class MessageEntry extends ChatListEntry { int i = 19; if (z2) { i = 1; - } else if (modelMessage.isInteraction() || modelMessage.getType() == 0 || modelMessage.getType() == -1) { + } else if (!MessageUtils.INSTANCE.isInteraction(message) && (((M = message.M()) == null || M.intValue() != 0) && ((M2 = message.M()) == null || M2.intValue() != -1))) { + Integer M5 = message.M(); + if (M5 != null && M5.intValue() == 20 && message.t() == null) { + i = 33; + } else { + Integer M6 = message.M(); + if ((M6 == null || M6.intValue() != 3) && ((M3 = message.M()) == null || M3.intValue() != 13)) { + Integer M7 = message.M(); + if ((M7 != null && M7.intValue() == -2) || ((M4 = message.M()) != null && M4.intValue() == -3)) { + i = 20; + } else { + Integer M8 = message.M(); + if (M8 != null && M8.intValue() == 19) { + i = 32; + } else { + Integer M9 = message.M(); + i = (M9 != null && M9.intValue() == 22) ? 38 : 5; + } + } + } + } + } else { i = 0; - } else if (modelMessage.getType() == 20 && modelMessage.getInteraction() == null) { - i = 33; - } else if (!(modelMessage.getType() == 3 || modelMessage.getType() == 13)) { - i = (modelMessage.getType() == -2 || modelMessage.getType() == -3) ? 20 : modelMessage.getType() == 19 ? 32 : modelMessage.getType() == 22 ? 38 : 5; } this.type = i; StringBuilder sb = new StringBuilder(); sb.append(getType()); sb.append(' '); - Object nonce = modelMessage.getNonce(); - sb.append(nonce == null ? Long.valueOf(modelMessage.getId()) : nonce); + Object B = message.B(); + sb.append(B == null ? Long.valueOf(message.r()) : B); this.key = sb.toString(); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ MessageEntry(ModelMessage modelMessage, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(modelMessage, state, guildMember, (i & 8) != 0 ? null : guildMember2, map, map2, (i & 64) != 0 ? false : z2, z3, (i & 256) != 0 ? true : z4, (i & 512) != 0 ? null : replyData, (i & 1024) != 0 ? null : guildMember3, (i & 2048) != 0 ? false : z5); + public /* synthetic */ MessageEntry(Message message, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(message, state, guildMember, (i & 8) != 0 ? null : guildMember2, map, map2, (i & 64) != 0 ? false : z2, z3, (i & 256) != 0 ? true : z4, (i & 512) != 0 ? null : replyData, (i & 1024) != 0 ? null : guildMember3, (i & 2048) != 0 ? false : z5); } private final boolean component7() { @@ -173,11 +195,11 @@ public final class MessageEntry extends ChatListEntry { return this.isExpandedBlocked; } - public static /* synthetic */ MessageEntry copy$default(MessageEntry messageEntry, ModelMessage modelMessage, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5, int i, Object obj) { - return messageEntry.copy((i & 1) != 0 ? messageEntry.message : modelMessage, (i & 2) != 0 ? messageEntry.messageState : state, (i & 4) != 0 ? messageEntry.author : guildMember, (i & 8) != 0 ? messageEntry.firstMentionedUser : guildMember2, (i & 16) != 0 ? messageEntry.roles : map, (i & 32) != 0 ? messageEntry.nickOrUsernames : map2, (i & 64) != 0 ? messageEntry.isMinimal : z2, (i & 128) != 0 ? messageEntry.isExpandedBlocked : z3, (i & 256) != 0 ? messageEntry.animateEmojis : z4, (i & 512) != 0 ? messageEntry.replyData : replyData, (i & 1024) != 0 ? messageEntry.interactionAuthor : guildMember3, (i & 2048) != 0 ? messageEntry.isThreadStarterMessage : z5); + public static /* synthetic */ MessageEntry copy$default(MessageEntry messageEntry, Message message, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5, int i, Object obj) { + return messageEntry.copy((i & 1) != 0 ? messageEntry.message : message, (i & 2) != 0 ? messageEntry.messageState : state, (i & 4) != 0 ? messageEntry.author : guildMember, (i & 8) != 0 ? messageEntry.firstMentionedUser : guildMember2, (i & 16) != 0 ? messageEntry.roles : map, (i & 32) != 0 ? messageEntry.nickOrUsernames : map2, (i & 64) != 0 ? messageEntry.isMinimal : z2, (i & 128) != 0 ? messageEntry.isExpandedBlocked : z3, (i & 256) != 0 ? messageEntry.animateEmojis : z4, (i & 512) != 0 ? messageEntry.replyData : replyData, (i & 1024) != 0 ? messageEntry.interactionAuthor : guildMember3, (i & 2048) != 0 ? messageEntry.isThreadStarterMessage : z5); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -217,10 +239,10 @@ public final class MessageEntry extends ChatListEntry { return this.animateEmojis; } - public final MessageEntry copy(ModelMessage modelMessage, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5) { - m.checkNotNullParameter(modelMessage, "message"); + public final MessageEntry copy(Message message, StoreMessageState.State state, GuildMember guildMember, GuildMember guildMember2, Map map, Map map2, boolean z2, boolean z3, boolean z4, ReplyData replyData, GuildMember guildMember3, boolean z5) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(map2, "nickOrUsernames"); - return new MessageEntry(modelMessage, state, guildMember, guildMember2, map, map2, z2, z3, z4, replyData, guildMember3, z5); + return new MessageEntry(message, state, guildMember, guildMember2, map, map2, z2, z3, z4, replyData, guildMember3, z5); } public boolean equals(Object obj) { @@ -255,7 +277,7 @@ public final class MessageEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -281,9 +303,9 @@ public final class MessageEntry extends ChatListEntry { } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (modelMessage != null ? modelMessage.hashCode() : 0) * 31; + int hashCode = (message != null ? message.hashCode() : 0) * 31; StoreMessageState.State state = this.messageState; int hashCode2 = (hashCode + (state != null ? state.hashCode() : 0)) * 31; GuildMember guildMember = this.author; diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java index 08d3206b79..48a353822b 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/MessageHeaderEntry.java @@ -3,7 +3,7 @@ package com.discord.widgets.chat.list.entries; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.guild.Guild; import d0.z.d.m; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -12,7 +12,7 @@ public final class MessageHeaderEntry extends ChatListEntry { public static final Companion Companion = new Companion(null); private final String channelName; private final String key = String.valueOf(getType()); - private final ModelMessage message; + private final Message message; private final String text; private final int type = 17; @@ -25,27 +25,27 @@ public final class MessageHeaderEntry extends ChatListEntry { this(); } - public final MessageHeaderEntry create(ModelMessage modelMessage, Channel channel, Guild guild) { - m.checkNotNullParameter(modelMessage, "message"); + public final MessageHeaderEntry create(Message message, Channel channel, Guild guild) { + m.checkNotNullParameter(message, "message"); String str = null; String name = guild != null ? guild.getName() : null; if (channel != null) { str = AnimatableValueParser.y0(channel); } - return new MessageHeaderEntry(modelMessage, name, str); + return new MessageHeaderEntry(message, name, str); } } - public MessageHeaderEntry(ModelMessage modelMessage, String str, String str2) { - m.checkNotNullParameter(modelMessage, "message"); - this.message = modelMessage; + public MessageHeaderEntry(Message message, String str, String str2) { + m.checkNotNullParameter(message, "message"); + this.message = message; this.text = str; this.channelName = str2; } - public static /* synthetic */ MessageHeaderEntry copy$default(MessageHeaderEntry messageHeaderEntry, ModelMessage modelMessage, String str, String str2, int i, Object obj) { + public static /* synthetic */ MessageHeaderEntry copy$default(MessageHeaderEntry messageHeaderEntry, Message message, String str, String str2, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = messageHeaderEntry.message; + message = messageHeaderEntry.message; } if ((i & 2) != 0) { str = messageHeaderEntry.text; @@ -53,14 +53,14 @@ public final class MessageHeaderEntry extends ChatListEntry { if ((i & 4) != 0) { str2 = messageHeaderEntry.channelName; } - return messageHeaderEntry.copy(modelMessage, str, str2); + return messageHeaderEntry.copy(message, str, str2); } - public static final MessageHeaderEntry create(ModelMessage modelMessage, Channel channel, Guild guild) { - return Companion.create(modelMessage, channel, guild); + public static final MessageHeaderEntry create(Message message, Channel channel, Guild guild) { + return Companion.create(message, channel, guild); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -72,9 +72,9 @@ public final class MessageHeaderEntry extends ChatListEntry { return this.channelName; } - public final MessageHeaderEntry copy(ModelMessage modelMessage, String str, String str2) { - m.checkNotNullParameter(modelMessage, "message"); - return new MessageHeaderEntry(modelMessage, str, str2); + public final MessageHeaderEntry copy(Message message, String str, String str2) { + m.checkNotNullParameter(message, "message"); + return new MessageHeaderEntry(message, str, str2); } public boolean equals(Object obj) { @@ -97,7 +97,7 @@ public final class MessageHeaderEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -111,9 +111,9 @@ public final class MessageHeaderEntry extends ChatListEntry { } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (modelMessage != null ? modelMessage.hashCode() : 0) * 31; + int hashCode = (message != null ? message.hashCode() : 0) * 31; String str = this.text; int hashCode2 = (hashCode + (str != null ? str.hashCode() : 0)) * 31; String str2 = this.channelName; diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java index 437ee42b95..138e08007a 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ReactionsEntry.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.entries; import c.d.b.a.a; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import d0.z.d.m; /* compiled from: ReactionsEntry.kt */ public final class ReactionsEntry extends ChatListEntry { @@ -9,25 +9,25 @@ public final class ReactionsEntry extends ChatListEntry { private final boolean canAddReactions; private final boolean canCreateReactions; private final String key; - private final ModelMessage message; + private final Message message; private final int type = 4; - public ReactionsEntry(ModelMessage modelMessage, boolean z2, boolean z3, boolean z4) { - m.checkNotNullParameter(modelMessage, "message"); - this.message = modelMessage; + public ReactionsEntry(Message message, boolean z2, boolean z3, boolean z4) { + m.checkNotNullParameter(message, "message"); + this.message = message; this.canAddReactions = z2; this.canCreateReactions = z3; this.animateEmojis = z4; StringBuilder sb = new StringBuilder(); sb.append(getType()); - Object nonce = modelMessage.getNonce(); - sb.append(nonce == null ? Long.valueOf(modelMessage.getId()) : nonce); + Object B = message.B(); + sb.append(B == null ? Long.valueOf(message.r()) : B); this.key = sb.toString(); } - public static /* synthetic */ ReactionsEntry copy$default(ReactionsEntry reactionsEntry, ModelMessage modelMessage, boolean z2, boolean z3, boolean z4, int i, Object obj) { + public static /* synthetic */ ReactionsEntry copy$default(ReactionsEntry reactionsEntry, Message message, boolean z2, boolean z3, boolean z4, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = reactionsEntry.message; + message = reactionsEntry.message; } if ((i & 2) != 0) { z2 = reactionsEntry.canAddReactions; @@ -38,10 +38,10 @@ public final class ReactionsEntry extends ChatListEntry { if ((i & 8) != 0) { z4 = reactionsEntry.animateEmojis; } - return reactionsEntry.copy(modelMessage, z2, z3, z4); + return reactionsEntry.copy(message, z2, z3, z4); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -57,9 +57,9 @@ public final class ReactionsEntry extends ChatListEntry { return this.animateEmojis; } - public final ReactionsEntry copy(ModelMessage modelMessage, boolean z2, boolean z3, boolean z4) { - m.checkNotNullParameter(modelMessage, "message"); - return new ReactionsEntry(modelMessage, z2, z3, z4); + public final ReactionsEntry copy(Message message, boolean z2, boolean z3, boolean z4) { + m.checkNotNullParameter(message, "message"); + return new ReactionsEntry(message, z2, z3, z4); } public boolean equals(Object obj) { @@ -90,7 +90,7 @@ public final class ReactionsEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -100,8 +100,8 @@ public final class ReactionsEntry extends ChatListEntry { } public int hashCode() { - ModelMessage modelMessage = this.message; - int hashCode = (modelMessage != null ? modelMessage.hashCode() : 0) * 31; + Message message = this.message; + int hashCode = (message != null ? message.hashCode() : 0) * 31; boolean z2 = this.canAddReactions; int i = 1; if (z2) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java index e113467255..bbd26fbd65 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/StickerEntry.java @@ -1,35 +1,35 @@ package com.discord.widgets.chat.list.entries; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.sticker.BaseSticker; -import com.discord.models.domain.ModelMessage; import d0.z.d.m; /* compiled from: StickerEntry.kt */ public final class StickerEntry extends ChatListEntry { private final String key; - private final ModelMessage message; + private final Message message; private final BaseSticker sticker; private final int type = 31; - public StickerEntry(ModelMessage modelMessage, BaseSticker baseSticker) { - m.checkNotNullParameter(modelMessage, "message"); + public StickerEntry(Message message, BaseSticker baseSticker) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(baseSticker, "sticker"); - this.message = modelMessage; + this.message = message; this.sticker = baseSticker; - this.key = getType() + " -- " + modelMessage.getId() + " -- " + baseSticker.c(); + this.key = getType() + " -- " + message.r() + " -- " + baseSticker.c(); } - public static /* synthetic */ StickerEntry copy$default(StickerEntry stickerEntry, ModelMessage modelMessage, BaseSticker baseSticker, int i, Object obj) { + public static /* synthetic */ StickerEntry copy$default(StickerEntry stickerEntry, Message message, BaseSticker baseSticker, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = stickerEntry.message; + message = stickerEntry.message; } if ((i & 2) != 0) { baseSticker = stickerEntry.sticker; } - return stickerEntry.copy(modelMessage, baseSticker); + return stickerEntry.copy(message, baseSticker); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -37,10 +37,10 @@ public final class StickerEntry extends ChatListEntry { return this.sticker; } - public final StickerEntry copy(ModelMessage modelMessage, BaseSticker baseSticker) { - m.checkNotNullParameter(modelMessage, "message"); + public final StickerEntry copy(Message message, BaseSticker baseSticker) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(baseSticker, "sticker"); - return new StickerEntry(modelMessage, baseSticker); + return new StickerEntry(message, baseSticker); } public boolean equals(Object obj) { @@ -59,7 +59,7 @@ public final class StickerEntry extends ChatListEntry { return this.key; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -73,9 +73,9 @@ public final class StickerEntry extends ChatListEntry { } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (modelMessage != null ? modelMessage.hashCode() : 0) * 31; + int hashCode = (message != null ? message.hashCode() : 0) * 31; BaseSticker baseSticker = this.sticker; if (baseSticker != null) { i = baseSticker.hashCode(); diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java index 9c88625518..84757505e6 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/ThreadEmbedEntry.java @@ -3,8 +3,8 @@ package com.discord.widgets.chat.list.entries; import a0.a.a.b; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import d0.z.d.m; import java.util.Map; @@ -13,33 +13,33 @@ public final class ThreadEmbedEntry extends ChatListEntry { private final boolean animateEmojis; private final String key; private final long messageId; - private final ModelMessage mostRecentMessage; + private final Message mostRecentMessage; private final GuildMember mostRecentMessageGuildMember; private final Map nickOrUsernames; - private final ModelMessage parentMessage; + private final Message parentMessage; private final Map roleMentions; private final Channel thread; private final int threadMessageCount; private final int type = 35; - public ThreadEmbedEntry(long j, Channel channel, int i, ModelMessage modelMessage, Map map, Map map2, boolean z2, GuildMember guildMember, ModelMessage modelMessage2) { + public ThreadEmbedEntry(long j, Channel channel, int i, Message message, Map map, Map map2, boolean z2, GuildMember guildMember, Message message2) { m.checkNotNullParameter(channel, "thread"); m.checkNotNullParameter(map2, "nickOrUsernames"); - m.checkNotNullParameter(modelMessage2, "parentMessage"); + m.checkNotNullParameter(message2, "parentMessage"); this.messageId = j; this.thread = channel; this.threadMessageCount = i; - this.mostRecentMessage = modelMessage; + this.mostRecentMessage = message; this.roleMentions = map; this.nickOrUsernames = map2; this.animateEmojis = z2; this.mostRecentMessageGuildMember = guildMember; - this.parentMessage = modelMessage2; + this.parentMessage = message2; this.key = a.q("35 -- ", j); } - public static /* synthetic */ ThreadEmbedEntry copy$default(ThreadEmbedEntry threadEmbedEntry, long j, Channel channel, int i, ModelMessage modelMessage, Map map, Map map2, boolean z2, GuildMember guildMember, ModelMessage modelMessage2, int i2, Object obj) { - return threadEmbedEntry.copy((i2 & 1) != 0 ? threadEmbedEntry.messageId : j, (i2 & 2) != 0 ? threadEmbedEntry.thread : channel, (i2 & 4) != 0 ? threadEmbedEntry.threadMessageCount : i, (i2 & 8) != 0 ? threadEmbedEntry.mostRecentMessage : modelMessage, (i2 & 16) != 0 ? threadEmbedEntry.roleMentions : map, (i2 & 32) != 0 ? threadEmbedEntry.nickOrUsernames : map2, (i2 & 64) != 0 ? threadEmbedEntry.animateEmojis : z2, (i2 & 128) != 0 ? threadEmbedEntry.mostRecentMessageGuildMember : guildMember, (i2 & 256) != 0 ? threadEmbedEntry.parentMessage : modelMessage2); + public static /* synthetic */ ThreadEmbedEntry copy$default(ThreadEmbedEntry threadEmbedEntry, long j, Channel channel, int i, Message message, Map map, Map map2, boolean z2, GuildMember guildMember, Message message2, int i2, Object obj) { + return threadEmbedEntry.copy((i2 & 1) != 0 ? threadEmbedEntry.messageId : j, (i2 & 2) != 0 ? threadEmbedEntry.thread : channel, (i2 & 4) != 0 ? threadEmbedEntry.threadMessageCount : i, (i2 & 8) != 0 ? threadEmbedEntry.mostRecentMessage : message, (i2 & 16) != 0 ? threadEmbedEntry.roleMentions : map, (i2 & 32) != 0 ? threadEmbedEntry.nickOrUsernames : map2, (i2 & 64) != 0 ? threadEmbedEntry.animateEmojis : z2, (i2 & 128) != 0 ? threadEmbedEntry.mostRecentMessageGuildMember : guildMember, (i2 & 256) != 0 ? threadEmbedEntry.parentMessage : message2); } public final long component1() { @@ -54,7 +54,7 @@ public final class ThreadEmbedEntry extends ChatListEntry { return this.threadMessageCount; } - public final ModelMessage component4() { + public final Message component4() { return this.mostRecentMessage; } @@ -74,15 +74,15 @@ public final class ThreadEmbedEntry extends ChatListEntry { return this.mostRecentMessageGuildMember; } - public final ModelMessage component9() { + public final Message component9() { return this.parentMessage; } - public final ThreadEmbedEntry copy(long j, Channel channel, int i, ModelMessage modelMessage, Map map, Map map2, boolean z2, GuildMember guildMember, ModelMessage modelMessage2) { + public final ThreadEmbedEntry copy(long j, Channel channel, int i, Message message, Map map, Map map2, boolean z2, GuildMember guildMember, Message message2) { m.checkNotNullParameter(channel, "thread"); m.checkNotNullParameter(map2, "nickOrUsernames"); - m.checkNotNullParameter(modelMessage2, "parentMessage"); - return new ThreadEmbedEntry(j, channel, i, modelMessage, map, map2, z2, guildMember, modelMessage2); + m.checkNotNullParameter(message2, "parentMessage"); + return new ThreadEmbedEntry(j, channel, i, message, map, map2, z2, guildMember, message2); } public boolean equals(Object obj) { @@ -109,7 +109,7 @@ public final class ThreadEmbedEntry extends ChatListEntry { return this.messageId; } - public final ModelMessage getMostRecentMessage() { + public final Message getMostRecentMessage() { return this.mostRecentMessage; } @@ -121,7 +121,7 @@ public final class ThreadEmbedEntry extends ChatListEntry { return this.nickOrUsernames; } - public final ModelMessage getParentMessage() { + public final Message getParentMessage() { return this.parentMessage; } @@ -147,8 +147,8 @@ public final class ThreadEmbedEntry extends ChatListEntry { Channel channel = this.thread; int i = 0; int hashCode = (((a + (channel != null ? channel.hashCode() : 0)) * 31) + this.threadMessageCount) * 31; - ModelMessage modelMessage = this.mostRecentMessage; - int hashCode2 = (hashCode + (modelMessage != null ? modelMessage.hashCode() : 0)) * 31; + Message message = this.mostRecentMessage; + int hashCode2 = (hashCode + (message != null ? message.hashCode() : 0)) * 31; Map map = this.roleMentions; int hashCode3 = (hashCode2 + (map != null ? map.hashCode() : 0)) * 31; Map map2 = this.nickOrUsernames; @@ -163,9 +163,9 @@ public final class ThreadEmbedEntry extends ChatListEntry { int i5 = (hashCode4 + i2) * 31; GuildMember guildMember = this.mostRecentMessageGuildMember; int hashCode5 = (i5 + (guildMember != null ? guildMember.hashCode() : 0)) * 31; - ModelMessage modelMessage2 = this.parentMessage; - if (modelMessage2 != null) { - i = modelMessage2.hashCode(); + Message message2 = this.parentMessage; + if (message2 != null) { + i = message2.hashCode(); } return hashCode5 + i; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java index bf402dfabc..7b0a7607d0 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$1.java @@ -1,20 +1,20 @@ package com.discord.widgets.chat.list.model; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.widgets.chat.list.entries.ChatListEntry; import d0.z.d.k; import java.util.List; import kotlin.Pair; import kotlin.jvm.functions.Function2; /* compiled from: WidgetChatListModel.kt */ -public final /* synthetic */ class WidgetChatListModel$Companion$getThreadDraft$1 extends k implements Function2, Pair>> { +public final /* synthetic */ class WidgetChatListModel$Companion$getThreadDraft$1 extends k implements Function2, Pair>> { public static final WidgetChatListModel$Companion$getThreadDraft$1 INSTANCE = new WidgetChatListModel$Companion$getThreadDraft$1(); public WidgetChatListModel$Companion$getThreadDraft$1() { super(2, Pair.class, "", "(Ljava/lang/Object;Ljava/lang/Object;)V", 0); } - public final Pair> invoke(ModelMessage modelMessage, List list) { - return new Pair<>(modelMessage, list); + public final Pair> invoke(Message message, List list) { + return new Pair<>(message, list); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java index 316c71999c..48210fd90b 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$getThreadDraft$3.java @@ -1,7 +1,7 @@ package com.discord.widgets.chat.list.model; import com.discord.api.channel.Channel; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.stores.StoreThreadDraft; @@ -20,7 +20,7 @@ import java.util.Map; import kotlin.Pair; import rx.functions.Func7; /* compiled from: WidgetChatListModel.kt */ -public final class WidgetChatListModel$Companion$getThreadDraft$3 implements Func7, Long, Map, Guild, StoreThreadDraft.ThreadDraftState, Long, Pair>, WidgetChatListModel> { +public final class WidgetChatListModel$Companion$getThreadDraft$3 implements Func7, Long, Map, Guild, StoreThreadDraft.ThreadDraftState, Long, Pair>, WidgetChatListModel> { public final /* synthetic */ long $guildId; public final /* synthetic */ Channel $parentChannel; public final /* synthetic */ Long $parentMessageId; @@ -31,7 +31,7 @@ public final class WidgetChatListModel$Companion$getThreadDraft$3 map, Long l, Map map2, Guild guild, StoreThreadDraft.ThreadDraftState threadDraftState, Long l2, Pair> pair) { + public final WidgetChatListModel call(Map map, Long l, Map map2, Guild guild, StoreThreadDraft.ThreadDraftState threadDraftState, Long l2, Pair> pair) { List roles; ArrayList arrayList = new ArrayList(); arrayList.add(new SpacerEntry(this.$parentChannel.g())); @@ -43,7 +43,7 @@ public final class WidgetChatListModel$Companion$getThreadDraft$3 map, Long l, Map map2, Guild guild, StoreThreadDraft.ThreadDraftState threadDraftState, Long l2, Pair> pair) { - return call((Map) map, l, (Map) map2, guild, threadDraftState, l2, pair); + public /* bridge */ /* synthetic */ WidgetChatListModel call(Map map, Long l, Map map2, Guild guild, StoreThreadDraft.ThreadDraftState threadDraftState, Long l2, Pair> pair) { + return call((Map) map, l, (Map) map2, guild, threadDraftState, l2, (Pair>) pair); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java index 9f38c0866d..6c571dcb8a 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel.java @@ -4,8 +4,8 @@ import a0.a.a.b; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.sticker.Sticker; -import com.discord.models.domain.ModelMessage; import com.discord.models.experiments.domain.Experiment; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; @@ -136,7 +136,7 @@ public final class WidgetChatListModel implements WidgetChatListAdapter.Data { Observable observeDraftState = companion.getThreadDraft().observeDraftState(); Observable observePermissionsForChannel = companion.getPermissions().observePermissionsForChannel(channel.g()); if (l != null) { - Observable observeMessagesForChannel = companion.getMessages().observeMessagesForChannel(channel.g(), l.longValue()); + Observable observeMessagesForChannel = companion.getMessages().observeMessagesForChannel(channel.g(), l.longValue()); Observable> singleMessage = WidgetChatListModelMessages.Companion.getSingleMessage(channel, l.longValue()); WidgetChatListModel$Companion$getThreadDraft$1 widgetChatListModel$Companion$getThreadDraft$1 = WidgetChatListModel$Companion$getThreadDraft$1.INSTANCE; if (widgetChatListModel$Companion$getThreadDraft$1 != null) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java index 93b94d63c7..47a5b51f13 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$get$2.java @@ -1,8 +1,10 @@ package com.discord.widgets.chat.list.model; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; +import com.discord.api.user.User; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.models.member.GuildMember; import com.discord.stores.StoreMessageReplies; import com.discord.utilities.embed.InviteEmbedModel; @@ -31,11 +33,11 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme public final WidgetChatListModelMessages invoke(WidgetChatListModelMessages.MessagesWithMetadata messagesWithMetadata, Channel channel, Map map, List list, Map map2, Long l, Map map3, Long l2, boolean z2, boolean z3, boolean z4, long j, Boolean bool, Map map4, InviteEmbedModel inviteEmbedModel) { Object obj; boolean z5; - ModelMessage modelMessage; + Message message; String str; - ModelMessage modelMessage2; + Message message2; WidgetChatListModelMessages.Companion companion; - ModelMessage modelMessage3; + Message message3; WidgetChatListModelMessages.Items items; WidgetChatListModelMessages.Items items2; WidgetChatListModelMessages$Companion$get$2 widgetChatListModelMessages$Companion$get$2 = this; @@ -50,8 +52,8 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel"); WidgetChatListModelMessages.Items items3 = new WidgetChatListModelMessages.Items(messagesWithMetadata.getMessages().size()); long j2 = 0; - ModelMessage modelMessage4 = null; - ModelMessage modelMessage5 = null; + Message message4 = null; + Message message5 = null; int i = 0; int i2 = 0; boolean z6 = false; @@ -61,38 +63,43 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme if (i < 0) { n.throwIndexOverflow(); } - ModelMessage modelMessage6 = (ModelMessage) obj2; + Message message6 = (Message) obj2; WidgetChatListModelMessages.Companion companion2 = WidgetChatListModelMessages.Companion; - if (WidgetChatListModelMessages.Companion.access$willAddTimestamp(companion2, modelMessage6.getTimestamp(), j2)) { - i2 = WidgetChatListModelMessages.Companion.access$addBlockedMessage(companion2, items3, modelMessage4, i2, z6); + UtcDateTime K = message6.K(); + if (WidgetChatListModelMessages.Companion.access$willAddTimestamp(companion2, K != null ? K.f() : 0, j2)) { + i2 = WidgetChatListModelMessages.Companion.access$addBlockedMessage(companion2, items3, message4, i2, z6); } - long access$tryAddTimestamp = WidgetChatListModelMessages.Companion.access$tryAddTimestamp(companion2, items3, modelMessage6.getId(), modelMessage6.getTimestamp(), j2); + long r = message6.r(); + UtcDateTime K2 = message6.K(); + long access$tryAddTimestamp = WidgetChatListModelMessages.Companion.access$tryAddTimestamp(companion2, items3, r, K2 != null ? K2.f() : 0, j2); boolean z8 = i == messagesWithMetadata.getMessages().size() - 1; - boolean containsKey = map5.containsKey(Long.valueOf(modelMessage6.getAuthor().i())); + User g = message6.g(); + boolean containsKey = map5.containsKey(g != null ? Long.valueOf(g.i()) : null); if (!containsKey || (i2 = i2 + 1) != 1) { - modelMessage = modelMessage4; + message = message4; } else { - z6 = list2.contains(Long.valueOf(modelMessage6.getId())); - modelMessage = modelMessage6; + z6 = list2.contains(Long.valueOf(message6.r())); + message = message6; } - int access$addBlockedMessage = (!containsKey || z8) ? WidgetChatListModelMessages.Companion.access$addBlockedMessage(companion2, items3, modelMessage, i2, z6) : i2; + int access$addBlockedMessage = (!containsKey || z8) ? WidgetChatListModelMessages.Companion.access$addBlockedMessage(companion2, items3, message, i2, z6) : i2; boolean z9 = (containsKey || !z6) ? z6 : false; if (!containsKey || z9) { - boolean access$shouldConcatMessage = WidgetChatListModelMessages.Companion.access$shouldConcatMessage(companion2, items3, modelMessage6, modelMessage5); + boolean access$shouldConcatMessage = WidgetChatListModelMessages.Companion.access$shouldConcatMessage(companion2, items3, message6, message5); items3.setConcatCount(access$shouldConcatMessage ? items3.getConcatCount() + 1 : 0); - if (modelMessage6.getType() == 21) { + Integer M = message6.M(); + if (M != null && M.intValue() == 21) { Channel channel2 = widgetChatListModelMessages$Companion$get$2.$channel; m.checkNotNullExpressionValue(map6, "channelMembers"); m.checkNotNullExpressionValue(bool, "showBotComponents"); - modelMessage3 = modelMessage6; - modelMessage2 = modelMessage; + message3 = message6; + message2 = message; str = "newMessagesMarkerMessageId"; companion = companion2; - items3.addItems(companion2.getThreadStarterMessageItems(channel, channel2, map2, map3, map, modelMessage6, messagesWithMetadata, z2, z3, bool.booleanValue(), z4, map4, inviteEmbedModel)); + items3.addItems(companion2.getThreadStarterMessageItems(channel, channel2, map2, map3, map, message6, messagesWithMetadata, z2, z3, bool.booleanValue(), z4, map4, inviteEmbedModel)); items = items3; } else { - modelMessage3 = modelMessage6; - modelMessage2 = modelMessage; + message3 = message6; + message2 = message; str = "newMessagesMarkerMessageId"; companion = companion2; Channel channel3 = widgetChatListModelMessages$Companion$get$2.$channel; @@ -100,12 +107,12 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme Map messageReplyState = messagesWithMetadata.getMessageReplyState(); m.checkNotNullExpressionValue(bool, "showBotComponents"); items = items3; - items.addItems(WidgetChatListModelMessages.Companion.getMessageItems$default(companion, channel3, map2, map3, map, messagesWithMetadata.getMessageThreads().get(Long.valueOf(modelMessage3.getId())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(modelMessage3.getId())), modelMessage3, messagesWithMetadata.getMessageState().get(Long.valueOf(modelMessage3.getId())), messageReplyState, z9, access$shouldConcatMessage, l2, z2, z3, z4, bool.booleanValue(), map4, inviteEmbedModel, false, 262144, null)); + items.addItems(WidgetChatListModelMessages.Companion.getMessageItems$default(companion, channel3, map2, map3, map, messagesWithMetadata.getMessageThreads().get(Long.valueOf(message3.r())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(message3.r())), message3, messagesWithMetadata.getMessageState().get(Long.valueOf(message3.r())), messageReplyState, z9, access$shouldConcatMessage, l2, z2, z3, z4, bool.booleanValue(), map4, inviteEmbedModel, false, 262144, null)); } } else { items = items3; - modelMessage3 = modelMessage6; - modelMessage2 = modelMessage; + message3 = message6; + message2 = message; str = "newMessagesMarkerMessageId"; companion = companion2; } @@ -113,7 +120,7 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme m.checkNotNullExpressionValue(l, str); items2 = items; widgetChatListModelMessages$Companion$get$2 = this; - z7 = WidgetChatListModelMessages.Companion.access$tryAddNewMessagesSeparator(companion, items2, l.longValue(), z8, modelMessage3.getId(), widgetChatListModelMessages$Companion$get$2.$channel); + z7 = WidgetChatListModelMessages.Companion.access$tryAddNewMessagesSeparator(companion, items2, l.longValue(), z8, message3.r(), widgetChatListModelMessages$Companion$get$2.$channel); } else { items2 = items; widgetChatListModelMessages$Companion$get$2 = this; @@ -123,18 +130,18 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme map6 = map2; items3 = items2; i = i3; - modelMessage5 = modelMessage3; + message5 = message3; j2 = access$tryAddTimestamp; i2 = access$addBlockedMessage; z6 = z9; - modelMessage4 = modelMessage2; + message4 = message2; } t.reverse(items3.getItems()); List items4 = items3.getItems(); - ModelMessage modelMessage7 = (ModelMessage) u.firstOrNull((List) messagesWithMetadata.getMessages()); - long id2 = modelMessage7 != null ? modelMessage7.getId() : 0; - ModelMessage modelMessage8 = (ModelMessage) u.lastOrNull((List) messagesWithMetadata.getMessages()); - long id3 = modelMessage8 != null ? modelMessage8.getId() : 0; + Message message7 = (Message) u.firstOrNull((List) messagesWithMetadata.getMessages()); + long r2 = message7 != null ? message7.r() : 0; + Message message8 = (Message) u.lastOrNull((List) messagesWithMetadata.getMessages()); + long r3 = message8 != null ? message8.r() : 0; m.checkNotNullExpressionValue(l, "newMessagesMarkerMessageId"); long longValue = l.longValue(); Iterator it = messagesWithMetadata.getMessages().iterator(); @@ -144,19 +151,20 @@ public final class WidgetChatListModelMessages$Companion$get$2 extends o impleme break; } obj = it.next(); - if (((ModelMessage) obj).getAuthor().i() == j) { - z5 = true; + User g2 = ((Message) obj).g(); + if (g2 == null || g2.i() != j) { + z5 = false; continue; } else { - z5 = false; + z5 = true; continue; } if (z5) { break; } } - ModelMessage modelMessage9 = (ModelMessage) obj; - return new WidgetChatListModelMessages(items4, id2, id3, map2, longValue, modelMessage9 != null ? Long.valueOf(modelMessage9.getId()) : null); + Message message9 = (Message) obj; + return new WidgetChatListModelMessages(items4, r2, r3, map2, longValue, message9 != null ? Long.valueOf(message9.r()) : null); } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java index 65878d6252..898c950b9d 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages$Companion$getSingleMessage$1.java @@ -1,8 +1,8 @@ package com.discord.widgets.chat.list.model; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; import com.discord.models.member.GuildMember; import com.discord.utilities.embed.InviteEmbedModel; import com.discord.widgets.chat.list.entries.ChatListEntry; @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import rx.functions.Func7; /* compiled from: WidgetChatListModelMessages.kt */ -public final class WidgetChatListModelMessages$Companion$getSingleMessage$1 implements Func7, Map, Boolean, Boolean, Boolean, InviteEmbedModel, List> { +public final class WidgetChatListModelMessages$Companion$getSingleMessage$1 implements Func7, Map, Boolean, Boolean, Boolean, InviteEmbedModel, List> { public final /* synthetic */ Channel $channel; public WidgetChatListModelMessages$Companion$getSingleMessage$1(Channel channel) { @@ -25,12 +25,12 @@ public final class WidgetChatListModelMessages$Companion$getSingleMessage$1 call(ModelMessage modelMessage, Map map, Map map2, Boolean bool, Boolean bool2, Boolean bool3, InviteEmbedModel inviteEmbedModel) { - return call(modelMessage, (Map) map, (Map) map2, bool, bool2, bool3, inviteEmbedModel); + public /* bridge */ /* synthetic */ List call(Message message, Map map, Map map2, Boolean bool, Boolean bool2, Boolean bool3, InviteEmbedModel inviteEmbedModel) { + return call(message, (Map) map, (Map) map2, bool, bool2, bool3, inviteEmbedModel); } - public final List call(ModelMessage modelMessage, Map map, Map map2, Boolean bool, Boolean bool2, Boolean bool3, InviteEmbedModel inviteEmbedModel) { - if (modelMessage == null) { + public final List call(Message message, Map map, Map map2, Boolean bool, Boolean bool2, Boolean bool3, InviteEmbedModel inviteEmbedModel) { + if (message == null) { return n.emptyList(); } WidgetChatListModelMessages.Companion companion = WidgetChatListModelMessages.Companion; @@ -47,6 +47,6 @@ public final class WidgetChatListModelMessages$Companion$getSingleMessage$1 implements b, Observable> { +public final class WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2 implements b, Observable> { public final /* synthetic */ Channel $channel; /* compiled from: WidgetChatListModelMessages.kt */ /* renamed from: com.discord.widgets.chat.list.model.WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$2$1 reason: invalid class name */ - public static final /* synthetic */ class AnonymousClass1 extends k implements Function6, Map, Map, Map, Map, Map, WidgetChatListModelMessages.MessagesWithMetadata> { + public static final /* synthetic */ class AnonymousClass1 extends k implements Function6, Map, Map, Map, Map, Map, WidgetChatListModelMessages.MessagesWithMetadata> { public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); public AnonymousClass1() { super(6, WidgetChatListModelMessages.MessagesWithMetadata.class, "", "(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)V", 0); } - public final WidgetChatListModelMessages.MessagesWithMetadata invoke(List list, Map map, Map map2, Map map3, Map map4, Map map5) { + public final WidgetChatListModelMessages.MessagesWithMetadata invoke(List list, Map map, Map map2, Map map3, Map map4, Map map5) { m.checkNotNullParameter(list, "p1"); m.checkNotNullParameter(map, "p2"); m.checkNotNullParameter(map2, "p3"); @@ -43,8 +43,8 @@ public final class WidgetChatListModelMessages$MessagesWithMetadata$Companion$ge /* 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ @Override // kotlin.jvm.functions.Function6 - public /* bridge */ /* synthetic */ WidgetChatListModelMessages.MessagesWithMetadata invoke(List list, Map map, Map map2, Map map3, Map map4, Map map5) { - return invoke(list, (Map) map, (Map) map2, (Map) map3, map4, map5); + public /* bridge */ /* synthetic */ WidgetChatListModelMessages.MessagesWithMetadata invoke(List list, Map map, Map map2, Map map3, Map map4, Map map5) { + return invoke((List) list, (Map) map, (Map) map2, (Map) map3, map4, map5); } } @@ -52,9 +52,16 @@ public final class WidgetChatListModelMessages$MessagesWithMetadata$Companion$ge this.$channel = channel; } + /* 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 // j0.k.b + public /* bridge */ /* synthetic */ Observable call(List list) { + return call((List) list); + } + /* JADX WARN: Multi-variable type inference failed */ /* JADX WARNING: Unknown variable types count: 1 */ - public final Observable call(List list) { + public final Observable call(List list) { j jVar = new j(list); StoreStream.Companion companion = StoreStream.Companion; Observable> messageState = companion.getMessageState().getMessageState(); diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java index 6af5ce3b1c..537ed264e4 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelMessages.java @@ -5,12 +5,12 @@ import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.interaction.Interaction; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; -import com.discord.api.message.reaction.MessageReaction; import com.discord.api.role.GuildRole; import com.discord.api.thread.ThreadMetadata; import com.discord.api.user.User; -import com.discord.models.domain.ModelMessage; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.models.member.GuildMember; import com.discord.stores.StoreMessageReplies; import com.discord.stores.StoreMessageState; @@ -21,11 +21,12 @@ import com.discord.stores.StoreThreadMessages; import com.discord.stores.StoreUserSettings; import com.discord.utilities.embed.InviteEmbedModel; import com.discord.utilities.guilds.RoleUtils; +import com.discord.utilities.message.LocalMessageCreatorsKt; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.mg_recycler.MGRecyclerDataPayload; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.rx.ObservableCombineLatestOverloadsKt; import com.discord.utilities.rx.ObservableExtensionsKt; -import com.discord.utilities.textprocessing.MessageUtils; import com.discord.utilities.time.ClockFactory; import com.discord.utilities.time.TimeUtils; import com.discord.widgets.botuikit.ComponentChatListState; @@ -70,12 +71,12 @@ public final class WidgetChatListModelMessages { this(); } - public static final /* synthetic */ int access$addBlockedMessage(Companion companion, Items items, ModelMessage modelMessage, int i, boolean z2) { - return companion.addBlockedMessage(items, modelMessage, i, z2); + public static final /* synthetic */ int access$addBlockedMessage(Companion companion, Items items, Message message, int i, boolean z2) { + return companion.addBlockedMessage(items, message, i, z2); } - public static final /* synthetic */ boolean access$shouldConcatMessage(Companion companion, Items items, ModelMessage modelMessage, ModelMessage modelMessage2) { - return companion.shouldConcatMessage(items, modelMessage, modelMessage2); + public static final /* synthetic */ boolean access$shouldConcatMessage(Companion companion, Items items, Message message, Message message2) { + return companion.shouldConcatMessage(items, message, message2); } public static final /* synthetic */ boolean access$tryAddNewMessagesSeparator(Companion companion, Items items, long j, boolean z2, long j2, Channel channel) { @@ -90,12 +91,12 @@ public final class WidgetChatListModelMessages { return companion.willAddTimestamp(j, j2); } - private final int addBlockedMessage(Items items, ModelMessage modelMessage, int i, boolean z2) { + private final int addBlockedMessage(Items items, Message message, int i, boolean z2) { if (i <= 0) { return i; } - m.checkNotNull(modelMessage); - items.addItem(new BlockedMessagesEntry(modelMessage, i, z2)); + m.checkNotNull(message); + items.addItem(new BlockedMessagesEntry(message, i, z2)); return 0; } @@ -107,8 +108,8 @@ public final class WidgetChatListModelMessages { } } - public static /* synthetic */ List getMessageItems$default(Companion companion, Channel channel, Map map, Map map2, Map map3, Channel channel2, StoreThreadMessages.ThreadState threadState, ModelMessage modelMessage, StoreMessageState.State state, Map map4, boolean z2, boolean z3, Long l, boolean z4, boolean z5, boolean z6, boolean z7, Map map5, InviteEmbedModel inviteEmbedModel, boolean z8, int i, Object obj) { - return companion.getMessageItems(channel, map, map2, map3, channel2, threadState, modelMessage, state, map4, z2, z3, l, z4, z5, z6, z7, map5, inviteEmbedModel, (i & 262144) != 0 ? false : z8); + public static /* synthetic */ List getMessageItems$default(Companion companion, Channel channel, Map map, Map map2, Map map3, Channel channel2, StoreThreadMessages.ThreadState threadState, Message message, StoreMessageState.State state, Map map4, boolean z2, boolean z3, Long l, boolean z4, boolean z5, boolean z6, boolean z7, Map map5, InviteEmbedModel inviteEmbedModel, boolean z8, int i, Object obj) { + return companion.getMessageItems(channel, map, map2, map3, channel2, threadState, message, state, map4, z2, z3, l, z4, z5, z6, z7, map5, inviteEmbedModel, (i & 262144) != 0 ? false : z8); } private final Observable observePermissionsForChannel(StorePermissions storePermissions, Channel channel) { @@ -133,27 +134,69 @@ public final class WidgetChatListModelMessages { return ObservableExtensionsKt.computationLatest(G).s(); } - private final boolean shouldConcatMessage(Items items, ModelMessage modelMessage, ModelMessage modelMessage2) { + private final boolean shouldConcatMessage(Items items, Message message, Message message2) { MGRecyclerDataPayload listItemMostRecentlyAdded; MGRecyclerDataPayload listItemMostRecentlyAdded2; MGRecyclerDataPayload listItemMostRecentlyAdded3; - if (modelMessage2 == null || modelMessage2.isSystemMessage() || modelMessage.hasThread() || modelMessage2.hasThread()) { + Integer M; + if (message2 == null) { return false; } - if (modelMessage.getType() != 0 && modelMessage.getType() != -1) { + MessageUtils messageUtils = MessageUtils.INSTANCE; + if (messageUtils.isSystemMessage(message2) || messageUtils.hasThread(message) || messageUtils.hasThread(message2)) { + return false; + } + Integer M2 = message.M(); + if ((M2 == null || M2.intValue() != 0) && ((M = message.M()) == null || M.intValue() != -1)) { return false; } MGRecyclerDataPayload listItemMostRecentlyAdded4 = items.getListItemMostRecentlyAdded(); - if (((listItemMostRecentlyAdded4 == null || listItemMostRecentlyAdded4.getType() != 0) && (((listItemMostRecentlyAdded = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded.getType() != 1) && (((listItemMostRecentlyAdded2 = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded2.getType() != 21) && ((listItemMostRecentlyAdded3 = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded3.getType() != 4)))) || modelMessage2.getAuthor().i() != modelMessage.getAuthor().i() || modelMessage.getTimestamp() - modelMessage2.getTimestamp() >= 420000 || modelMessage2.hasAttachments() || modelMessage2.hasEmbeds() || modelMessage2.hasMentions() || modelMessage.hasAttachments() || modelMessage.hasEmbeds() || modelMessage.hasMentions() || items.getConcatCount() >= 5) { + if ((listItemMostRecentlyAdded4 == null || listItemMostRecentlyAdded4.getType() != 0) && (((listItemMostRecentlyAdded = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded.getType() != 1) && (((listItemMostRecentlyAdded2 = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded2.getType() != 21) && ((listItemMostRecentlyAdded3 = items.getListItemMostRecentlyAdded()) == null || listItemMostRecentlyAdded3.getType() != 4)))) { return false; } - return !modelMessage.isWebhook() || m.areEqual(modelMessage2.getAuthor().r(), modelMessage.getAuthor().r()); + User g = message2.g(); + String str = null; + Long valueOf = g != null ? Long.valueOf(g.i()) : null; + User g2 = message.g(); + if (!m.areEqual(valueOf, g2 != null ? Long.valueOf(g2.i()) : null)) { + return false; + } + UtcDateTime K = message.K(); + long j = 0; + long f = K != null ? K.f() : 0; + UtcDateTime K2 = message2.K(); + if (K2 != null) { + j = K2.f(); + } + if (f - j >= 420000 || messageUtils.hasAttachments(message2) || messageUtils.hasEmbeds(message2)) { + return false; + } + List z2 = message2.z(); + if (!(z2 == null || z2.isEmpty()) || messageUtils.hasAttachments(message) || messageUtils.hasEmbeds(message)) { + return false; + } + List z3 = message.z(); + if (!(z3 == null || z3.isEmpty()) || items.getConcatCount() >= 5) { + return false; + } + if (messageUtils.isWebhook(message)) { + User g3 = message2.g(); + String r = g3 != null ? g3.r() : null; + User g4 = message.g(); + if (g4 != null) { + str = g4.r(); + } + if (!m.areEqual(r, str)) { + return false; + } + } + return true; } private final boolean tryAddNewMessagesSeparator(Items items, long j, boolean z2, long j2, Channel channel) { boolean z3 = true; boolean z4 = j > 0; - if (z2 || !z4 || ModelMessage.compare(Long.valueOf(j2), Long.valueOf(j)) != 0) { + if (z2 || !z4 || MessageUtils.compareMessages(Long.valueOf(j2), Long.valueOf(j)) != 0) { z3 = false; } if (z3) { @@ -201,10 +244,13 @@ public final class WidgetChatListModelMessages { return ObservableCombineLatestOverloadsKt.combineLatest(observable, observeChannel, observeForType, observeExpandedBlockedMessageIds, observeGuildMembers, observeUnreadMarkerMessageId, observeRoles, observePermissionsForChannel, observeIsAnimatedEmojisEnabled$default, observeIsAutoPlayGifsEnabled$default, observeIsRenderEmbedsEnabled, observeMeId, G, ComponentChatListState.INSTANCE.observeChatListComponentState(), InviteEmbedModel.Companion.observe$default(InviteEmbedModel.Companion, null, null, null, null, 15, null), new WidgetChatListModelMessages$Companion$get$2(channel)); } - public final List getMessageItems(Channel channel, Map map, Map map2, Map map3, Channel channel2, StoreThreadMessages.ThreadState threadState, ModelMessage modelMessage, StoreMessageState.State state, Map map4, boolean z2, boolean z3, Long l, boolean z4, boolean z5, boolean z6, boolean z7, Map map5, InviteEmbedModel inviteEmbedModel, boolean z8) { + public final List getMessageItems(Channel channel, Map map, Map map2, Map map3, Channel channel2, StoreThreadMessages.ThreadState threadState, Message message, StoreMessageState.State state, Map map4, boolean z2, boolean z3, Long l, boolean z4, boolean z5, boolean z6, boolean z7, Map map5, InviteEmbedModel inviteEmbedModel, boolean z8) { ArrayList arrayList; MessageEntry.ReplyData replyData; + Map map6; + Long l2; User c2; + User user; MessageEntry.ReplyData replyData2; StoreMessageReplies.MessageState messageState; MessageEntry.ReplyData replyData3; @@ -213,21 +259,24 @@ public final class WidgetChatListModelMessages { MessageEntry.ReplyData replyData4; boolean z10; StoreMessageReplies.MessageState messageState2; + Map map7; + Long l3; m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(map, "channelMembers"); m.checkNotNullParameter(map2, "guildRoles"); m.checkNotNullParameter(map3, "blockedRelationships"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(map4, "repliedMessages"); m.checkNotNullParameter(map5, "componentStoreState"); m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel"); - if (modelMessage.getType() == 38 && !PermissionUtils.can(1, l)) { + Integer M = message.M(); + if (M != null && M.intValue() == 38 && !PermissionUtils.can(1, l)) { return n.emptyList(); } ArrayList arrayList2 = new ArrayList(); - MessageReference messageReference = modelMessage.getMessageReference(); - Long l2 = null; - StoreMessageReplies.MessageState messageState3 = (StoreMessageReplies.MessageState) map4.get(messageReference != null ? messageReference.c() : null); + MessageReference A = message.A(); + Long l4 = null; + StoreMessageReplies.MessageState messageState3 = (StoreMessageReplies.MessageState) map4.get(A != null ? A.c() : null); if (messageState3 != null) { boolean z11 = messageState3 instanceof StoreMessageReplies.MessageState.Loaded; if (z11) { @@ -235,7 +284,7 @@ public final class WidgetChatListModelMessages { replyData3 = replyData2; messageState = messageState3; arrayList = arrayList2; - Object firstOrNull = u.firstOrNull((List) getMessageItems$default(this, channel, map, map2, map3, channel2, threadState, ((StoreMessageReplies.MessageState.Loaded) messageState3).getModelMessage(), state, map4, z2, false, null, false, z5, z6, z7, map5, inviteEmbedModel, false, 262144, null)); + Object firstOrNull = u.firstOrNull((List) getMessageItems$default(this, channel, map, map2, map3, channel2, threadState, ((StoreMessageReplies.MessageState.Loaded) messageState3).getMessage(), state, map4, z2, false, null, false, z5, z6, z7, map5, inviteEmbedModel, false, 262144, null)); if (!(firstOrNull instanceof MessageEntry)) { firstOrNull = null; } @@ -249,7 +298,15 @@ public final class WidgetChatListModelMessages { } if (z9) { messageState2 = messageState; - z10 = map3.containsKey(Long.valueOf(((StoreMessageReplies.MessageState.Loaded) messageState2).getModelMessage().getAuthor().i())); + User g = ((StoreMessageReplies.MessageState.Loaded) messageState2).getMessage().g(); + if (g != null) { + l3 = Long.valueOf(g.i()); + map7 = map3; + } else { + map7 = map3; + l3 = null; + } + z10 = map7.containsKey(l3); replyData4 = replyData3; } else { messageState2 = messageState; @@ -261,59 +318,63 @@ public final class WidgetChatListModelMessages { arrayList = arrayList2; replyData = null; } - GuildMember guildMember = map.get(Long.valueOf(modelMessage.getAuthor().i())); - List mentions = modelMessage.getMentions(); - m.checkNotNullExpressionValue(mentions, "message.mentions"); - User user = (User) u.firstOrNull((List) mentions); - GuildMember guildMember2 = map.get(user != null ? Long.valueOf(user.i()) : null); - Map map6 = RoleUtils.containsRoleMentions(modelMessage.getContent()) ? map2 : null; - Map nickOrUsernames = MessageUtils.getNickOrUsernames(modelMessage, channel, map, channel.m()); - Interaction interaction = modelMessage.getInteraction(); - if (!(interaction == null || (c2 = interaction.c()) == null)) { - l2 = Long.valueOf(c2.i()); + User g2 = message.g(); + if (g2 != null) { + l2 = Long.valueOf(g2.i()); + map6 = map; + } else { + map6 = map; + l2 = null; } - arrayList.add(new MessageEntry(modelMessage, state, guildMember, guildMember2, map6, nickOrUsernames, z3, z2, z4, replyData, map.get(l2), z8)); + GuildMember guildMember = map6.get(l2); + List z12 = message.z(); + GuildMember guildMember2 = map6.get((z12 == null || (user = (User) u.firstOrNull(z12)) == null) ? null : Long.valueOf(user.i())); + Map map8 = RoleUtils.containsRoleMentions(message.k()) ? map2 : null; + Map nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map6, channel.m()); + Interaction t = message.t(); + if (!(t == null || (c2 = t.c()) == null)) { + l4 = Long.valueOf(c2.i()); + } + arrayList.add(new MessageEntry(message, state, guildMember, guildMember2, map8, nickOrUsernames, z3, z2, z4, replyData, map6.get(l4), z8)); int size = arrayList.size(); ChatListEntry.Companion companion = ChatListEntry.Companion; - arrayList.addAll(companion.createEmbedEntries(modelMessage, state, z2, z4, z5, z6, channel.e(), z8)); - arrayList.addAll(companion.createStickerEntries(modelMessage)); - arrayList.addAll(companion.createGameInviteEntries(modelMessage)); - arrayList.addAll(companion.createSpotifyListenTogetherEntries(modelMessage)); - arrayList.addAll(companion.createInviteEntries(modelMessage, inviteEmbedModel)); - arrayList.addAll(companion.createGuildTemplateEntries(modelMessage)); - arrayList.addAll(companion.createGiftEntries(modelMessage)); + arrayList.addAll(companion.createEmbedEntries(message, state, z2, z4, z5, z6, channel.e(), z8)); + arrayList.addAll(companion.createStickerEntries(message)); + arrayList.addAll(companion.createGameInviteEntries(message)); + arrayList.addAll(companion.createSpotifyListenTogetherEntries(message)); + arrayList.addAll(companion.createInviteEntries(message, inviteEmbedModel)); + arrayList.addAll(companion.createGuildTemplateEntries(message)); + arrayList.addAll(companion.createGiftEntries(message)); if (z8) { - arrayList.add(new ThreadStarterDividerEntry(channel.g(), modelMessage.getId())); + arrayList.add(new ThreadStarterDividerEntry(channel.g(), message.r())); return arrayList; } if (z7) { - arrayList.addAll(companion.createBotComponentEntries(modelMessage, channel.e(), map5.get(Long.valueOf(modelMessage.getId())))); + arrayList.addAll(companion.createBotComponentEntries(message, channel.e(), map5.get(Long.valueOf(message.r())))); } - Map reactions = modelMessage.getReactions(); - m.checkNotNullExpressionValue(reactions, "message.reactions"); - boolean z12 = true; - if (!reactions.isEmpty()) { + boolean z13 = true; + if (!message.F().isEmpty()) { ThreadMetadata x2 = channel.x(); - boolean z13 = x2 == null || !x2.b(); - if (!PermissionUtils.can(64, l) || !z13) { - z12 = false; + boolean z14 = x2 == null || !x2.b(); + if (!PermissionUtils.can(64, l) || !z14) { + z13 = false; } - arrayList.add(new ReactionsEntry(modelMessage, z13, z12, z4)); + arrayList.add(new ReactionsEntry(message, z14, z13, z4)); } - if (modelMessage.isHasLocalUploads() && !modelMessage.isFailed()) { - String nonce = modelMessage.getNonce(); - if (nonce == null) { - nonce = ""; + if (message.p() && !MessageUtils.INSTANCE.isFailed(message)) { + String B = message.B(); + if (B == null) { + B = ""; } - m.checkNotNullExpressionValue(nonce, "message.nonce ?: \"\""); - arrayList.add(new UploadProgressEntry(nonce, modelMessage.getChannelId())); + arrayList.add(new UploadProgressEntry(B, message.i())); } - if (ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && modelMessage.hasThread() && channel2 != null) { + if (ViewThreadsFeatureFlag.Companion.getINSTANCE().isEnabled() && MessageUtils.INSTANCE.hasThread(message) && channel2 != null) { enableThreadSpine(arrayList, size); - arrayList.addAll(companion.createThreadEmbedEntries(channel, map, modelMessage, channel2, threadState, map2, z4, z6)); + arrayList.addAll(companion.createThreadEmbedEntries(channel, map, message, channel2, threadState, map2, z4, z6)); } - if (modelMessage.isEphemeralMessage() || (modelMessage.isInteraction() && modelMessage.isFailed())) { - arrayList.add(new EphemeralMessageEntry(modelMessage)); + MessageUtils messageUtils = MessageUtils.INSTANCE; + if (messageUtils.isEphemeralMessage(message) || (messageUtils.isInteraction(message) && messageUtils.isFailed(message))) { + arrayList.add(new EphemeralMessageEntry(message)); } return arrayList; } @@ -326,29 +387,31 @@ public final class WidgetChatListModelMessages { return e; } - public final List getThreadStarterMessageItems(Channel channel, Channel channel2, Map map, Map map2, Map map3, ModelMessage modelMessage, MessagesWithMetadata messagesWithMetadata, boolean z2, boolean z3, boolean z4, boolean z5, Map map4, InviteEmbedModel inviteEmbedModel) { + public final List getThreadStarterMessageItems(Channel channel, Channel channel2, Map map, Map map2, Map map3, Message message, MessagesWithMetadata messagesWithMetadata, boolean z2, boolean z3, boolean z4, boolean z5, Map map4, InviteEmbedModel inviteEmbedModel) { Channel channel3; - ModelMessage modelMessage2; + Message message2; m.checkNotNullParameter(channel2, "channel"); m.checkNotNullParameter(map, "channelMembers"); m.checkNotNullParameter(map2, "guildRoles"); m.checkNotNullParameter(map3, "blockedRelationships"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(messagesWithMetadata, "messagesWithMetadata"); m.checkNotNullParameter(map4, "componentStoreState"); m.checkNotNullParameter(inviteEmbedModel, "inviteEmbedModel"); Map parentChannelMessageReplyState = messagesWithMetadata.getParentChannelMessageReplyState(); - MessageReference messageReference = modelMessage.getMessageReference(); - StoreMessageReplies.MessageState messageState = parentChannelMessageReplyState.get(messageReference != null ? messageReference.c() : null); + MessageReference A = message.A(); + StoreMessageReplies.MessageState messageState = parentChannelMessageReplyState.get(A != null ? A.c() : null); if (channel == null || !(messageState instanceof StoreMessageReplies.MessageState.Loaded)) { - modelMessage2 = ModelMessage.createThreadStarterMessageNotFoundMessage(channel2.g(), modelMessage.getAuthor(), ClockFactory.get()); - m.checkNotNullExpressionValue(modelMessage2, "ModelMessage.createThrea…ctory.get()\n )"); + long g = channel2.g(); + User g2 = message.g(); + m.checkNotNull(g2); + message2 = LocalMessageCreatorsKt.createThreadStarterMessageNotFoundMessage(g, g2, ClockFactory.get()); channel3 = channel2; } else { - modelMessage2 = ((StoreMessageReplies.MessageState.Loaded) messageState).getModelMessage(); + message2 = ((StoreMessageReplies.MessageState.Loaded) messageState).getMessage(); channel3 = channel; } - return getMessageItems(channel3, map, map2, map3, null, null, modelMessage2, messagesWithMetadata.getMessageState().get(Long.valueOf(modelMessage2.getId())), messagesWithMetadata.getParentChannelMessageReplyState(), false, false, null, z2, z3, z5, z4, map4, inviteEmbedModel, true); + return getMessageItems(channel3, map, map2, map3, null, null, message2, messagesWithMetadata.getMessageState().get(Long.valueOf(message2.r())), messagesWithMetadata.getParentChannelMessageReplyState(), false, false, null, z2, z3, z5, z4, map4, inviteEmbedModel, true); } } @@ -421,7 +484,7 @@ public final class WidgetChatListModelMessages { private final Map messageReplyState; private final Map messageState; private final Map messageThreads; - private final List messages; + private final List messages; private final Map parentChannelMessageReplyState; private final Map threadCountsAndLatestMessages; @@ -441,7 +504,7 @@ public final class WidgetChatListModelMessages { return Z; } - public final Observable get(List list) { + public final Observable get(List list) { m.checkNotNullParameter(list, "messages"); StoreStream.Companion companion = StoreStream.Companion; Observable i = Observable.i(companion.getMessageState().getMessageState(), companion.getChannels().observeThreadsFromMessages(list), companion.getThreadMessages().observeThreadCountAndLatestMessage(), new WidgetChatListModelMessages$MessagesWithMetadata$Companion$get$1(list)); @@ -450,11 +513,10 @@ public final class WidgetChatListModelMessages { } } - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.util.List */ /* JADX DEBUG: Multi-variable search result rejected for r6v0, resolved type: java.util.Map */ /* JADX DEBUG: Multi-variable search result rejected for r7v0, resolved type: java.util.Map */ /* JADX WARN: Multi-variable type inference failed */ - public MessagesWithMetadata(List list, Map map, Map map2, Map map3, Map map4, Map map5) { + public MessagesWithMetadata(List list, Map map, Map map2, Map map3, Map map4, Map map5) { m.checkNotNullParameter(list, "messages"); m.checkNotNullParameter(map, "messageState"); m.checkNotNullParameter(map2, "messageThreads"); @@ -493,7 +555,7 @@ public final class WidgetChatListModelMessages { return messagesWithMetadata.copy(list, map, map2, map3, map4, map5); } - public final List component1() { + public final List component1() { return this.messages; } @@ -517,7 +579,7 @@ public final class WidgetChatListModelMessages { return this.parentChannelMessageReplyState; } - public final MessagesWithMetadata copy(List list, Map map, Map map2, Map map3, Map map4, Map map5) { + public final MessagesWithMetadata copy(List list, Map map, Map map2, Map map3, Map map4, Map map5) { m.checkNotNullParameter(list, "messages"); m.checkNotNullParameter(map, "messageState"); m.checkNotNullParameter(map2, "messageThreads"); @@ -550,7 +612,7 @@ public final class WidgetChatListModelMessages { return this.messageThreads; } - public final List getMessages() { + public final List getMessages() { return this.messages; } @@ -563,7 +625,7 @@ public final class WidgetChatListModelMessages { } public int hashCode() { - List list = this.messages; + List list = this.messages; int i = 0; int hashCode = (list != null ? list.hashCode() : 0) * 31; Map map = this.messageState; diff --git a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java index eda99b8c79..f6d4b4bd6e 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/chat/list/sheet/WidgetApplicationCommandBottomSheet.java @@ -129,7 +129,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet { objArr[0] = str; boolean z2 = true; objArr[1] = sb; - CharSequence c2 = b.c(textView, 2131893691, objArr, new WidgetApplicationCommandBottomSheet$configureCommandTitle$content$1(this, loaded, themedColor)); + CharSequence c2 = b.c(textView, 2131893731, objArr, new WidgetApplicationCommandBottomSheet$configureCommandTitle$content$1(this, loaded, themedColor)); TextView textView2 = getBinding().f; m.checkNotNullExpressionValue(textView2, "binding.commandBottomSheetCommandTitle"); textView2.setMovementMethod(LinkMovementMethod.getInstance()); @@ -179,7 +179,7 @@ public final class WidgetApplicationCommandBottomSheet extends AppBottomSheet { spannableStringBuilder.append((CharSequence) configureSlashCommandString(loaded, applicationCommandValue)); } } - TextView textView = getBinding().f1668c; + TextView textView = getBinding().f1670c; m.checkNotNullExpressionValue(textView, "binding.commandBottomSheetCommandContent"); textView.setText(spannableStringBuilder); } diff --git a/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java b/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java index bd924a4bc9..de87f42b69 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java +++ b/app/src/main/java/com/discord/widgets/chat/list/utils/EmbeddedMessageParser.java @@ -2,8 +2,9 @@ package com.discord.widgets.chat.list.utils; import android.content.Context; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; +import com.discord.api.user.User; import com.discord.stores.StoreMessageState; import com.discord.stores.StoreStream; import com.discord.stores.StoreUserSettings; @@ -27,15 +28,15 @@ public final class EmbeddedMessageParser { private final boolean animateEmojis; private final Context context; private final Integer maxNodes; - private final ModelMessage message; + private final Message message; private final StoreMessageState.State messageState; private final Map nickOrUsernames; private final Map roleMentions; - public ParserData(Context context, Map map, Map map2, boolean z2, StoreMessageState.State state, Integer num, ModelMessage modelMessage, WidgetChatListAdapter widgetChatListAdapter) { + public ParserData(Context context, Map map, Map map2, boolean z2, StoreMessageState.State state, Integer num, Message message, WidgetChatListAdapter widgetChatListAdapter) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(map2, "nickOrUsernames"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); this.context = context; this.roleMentions = map; @@ -43,12 +44,12 @@ public final class EmbeddedMessageParser { this.animateEmojis = z2; this.messageState = state; this.maxNodes = num; - this.message = modelMessage; + this.message = message; this.adapter = widgetChatListAdapter; } - public static /* synthetic */ ParserData copy$default(ParserData parserData, Context context, Map map, Map map2, boolean z2, StoreMessageState.State state, Integer num, ModelMessage modelMessage, WidgetChatListAdapter widgetChatListAdapter, int i, Object obj) { - return parserData.copy((i & 1) != 0 ? parserData.context : context, (i & 2) != 0 ? parserData.roleMentions : map, (i & 4) != 0 ? parserData.nickOrUsernames : map2, (i & 8) != 0 ? parserData.animateEmojis : z2, (i & 16) != 0 ? parserData.messageState : state, (i & 32) != 0 ? parserData.maxNodes : num, (i & 64) != 0 ? parserData.message : modelMessage, (i & 128) != 0 ? parserData.adapter : widgetChatListAdapter); + public static /* synthetic */ ParserData copy$default(ParserData parserData, Context context, Map map, Map map2, boolean z2, StoreMessageState.State state, Integer num, Message message, WidgetChatListAdapter widgetChatListAdapter, int i, Object obj) { + return parserData.copy((i & 1) != 0 ? parserData.context : context, (i & 2) != 0 ? parserData.roleMentions : map, (i & 4) != 0 ? parserData.nickOrUsernames : map2, (i & 8) != 0 ? parserData.animateEmojis : z2, (i & 16) != 0 ? parserData.messageState : state, (i & 32) != 0 ? parserData.maxNodes : num, (i & 64) != 0 ? parserData.message : message, (i & 128) != 0 ? parserData.adapter : widgetChatListAdapter); } public final Context component1() { @@ -75,7 +76,7 @@ public final class EmbeddedMessageParser { return this.maxNodes; } - public final ModelMessage component7() { + public final Message component7() { return this.message; } @@ -83,12 +84,12 @@ public final class EmbeddedMessageParser { return this.adapter; } - public final ParserData copy(Context context, Map map, Map map2, boolean z2, StoreMessageState.State state, Integer num, ModelMessage modelMessage, WidgetChatListAdapter widgetChatListAdapter) { + public final ParserData copy(Context context, Map map, Map map2, boolean z2, StoreMessageState.State state, Integer num, Message message, WidgetChatListAdapter widgetChatListAdapter) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(map2, "nickOrUsernames"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(widgetChatListAdapter, "adapter"); - return new ParserData(context, map, map2, z2, state, num, modelMessage, widgetChatListAdapter); + return new ParserData(context, map, map2, z2, state, num, message, widgetChatListAdapter); } public boolean equals(Object obj) { @@ -118,7 +119,7 @@ public final class EmbeddedMessageParser { return this.maxNodes; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -154,8 +155,8 @@ public final class EmbeddedMessageParser { int hashCode4 = (i5 + (state != null ? state.hashCode() : 0)) * 31; Integer num = this.maxNodes; int hashCode5 = (hashCode4 + (num != null ? num.hashCode() : 0)) * 31; - ModelMessage modelMessage = this.message; - int hashCode6 = (hashCode5 + (modelMessage != null ? modelMessage.hashCode() : 0)) * 31; + Message message = this.message; + int hashCode6 = (hashCode5 + (message != null ? message.hashCode() : 0)) * 31; WidgetChatListAdapter widgetChatListAdapter = this.adapter; if (widgetChatListAdapter != null) { i = widgetChatListAdapter.hashCode(); @@ -188,9 +189,9 @@ public final class EmbeddedMessageParser { private EmbeddedMessageParser() { } - private final MessagePreprocessor getMessagePreprocessor(long j, ModelMessage modelMessage, StoreMessageState.State state, Integer num) { + private final MessagePreprocessor getMessagePreprocessor(long j, Message message, StoreMessageState.State state, Integer num) { StoreUserSettings userSettings = StoreStream.Companion.getUserSettings(); - return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : modelMessage.getEmbeds(), false, num); + return new MessagePreprocessor(j, state, (!userSettings.getIsEmbedMediaInlined() || !userSettings.getIsRenderEmbedsEnabled()) ? null : message.m(), false, num); } private final MessageRenderContext getMessageRenderContext(ParserData parserData) { @@ -200,16 +201,16 @@ public final class EmbeddedMessageParser { public final DraweeSpanStringBuilder parse(ParserData parserData) { m.checkNotNullParameter(parserData, "parserData"); MessageRenderContext messageRenderContext = getMessageRenderContext(parserData); - MessagePreprocessor messagePreprocessor = getMessagePreprocessor(parserData.getMessage().getAuthor().i(), parserData.getMessage(), parserData.getMessageState(), parserData.getMaxNodes()); - String content = parserData.getMessage().getContent(); - if (content == null) { - content = ""; + User g = parserData.getMessage().g(); + MessagePreprocessor messagePreprocessor = getMessagePreprocessor(g != null ? g.i() : 0, parserData.getMessage(), parserData.getMessageState(), parserData.getMaxNodes()); + String k = parserData.getMessage().k(); + if (k == null) { + k = ""; } - m.checkNotNullExpressionValue(content, "parserData.message.content ?: \"\""); Context context = parserData.getContext(); String property = System.getProperty("line.separator"); Objects.requireNonNull(property); m.checkNotNullExpressionValue(property, "Objects.requireNonNull(S…operty(\"line.separator\"))"); - return DiscordParser.parseChannelMessage(context, new Regex(property).replace(content, " "), messageRenderContext, messagePreprocessor, DiscordParser.ParserOptions.REPLY, false); + return DiscordParser.parseChannelMessage(context, new Regex(property).replace(k, " "), messageRenderContext, messagePreprocessor, DiscordParser.ParserOptions.REPLY, false); } } diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java index b02b1886ae..d9cab85963 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java @@ -140,20 +140,20 @@ public final class ManageReactionsEmojisAdapter extends MGRecyclerAdapterSimple< /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ReactionEmojiViewHolder(ManageReactionsEmojisAdapter manageReactionsEmojisAdapter) { - super(2131559072, manageReactionsEmojisAdapter); + super(2131559073, manageReactionsEmojisAdapter); m.checkNotNullParameter(manageReactionsEmojisAdapter, "adapter"); View view = this.itemView; - int i = 2131363773; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363773); + int i = 2131363776; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363776); if (linearLayout != null) { - i = 2131363774; - TextView textView = (TextView) view.findViewById(2131363774); + i = 2131363777; + TextView textView = (TextView) view.findViewById(2131363777); if (textView != null) { - i = 2131363775; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363775); + i = 2131363778; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363778); if (simpleDraweeSpanTextView != null) { - i = 2131363776; - View findViewById = view.findViewById(2131363776); + i = 2131363779; + View findViewById = view.findViewById(2131363779); if (findViewById != null) { WidgetManageReactionsEmojiBinding widgetManageReactionsEmojiBinding = new WidgetManageReactionsEmojiBinding((RelativeLayout) view, linearLayout, textView, simpleDraweeSpanTextView, findViewById); m.checkNotNullExpressionValue(widgetManageReactionsEmojiBinding, "WidgetManageReactionsEmojiBinding.bind(itemView)"); @@ -174,7 +174,7 @@ public final class ManageReactionsEmojisAdapter extends MGRecyclerAdapterSimple< m.checkNotNullParameter(reactionEmojiItem, "data"); super.onConfigure(i, (int) reactionEmojiItem); EmojiNode.Companion companion = EmojiNode.Companion; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1824c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1826c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.manageReactionsEmojiEmojiTextview"); companion.renderEmoji(simpleDraweeSpanTextView, reactionEmojiItem.getReaction().b(), true, emojiSizePx); TextView textView = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java index 982cfcef48..fabdafecc8 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsModelProvider$get$reactionsObs$1.java @@ -1,16 +1,16 @@ package com.discord.widgets.chat.managereactions; +import com.discord.api.message.Message; import com.discord.api.message.reaction.MessageReaction; -import com.discord.models.domain.ModelMessage; import d0.t.h0; import j0.k.b; import java.util.Map; /* compiled from: ManageReactionsModel.kt */ -public final class ManageReactionsModelProvider$get$reactionsObs$1 implements b> { +public final class ManageReactionsModelProvider$get$reactionsObs$1 implements b> { public static final ManageReactionsModelProvider$get$reactionsObs$1 INSTANCE = new ManageReactionsModelProvider$get$reactionsObs$1(); - public final Map call(ModelMessage modelMessage) { - Map reactions; - return (modelMessage == null || (reactions = modelMessage.getReactions()) == null) ? h0.emptyMap() : reactions; + public final Map call(Message message) { + Map F; + return (message == null || (F = message.F()) == null) ? h0.emptyMap() : F; } } diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java index 9b34b308fb..ffc4348db0 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java @@ -81,14 +81,14 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ErrorViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) { - super(2131559073, manageReactionsResultsAdapter); + super(2131559074, manageReactionsResultsAdapter); m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter"); View view = this.itemView; - int i = 2131363778; - ImageView imageView = (ImageView) view.findViewById(2131363778); + int i = 2131363781; + ImageView imageView = (ImageView) view.findViewById(2131363781); if (imageView != null) { - i = 2131363779; - TextView textView = (TextView) view.findViewById(2131363779); + i = 2131363782; + TextView textView = (TextView) view.findViewById(2131363782); if (textView != null) { WidgetManageReactionsResultErrorBinding widgetManageReactionsResultErrorBinding = new WidgetManageReactionsResultErrorBinding((RelativeLayout) view, imageView, textView); m.checkNotNullExpressionValue(widgetManageReactionsResultErrorBinding, "WidgetManageReactionsRes…rorBinding.bind(itemView)"); @@ -126,7 +126,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple public static final class LoadingViewHolder extends MGRecyclerViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public LoadingViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) { - super(2131559074, manageReactionsResultsAdapter); + super(2131559075, manageReactionsResultsAdapter); m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter"); } } @@ -278,17 +278,17 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ReactionUserViewHolder(ManageReactionsResultsAdapter manageReactionsResultsAdapter) { - super(2131559075, manageReactionsResultsAdapter); + super(2131559076, manageReactionsResultsAdapter); m.checkNotNullParameter(manageReactionsResultsAdapter, "adapter"); View view = this.itemView; - int i = 2131363780; - ImageView imageView = (ImageView) view.findViewById(2131363780); + int i = 2131363783; + ImageView imageView = (ImageView) view.findViewById(2131363783); if (imageView != null) { - i = 2131363781; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363781); + i = 2131363784; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363784); if (simpleDraweeView != null) { - i = 2131363782; - TextView textView = (TextView) view.findViewById(2131363782); + i = 2131363785; + TextView textView = (TextView) view.findViewById(2131363785); if (textView != null) { WidgetManageReactionsResultUserBinding widgetManageReactionsResultUserBinding = new WidgetManageReactionsResultUserBinding((RelativeLayout) view, imageView, simpleDraweeView, textView); m.checkNotNullExpressionValue(widgetManageReactionsResultUserBinding, "WidgetManageReactionsRes…serBinding.bind(itemView)"); @@ -313,7 +313,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple str = reactionUserItem.getUser().getUsername(); } textView.setText(str); - SimpleDraweeView simpleDraweeView = this.binding.f1825c; + SimpleDraweeView simpleDraweeView = this.binding.f1827c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.manageReactionsResultUserAvatar"); IconUtils.setIcon$default(simpleDraweeView, reactionUserItem.getUser(), 2131165296, null, null, reactionUserItem.getGuildMember(), 24, null); ImageView imageView = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java index 53569a6f1d..3d36e97693 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions$binding$2.java @@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetManageReactions$binding$2 extends k imp public final WidgetManageReactionsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363777; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363777); + int i = 2131363780; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363780); if (recyclerView != null) { - i = 2131363783; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363783); + i = 2131363786; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363786); if (recyclerView2 != null) { return new WidgetManageReactionsBinding((CoordinatorLayout) view, recyclerView, recyclerView2); } diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java index 0deb1bdd50..4f06b1d1b1 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java @@ -57,7 +57,7 @@ public final class WidgetManageReactions extends AppFragment { } public WidgetManageReactions() { - super(2131559071); + super(2131559072); } public static final /* synthetic */ void access$configureUI(WidgetManageReactions widgetManageReactions, ManageReactionsModel manageReactionsModel) { @@ -110,7 +110,7 @@ public final class WidgetManageReactions extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131892478); + setActionBarTitle(2131892520); if (this.modelProvider == null) { this.modelProvider = new ManageReactionsModelProvider(getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_CHANNEL_ID", 0), getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_MESSAGE_ID", 0), getMostRecentIntent().getStringExtra("com.discord.intent.extra.EXTRA_EMOJI_KEY"), null, null, null, 56, null); } @@ -118,7 +118,7 @@ public final class WidgetManageReactions extends AppFragment { RecyclerView recyclerView = getBinding().b; m.checkNotNullExpressionValue(recyclerView, "binding.manageReactionsEmojisRecycler"); this.emojisAdapter = (ManageReactionsEmojisAdapter) companion.configure(new ManageReactionsEmojisAdapter(recyclerView)); - RecyclerView recyclerView2 = getBinding().f1823c; + RecyclerView recyclerView2 = getBinding().f1825c; m.checkNotNullExpressionValue(recyclerView2, "binding.manageReactionsResultsRecycler"); this.resultsAdapter = (ManageReactionsResultsAdapter) companion.configure(new ManageReactionsResultsAdapter(recyclerView2)); ManageReactionsEmojisAdapter manageReactionsEmojisAdapter = this.emojisAdapter; diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java index b6920f23c4..cabce7b272 100644 --- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java +++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$binding$2.java @@ -43,8 +43,8 @@ public final /* synthetic */ class WidgetChatOverlay$binding$2 extends k impleme i = 2131362602; TextView textView2 = (TextView) view.findViewById(2131362602); if (textView2 != null) { - i = 2131365116; - View findViewById = view.findViewById(2131365116); + i = 2131365120; + View findViewById = view.findViewById(2131365120); if (findViewById != null) { int i2 = 2131362494; StickerView stickerView = (StickerView) findViewById.findViewById(2131362494); diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java index 884b9d3daf..6ced81c710 100644 --- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1.java @@ -2,12 +2,10 @@ package com.discord.widgets.chat.overlay; import android.content.Context; import android.view.View; -import androidx.fragment.app.FragmentManager; import com.discord.api.sticker.Sticker; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.views.sticker.StickerView; import com.discord.widgets.chat.MessageManager; -import com.discord.widgets.chat.input.AppFlexInputViewModel; import d0.z.d.m; import java.util.List; /* compiled from: WidgetChatOverlay.kt */ @@ -15,34 +13,22 @@ public final class WidgetChatOverlay$configureStickerSuggestions$$inlined$forEac public final /* synthetic */ Sticker $matchedSticker$inlined; public final /* synthetic */ List $ownedStickerMatches$inlined; public final /* synthetic */ boolean $shouldClearTextOnSend$inlined; - public final /* synthetic */ boolean $showUnownedSticker$inlined; public final /* synthetic */ Sticker $sticker; public final /* synthetic */ StickerView $stickerView$inlined; - public final /* synthetic */ List $unownedStickerMatches$inlined; public final /* synthetic */ WidgetChatOverlay this$0; - public WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1(Sticker sticker, StickerView stickerView, Sticker sticker2, boolean z2, WidgetChatOverlay widgetChatOverlay, List list, List list2, boolean z3) { + public WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1(Sticker sticker, StickerView stickerView, Sticker sticker2, WidgetChatOverlay widgetChatOverlay, List list, boolean z2) { this.$sticker = sticker; this.$stickerView$inlined = stickerView; this.$matchedSticker$inlined = sticker2; - this.$showUnownedSticker$inlined = z2; this.this$0 = widgetChatOverlay; - this.$unownedStickerMatches$inlined = list; - this.$ownedStickerMatches$inlined = list2; - this.$shouldClearTextOnSend$inlined = z3; + this.$ownedStickerMatches$inlined = list; + this.$shouldClearTextOnSend$inlined = z2; } @Override // android.view.View.OnClickListener public final void onClick(View view) { AnalyticsTracker.INSTANCE.expressionSuggestionsSelected(this.$matchedSticker$inlined.getId()); - if (this.$showUnownedSticker$inlined) { - AppFlexInputViewModel access$getFlexInputViewModel$p = WidgetChatOverlay.access$getFlexInputViewModel$p(this.this$0); - Sticker sticker = this.$matchedSticker$inlined; - FragmentManager supportFragmentManager = this.this$0.requireAppActivity().getSupportFragmentManager(); - m.checkNotNullExpressionValue(supportFragmentManager, "requireAppActivity().supportFragmentManager"); - access$getFlexInputViewModel$p.onStickerNudgeClicked(sticker, supportFragmentManager); - return; - } m.checkNotNullExpressionValue(view, "it"); Context context = view.getContext(); m.checkNotNullExpressionValue(context, "it.context"); diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java index bc739038cc..ea0d2e2c71 100644 --- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java +++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay$flexInputViewModel$2.java @@ -18,6 +18,6 @@ public final class WidgetChatOverlay$flexInputViewModel$2 extends o implements F @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, null, 126, null); + return new AppFlexInputViewModel(this.this$0, null, null, null, null, null, 62, null); } } diff --git a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java index f203b5d54c..343918bb7d 100644 --- a/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java +++ b/app/src/main/java/com/discord/widgets/chat/overlay/WidgetChatOverlay.java @@ -151,7 +151,7 @@ public final class WidgetChatOverlay extends AppFragment { private final void configureTyping(ChatTypingModel.Typing typing) { int i = 8; if (!typing.getTypingUsers().isEmpty() || typing.getChannelRateLimit() > 0) { - RelativeLayout relativeLayout = this.binding.f1749c; + RelativeLayout relativeLayout = this.binding.f1751c; m.checkNotNullExpressionValue(relativeLayout, "binding.chatOverlayTyping"); relativeLayout.setVisibility(0); ConstraintLayout constraintLayout = this.binding.a; @@ -189,7 +189,7 @@ public final class WidgetChatOverlay extends AppFragment { return; } this.binding.d.b(); - RelativeLayout relativeLayout2 = this.binding.f1749c; + RelativeLayout relativeLayout2 = this.binding.f1751c; m.checkNotNullExpressionValue(relativeLayout2, "binding.chatOverlayTyping"); relativeLayout2.setVisibility(8); } @@ -203,20 +203,20 @@ public final class WidgetChatOverlay extends AppFragment { } ConstraintLayout constraintLayout = this.binding.a; m.checkNotNullExpressionValue(constraintLayout, "binding.root"); - String string = constraintLayout.getResources().getString(2131887331); + String string = constraintLayout.getResources().getString(2131887333); m.checkNotNullExpressionValue(string, "binding.root.resources.g…nnel_slowmode_desc_short)"); return string; } private final CharSequence getTypingString(Resources resources, List list) { int size = list.size(); - return size != 0 ? size != 1 ? size != 2 ? size != 3 ? c.a.l.b.h(resources, 2131893191, new Object[0], null, 4) : c.a.l.b.h(resources, 2131893854, new Object[]{list.get(0), list.get(1), list.get(2)}, null, 4) : c.a.l.b.h(resources, 2131893990, new Object[]{list.get(0), list.get(1)}, null, 4) : c.a.l.b.h(resources, 2131891636, new Object[]{list.get(0)}, null, 4) : ""; + return size != 0 ? size != 1 ? size != 2 ? size != 3 ? c.a.l.b.h(resources, 2131893233, new Object[0], null, 4) : c.a.l.b.h(resources, 2131893893, new Object[]{list.get(0), list.get(1), list.get(2)}, null, 4) : c.a.l.b.h(resources, 2131894029, new Object[]{list.get(0), list.get(1)}, null, 4) : c.a.l.b.h(resources, 2131891669, new Object[]{list.get(0)}, null, 4) : ""; } public final void configureUI(ChatTypingModel chatTypingModel) { m.checkNotNullParameter(chatTypingModel, "model"); if (chatTypingModel instanceof ChatTypingModel.Hide) { - RelativeLayout relativeLayout = this.binding.f1749c; + RelativeLayout relativeLayout = this.binding.f1751c; m.checkNotNullExpressionValue(relativeLayout, "binding.chatOverlayTyping"); relativeLayout.setVisibility(8); } else if (chatTypingModel instanceof ChatTypingModel.Typing) { @@ -226,7 +226,7 @@ public final class WidgetChatOverlay extends AppFragment { } public WidgetChatOverlay() { - super(2131558968); + super(2131558969); } public static final /* synthetic */ void access$configureStickerSuggestions(WidgetChatOverlay widgetChatOverlay, Pair pair) { @@ -269,9 +269,7 @@ public final class WidgetChatOverlay extends AppFragment { return; } List take = u.take(getFlexInputViewModel().getMatchingStickers(component2.a, false), 4); - boolean z2 = true; - List take2 = u.take(getFlexInputViewModel().getMatchingStickers(component2.a, true), 1); - boolean z3 = SearchUtils.INSTANCE.getQueriesFromSearchText(component2.a).size() == 1; + boolean z2 = SearchUtils.INSTANCE.getQueriesFromSearchText(component2.a).size() == 1; if (take == null || take.isEmpty()) { g4 g4Var2 = getBinding().h; m.checkNotNullExpressionValue(g4Var2, "binding.stickersSuggestions"); @@ -287,32 +285,22 @@ public final class WidgetChatOverlay extends AppFragment { m.checkNotNullExpressionValue(linearLayout3, "binding.stickersSuggestions.root"); linearLayout3.setVisibility(0); int i = 2; - int i2 = 3; - int i3 = 0; + int i2 = 0; for (Object obj : n.listOf((Object[]) new StickerView[]{getBinding().h.b, getBinding().h.f96c, getBinding().h.d, getBinding().h.e})) { - int i4 = i3 + 1; - if (i3 < 0) { + int i3 = i2 + 1; + if (i2 < 0) { n.throwIndexOverflow(); } StickerView stickerView = (StickerView) obj; - boolean z4 = i3 == i2; - boolean z5 = z4 && (take2.isEmpty() ^ z2); - Sticker sticker = z5 ? (Sticker) u.first((List) take2) : i3 < take.size() ? (Sticker) take.get(i3) : null; + Sticker sticker = i2 < take.size() ? (Sticker) take.get(i2) : null; m.checkNotNullExpressionValue(stickerView, "stickerView"); stickerView.setVisibility(sticker != null ? 0 : 8); if (sticker != null) { StickerView.d(stickerView, sticker, null, i); - stickerView.setOnClickListener(new WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1(sticker, stickerView, sticker, z5, this, take2, take, z3)); + stickerView.setOnClickListener(new WidgetChatOverlay$configureStickerSuggestions$$inlined$forEachIndexed$lambda$1(sticker, stickerView, sticker, this, take, z2)); } - if (z4) { - ImageView imageView = getBinding().h.f; - m.checkNotNullExpressionValue(imageView, "binding.stickersSuggesti…nputSuggestedSticker4Lock"); - imageView.setVisibility(z5 && sticker != null ? 0 : 8); - } - i3 = i4; + i2 = i3; i = 2; - i2 = 3; - z2 = true; } } @@ -341,7 +329,7 @@ public final class WidgetChatOverlay extends AppFragment { Drawable background = linearLayout.getBackground(); m.checkNotNullExpressionValue(background, "binding.stickersSuggestions.root.background"); background.setAlpha(216); - getBinding().h.g.setOnClickListener(WidgetChatOverlay$onViewBoundOrOnResume$1.INSTANCE); + getBinding().h.f.setOnClickListener(WidgetChatOverlay$onViewBoundOrOnResume$1.INSTANCE); getBinding().b.setOnClickListener(WidgetChatOverlay$onViewBoundOrOnResume$2.INSTANCE); Observable s2 = OldMessageModel.Companion.get().s(); m.checkNotNullExpressionValue(s2, "OldMessageModel.get()\n … .distinctUntilChanged()"); diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java index 636871295c..aa908b371f 100644 --- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model$Companion$get$1.java @@ -3,8 +3,8 @@ package com.discord.widgets.chat.pins; import android.content.Context; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.stores.StoreStream; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import rx.functions.Func9; /* compiled from: WidgetChannelPinnedMessages.kt */ -public final class WidgetChannelPinnedMessages$Model$Companion$get$1 implements Func9, Map, Map, Map, Boolean, Boolean, Guild, InviteEmbedModel, WidgetChannelPinnedMessages.Model> { +public final class WidgetChannelPinnedMessages$Model$Companion$get$1 implements Func9, Map, Map, Map, Boolean, Boolean, Guild, InviteEmbedModel, WidgetChannelPinnedMessages.Model> { public final /* synthetic */ Channel $channel; public final /* synthetic */ Context $context; @@ -33,17 +33,17 @@ public final class WidgetChannelPinnedMessages$Model$Companion$get$1 list, Map map, Map map2, Map map3, Boolean bool, Boolean bool2, Guild guild, InviteEmbedModel inviteEmbedModel) { + public final WidgetChannelPinnedMessages.Model call(Long l, List list, Map map, Map map2, Map map3, Boolean bool, Boolean bool2, Guild guild, InviteEmbedModel inviteEmbedModel) { ArrayList arrayList; Map map4; List roles; List listOf; - List list2 = list; + List list2 = list; Map map5 = map2; if (list2 == null) { listOf = m.listOf(new LoadingEntry()); } else if (list.isEmpty()) { - String string = this.$context.getString(AnimatableValueParser.r1(this.$channel) ? 2131891374 : 2131891373); + String string = this.$context.getString(AnimatableValueParser.r1(this.$channel) ? 2131891407 : 2131891406); d0.z.d.m.checkNotNullExpressionValue(string, "context.getString(\n …}\n )"); listOf = m.listOf(new EmptyPinsEntry(string)); } else { @@ -51,7 +51,7 @@ public final class WidgetChannelPinnedMessages$Model$Companion$get$1 list, Map map, Map map2, Map map3, Boolean bool, Boolean bool2, Guild guild, InviteEmbedModel inviteEmbedModel) { - return call(l, list, (Map) map, (Map) map2, (Map) map3, bool, bool2, guild, inviteEmbedModel); + public /* bridge */ /* synthetic */ WidgetChannelPinnedMessages.Model call(Long l, List list, Map map, Map map2, Map map3, Boolean bool, Boolean bool2, Guild guild, InviteEmbedModel inviteEmbedModel) { + return call(l, (List) list, (Map) map, (Map) map2, (Map) map3, bool, bool2, guild, inviteEmbedModel); } } diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java index b754762c72..ef284cb04f 100644 --- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$onViewBound$1.java @@ -6,11 +6,11 @@ import c.a.d.l; import com.discord.api.activity.Activity; import com.discord.api.application.Application; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.message.reaction.MessageReaction; import com.discord.api.sticker.BaseSticker; import com.discord.api.sticker.Sticker; -import com.discord.models.domain.ModelMessage; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreChat; import com.discord.stores.StoreStream; @@ -45,9 +45,9 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onDismissClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onDismissClicked(this, modelMessage); + public void onDismissClicked(Message message) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onDismissClicked(this, message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -62,44 +62,44 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorAvatarClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageAuthorAvatarClicked(this, modelMessage, j); + public void onMessageAuthorAvatarClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageAuthorAvatarClicked(this, message, j); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorLongClicked(ModelMessage modelMessage, Long l) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageAuthorLongClicked(this, modelMessage, l); + public void onMessageAuthorLongClicked(Message message, Long l) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageAuthorLongClicked(this, message, l); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorNameClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageAuthorNameClicked(this, modelMessage, j); + public void onMessageAuthorNameClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageAuthorNameClicked(this, message, j); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageBlockedGroupClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageBlockedGroupClicked(this, modelMessage); + public void onMessageBlockedGroupClicked(Message message) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onMessageBlockedGroupClicked(this, message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageClicked(ModelMessage modelMessage, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); - StoreStream.Companion.getMessagesLoader().jumpToMessage(modelMessage.getChannelId(), modelMessage.getId()); + public void onMessageClicked(Message message, boolean z2) { + m.checkNotNullParameter(message, "message"); + StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r()); l.c(this.this$0.requireContext(), false, null, 6); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageLongClicked(ModelMessage modelMessage, CharSequence charSequence, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); + public void onMessageLongClicked(Message message, CharSequence charSequence, boolean z2) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(charSequence, "formattedMessage"); WidgetChatListActions.Companion companion = WidgetChatListActions.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - companion.showForPin(parentFragmentManager, modelMessage.getChannelId(), modelMessage.getId(), charSequence); + companion.showForPin(parentFragmentManager, message.i(), message.r(), charSequence); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -108,9 +108,9 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onOpenPinsClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onOpenPinsClicked(this, modelMessage); + public void onOpenPinsClicked(Message message) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onOpenPinsClicked(this, message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -144,10 +144,10 @@ public final class WidgetChannelPinnedMessages$onViewBound$1 implements WidgetCh } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onStickerClicked(ModelMessage modelMessage, BaseSticker baseSticker) { - m.checkNotNullParameter(modelMessage, "message"); + public void onStickerClicked(Message message, BaseSticker baseSticker) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(baseSticker, "sticker"); - StoreStream.Companion.getMessagesLoader().jumpToMessage(modelMessage.getChannelId(), modelMessage.getId()); + StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r()); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler diff --git a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java index 62e0ac6e88..402681c56e 100644 --- a/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java +++ b/app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java @@ -343,7 +343,7 @@ public final class WidgetChannelPinnedMessages extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131891856); + setActionBarTitle(2131891893); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; RecyclerView recyclerView = getBinding().b; m.checkNotNullExpressionValue(recyclerView, "binding.channelPinnedMessagesRecycler"); diff --git a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java index 86721ad001..55c9f11e27 100644 --- a/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java +++ b/app/src/main/java/com/discord/widgets/client/WidgetClientOutdated.java @@ -35,7 +35,7 @@ public final class WidgetClientOutdated extends AppFragment { } public WidgetClientOutdated() { - super(2131558974); + super(2131558975); } private final WidgetClientOutdatedBinding getBinding() { diff --git a/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java b/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java index e0cc1bf026..9f342d90dc 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/AddFriendsFailed.java @@ -58,14 +58,14 @@ public final class AddFriendsFailed extends AppDialog { super.onViewBound(view); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader"); - textView.setText(b.j(this, 2131888789, new Object[0], null, 4)); + textView.setText(b.j(this, 2131888799, new Object[0], null, 4)); TextView textView2 = getBinding().e; m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText"); - textView2.setText(b.j(this, 2131888787, new Object[0], null, 4)); - MaterialButton materialButton = getBinding().f1647c; + textView2.setText(b.j(this, 2131888797, new Object[0], null, 4)); + MaterialButton materialButton = getBinding().f1649c; m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm"); - materialButton.setText(b.j(this, 2131891633, new Object[0], null, 4)); - getBinding().f1647c.setOnClickListener(new AddFriendsFailed$onViewBound$1(this)); + materialButton.setText(b.j(this, 2131891666, new Object[0], null, 4)); + getBinding().f1649c.setOnClickListener(new AddFriendsFailed$onViewBound$1(this)); MaterialButton materialButton2 = getBinding().b; m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationCancel"); materialButton2.setVisibility(8); diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java index e2e48918c8..da710f716d 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncFriendSuggestionListAdapter.java @@ -40,21 +40,21 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap super(2131558793, contactSyncFriendSuggestionListAdapter); m.checkNotNullParameter(contactSyncFriendSuggestionListAdapter, "adapter"); View view = this.itemView; - int i = 2131363226; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363226); + int i = 2131363228; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363228); if (simpleDraweeView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131363228; - TextView textView = (TextView) view.findViewById(2131363228); + i = 2131363230; + TextView textView = (TextView) view.findViewById(2131363230); if (textView != null) { - i = 2131363229; - TextView textView2 = (TextView) view.findViewById(2131363229); + i = 2131363231; + TextView textView2 = (TextView) view.findViewById(2131363231); if (textView2 != null) { - i = 2131363230; - TextView textView3 = (TextView) view.findViewById(2131363230); + i = 2131363232; + TextView textView3 = (TextView) view.findViewById(2131363232); if (textView3 != null) { - i = 2131363231; - MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131363231); + i = 2131363233; + MaterialCheckBox materialCheckBox = (MaterialCheckBox) view.findViewById(2131363233); if (materialCheckBox != null) { ViewSelectableFriendSuggestionBinding viewSelectableFriendSuggestionBinding = new ViewSelectableFriendSuggestionBinding(constraintLayout, simpleDraweeView, constraintLayout, textView, textView2, textView3, materialCheckBox); m.checkNotNullExpressionValue(viewSelectableFriendSuggestionBinding, "ViewSelectableFriendSugg…ionBinding.bind(itemView)"); @@ -81,10 +81,10 @@ public final class ContactSyncFriendSuggestionListAdapter extends MGRecyclerAdap WidgetContactSyncViewModel.Item.FriendSuggestionItem friendSuggestionItem = (WidgetContactSyncViewModel.Item.FriendSuggestionItem) item; FriendSuggestion suggestion = friendSuggestionItem.getSuggestion(); User b = suggestion.b(); - ConstraintLayout constraintLayout = this.binding.f1657c; + ConstraintLayout constraintLayout = this.binding.f1659c; m.checkNotNullExpressionValue(constraintLayout, "binding.friendSuggestionContainer"); int paddingLeft = constraintLayout.getPaddingLeft(); - ConstraintLayout constraintLayout2 = this.binding.f1657c; + ConstraintLayout constraintLayout2 = this.binding.f1659c; m.checkNotNullExpressionValue(constraintLayout2, "binding.friendSuggestionContainer"); int i2 = 0; constraintLayout.setPadding(paddingLeft, 0, constraintLayout2.getPaddingRight(), ContactSyncFriendSuggestionListAdapter.access$getSpacing$p((ContactSyncFriendSuggestionListAdapter) this.adapter)); diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java index 4d939b7717..c921cb5acb 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncPermissionsSheet.java @@ -66,15 +66,15 @@ public final class ContactSyncPermissionsSheet extends AppBottomSheet { CheckedSetting checkedSetting2 = getBinding().e; m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncPermissionsPhoneToggle"); checkedSetting2.setChecked(viewState.getAllowPhone()); - CheckedSetting checkedSetting3 = getBinding().f1601c; + CheckedSetting checkedSetting3 = getBinding().f1603c; m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncPermissionsEmailToggle"); checkedSetting3.setChecked(viewState.getAllowEmail()); LinkifiedTextView linkifiedTextView = getBinding().d; m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncPermissionsLearnMore"); - b.m(linkifiedTextView, 2131887574, new Object[0], new ContactSyncPermissionsSheet$configureUI$1(this)); + b.m(linkifiedTextView, 2131887576, new Object[0], new ContactSyncPermissionsSheet$configureUI$1(this)); getBinding().b.e(new ContactSyncPermissionsSheet$configureUI$2(this, z2)); getBinding().e.e(new ContactSyncPermissionsSheet$configureUI$3(this, viewState)); - getBinding().f1601c.e(new ContactSyncPermissionsSheet$configureUI$4(this, viewState)); + getBinding().f1603c.e(new ContactSyncPermissionsSheet$configureUI$4(this, viewState)); } private final ContactSyncPermissionsSheetBinding getBinding() { diff --git a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java index 2003af724a..1a16f07f09 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/ContactSyncUpsellSheet.java @@ -69,8 +69,8 @@ public final class ContactSyncUpsellSheet extends AppBottomSheet { getBinding().d.f93c.e(new ContactSyncUpsellSheet$configureUI$1(this, z2)); LinkifiedTextView linkifiedTextView = getBinding().d.b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.contactSyncUpsel…contactSyncDiscoveryInfo2"); - b.m(linkifiedTextView, 2131887574, new Object[0], new ContactSyncUpsellSheet$configureUI$2(this)); - getBinding().f1602c.setOnClickListener(new ContactSyncUpsellSheet$configureUI$3(this)); + b.m(linkifiedTextView, 2131887576, new Object[0], new ContactSyncUpsellSheet$configureUI$2(this)); + getBinding().f1604c.setOnClickListener(new ContactSyncUpsellSheet$configureUI$3(this)); getBinding().b.setOnClickListener(new ContactSyncUpsellSheet$configureUI$4(this, viewState)); } diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java index bf8e726311..58dccd99e0 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$1.java @@ -14,7 +14,7 @@ public final class WidgetContactSync$configureToolbar$1 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363877) { + if (menuItem.getItemId() == 2131363879) { WidgetContactSync.access$getViewModel$p(this.this$0).skip(); } } diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java index cd212fc915..3584b0e7f9 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSync$configureToolbar$2.java @@ -14,7 +14,7 @@ public final class WidgetContactSync$configureToolbar$2 implements Action1 implements Action2 implements Action1 { } public final void call(Menu menu) { - MenuItem findItem = menu.findItem(2131363882); + MenuItem findItem = menu.findItem(2131363884); m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_debugging_filter)"); findItem.setChecked(this.$model.isFiltered()); } diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java index 1d04f3ae91..9406f27aaf 100644 --- a/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java +++ b/app/src/main/java/com/discord/widgets/debugging/WidgetDebugging.java @@ -90,14 +90,14 @@ public final class WidgetDebugging extends AppFragment { super(i, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131363768); + TextView textView = (TextView) view.findViewById(2131363771); if (textView != null) { WidgetDebuggingAdapterItemBinding widgetDebuggingAdapterItemBinding = new WidgetDebuggingAdapterItemBinding((LinearLayout) view, textView); m.checkNotNullExpressionValue(widgetDebuggingAdapterItemBinding, "WidgetDebuggingAdapterItemBinding.bind(itemView)"); this.binding = widgetDebuggingAdapterItemBinding; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363768))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363771))); } public static final /* synthetic */ WidgetDebuggingAdapterItemBinding access$getBinding$p(Item item) { @@ -163,7 +163,7 @@ public final class WidgetDebugging extends AppFragment { public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 0) { - return new Item(2131558983, this); + return new Item(2131558984, this); } throw invalidViewTypeException(i); } @@ -261,7 +261,7 @@ public final class WidgetDebugging extends AppFragment { } public WidgetDebugging() { - super(2131558982); + super(2131558983); } public static final /* synthetic */ void access$configureUI(WidgetDebugging widgetDebugging, Model model) { @@ -300,7 +300,7 @@ public final class WidgetDebugging extends AppFragment { linearLayoutManager.setReverseLayout(true); linearLayoutManager.setSmoothScrollbarEnabled(true); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131888045); + setActionBarTitle(2131888046); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java index cb70afa5a0..d17513541c 100644 --- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java +++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash$binding$2.java @@ -19,26 +19,26 @@ public final /* synthetic */ class WidgetFatalCrash$binding$2 extends k implemen public final WidgetFatalCrashBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363160; - TextView textView = (TextView) view.findViewById(2131363160); + int i = 2131363162; + TextView textView = (TextView) view.findViewById(2131363162); if (textView != null) { - i = 2131363161; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363161); + i = 2131363163; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363163); if (linearLayout != null) { - i = 2131363162; - TextView textView2 = (TextView) view.findViewById(2131363162); + i = 2131363164; + TextView textView2 = (TextView) view.findViewById(2131363164); if (textView2 != null) { - i = 2131363163; - TextView textView3 = (TextView) view.findViewById(2131363163); + i = 2131363165; + TextView textView3 = (TextView) view.findViewById(2131363165); if (textView3 != null) { - i = 2131363164; - TextView textView4 = (TextView) view.findViewById(2131363164); + i = 2131363166; + TextView textView4 = (TextView) view.findViewById(2131363166); if (textView4 != null) { - i = 2131363165; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363165); + i = 2131363167; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363167); if (linkifiedTextView != null) { - i = 2131363166; - TextView textView5 = (TextView) view.findViewById(2131363166); + i = 2131363168; + TextView textView5 = (TextView) view.findViewById(2131363168); if (textView5 != null) { return new WidgetFatalCrashBinding((ScrollView) view, textView, linearLayout, textView2, textView3, textView4, linkifiedTextView, textView5); } diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java index f8b1f65e4e..ae636fa19f 100644 --- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java +++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java @@ -67,7 +67,7 @@ public final class WidgetFatalCrash extends AppFragment { } public WidgetFatalCrash() { - super(2131559000); + super(2131559001); } private final WidgetFatalCrashBinding getBinding() { @@ -86,26 +86,26 @@ public final class WidgetFatalCrash extends AppFragment { super.onViewBound(view); LinkifiedTextView linkifiedTextView = getBinding().f; m.checkNotNullExpressionValue(linkifiedTextView, "binding.fatalCrashTestersInvite"); - linkifiedTextView.setText(b.j(this, 2131887890, new Object[]{"https://discord.gg/discord-testers"}, null, 4)); + linkifiedTextView.setText(b.j(this, 2131887892, new Object[]{"https://discord.gg/discord-testers"}, null, 4)); Bundle extras = getMostRecentIntent().getExtras(); TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.fatalCrashSource"); Object[] objArr = new Object[1]; - objArr[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_SOURCE", getString(2131893474)) : null; - textView.setText(b.j(this, 2131887889, objArr, null, 4)); + objArr[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_SOURCE", getString(2131893514)) : null; + textView.setText(b.j(this, 2131887891, objArr, null, 4)); TextView textView2 = getBinding().g; m.checkNotNullExpressionValue(textView2, "binding.fatalCrashTime"); Object[] objArr2 = new Object[1]; objArr2[0] = extras != null ? extras.getString("INTENT_EXTRA_CRASH_TIME") : null; - textView2.setText(b.j(this, 2131887891, objArr2, null, 4)); + textView2.setText(b.j(this, 2131887893, objArr2, null, 4)); TextView textView3 = getBinding().b; m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion"); - textView3.setText(b.j(this, 2131887884, new Object[]{"80.11 - Stable"}, null, 4)); + textView3.setText(b.j(this, 2131887886, new Object[]{"81.14 - Stable"}, null, 4)); TextView textView4 = getBinding().d; m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion"); - textView4.setText(b.j(this, 2131887887, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4)); - TextView textView5 = getBinding().f1773c; + textView4.setText(b.j(this, 2131887889, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4)); + TextView textView5 = getBinding().f1775c; m.checkNotNullExpressionValue(textView5, "binding.fatalCrashDevice"); - textView5.setText(b.j(this, 2131887886, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4)); + textView5.setText(b.j(this, 2131887888, new Object[]{Build.MODEL + ' ' + Build.PRODUCT}, null, 4)); } } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java new file mode 100644 index 0000000000..3d10dc6d6b --- /dev/null +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel$Companion$observeStores$1.java @@ -0,0 +1,35 @@ +package com.discord.widgets.directories; + +import com.discord.api.channel.Channel; +import com.discord.api.directory.DirectoryEntry; +import com.discord.stores.StoreChannelsSelected; +import com.discord.stores.StoreDirectories; +import com.discord.stores.utilities.Default; +import com.discord.stores.utilities.RestCallState; +import com.discord.widgets.directories.WidgetDirectoriesViewModel; +import d0.z.d.o; +import java.util.List; +import kotlin.jvm.functions.Function0; +/* compiled from: WidgetDirectoriesViewModel.kt */ +public final class WidgetDirectoriesViewModel$Companion$observeStores$1 extends o implements Function0 { + public final /* synthetic */ StoreChannelsSelected $channelsSelectedStore; + public final /* synthetic */ StoreDirectories $directoriesStore; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetDirectoriesViewModel$Companion$observeStores$1(StoreChannelsSelected storeChannelsSelected, StoreDirectories storeDirectories) { + super(0); + this.$channelsSelectedStore = storeChannelsSelected; + this.$directoriesStore = storeDirectories; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final WidgetDirectoriesViewModel.StoreState mo1invoke() { + RestCallState> restCallState; + Channel selectedChannel = this.$channelsSelectedStore.getSelectedChannel(); + if (selectedChannel == null || (restCallState = this.$directoriesStore.getDirectoriesForChannel(selectedChannel.g())) == null) { + restCallState = Default.INSTANCE; + } + return new WidgetDirectoriesViewModel.StoreState(selectedChannel, restCallState); + } +} diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java new file mode 100644 index 0000000000..c0f9f4a631 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoriesViewModel.java @@ -0,0 +1,241 @@ +package com.discord.widgets.directories; + +import android.content.Context; +import c.d.b.a.a; +import com.discord.api.channel.Channel; +import com.discord.api.directory.DirectoryEntry; +import com.discord.app.AppViewModel; +import com.discord.stores.StoreChannelsSelected; +import com.discord.stores.StoreDirectories; +import com.discord.stores.StoreStream; +import com.discord.stores.updates.ObservationDeck; +import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.stores.utilities.Failure; +import com.discord.stores.utilities.RestCallState; +import com.discord.stores.utilities.Success; +import com.discord.utilities.error.Error; +import com.discord.utilities.rx.ObservableExtensionsKt; +import d0.t.n; +import d0.z.d.k; +import d0.z.d.m; +import java.util.List; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +import kotlin.jvm.internal.DefaultConstructorMarker; +import rx.Observable; +/* compiled from: WidgetDirectoriesViewModel.kt */ +public final class WidgetDirectoriesViewModel extends AppViewModel { + public static final Companion Companion = new Companion(null); + + /* compiled from: WidgetDirectoriesViewModel.kt */ + /* renamed from: com.discord.widgets.directories.WidgetDirectoriesViewModel$1 reason: invalid class name */ + public static final /* synthetic */ class AnonymousClass1 extends k implements Function1 { + public AnonymousClass1(WidgetDirectoriesViewModel widgetDirectoriesViewModel) { + super(1, widgetDirectoriesViewModel, WidgetDirectoriesViewModel.class, "handleStoreState", "handleStoreState(Lcom/discord/widgets/directories/WidgetDirectoriesViewModel$StoreState;)V", 0); + } + + /* 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(StoreState storeState) { + invoke(storeState); + return Unit.a; + } + + public final void invoke(StoreState storeState) { + m.checkNotNullParameter(storeState, "p1"); + ((WidgetDirectoriesViewModel) this.receiver).handleStoreState(storeState); + } + } + + /* compiled from: WidgetDirectoriesViewModel.kt */ + public static final class Companion { + private Companion() { + } + + public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + + public static final /* synthetic */ Observable access$observeStores(Companion companion, ObservationDeck observationDeck, StoreChannelsSelected storeChannelsSelected, StoreDirectories storeDirectories) { + return companion.observeStores(observationDeck, storeChannelsSelected, storeDirectories); + } + + private final Observable observeStores(ObservationDeck observationDeck, StoreChannelsSelected storeChannelsSelected, StoreDirectories storeDirectories) { + return ObservationDeck.connectRx$default(observationDeck, new ObservationDeck.UpdateSource[]{storeDirectories, storeChannelsSelected}, false, null, null, new WidgetDirectoriesViewModel$Companion$observeStores$1(storeChannelsSelected, storeDirectories), 14, null); + } + } + + /* compiled from: WidgetDirectoriesViewModel.kt */ + public static final class StoreState { + private final Channel channel; + private final RestCallState> directories; + + /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.stores.utilities.RestCallState> */ + /* JADX WARN: Multi-variable type inference failed */ + public StoreState(Channel channel, RestCallState> restCallState) { + m.checkNotNullParameter(restCallState, "directories"); + this.channel = channel; + this.directories = restCallState; + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.directories.WidgetDirectoriesViewModel$StoreState */ + /* JADX WARN: Multi-variable type inference failed */ + public static /* synthetic */ StoreState copy$default(StoreState storeState, Channel channel, RestCallState restCallState, int i, Object obj) { + if ((i & 1) != 0) { + channel = storeState.channel; + } + if ((i & 2) != 0) { + restCallState = storeState.directories; + } + return storeState.copy(channel, restCallState); + } + + public final Channel component1() { + return this.channel; + } + + public final RestCallState> component2() { + return this.directories; + } + + public final StoreState copy(Channel channel, RestCallState> restCallState) { + m.checkNotNullParameter(restCallState, "directories"); + return new StoreState(channel, restCallState); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof StoreState)) { + return false; + } + StoreState storeState = (StoreState) obj; + return m.areEqual(this.channel, storeState.channel) && m.areEqual(this.directories, storeState.directories); + } + + public final Channel getChannel() { + return this.channel; + } + + public final RestCallState> getDirectories() { + return this.directories; + } + + public int hashCode() { + Channel channel = this.channel; + int i = 0; + int hashCode = (channel != null ? channel.hashCode() : 0) * 31; + RestCallState> restCallState = this.directories; + if (restCallState != null) { + i = restCallState.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder L = a.L("StoreState(channel="); + L.append(this.channel); + L.append(", directories="); + L.append(this.directories); + L.append(")"); + return L.toString(); + } + } + + /* compiled from: WidgetDirectoriesViewModel.kt */ + public static abstract class ViewState { + private final List directories; + + /* compiled from: WidgetDirectoriesViewModel.kt */ + public static final class Empty extends ViewState { + public static final Empty INSTANCE = new Empty(); + + private Empty() { + super(null, 1, null); + } + } + + /* compiled from: WidgetDirectoriesViewModel.kt */ + public static final class Failure extends ViewState { + private final Error error; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public Failure(Error error) { + super(n.emptyList(), null); + m.checkNotNullParameter(error, "error"); + this.error = error; + } + + public final Error getError() { + return this.error; + } + } + + /* compiled from: WidgetDirectoriesViewModel.kt */ + public static final class Loaded extends ViewState { + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public Loaded(List list) { + super(list, null); + m.checkNotNullParameter(list, "directories"); + } + } + + private ViewState(List list) { + this.directories = list; + } + + /* JADX INFO: this call moved to the top of the method (can break code semantics) */ + public /* synthetic */ ViewState(List list, int i, DefaultConstructorMarker defaultConstructorMarker) { + this((i & 1) != 0 ? n.emptyList() : list); + } + + public /* synthetic */ ViewState(List list, DefaultConstructorMarker defaultConstructorMarker) { + this(list); + } + + public final List getDirectories() { + return this.directories; + } + } + + public WidgetDirectoriesViewModel() { + this(null, 1, null); + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetDirectoriesViewModel(Observable observable) { + super(ViewState.Empty.INSTANCE); + m.checkNotNullParameter(observable, "storeObservable"); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(observable), this, null, 2, null), WidgetDirectoriesViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this), 62, (Object) null); + } + + /* JADX WARNING: Illegal instructions before constructor call */ + public /* synthetic */ WidgetDirectoriesViewModel(Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(observable); + if ((i & 1) != 0) { + Companion companion = Companion; + ObservationDeck observationDeck = ObservationDeckProvider.get(); + StoreStream.Companion companion2 = StoreStream.Companion; + observable = Companion.access$observeStores(companion, observationDeck, companion2.getChannelsSelected(), companion2.getDirectories()); + } + } + + public final void handleStoreState(StoreState storeState) { + m.checkNotNullParameter(storeState, "state"); + RestCallState> directories = storeState.getDirectories(); + if (directories instanceof Success) { + List invoke = storeState.getDirectories().invoke(); + if (invoke == null) { + invoke = n.emptyList(); + } + updateViewState(new ViewState.Loaded(invoke)); + } else if (directories instanceof Failure) { + updateViewState(new ViewState.Failure(((Failure) storeState.getDirectories()).getError())); + } else { + updateViewState(ViewState.Empty.INSTANCE); + } + } +} diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java index bbbebaf52e..063a243371 100644 --- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet$binding$2.java @@ -27,51 +27,51 @@ public final /* synthetic */ class WidgetEmojiSheet$binding$2 extends k implemen i = 2131362185; FrameLayout frameLayout = (FrameLayout) view.findViewById(2131362185); if (frameLayout != null) { - i = 2131362937; - View findViewById = view.findViewById(2131362937); + i = 2131362939; + View findViewById = view.findViewById(2131362939); if (findViewById != null) { - i = 2131363006; - TextView textView2 = (TextView) view.findViewById(2131363006); + i = 2131363008; + TextView textView2 = (TextView) view.findViewById(2131363008); if (textView2 != null) { - i = 2131363009; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363009); + i = 2131363011; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363011); if (simpleDraweeView != null) { AppViewFlipper appViewFlipper = (AppViewFlipper) view; - i = 2131363167; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363167); + i = 2131363169; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363169); if (materialButton != null) { - i = 2131363168; - FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363168); + i = 2131363170; + FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363170); if (frameLayout2 != null) { - i = 2131363169; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363169); + i = 2131363171; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363171); if (materialButton2 != null) { - i = 2131363338; - TextView textView3 = (TextView) view.findViewById(2131363338); + i = 2131363340; + TextView textView3 = (TextView) view.findViewById(2131363340); if (textView3 != null) { - i = 2131363339; - FrameLayout frameLayout3 = (FrameLayout) view.findViewById(2131363339); + i = 2131363341; + FrameLayout frameLayout3 = (FrameLayout) view.findViewById(2131363341); if (frameLayout3 != null) { - i = 2131363343; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363343); + i = 2131363345; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363345); if (linearLayout != null) { - i = 2131363362; - TextView textView4 = (TextView) view.findViewById(2131363362); + i = 2131363364; + TextView textView4 = (TextView) view.findViewById(2131363364); if (textView4 != null) { - i = 2131363386; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363386); + i = 2131363388; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363388); if (simpleDraweeView2 != null) { - i = 2131363393; - TextView textView5 = (TextView) view.findViewById(2131363393); + i = 2131363395; + TextView textView5 = (TextView) view.findViewById(2131363395); if (textView5 != null) { - i = 2131363717; - MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363717); + i = 2131363720; + MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363720); if (materialButton3 != null) { - i = 2131363993; - TextView textView6 = (TextView) view.findViewById(2131363993); + i = 2131363995; + TextView textView6 = (TextView) view.findViewById(2131363995); if (textView6 != null) { - i = 2131364245; - MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364245); + i = 2131364247; + MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131364247); if (materialButton4 != null) { return new WidgetEmojiSheetBinding(appViewFlipper, textView, frameLayout, findViewById, textView2, simpleDraweeView, appViewFlipper, materialButton, frameLayout2, materialButton2, textView3, frameLayout3, linearLayout, textView4, simpleDraweeView2, textView5, materialButton3, textView6, materialButton4); } diff --git a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java index 5585967898..269286006b 100644 --- a/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java +++ b/app/src/main/java/com/discord/widgets/emoji/WidgetEmojiSheet.java @@ -195,7 +195,7 @@ public final class WidgetEmojiSheet extends AppBottomSheet { TextView textView = binding2.p; m.checkNotNullExpressionValue(textView, "nameTv"); textView.setText(':' + emojiCustom2.getName() + ':'); - TextView textView2 = binding2.f1768c; + TextView textView2 = binding2.f1770c; m.checkNotNullExpressionValue(textView2, "emojiInfoTv"); textView2.setText(getString(getCustomEmojiInfoText(isCurrentGuild, isUserInGuild, isPublic, isUserPremium))); configureButtons(isUserPremium, isUserInGuild, known != null ? known.getGuild() : null); @@ -247,19 +247,19 @@ public final class WidgetEmojiSheet extends AppBottomSheet { m.checkNotNullExpressionValue(textView, "guildAvatarText"); textView.setText(guild.getShortName()); } - int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231809 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232034 : 0; + int i = guild.getFeatures().contains(GuildFeature.PARTNERED) ? 2131231812 : guild.getFeatures().contains(GuildFeature.VERIFIED) ? 2131232037 : 0; TextView textView2 = binding.n; m.checkNotNullExpressionValue(textView2, "guildNameTv"); DrawableCompat.setCompoundDrawablesCompat(textView2, i, 0, 0, 0); TextView textView3 = binding.n; m.checkNotNullExpressionValue(textView3, "guildNameTv"); textView3.setText(guild.getName()); - int i2 = z3 ? 2131888297 : 2131888296; + int i2 = z3 ? 2131888307 : 2131888306; String str = null; CharSequence j = b.j(this, i2, new Object[0], null, 4); if (num != null) { String format = NumberFormat.getNumberInstance(new LocaleManager().getPrimaryLocale(requireContext())).format(Integer.valueOf(num.intValue())); - str = b.j(this, 2131890339, new Object[]{format}, null, 4).toString() + " • "; + str = b.j(this, 2131890369, new Object[]{format}, null, 4).toString() + " • "; } if (str == null) { str = ""; @@ -277,9 +277,9 @@ public final class WidgetEmojiSheet extends AppBottomSheet { TextView textView = binding.p; m.checkNotNullExpressionValue(textView, "nameTv"); textView.setText(':' + emojiUnicode.getEmojiUnicode().getFirstName() + ':'); - TextView textView2 = binding.f1768c; + TextView textView2 = binding.f1770c; m.checkNotNullExpressionValue(textView2, "emojiInfoTv"); - textView2.setText(getString(2131888300)); + textView2.setText(getString(2131888310)); FrameLayout frameLayout = binding.b; m.checkNotNullExpressionValue(frameLayout, "buttonContainer"); frameLayout.setVisibility(8); @@ -298,21 +298,21 @@ public final class WidgetEmojiSheet extends AppBottomSheet { private final int getCustomEmojiInfoText(boolean z2, boolean z3, boolean z4, boolean z5) { if (z2 && !z5) { - return 2131888288; + return 2131888298; } if (z2 && z5) { - return 2131888292; + return 2131888302; } if (z3 && !z5) { - return 2131888289; + return 2131888299; } if (z3 && z5) { - return 2131888293; + return 2131888303; } if (!z4 || z5) { - return (!z4 || !z5) ? 2131888295 : 2131888294; + return (!z4 || !z5) ? 2131888305 : 2131888304; } - return 2131888301; + return 2131888311; } private final EmojiNode.EmojiIdAndType getEmojiIdAndType() { @@ -341,6 +341,6 @@ public final class WidgetEmojiSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131558993; + return 2131558994; } } diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java index e1f4c3d063..005a41ab22 100644 --- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$binding$2.java @@ -19,15 +19,15 @@ public final /* synthetic */ class WidgetFeedbackSheet$binding$2 extends k imple public final WidgetFeedbackSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363178; - ImageView imageView = (ImageView) view.findViewById(2131363178); + int i = 2131363180; + ImageView imageView = (ImageView) view.findViewById(2131363180); if (imageView != null) { NestedScrollView nestedScrollView = (NestedScrollView) view; - i = 2131363180; - FeedbackView feedbackView = (FeedbackView) view.findViewById(2131363180); + i = 2131363182; + FeedbackView feedbackView = (FeedbackView) view.findViewById(2131363182); if (feedbackView != null) { - i = 2131363181; - TextView textView = (TextView) view.findViewById(2131363181); + i = 2131363183; + TextView textView = (TextView) view.findViewById(2131363183); if (textView != null) { return new WidgetFeedbackSheetBinding(nestedScrollView, imageView, nestedScrollView, feedbackView, textView); } diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java index 80236dc75f..12197e8e16 100644 --- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java +++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.java @@ -22,7 +22,7 @@ public final class WidgetFeedbackSheet$handleEvent$1 extends o implements Functi } public final void invoke(Long l) { - c.a.d.o.i(this.this$0, 2131887115, 0, 4); + c.a.d.o.i(this.this$0, 2131887116, 0, 4); this.this$0.requireDialog().cancel(); } } diff --git a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java index 090fadecbc..572f495fc4 100644 --- a/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java +++ b/app/src/main/java/com/discord/widgets/feedback/WidgetFeedbackSheet.java @@ -187,7 +187,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet { } if (z2) { if (viewState.getShowFaceRatings()) { - NestedScrollView nestedScrollView = getBinding().f1774c; + NestedScrollView nestedScrollView = getBinding().f1776c; m.checkNotNullExpressionValue(nestedScrollView, "binding.feedbackSheetContainer"); updatePeekHeightPx(nestedScrollView.getMeasuredHeight()); } @@ -221,7 +221,7 @@ public final class WidgetFeedbackSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559001; + return 2131559002; } public final Function0 getOnDismissed() { diff --git a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java index 0bdebdb1a2..87162db91a 100644 --- a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java +++ b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateContactSyncView.java @@ -55,8 +55,8 @@ public final class EmptyFriendsStateContactSyncView extends ConstraintLayout { this.binding.d.setTextSize(2, 18.0f); TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.csSubtitle"); - b.n(textView, 2131887557, new Object[0], null, 4); + b.n(textView, 2131887559, new Object[0], null, 4); } - this.binding.f1605c.setOnClickListener(EmptyFriendsStateContactSyncView$updateView$1.INSTANCE); + this.binding.f1607c.setOnClickListener(EmptyFriendsStateContactSyncView$updateView$1.INSTANCE); } } diff --git a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java index d53840a953..2a5c113c27 100644 --- a/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java +++ b/app/src/main/java/com/discord/widgets/friends/EmptyFriendsStateView.java @@ -57,7 +57,7 @@ public final class EmptyFriendsStateView extends ConstraintLayout { m.checkNotNullExpressionValue(obtainStyledAttributes, "context.obtainStyledAttr…le.EmptyFriendsStateView)"); int resourceId = obtainStyledAttributes.getResourceId(0, 2131165778); obtainStyledAttributes.recycle(); - this.binding.f1606c.setTextSize(0, getResources().getDimension(resourceId)); + this.binding.f1608c.setTextSize(0, getResources().getDimension(resourceId)); } public final void updateView(String str) { diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java index 06461a3015..3f38f9d128 100644 --- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java +++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$acceptFriendRequest$2.java @@ -50,7 +50,7 @@ public final class FriendsListViewModel$acceptFriendRequest$2 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Boolean mo1invoke() { - FriendsListViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888048); + FriendsListViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888049); return null; } } diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java index d165ad23bc..2a7f1222a0 100644 --- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java +++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$launchVoiceCall$2.java @@ -25,6 +25,6 @@ public final class FriendsListViewModel$launchVoiceCall$2 extends o implements F public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java index 8ae0a8c90b..b78131c0a4 100644 --- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java +++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel$removeFriendRequest$2.java @@ -25,6 +25,6 @@ public final class FriendsListViewModel$removeFriendRequest$2 extends o implemen public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + FriendsListViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java index 25cc619112..5ff7f68467 100644 --- a/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java +++ b/app/src/main/java/com/discord/widgets/friends/FriendsListViewModel.java @@ -1579,7 +1579,7 @@ public final class FriendsListViewModel extends AppViewModel { } } List list = u.toList(u.sortedWith(arrayList2, FriendsListViewModel$getItems$sortedPendingItems$1.INSTANCE)); - Item.PendingHeader pendingHeader = !list.isEmpty() ? new Item.PendingHeader(2131888822, list.size(), false, list.size() > 2) : null; + Item.PendingHeader pendingHeader = !list.isEmpty() ? new Item.PendingHeader(2131888832, list.size(), false, list.size() > 2) : null; ArrayList arrayList4 = new ArrayList(); ArrayList arrayList5 = new ArrayList(); for (Object obj : arrayList3) { @@ -1589,7 +1589,7 @@ public final class FriendsListViewModel extends AppViewModel { } List list2 = u.toList(u.sortedWith(arrayList5, FriendsListViewModel$getItems$onlineFriendItems$2.INSTANCE)); if (!list2.isEmpty()) { - arrayList4.add(new Item.Header(2131888818, list2.size())); + arrayList4.add(new Item.Header(2131888828, list2.size())); arrayList4.addAll(list2); } ArrayList arrayList6 = new ArrayList(); @@ -1600,7 +1600,7 @@ public final class FriendsListViewModel extends AppViewModel { } List list3 = u.toList(u.sortedWith(arrayList6, FriendsListViewModel$getItems$offlineFriendItems$2.INSTANCE)); if (true ^ list3.isEmpty()) { - arrayList4.add(new Item.Header(2131888817, list3.size())); + arrayList4.add(new Item.Header(2131888827, list3.size())); arrayList4.addAll(list3); } return new ListSections(suggestedFriendsHeader, arrayList, pendingHeader, list, arrayList4, z2 ? new Item.ContactSyncUpsell(false) : null); @@ -1720,6 +1720,6 @@ public final class FriendsListViewModel extends AppViewModel { } public final void removeFriendRequest(long j, int i) { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("Friends List", j), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$removeFriendRequest$2(this), (Function0) null, (Function0) null, new FriendsListViewModel$removeFriendRequest$1(this, i == 3 ? 2131888791 : 2131888786), 54, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("Friends List", j), false, 1, null), this, null, 2, null), FriendsListViewModel.class, (Context) null, (Function1) null, new FriendsListViewModel$removeFriendRequest$2(this), (Function0) null, (Function0) null, new FriendsListViewModel$removeFriendRequest$1(this, i == 3 ? 2131888801 : 2131888796), 54, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java b/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java index 8073d37574..939317321e 100644 --- a/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java +++ b/app/src/main/java/com/discord/widgets/friends/SuggestedFriendView.java @@ -32,20 +32,20 @@ public final class SuggestedFriendView extends ConstraintLayout { super(context, attributeSet, i); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558675, this); - int i2 = 2131365131; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365131); + int i2 = 2131365135; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131365135); if (simpleDraweeView != null) { - i2 = 2131365132; - AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById(2131365132); + i2 = 2131365136; + AppCompatImageView appCompatImageView = (AppCompatImageView) findViewById(2131365136); if (appCompatImageView != null) { - i2 = 2131365133; - TextView textView = (TextView) findViewById(2131365133); + i2 = 2131365137; + TextView textView = (TextView) findViewById(2131365137); if (textView != null) { - i2 = 2131365134; - AppCompatImageView appCompatImageView2 = (AppCompatImageView) findViewById(2131365134); + i2 = 2131365138; + AppCompatImageView appCompatImageView2 = (AppCompatImageView) findViewById(2131365138); if (appCompatImageView2 != null) { - i2 = 2131365135; - TextView textView2 = (TextView) findViewById(2131365135); + i2 = 2131365139; + TextView textView2 = (TextView) findViewById(2131365139); if (textView2 != null) { SuggestedFriendViewBinding suggestedFriendViewBinding = new SuggestedFriendViewBinding(this, simpleDraweeView, appCompatImageView, textView, appCompatImageView2, textView2); m.checkNotNullExpressionValue(suggestedFriendViewBinding, "SuggestedFriendViewBindi…ater.from(context), this)"); @@ -76,7 +76,7 @@ public final class SuggestedFriendView extends ConstraintLayout { public final void setOnDeclineClicked(Function0 function0) { m.checkNotNullParameter(function0, "onDeclineClicked"); - this.binding.f1631c.setOnClickListener(new SuggestedFriendView$setOnDeclineClicked$1(function0)); + this.binding.f1633c.setOnClickListener(new SuggestedFriendView$setOnDeclineClicked$1(function0)); } public final void setOnSendClicked(Function0 function0) { diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java index 03a01a4e54..fcbfb3301b 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAdd.java @@ -53,7 +53,7 @@ public final class WidgetFriendsAdd extends AppFragment { } public WidgetFriendsAdd() { - super(2131559003); + super(2131559004); } private final WidgetFriendsAddBinding getBinding() { @@ -73,14 +73,14 @@ public final class WidgetFriendsAdd extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131888832); + setActionBarTitle(2131888842); SimplePager simplePager = getBinding().b; m.checkNotNullExpressionValue(simplePager, "binding.addFriendViewPager"); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - String string = getString(2131894358); + String string = getString(2131894405); m.checkNotNullExpressionValue(string, "getString(R.string.username)"); - String string2 = getString(2131891283); + String string2 = getString(2131891316); m.checkNotNullExpressionValue(string2, "getString(R.string.nearby_scan)"); simplePager.setAdapter(new SimplePager.Adapter(parentFragmentManager, new SimplePager.Adapter.Item(string, WidgetFriendsAdd$onViewBound$1.INSTANCE), new SimplePager.Adapter.Item(string2, WidgetFriendsAdd$onViewBound$2.INSTANCE))); } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java index d683d20156..2118a21200 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById$binding$2.java @@ -20,17 +20,17 @@ public final /* synthetic */ class WidgetFriendsAddById$binding$2 extends k impl public final WidgetFriendsAddByIdBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363224; - TextView textView = (TextView) view.findViewById(2131363224); + int i = 2131363226; + TextView textView = (TextView) view.findViewById(2131363226); if (textView != null) { - i = 2131363232; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363232); + i = 2131363234; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363234); if (linearLayout != null) { - i = 2131363233; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363233); + i = 2131363235; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363235); if (materialButton != null) { - i = 2131363234; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363234); + i = 2131363236; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363236); if (textInputLayout != null) { return new WidgetFriendsAddByIdBinding((NestedScrollView) view, textView, linearLayout, materialButton, textInputLayout); } diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java index a8c54f46eb..0b9952ee74 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddById.java @@ -134,7 +134,7 @@ public final class WidgetFriendsAddById extends AppFragment { } public WidgetFriendsAddById() { - super(2131559004); + super(2131559005); } public static final /* synthetic */ void access$extractTargetAndSendFriendRequest(WidgetFriendsAddById widgetFriendsAddById) { @@ -179,7 +179,7 @@ public final class WidgetFriendsAddById extends AppFragment { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); UserUtils userUtils = UserUtils.INSTANCE; - CharSequence h = b.h(resources, 2131893104, new Object[]{UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null)}, null, 4); + CharSequence h = b.h(resources, 2131893146, new Object[]{UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null)}, null, 4); SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(h); SpannableStringBuilder spannableStringBuilder2 = (SpannableStringBuilder) h; spannableStringBuilder.setSpan(new ForegroundColorSpan(ColorCompat.getThemedColor(requireContext(), 2130968932)), spannableStringBuilder2.length() - UserUtils.getUserNameWithDiscriminator$default(userUtils, user, null, null, 3, null).length(), spannableStringBuilder2.length(), 33); @@ -240,7 +240,7 @@ public final class WidgetFriendsAddById extends AppFragment { m.checkNotNullExpressionValue(textInputLayout2, "binding.friendsAddTextEditWrap"); String str = null; ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetFriendsAddById$onViewBound$3(this), 1, null); - getBinding().f1776c.setOnClickListener(new WidgetFriendsAddById$onViewBound$4(this)); + getBinding().f1778c.setOnClickListener(new WidgetFriendsAddById$onViewBound$4(this)); Bundle extras = getMostRecentIntent().getExtras(); if (extras != null) { str = extras.getString("android.intent.extra.TEXT"); diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java index b9c4975730..7db4cea63b 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsAddUserAdapter.java @@ -292,7 +292,7 @@ public final class WidgetFriendsAddUserAdapter extends MGRecyclerAdapterSimple implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case 2131363886: + case 2131363888: WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null); return; - case 2131363887: + case 2131363889: ContactSyncAnalytics.Companion.trackStart$default(ContactSyncAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null); AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null)); WidgetContactSync.Companion companion2 = WidgetContactSync.Companion; m.checkNotNullExpressionValue(context, "context"); WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null); return; - case 2131363888: + case 2131363890: if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) { GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java index b372beafb8..ab0f0c2b7c 100644 --- a/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java +++ b/app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$2.java @@ -12,7 +12,7 @@ public final class WidgetFriendsList$configureToolbar$2 implements Action1) m.shuffled(REASONS), FeedbackIssue.GUILD_DELETE_OTHER), 2131889182, null, 2131889181, 8, null)); + super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, u.plus((Collection) m.shuffled(REASONS), FeedbackIssue.GUILD_DELETE_OTHER), 2131889192, null, 2131889191, 8, null)); this.pendingFeedback = new PendingFeedback.GuildDeleteFeedback(j, null, null, 6, null); } diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java index 640c46395e..8a1b0e3db3 100644 --- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings$binding$2.java @@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetGuildFolderSettings$binding$2 extends k public final WidgetGuildFolderSettingsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362963; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362963); + int i = 2131362965; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362965); if (textInputLayout != null) { - i = 2131363358; - TextView textView = (TextView) view.findViewById(2131363358); + i = 2131363360; + TextView textView = (TextView) view.findViewById(2131363360); if (textView != null) { - i = 2131363359; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363359); + i = 2131363361; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363361); if (relativeLayout != null) { - i = 2131363360; - View findViewById = view.findViewById(2131363360); + i = 2131363362; + View findViewById = view.findViewById(2131363362); if (findViewById != null) { - i = 2131363361; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363361); + i = 2131363363; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363363); if (floatingActionButton != null) { return new WidgetGuildFolderSettingsBinding((CoordinatorLayout) view, textInputLayout, textView, relativeLayout, findViewById, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java index 320ff53081..4b436de8f2 100644 --- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java +++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettings.java @@ -70,7 +70,7 @@ public final class WidgetGuildFolderSettings extends AppFragment { } public WidgetGuildFolderSettings() { - super(2131559030); + super(2131559031); WidgetGuildFolderSettings$viewModel$2 widgetGuildFolderSettings$viewModel$2 = new WidgetGuildFolderSettings$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildFolderSettingsViewModel.class), new WidgetGuildFolderSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildFolderSettings$viewModel$2)); @@ -150,7 +150,7 @@ public final class WidgetGuildFolderSettings extends AppFragment { Selection.setSelection(text, ViewExtensions.getTextOrEmpty(textInputLayout5).length()); } } - TextView textView = getBinding().f1793c; + TextView textView = getBinding().f1795c; m.checkNotNullExpressionValue(textView, "binding.guildFolderColorName"); StringBuilder sb = new StringBuilder(); sb.append('#'); @@ -228,19 +228,19 @@ public final class WidgetGuildFolderSettings extends AppFragment { kVar.f1461s = ColorCompat.getThemedColor(getContext(), 2130968904); kVar.i = false; kVar.g = getColorsToDisplay(intValue); - kVar.a = 2131889230; + kVar.a = 2131889240; kVar.r = ColorCompat.getThemedColor(getContext(), 2130968932); FontUtils fontUtils = FontUtils.INSTANCE; kVar.f1462x = fontUtils.getThemedFontResId(getContext(), 2130969320); kVar.o = ColorCompat.getThemedColor(getContext(), 2130968892); - kVar.f1460c = 2131887415; - kVar.v = ColorCompat.getColor(getContext(), 2131100427); - kVar.b = 2131887416; + kVar.f1460c = 2131887417; + kVar.v = ColorCompat.getColor(getContext(), 2131100428); + kVar.b = 2131887418; kVar.p = ColorCompat.getThemedColor(getContext(), 2130968994); - kVar.d = 2131893090; + kVar.d = 2131893132; kVar.l = true; - kVar.e = 2131892599; - kVar.w = ColorCompat.getColor(getContext(), 2131100427); + kVar.e = 2131892641; + kVar.w = ColorCompat.getColor(getContext(), 2131100428); kVar.f1463y = fontUtils.getThemedFontResId(getContext(), 2130969326); kVar.q = ColorCompat.getThemedColor(getContext(), 2130968900); kVar.t = ColorCompat.getThemedColor(getContext(), 2130968988); @@ -264,7 +264,7 @@ public final class WidgetGuildFolderSettings extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131893131); + setActionBarTitle(2131893173); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java index d9212896ec..91f932652f 100644 --- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildFolderSettingsViewModel.java @@ -469,12 +469,12 @@ public final class WidgetGuildFolderSettingsViewModel extends AppViewModel publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.UpdateFolderSettingsFailure(2131888048)); + publishSubject.j.onNext(new Event.UpdateFolderSettingsFailure(2131888049)); } private final void emitUpdateSuccessEvent() { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.UpdateFolderSettingsSuccess(2131889235)); + publishSubject.j.onNext(new Event.UpdateFolderSettingsSuccess(2131889245)); } private final void handleStoreState(StoreState storeState) { diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java index 1f6b8faa92..1af7bd4b16 100644 --- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetGuildSelector$binding$2 extends k imple public final WidgetGuildSelectorBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363340; - TextView textView = (TextView) view.findViewById(2131363340); + int i = 2131363342; + TextView textView = (TextView) view.findViewById(2131363342); if (textView != null) { - i = 2131363445; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363445); + i = 2131363447; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363447); if (recyclerView != null) { return new WidgetGuildSelectorBinding((NestedScrollView) view, textView, recyclerView); } diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java index b67394dd01..b9a6bdc3cc 100644 --- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java +++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java @@ -74,17 +74,17 @@ public final class WidgetGuildSelector extends AppBottomSheet { m.checkNotNullParameter(adapter, "adapter"); this.noGuildStringId = i2; View view = this.itemView; - int i3 = 2131363642; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363642); + int i3 = 2131363645; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363645); if (frameLayout != null) { - i3 = 2131363678; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363678); + i3 = 2131363681; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363681); if (simpleDraweeView != null) { - i3 = 2131363707; - TextView textView = (TextView) view.findViewById(2131363707); + i3 = 2131363710; + TextView textView = (TextView) view.findViewById(2131363710); if (textView != null) { - i3 = 2131363710; - TextView textView2 = (TextView) view.findViewById(2131363710); + i3 = 2131363713; + TextView textView2 = (TextView) view.findViewById(2131363713); if (textView2 != null) { WidgetGuildSelectorItemBinding widgetGuildSelectorItemBinding = new WidgetGuildSelectorItemBinding((LinearLayout) view, frameLayout, simpleDraweeView, textView, textView2); m.checkNotNullExpressionValue(widgetGuildSelectorItemBinding, "WidgetGuildSelectorItemBinding.bind(itemView)"); @@ -129,13 +129,13 @@ public final class WidgetGuildSelector extends AppBottomSheet { z2 = true; } } - SimpleDraweeView simpleDraweeView = this.binding.f1808c; + SimpleDraweeView simpleDraweeView = this.binding.f1810c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIcon"); Guild guild4 = item.getGuild(); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); Integer valueOf = Integer.valueOf(ColorCompat.getThemedColor(view, 2130968904)); - SimpleDraweeView simpleDraweeView2 = this.binding.f1808c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1810c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.itemIcon"); SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, false, guild4, (float) simpleDraweeView2.getResources().getDimensionPixelSize(2131165445), null, valueOf, null, null, true, null, 360, null); FrameLayout frameLayout = this.binding.b; @@ -166,7 +166,7 @@ public final class WidgetGuildSelector extends AppBottomSheet { @Override // androidx.recyclerview.widget.RecyclerView.Adapter public ItemGuild onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - return new ItemGuild(2131559045, this, this.noGuildStringId); + return new ItemGuild(2131559046, this, this.noGuildStringId); } } @@ -193,7 +193,7 @@ public final class WidgetGuildSelector extends AppBottomSheet { str = "GUILD_SELECTOR_DEFAULT_REQUEST_KEY"; } boolean z3 = (i2 & 4) != 0 ? false : z2; - int i3 = (i2 & 8) != 0 ? 2131891407 : i; + int i3 = (i2 & 8) != 0 ? 2131891440 : i; if ((i2 & 16) != 0) { filterFunction = null; } @@ -443,7 +443,7 @@ public final class WidgetGuildSelector extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559044; + return 2131559045; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java index 81d474b2cd..f508af36cf 100644 --- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java +++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetFolderContextMenu.java @@ -64,7 +64,7 @@ public final class WidgetFolderContextMenu extends AppFragment { } private final int computeMaxContextMenuHeight(Context context) { - WidgetFolderContextMenuBinding a = WidgetFolderContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559002, (ViewGroup) null, false)); + WidgetFolderContextMenuBinding a = WidgetFolderContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559003, (ViewGroup) null, false)); m.checkNotNullExpressionValue(a, "WidgetFolderContextMenuB…om(context), null, false)"); CardView cardView = a.a; m.checkNotNullExpressionValue(cardView, "WidgetFolderContextMenuB…ntext), null, false).root"); @@ -144,7 +144,7 @@ public final class WidgetFolderContextMenu extends AppFragment { } public WidgetFolderContextMenu() { - super(2131559002); + super(2131559003); WidgetFolderContextMenu$viewModel$2 widgetFolderContextMenu$viewModel$2 = new WidgetFolderContextMenu$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(FolderContextMenuViewModel.class), new WidgetFolderContextMenu$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetFolderContextMenu$viewModel$2)); @@ -202,12 +202,12 @@ public final class WidgetFolderContextMenu extends AppFragment { } private final void configureValidUI(FolderContextMenuViewModel.ViewState.Valid valid) { - TextView textView = getBinding().f1775c; + TextView textView = getBinding().f1777c; m.checkNotNullExpressionValue(textView, "binding.folderContextMenuHeader"); CharSequence name = valid.getFolder().getName(); boolean z2 = false; if (name == null) { - name = b.j(this, 2131889234, new Object[0], null, 4); + name = b.j(this, 2131889244, new Object[0], null, 4); } textView.setText(name); getBinding().d.setOnClickListener(new WidgetFolderContextMenu$configureValidUI$1(this)); diff --git a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java index 18faf7ccb3..b5ade44454 100644 --- a/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java +++ b/app/src/main/java/com/discord/widgets/guilds/contextmenu/WidgetGuildContextMenu.java @@ -63,7 +63,7 @@ public final class WidgetGuildContextMenu extends AppFragment { } private final int computeMaxContextMenuHeight(Context context) { - WidgetGuildContextMenuBinding a = WidgetGuildContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559028, (ViewGroup) null, false)); + WidgetGuildContextMenuBinding a = WidgetGuildContextMenuBinding.a(LayoutInflater.from(context).inflate(2131559029, (ViewGroup) null, false)); m.checkNotNullExpressionValue(a, "WidgetGuildContextMenuBi…om(context), null, false)"); CardView cardView = a.a; m.checkNotNullExpressionValue(cardView, "WidgetGuildContextMenuBi…ntext), null, false).root"); @@ -143,7 +143,7 @@ public final class WidgetGuildContextMenu extends AppFragment { } public WidgetGuildContextMenu() { - super(2131559028); + super(2131559029); WidgetGuildContextMenu$viewModel$2 widgetGuildContextMenu$viewModel$2 = new WidgetGuildContextMenu$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildContextMenuViewModel.class), new WidgetGuildContextMenu$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildContextMenu$viewModel$2)); @@ -197,7 +197,7 @@ public final class WidgetGuildContextMenu extends AppFragment { } private final void configureValidUI(GuildContextMenuViewModel.ViewState.Valid valid) { - TextView textView = getBinding().f1791c; + TextView textView = getBinding().f1793c; m.checkNotNullExpressionValue(textView, "binding.guildContextMenuHeader"); textView.setText(valid.getGuild().getName()); getBinding().e.setOnClickListener(new WidgetGuildContextMenu$configureValidUI$1(this)); diff --git a/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java b/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java index 9d7d7ec24d..932c6f1997 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/GuildCreateCloneViews.java @@ -134,7 +134,7 @@ public interface GuildCreateCloneViews { ConstraintLayout constraintLayout = i0Var.a; m.checkNotNullExpressionValue(constraintLayout, "binding.guildCreateIconUploader.root"); this.guildCreateIconUploader = constraintLayout; - LinkifiedTextView linkifiedTextView = widgetGuildCreateBinding.f1792c; + LinkifiedTextView linkifiedTextView = widgetGuildCreateBinding.f1794c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.guildCreateGuidelines"); this.guidelinesTextView = linkifiedTextView; ScreenTitleView screenTitleView = widgetGuildCreateBinding.f; diff --git a/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java b/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java index 6a437fd18a..72a950a8f2 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/GuildTemplateChannelsView.java @@ -104,11 +104,11 @@ public final class GuildTemplateChannelsView extends LinearLayout { super(i, channelsAdapter); m.checkNotNullParameter(channelsAdapter, "adapter"); View view = this.itemView; - int i2 = 2131363446; - ImageView imageView = (ImageView) view.findViewById(2131363446); + int i2 = 2131363448; + ImageView imageView = (ImageView) view.findViewById(2131363448); if (imageView != null) { - i2 = 2131363447; - TextView textView = (TextView) view.findViewById(2131363447); + i2 = 2131363449; + TextView textView = (TextView) view.findViewById(2131363449); if (textView != null) { GuildTemplateChannelsItemViewBinding guildTemplateChannelsItemViewBinding = new GuildTemplateChannelsItemViewBinding((LinearLayout) view, imageView, textView); m.checkNotNullExpressionValue(guildTemplateChannelsItemViewBinding, "GuildTemplateChannelsIte…iewBinding.bind(itemView)"); @@ -122,7 +122,7 @@ public final class GuildTemplateChannelsView extends LinearLayout { public void onConfigure(int i, ChannelDataPayload channelDataPayload) { m.checkNotNullParameter(channelDataPayload, "data"); super.onConfigure(i, (int) channelDataPayload); - TextView textView = this.binding.f1612c; + TextView textView = this.binding.f1614c; m.checkNotNullExpressionValue(textView, "binding.guildTemplateChannelsItemName"); textView.setText(AnimatableValueParser.y0(channelDataPayload.getChannel())); if (AnimatableValueParser.f1(channelDataPayload.getChannel())) { @@ -166,7 +166,7 @@ public final class GuildTemplateChannelsView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558518, (ViewGroup) this, false); addView(inflate); - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363448); + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363450); if (recyclerView != null) { GuildTemplateChannelsViewBinding guildTemplateChannelsViewBinding = new GuildTemplateChannelsViewBinding((LinearLayout) inflate, recyclerView); m.checkNotNullExpressionValue(guildTemplateChannelsViewBinding, "GuildTemplateChannelsVie…rom(context), this, true)"); @@ -178,7 +178,7 @@ public final class GuildTemplateChannelsView extends LinearLayout { recyclerView.setHasFixedSize(false); return; } - throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363448))); + throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(2131363450))); } public final void updateView(List list) { diff --git a/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java b/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java index a4ac154983..5c3d3ef553 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/StockGuildTemplate.java @@ -41,133 +41,133 @@ public enum StockGuildTemplate { m.checkNotNullParameter(resources, "resources"); switch (ordinal()) { case 0: - String string = resources.getString(2131890011); + String string = resources.getString(2131890024); m.checkNotNullExpressionValue(string, "resources.getString(R.st…plate_name_category_text)"); - String string2 = resources.getString(2131890018); + String string2 = resources.getString(2131890031); m.checkNotNullExpressionValue(string2, "resources.getString(R.st…ld_template_name_general)"); - String string3 = resources.getString(2131890015); + String string3 = resources.getString(2131890028); m.checkNotNullExpressionValue(string3, "resources.getString(R.st…guild_template_name_game)"); - String string4 = resources.getString(2131890026); + String string4 = resources.getString(2131890039); m.checkNotNullExpressionValue(string4, "resources.getString(R.st…uild_template_name_music)"); List access$createCategorySection = StockGuildTemplateKt.access$createCategorySection(string, 100, 0, new ChannelTemplate.SystemChannel(string2), new ChannelTemplate.NormalChannel(string3), new ChannelTemplate.NormalChannel(string4)); - String string5 = resources.getString(2131890012); + String string5 = resources.getString(2131890025); m.checkNotNullExpressionValue(string5, "resources.getString(R.st…late_name_category_voice)"); - String string6 = resources.getString(2131890039); + String string6 = resources.getString(2131890052); m.checkNotNullExpressionValue(string6, "resources.getString(R.st…mplate_name_voice_lounge)"); - String string7 = resources.getString(2131890043); + String string7 = resources.getString(2131890056); m.checkNotNullExpressionValue(string7, "resources.getString(R.st…e_name_voice_stream_room)"); return u.plus((Collection) access$createCategorySection, (Iterable) StockGuildTemplateKt.access$createCategorySection(string5, 200, 2, new ChannelTemplate.NormalChannel(string6), new ChannelTemplate.NormalChannel(string7))); case 1: - String string8 = resources.getString(2131890010); + String string8 = resources.getString(2131890023); m.checkNotNullExpressionValue(string8, "resources.getString(R.st…ame_category_information)"); - String string9 = resources.getString(2131890046); + String string9 = resources.getString(2131890059); m.checkNotNullExpressionValue(string9, "resources.getString(R.st…e_name_welcome_and_rules)"); - String string10 = resources.getString(2131890028); + String string10 = resources.getString(2131890041); m.checkNotNullExpressionValue(string10, "resources.getString(R.st…ate_name_notes_resources)"); List access$createCategorySection2 = StockGuildTemplateKt.access$createCategorySection(string8, 100, 0, new ChannelTemplate.NormalChannel(string9), new ChannelTemplate.NormalChannel(string10)); - String string11 = resources.getString(2131890011); + String string11 = resources.getString(2131890024); m.checkNotNullExpressionValue(string11, "resources.getString(R.st…plate_name_category_text)"); - String string12 = resources.getString(2131890018); + String string12 = resources.getString(2131890031); m.checkNotNullExpressionValue(string12, "resources.getString(R.st…ld_template_name_general)"); - String string13 = resources.getString(2131890021); + String string13 = resources.getString(2131890034); m.checkNotNullExpressionValue(string13, "resources.getString(R.st…plate_name_homework_help)"); - String string14 = resources.getString(2131890032); + String string14 = resources.getString(2131890045); m.checkNotNullExpressionValue(string14, "resources.getString(R.st…te_name_session_planning)"); - String string15 = resources.getString(2131890029); + String string15 = resources.getString(2131890042); m.checkNotNullExpressionValue(string15, "resources.getString(R.st…_template_name_off_topic)"); List plus = u.plus((Collection) access$createCategorySection2, (Iterable) StockGuildTemplateKt.access$createCategorySection(string11, 200, 0, new ChannelTemplate.SystemChannel(string12), new ChannelTemplate.NormalChannel(string13), new ChannelTemplate.NormalChannel(string14), new ChannelTemplate.NormalChannel(string15))); - String string16 = resources.getString(2131890012); + String string16 = resources.getString(2131890025); m.checkNotNullExpressionValue(string16, "resources.getString(R.st…late_name_category_voice)"); - String string17 = resources.getString(2131890039); + String string17 = resources.getString(2131890052); m.checkNotNullExpressionValue(string17, "resources.getString(R.st…mplate_name_voice_lounge)"); - return u.plus((Collection) plus, (Iterable) StockGuildTemplateKt.access$createCategorySection(string16, 300, 2, new ChannelTemplate.NormalChannel(string17), new ChannelTemplate.NormalChannel(b.h(resources, 2131890044, new Object[]{"1"}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.h(resources, 2131890044, new Object[]{"2"}, null, 4).toString()))); + return u.plus((Collection) plus, (Iterable) StockGuildTemplateKt.access$createCategorySection(string16, 300, 2, new ChannelTemplate.NormalChannel(string17), new ChannelTemplate.NormalChannel(b.h(resources, 2131890057, new Object[]{"1"}, null, 4).toString()), new ChannelTemplate.NormalChannel(b.h(resources, 2131890057, new Object[]{"2"}, null, 4).toString()))); case 2: - String string18 = resources.getString(2131890011); + String string18 = resources.getString(2131890024); m.checkNotNullExpressionValue(string18, "resources.getString(R.st…plate_name_category_text)"); - String string19 = resources.getString(2131890018); + String string19 = resources.getString(2131890031); m.checkNotNullExpressionValue(string19, "resources.getString(R.st…ld_template_name_general)"); - String string20 = resources.getString(2131890013); + String string20 = resources.getString(2131890026); m.checkNotNullExpressionValue(string20, "resources.getString(R.st…ame_clips_and_highlights)"); List access$createCategorySection3 = StockGuildTemplateKt.access$createCategorySection(string18, 100, 0, new ChannelTemplate.SystemChannel(string19), new ChannelTemplate.NormalChannel(string20)); - String string21 = resources.getString(2131890012); + String string21 = resources.getString(2131890025); m.checkNotNullExpressionValue(string21, "resources.getString(R.st…late_name_category_voice)"); - String string22 = resources.getString(2131890038); + String string22 = resources.getString(2131890051); m.checkNotNullExpressionValue(string22, "resources.getString(R.st…emplate_name_voice_lobby)"); - String string23 = resources.getString(2131890036); + String string23 = resources.getString(2131890049); m.checkNotNullExpressionValue(string23, "resources.getString(R.st…mplate_name_voice_gaming)"); return u.plus((Collection) access$createCategorySection3, (Iterable) StockGuildTemplateKt.access$createCategorySection(string21, 200, 2, new ChannelTemplate.NormalChannel(string22), new ChannelTemplate.NormalChannel(string23))); case 3: - String string24 = resources.getString(2131890010); + String string24 = resources.getString(2131890023); m.checkNotNullExpressionValue(string24, "resources.getString(R.st…ame_category_information)"); - String string25 = resources.getString(2131890046); + String string25 = resources.getString(2131890059); m.checkNotNullExpressionValue(string25, "resources.getString(R.st…e_name_welcome_and_rules)"); - String string26 = resources.getString(2131890009); + String string26 = resources.getString(2131890022); m.checkNotNullExpressionValue(string26, "resources.getString(R.st…plate_name_announcements)"); List access$createCategorySection4 = StockGuildTemplateKt.access$createCategorySection(string24, 100, 0, new ChannelTemplate.NormalChannel(string25), new ChannelTemplate.NormalChannel(string26)); - String string27 = resources.getString(2131890011); + String string27 = resources.getString(2131890024); m.checkNotNullExpressionValue(string27, "resources.getString(R.st…plate_name_category_text)"); - String string28 = resources.getString(2131890018); + String string28 = resources.getString(2131890031); m.checkNotNullExpressionValue(string28, "resources.getString(R.st…ld_template_name_general)"); - String string29 = resources.getString(2131890014); + String string29 = resources.getString(2131890027); m.checkNotNullExpressionValue(string29, "resources.getString(R.st…ild_template_name_events)"); - String string30 = resources.getString(2131890022); + String string30 = resources.getString(2131890035); m.checkNotNullExpressionValue(string30, "resources.getString(R.st…_name_ideas_and_feedback)"); List plus2 = u.plus((Collection) access$createCategorySection4, (Iterable) StockGuildTemplateKt.access$createCategorySection(string27, 200, 0, new ChannelTemplate.SystemChannel(string28), new ChannelTemplate.NormalChannel(string29), new ChannelTemplate.NormalChannel(string30))); - String string31 = resources.getString(2131890012); + String string31 = resources.getString(2131890025); m.checkNotNullExpressionValue(string31, "resources.getString(R.st…late_name_category_voice)"); - String string32 = resources.getString(2131890039); + String string32 = resources.getString(2131890052); m.checkNotNullExpressionValue(string32, "resources.getString(R.st…mplate_name_voice_lounge)"); - String string33 = resources.getString(2131890035); + String string33 = resources.getString(2131890048); m.checkNotNullExpressionValue(string33, "resources.getString(R.st…_voice_community_hangout)"); - String string34 = resources.getString(2131890043); + String string34 = resources.getString(2131890056); m.checkNotNullExpressionValue(string34, "resources.getString(R.st…e_name_voice_stream_room)"); return u.plus((Collection) plus2, (Iterable) StockGuildTemplateKt.access$createCategorySection(string31, 300, 2, new ChannelTemplate.NormalChannel(string32), new ChannelTemplate.NormalChannel(string33), new ChannelTemplate.NormalChannel(string34))); case 4: - String string35 = resources.getString(2131890010); + String string35 = resources.getString(2131890023); m.checkNotNullExpressionValue(string35, "resources.getString(R.st…ame_category_information)"); - String string36 = resources.getString(2131890046); + String string36 = resources.getString(2131890059); m.checkNotNullExpressionValue(string36, "resources.getString(R.st…e_name_welcome_and_rules)"); - String string37 = resources.getString(2131890009); + String string37 = resources.getString(2131890022); m.checkNotNullExpressionValue(string37, "resources.getString(R.st…plate_name_announcements)"); List access$createCategorySection5 = StockGuildTemplateKt.access$createCategorySection(string35, 100, 0, new ChannelTemplate.NormalChannel(string36), new ChannelTemplate.NormalChannel(string37)); - String string38 = resources.getString(2131890011); + String string38 = resources.getString(2131890024); m.checkNotNullExpressionValue(string38, "resources.getString(R.st…plate_name_category_text)"); - String string39 = resources.getString(2131890018); + String string39 = resources.getString(2131890031); m.checkNotNullExpressionValue(string39, "resources.getString(R.st…ld_template_name_general)"); - String string40 = resources.getString(2131890023); + String string40 = resources.getString(2131890036); m.checkNotNullExpressionValue(string40, "resources.getString(R.st…plate_name_meeting_plans)"); List plus3 = u.plus((Collection) access$createCategorySection5, (Iterable) StockGuildTemplateKt.access$createCategorySection(string38, 200, 0, new ChannelTemplate.SystemChannel(string39), new ChannelTemplate.NormalChannel(string40))); - String string41 = resources.getString(2131890012); + String string41 = resources.getString(2131890025); m.checkNotNullExpressionValue(string41, "resources.getString(R.st…late_name_category_voice)"); - String string42 = resources.getString(2131890039); + String string42 = resources.getString(2131890052); m.checkNotNullExpressionValue(string42, "resources.getString(R.st…mplate_name_voice_lounge)"); - String string43 = resources.getString(2131890040); + String string43 = resources.getString(2131890053); m.checkNotNullExpressionValue(string43, "resources.getString(R.st…_name_voice_meeting_room)"); return u.plus((Collection) plus3, (Iterable) StockGuildTemplateKt.access$createCategorySection(string41, 300, 2, new ChannelTemplate.NormalChannel(string42), new ChannelTemplate.NormalChannel(string43))); case 5: - String string44 = resources.getString(2131890010); + String string44 = resources.getString(2131890023); m.checkNotNullExpressionValue(string44, "resources.getString(R.st…ame_category_information)"); - String string45 = resources.getString(2131890046); + String string45 = resources.getString(2131890059); m.checkNotNullExpressionValue(string45, "resources.getString(R.st…e_name_welcome_and_rules)"); - String string46 = resources.getString(2131890009); + String string46 = resources.getString(2131890022); m.checkNotNullExpressionValue(string46, "resources.getString(R.st…plate_name_announcements)"); - String string47 = resources.getString(2131890031); + String string47 = resources.getString(2131890044); m.checkNotNullExpressionValue(string47, "resources.getString(R.st…_template_name_resources)"); List access$createCategorySection6 = StockGuildTemplateKt.access$createCategorySection(string44, 100, 0, new ChannelTemplate.NormalChannel(string45), new ChannelTemplate.NormalChannel(string46), new ChannelTemplate.NormalChannel(string47)); - String string48 = resources.getString(2131890011); + String string48 = resources.getString(2131890024); m.checkNotNullExpressionValue(string48, "resources.getString(R.st…plate_name_category_text)"); - String string49 = resources.getString(2131890018); + String string49 = resources.getString(2131890031); m.checkNotNullExpressionValue(string49, "resources.getString(R.st…ld_template_name_general)"); - String string50 = resources.getString(2131890023); + String string50 = resources.getString(2131890036); m.checkNotNullExpressionValue(string50, "resources.getString(R.st…plate_name_meeting_plans)"); - String string51 = resources.getString(2131890029); + String string51 = resources.getString(2131890042); m.checkNotNullExpressionValue(string51, "resources.getString(R.st…_template_name_off_topic)"); List plus4 = u.plus((Collection) access$createCategorySection6, (Iterable) StockGuildTemplateKt.access$createCategorySection(string48, 200, 0, new ChannelTemplate.SystemChannel(string49), new ChannelTemplate.NormalChannel(string50), new ChannelTemplate.NormalChannel(string51))); - String string52 = resources.getString(2131890012); + String string52 = resources.getString(2131890025); m.checkNotNullExpressionValue(string52, "resources.getString(R.st…late_name_category_voice)"); - String string53 = resources.getString(2131890039); + String string53 = resources.getString(2131890052); m.checkNotNullExpressionValue(string53, "resources.getString(R.st…mplate_name_voice_lounge)"); - String string54 = resources.getString(2131890040); + String string54 = resources.getString(2131890053); m.checkNotNullExpressionValue(string54, "resources.getString(R.st…_name_voice_meeting_room)"); return u.plus((Collection) plus4, (Iterable) StockGuildTemplateKt.access$createCategorySection(string52, 300, 2, new ChannelTemplate.NormalChannel(string53), new ChannelTemplate.NormalChannel(string54))); case 6: diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java index 4723468f63..c84d35ef57 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetCreationIntent.java @@ -73,7 +73,7 @@ public final class WidgetCreationIntent extends AppFragment { /* JADX INFO: this call moved to the top of the method (can break code semantics) */ public /* synthetic */ WidgetCreationIntent(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) { - this((i2 & 1) != 0 ? 2131558981 : i); + this((i2 & 1) != 0 ? 2131558982 : i); } public static final /* synthetic */ void access$onSelectionPressed(WidgetCreationIntent widgetCreationIntent, Boolean bool) { @@ -81,14 +81,14 @@ public final class WidgetCreationIntent extends AppFragment { } private final void configureCommunityButton(View view, TextView textView) { - textView.setText(getString(2131887970)); - textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231131), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232059), (Drawable) null); + textView.setText(getString(2131887971)); + textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231131), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232062), (Drawable) null); view.setOnClickListener(new WidgetCreationIntent$configureCommunityButton$1(this)); } private final void configureFriendsButton(View view, TextView textView) { - textView.setText(getString(2131887971)); - textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231129), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232059), (Drawable) null); + textView.setText(getString(2131887972)); + textView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), 2131231129), (Drawable) null, ContextCompat.getDrawable(requireContext(), 2131232062), (Drawable) null); view.setOnClickListener(new WidgetCreationIntent$configureFriendsButton$1(this)); } @@ -119,7 +119,7 @@ public final class WidgetCreationIntent extends AppFragment { if (IS_FRIENDS_FIRST) { MaterialCardView materialCardView = getBinding().b; m.checkNotNullExpressionValue(materialCardView, "binding.creationIntentFirstOption"); - TextView textView = getBinding().f1758c; + TextView textView = getBinding().f1760c; m.checkNotNullExpressionValue(textView, "binding.creationIntentFirstOptionText"); configureFriendsButton(materialCardView, textView); MaterialCardView materialCardView2 = getBinding().d; @@ -130,7 +130,7 @@ public final class WidgetCreationIntent extends AppFragment { } else { MaterialCardView materialCardView3 = getBinding().b; m.checkNotNullExpressionValue(materialCardView3, "binding.creationIntentFirstOption"); - TextView textView3 = getBinding().f1758c; + TextView textView3 = getBinding().f1760c; m.checkNotNullExpressionValue(textView3, "binding.creationIntentFirstOptionText"); configureCommunityButton(materialCardView3, textView3); MaterialCardView materialCardView4 = getBinding().d; @@ -141,6 +141,6 @@ public final class WidgetCreationIntent extends AppFragment { } LinkifiedTextView linkifiedTextView = getBinding().f; m.checkNotNullExpressionValue(linkifiedTextView, "binding.creationIntentSkipText"); - b.m(linkifiedTextView, 2131887972, new Object[0], new WidgetCreationIntent$onViewBound$1(this)); + b.m(linkifiedTextView, 2131887973, new Object[0], new WidgetCreationIntent$onViewBound$1(this)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java index d9c1abbffb..f4d7c1e201 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone$binding$2.java @@ -25,39 +25,39 @@ public final /* synthetic */ class WidgetGuildClone$binding$2 extends k implemen public final WidgetGuildCloneBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363351; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363351); + int i = 2131363353; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363353); if (loadingButton != null) { - i = 2131363352; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363352); + i = 2131363354; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363354); if (appViewFlipper != null) { - i = 2131363353; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363353); + i = 2131363355; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363355); if (linkifiedTextView != null) { - i = 2131363354; - View findViewById = view.findViewById(2131363354); + i = 2131363356; + View findViewById = view.findViewById(2131363356); if (findViewById != null) { i0 a = i0.a(findViewById); - i = 2131363355; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363355); + i = 2131363357; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363357); if (textInputLayout != null) { - i = 2131363356; - TextView textView = (TextView) view.findViewById(2131363356); + i = 2131363358; + TextView textView = (TextView) view.findViewById(2131363358); if (textView != null) { - i = 2131363449; - TextView textView2 = (TextView) view.findViewById(2131363449); + i = 2131363451; + TextView textView2 = (TextView) view.findViewById(2131363451); if (textView2 != null) { - i = 2131363450; - GuildTemplateChannelsView guildTemplateChannelsView = (GuildTemplateChannelsView) view.findViewById(2131363450); + i = 2131363452; + GuildTemplateChannelsView guildTemplateChannelsView = (GuildTemplateChannelsView) view.findViewById(2131363452); if (guildTemplateChannelsView != null) { - i = 2131363451; - RolesListView rolesListView = (RolesListView) view.findViewById(2131363451); + i = 2131363453; + RolesListView rolesListView = (RolesListView) view.findViewById(2131363453); if (rolesListView != null) { - i = 2131363452; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363452); + i = 2131363454; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363454); if (linearLayout != null) { - i = 2131363765; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131363765); + i = 2131363768; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131363768); if (progressBar != null) { return new WidgetGuildCloneBinding((CoordinatorLayout) view, loadingButton, appViewFlipper, linkifiedTextView, a, textInputLayout, textView, textView2, guildTemplateChannelsView, rolesListView, linearLayout, progressBar); } diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java index 7ce572e83c..a4ca4eb1f8 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildClone.java @@ -68,7 +68,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate { } public WidgetGuildClone() { - super(2131559027); + super(2131559028); } private final WidgetGuildCloneBinding getBinding() { @@ -83,30 +83,30 @@ public final class WidgetGuildClone extends WidgetGuildCreate { StoreStream.Companion.getGuildTemplates().clearDynamicLinkGuildTemplateCode(); int i = 0; if (m.areEqual(viewState, WidgetGuildCreateViewModel.ViewState.Uninitialized.INSTANCE)) { - AppViewFlipper appViewFlipper = getBinding().f1790c; + AppViewFlipper appViewFlipper = getBinding().f1792c; m.checkNotNullExpressionValue(appViewFlipper, "binding.guildCreateFlipper"); appViewFlipper.setDisplayedChild(0); } else if (viewState instanceof WidgetGuildCreateViewModel.ViewState.Initialized) { WidgetGuildCreateViewModel.ViewState.Initialized initialized = (WidgetGuildCreateViewModel.ViewState.Initialized) viewState; StoreGuildTemplates.GuildTemplateState guildTemplate = initialized.getGuildTemplate(); if (m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.None.INSTANCE) || m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.Invalid.INSTANCE) || m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.LoadFailed.INSTANCE)) { - AppViewFlipper appViewFlipper2 = getBinding().f1790c; + AppViewFlipper appViewFlipper2 = getBinding().f1792c; m.checkNotNullExpressionValue(appViewFlipper2, "binding.guildCreateFlipper"); appViewFlipper2.setDisplayedChild(1); } else if (m.areEqual(guildTemplate, StoreGuildTemplates.GuildTemplateState.Loading.INSTANCE)) { - AppViewFlipper appViewFlipper3 = getBinding().f1790c; + AppViewFlipper appViewFlipper3 = getBinding().f1792c; m.checkNotNullExpressionValue(appViewFlipper3, "binding.guildCreateFlipper"); appViewFlipper3.setDisplayedChild(0); } else if (guildTemplate instanceof StoreGuildTemplates.GuildTemplateState.Resolved) { ModelGuildTemplate guildTemplate2 = ((StoreGuildTemplates.GuildTemplateState.Resolved) initialized.getGuildTemplate()).getGuildTemplate(); Guild serializedSourceGuild = guildTemplate2.getSerializedSourceGuild(); if (serializedSourceGuild == null) { - AppViewFlipper appViewFlipper4 = getBinding().f1790c; + AppViewFlipper appViewFlipper4 = getBinding().f1792c; m.checkNotNullExpressionValue(appViewFlipper4, "binding.guildCreateFlipper"); appViewFlipper4.setDisplayedChild(1); return; } - AppViewFlipper appViewFlipper5 = getBinding().f1790c; + AppViewFlipper appViewFlipper5 = getBinding().f1792c; m.checkNotNullExpressionValue(appViewFlipper5, "binding.guildCreateFlipper"); appViewFlipper5.setDisplayedChild(2); TextView textView = getBinding().g; @@ -156,7 +156,7 @@ public final class WidgetGuildClone extends WidgetGuildCreate { if (stringExtra2 == null) { stringExtra2 = ""; } - return new WidgetGuildCreateViewModel(2131887924, null, stringExtra, false, stringExtra2, null, null, null, null, 450, null); + return new WidgetGuildCreateViewModel(2131887925, null, stringExtra, false, stringExtra2, null, null, null, null, 450, null); } @Override // com.discord.widgets.guilds.create.WidgetGuildCreate diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java index f2072eb667..8e6eaa35b9 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate$binding$2.java @@ -21,21 +21,21 @@ public final /* synthetic */ class WidgetGuildCreate$binding$2 extends k impleme public final WidgetGuildCreateBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363351; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363351); + int i = 2131363353; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363353); if (loadingButton != null) { - i = 2131363353; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363353); + i = 2131363355; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363355); if (linkifiedTextView != null) { - i = 2131363354; - View findViewById = view.findViewById(2131363354); + i = 2131363356; + View findViewById = view.findViewById(2131363356); if (findViewById != null) { i0 a = i0.a(findViewById); - i = 2131363355; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363355); + i = 2131363357; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363357); if (textInputLayout != null) { - i = 2131363357; - ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363357); + i = 2131363359; + ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131363359); if (screenTitleView != null) { return new WidgetGuildCreateBinding((CoordinatorLayout) view, loadingButton, linkifiedTextView, a, textInputLayout, screenTitleView); } diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java index 137e39b39c..b17494d455 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreate.java @@ -206,7 +206,7 @@ public class WidgetGuildCreate extends AppFragment { /* JADX INFO: this call moved to the top of the method (can break code semantics) */ public /* synthetic */ WidgetGuildCreate(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) { - this((i2 & 1) != 0 ? 2131559029 : i); + this((i2 & 1) != 0 ? 2131559030 : i); } public static final /* synthetic */ WidgetGuildCreateViewModel access$getViewModel$p(WidgetGuildCreate widgetGuildCreate) { @@ -280,7 +280,7 @@ public class WidgetGuildCreate extends AppFragment { Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("com.discord.intent.extra.EXTRA_OPTIONS"); Objects.requireNonNull(serializableExtra, "null cannot be cast to non-null type com.discord.widgets.guilds.create.WidgetGuildCreate.Options"); Options options = (Options) serializableExtra; - return new WidgetGuildCreateViewModel(2131887924, options.getTemplate(), null, options.getShowChannelPrompt(), options.getAnalyticsLocation(), options.getCustomTitle(), null, null, null, 448, null); + return new WidgetGuildCreateViewModel(2131887925, options.getTemplate(), null, options.getShowChannelPrompt(), options.getAnalyticsLocation(), options.getCustomTitle(), null, null, null, 448, null); } public GuildCreateCloneViews getViews() { @@ -314,7 +314,7 @@ public class WidgetGuildCreate extends AppFragment { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildCreate$onResume$1(this), 62, (Object) null); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGuildCreate$onResume$2(this), 62, (Object) null); getViews().getGuildCreateIconUploader().setOnClickListener(new WidgetGuildCreate$onResume$3(this)); - b.n(getViews().getGuidelinesTextView(), 2131887928, new Object[]{"https://discord.com/guidelines"}, null, 4); + b.n(getViews().getGuidelinesTextView(), 2131887929, new Object[]{"https://discord.com/guidelines"}, null, 4); EditText editText = getViews().getGuildCreateName().getEditText(); if (editText != null) { TextWatcherKt.addLifecycleAwareTextWatcher(editText, this, new WidgetGuildCreate$onResume$4(this)); diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java index e7e68b9177..52f2cb5509 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java @@ -589,7 +589,7 @@ public final class WidgetGuildCreateViewModel extends AppViewModel { String guildIconUri = initialized.getGuildIconUri(); if (!initialized.isBusy()) { if (t.isBlank(guildName)) { - emitEvent(new Event.ShowToast(2131893138)); + emitEvent(new Event.ShowToast(2131893180)); return; } if (initialized.getGuildTemplate() instanceof StoreGuildTemplates.GuildTemplateState.Resolved) { diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java index a44d6bf0b4..5992b87332 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInvite.java @@ -6,6 +6,7 @@ import com.discord.api.channel.Channel; import com.discord.api.guild.Guild; import com.discord.api.user.User; import com.discord.models.domain.ModelInvite; +import com.discord.models.invite.InviteUtils; import d0.z.d.m; import java.io.Serializable; import kotlin.jvm.internal.DefaultConstructorMarker; @@ -163,7 +164,7 @@ public final class GuildInvite implements Serializable { } public final String toLink() { - return a.H(new Object[]{"https://discord.gg", this.inviteCode}, 2, "%1$s/%2$s", "java.lang.String.format(format, *args)"); + return InviteUtils.INSTANCE.createLinkFromCode(this.inviteCode); } @Override // java.lang.Object diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java index a325308c36..cbd5606068 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel$sendInviteToChannel$1.java @@ -46,7 +46,7 @@ public final class GuildInviteShareSheetViewModel$sendInviteToChannel$1 extends if (set == null) { set = n0.emptySet(); } - GuildInviteShareSheetViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().getChannelId())))))); + GuildInviteShareSheetViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().i())))))); } } } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java index 69d3c71281..de84c40711 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.java @@ -16,7 +16,7 @@ import d0.z.d.m; /* compiled from: GuildInviteUiHelper.kt */ public final class GuildInviteUiHelperKt { private static final void copyLink(Context context, String str) { - o.a(context, str, 2131890519); + o.a(context, str, 2131890549); } public static final void copyLinkClick(Context context, ModelInvite modelInvite, Intent intent) { @@ -57,30 +57,30 @@ public final class GuildInviteUiHelperKt { public static final CharSequence getInviteLinkText(Context context, Experiment experiment) { m.checkNotNullParameter(context, "context"); - return b.g(context, 2131890525, new Object[]{(experiment == null || experiment.getBucket() != 1) ? StringResourceUtilsKt.getI18nPluralString(context, 2131755062, 1, 1) : StringResourceUtilsKt.getI18nPluralString(context, 2131755062, 7, 7)}, null, 4); + return b.g(context, 2131890555, new Object[]{(experiment == null || experiment.getBucket() != 1) ? StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 1, 1) : StringResourceUtilsKt.getI18nPluralString(context, 2131755063, 7, 7)}, null, 4); } public static final CharSequence getInviteSettingsText(Context context, long j) { m.checkNotNullParameter(context, "context"); - return j <= 0 ? b.g(context, 2131890968, new Object[0], null, 4) : b.g(context, 2131890500, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j)}, null, 4); + return j <= 0 ? b.g(context, 2131890999, new Object[0], null, 4) : b.g(context, 2131890530, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j)}, null, 4); } public static final CharSequence getInviteSettingsText(Context context, long j, int i) { Object obj; m.checkNotNullParameter(context, "context"); if (i == 0) { - obj = context.getString(2131890973); + obj = context.getString(2131891004); m.checkNotNullExpressionValue(obj, "context.getString(R.stri…scription_unlimited_uses)"); } else { Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "context.resources"); - obj = StringResourceUtilsKt.getQuantityString(resources, context, 2131755213, i, Integer.valueOf(i)); + obj = StringResourceUtilsKt.getQuantityString(resources, context, 2131755214, i, Integer.valueOf(i)); } - return j <= 0 ? b.g(context, 2131890552, new Object[]{context.getString(2131890968), obj}, null, 4) : b.g(context, 2131890553, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j), obj}, null, 4); + return j <= 0 ? b.g(context, 2131890582, new Object[]{context.getString(2131890999), obj}, null, 4) : b.g(context, 2131890583, new Object[]{DurationUtilsKt.humanizeDurationRounded(context, j), obj}, null, 4); } private static final void shareLink(Context context, String str) { - String string = context.getResources().getString(2131893865); + String string = context.getResources().getString(2131893904); m.checkNotNullExpressionValue(string, "context.resources.getStr…ip_instant_invite_title3)"); IntentUtils.performChooserSendIntent(context, str, string); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java index 06ca005187..0d86aa4964 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java @@ -36,7 +36,7 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple it2 = until.iterator(); while (it2.hasNext()) { - View childAt = this.binding.f1652c.getChildAt(((c0) it2).nextInt()); + View childAt = this.binding.f1654c.getChildAt(((c0) it2).nextInt()); Objects.requireNonNull(childAt, "null cannot be cast to non-null type android.widget.RadioButton"); arrayList.add((RadioButton) childAt); } @@ -407,7 +407,7 @@ public final class ViewInviteSettingsSheet extends NestedScrollView { if (radioButton != null) { radioButton.setChecked(true); } - this.binding.f1652c.setOnCheckedChangeListener(new ViewInviteSettingsSheet$configureUi$4(this)); + this.binding.f1654c.setOnCheckedChangeListener(new ViewInviteSettingsSheet$configureUi$4(this)); RadioGroup radioGroup2 = this.binding.e; m.checkNotNullExpressionValue(radioGroup2, "binding.guildInviteMaxUsesRadiogroup"); IntRange until2 = f.until(0, radioGroup2.getChildCount()); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java index 6e1eec0d78..c3a013d693 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java @@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetGuildInvite$binding$2 extends k impleme public final WidgetGuildInviteBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363363; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363363); + int i = 2131363365; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363365); if (materialButton != null) { - i = 2131363364; - View findViewById = view.findViewById(2131363364); + i = 2131363366; + View findViewById = view.findViewById(2131363366); if (findViewById != null) { - i = 2131363365; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363365); + i = 2131363367; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363367); if (materialButton2 != null) { - i = 2131363374; - WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(2131363374); + i = 2131363376; + WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(2131363376); if (widgetInviteInfo != null) { - i = 2131363382; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363382); + i = 2131363384; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363384); if (simpleDraweeView != null) { return new WidgetGuildInviteBinding((CoordinatorLayout) view, materialButton, findViewById, materialButton2, widgetInviteInfo, simpleDraweeView); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java index a5d084ef7e..8c20ae36e6 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java @@ -70,7 +70,7 @@ public final class WidgetGuildInvite extends AppFragment { } public WidgetGuildInvite() { - super(2131559031); + super(2131559032); } public static final /* synthetic */ void access$configureUI(WidgetGuildInvite widgetGuildInvite, StoreInstantInvites.InviteState.Resolved resolved) { @@ -111,7 +111,7 @@ public final class WidgetGuildInvite extends AppFragment { ModelInvite invite = resolved.getInvite(); trackAndConsumeDynamicLinkCache(invite); getBinding().d.configureUI(invite); - MaterialButton materialButton = getBinding().f1794c; + MaterialButton materialButton = getBinding().f1796c; m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel"); materialButton.setVisibility(8); MaterialButton materialButton2 = getBinding().b; @@ -133,7 +133,7 @@ public final class WidgetGuildInvite extends AppFragment { } private final void configureUIFailure(Error error) { - MaterialButton materialButton = getBinding().f1794c; + MaterialButton materialButton = getBinding().f1796c; m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel"); materialButton.setVisibility(0); MaterialButton materialButton2 = getBinding().b; @@ -219,7 +219,7 @@ public final class WidgetGuildInvite extends AppFragment { setRetainInstance(true); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); AnalyticsTracker.INSTANCE.inviteViewed(); - getBinding().f1794c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this)); + getBinding().f1796c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this)); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java index e467404e59..161e61ba6c 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings$binding$2.java @@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetGuildInviteSettings$binding$2 extends k public final WidgetGuildInviteSettingsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363366; - Spinner spinner = (Spinner) view.findViewById(2131363366); + int i = 2131363368; + Spinner spinner = (Spinner) view.findViewById(2131363368); if (spinner != null) { - i = 2131363372; - RadioGroup radioGroup = (RadioGroup) view.findViewById(2131363372); + i = 2131363374; + RadioGroup radioGroup = (RadioGroup) view.findViewById(2131363374); if (radioGroup != null) { - i = 2131363373; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363373); + i = 2131363375; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363375); if (materialButton != null) { - i = 2131363376; - RadioGroup radioGroup2 = (RadioGroup) view.findViewById(2131363376); + i = 2131363378; + RadioGroup radioGroup2 = (RadioGroup) view.findViewById(2131363378); if (radioGroup2 != null) { - i = 2131363385; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363385); + i = 2131363387; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363387); if (checkedSetting != null) { return new WidgetGuildInviteSettingsBinding((LinearLayout) view, spinner, radioGroup, materialButton, radioGroup2, checkedSetting); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java index 6ca882317e..dd055c7fec 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteSettings.java @@ -160,7 +160,7 @@ public final class WidgetGuildInviteSettings extends AppFragment { } public WidgetGuildInviteSettings() { - super(2131559033); + super(2131559034); WidgetGuildInviteSettings$viewModel$2 widgetGuildInviteSettings$viewModel$2 = new WidgetGuildInviteSettings$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(GuildInviteSettingsViewModel.class), new WidgetGuildInviteSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteSettings$viewModel$2)); @@ -232,34 +232,34 @@ public final class WidgetGuildInviteSettings extends AppFragment { private final CharSequence getExpireAfterString(int i, Context context) { if (i == 0) { - return b.j(this, 2131891392, new Object[0], null, 4); + return b.j(this, 2131891425, new Object[0], null, 4); } if (i == 1800) { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - return StringResourceUtilsKt.getQuantityString(resources, context, 2131755066, 30, 30); + return StringResourceUtilsKt.getQuantityString(resources, context, 2131755067, 30, 30); } else if (i == 3600) { Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755064, 1, 1); + return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755065, 1, 1); } else if (i == 21600) { Resources resources3 = getResources(); m.checkNotNullExpressionValue(resources3, "resources"); - return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755064, 6, 6); + return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755065, 6, 6); } else if (i == 43200) { Resources resources4 = getResources(); m.checkNotNullExpressionValue(resources4, "resources"); - return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755064, 12, 12); + return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755065, 12, 12); } else if (i == 86400) { Resources resources5 = getResources(); m.checkNotNullExpressionValue(resources5, "resources"); - return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755062, 1, 1); + return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755063, 1, 1); } else if (i != 604800) { return ""; } else { Resources resources6 = getResources(); m.checkNotNullExpressionValue(resources6, "resources"); - return StringResourceUtilsKt.getQuantityString(resources6, context, 2131755062, 7, 7); + return StringResourceUtilsKt.getQuantityString(resources6, context, 2131755063, 7, 7); } } @@ -307,13 +307,13 @@ public final class WidgetGuildInviteSettings extends AppFragment { } getBinding().b.setSelection(Math.max(i, 0), false); ModelInvite.Settings inviteSettings = viewState.getInviteSettings(); - RadioGroup radioGroup = getBinding().f1796c; + RadioGroup radioGroup = getBinding().f1798c; m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup"); IntRange until = f.until(0, radioGroup.getChildCount()); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(until, 10)); Iterator it2 = until.iterator(); while (it2.hasNext()) { - View childAt = getBinding().f1796c.getChildAt(((c0) it2).nextInt()); + View childAt = getBinding().f1798c.getChildAt(((c0) it2).nextInt()); Objects.requireNonNull(childAt, "null cannot be cast to non-null type android.widget.RadioButton"); arrayList.add((RadioButton) childAt); } @@ -340,7 +340,7 @@ public final class WidgetGuildInviteSettings extends AppFragment { if (radioButton != null) { radioButton.setChecked(true); } - getBinding().f1796c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings)); + getBinding().f1798c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings)); RadioGroup radioGroup2 = getBinding().e; m.checkNotNullExpressionValue(radioGroup2, "binding.guildInviteMaxUsesRadiogroup"); IntRange until2 = f.until(0, radioGroup2.getChildCount()); @@ -389,7 +389,7 @@ public final class WidgetGuildInviteSettings extends AppFragment { requireActivity().setResult(-1, intent); requireActivity().finish(); } else if (m.areEqual(event, GuildInviteSettingsViewModel.Event.InviteCreationFailure.INSTANCE)) { - c.a.d.o.g(requireContext(), 2131888048, 0, null, 12); + c.a.d.o.g(requireContext(), 2131888049, 0, null, 12); } } @@ -405,7 +405,7 @@ public final class WidgetGuildInviteSettings extends AppFragment { m.throwUninitializedPropertyAccessException("channelsSpinnerAdapter"); } spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter); - RadioGroup radioGroup = getBinding().f1796c; + RadioGroup radioGroup = getBinding().f1798c; m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup"); int[] iArr = ModelInvite.Settings.EXPIRES_AFTER_ARRAY; m.checkNotNullExpressionValue(iArr, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY"); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java index a90d70ffa1..c360569a8a 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$binding$2.java @@ -26,32 +26,32 @@ public final /* synthetic */ class WidgetGuildInviteShare$binding$2 extends k im int i = 2131362153; View findViewById = view.findViewById(2131362153); if (findViewById != null) { - i = 2131363367; - TextView textView = (TextView) view.findViewById(2131363367); + i = 2131363369; + TextView textView = (TextView) view.findViewById(2131363369); if (textView != null) { - i = 2131363375; - TextView textView2 = (TextView) view.findViewById(2131363375); + i = 2131363377; + TextView textView2 = (TextView) view.findViewById(2131363377); if (textView2 != null) { - i = 2131363377; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363377); + i = 2131363379; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363379); if (checkedSetting != null) { - i = 2131363378; - ImageView imageView = (ImageView) view.findViewById(2131363378); + i = 2131363380; + ImageView imageView = (ImageView) view.findViewById(2131363380); if (imageView != null) { - i = 2131363379; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363379); + i = 2131363381; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363381); if (materialButton != null) { - i = 2131363381; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363381); + i = 2131363383; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363383); if (textInputLayout != null) { - i = 2131363383; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363383); + i = 2131363385; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363385); if (recyclerView != null) { - i = 2131363384; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363384); + i = 2131363386; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363386); if (appViewFlipper != null) { - i = 2131363629; - ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363629); + i = 2131363632; + ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363632); if (viewInviteSettingsSheet != null) { return new WidgetGuildInviteShareBinding((CoordinatorLayout) view, findViewById, textView, textView2, checkedSetting, imageView, materialButton, textInputLayout, recyclerView, appViewFlipper, viewInviteSettingsSheet); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java index 05934fbebb..0036abce11 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.java @@ -35,7 +35,7 @@ public final class WidgetGuildInviteShare$configureUI$3 extends o implements Fun WidgetGuildInviteShare.access$sendInvite(this.this$0, inviteSuggestionItem, this.$viewState, this.$invite); AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; Context context = WidgetGuildInviteShare.access$getAdapter$p(this.this$0).getContext(); - String string = this.this$0.getString(2131890551); + String string = this.this$0.getString(2131890581); m.checkNotNullExpressionValue(string, "getString(R.string.invite_sent)"); accessibilityUtils.sendAnnouncement(context, string); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java index 7e8450c28f..043c8861bc 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java @@ -90,7 +90,7 @@ public final class WidgetGuildInviteShare extends AppFragment { } public WidgetGuildInviteShare() { - super(2131559034); + super(2131559035); WidgetGuildInviteShare$viewModel$2 widgetGuildInviteShare$viewModel$2 = new WidgetGuildInviteShare$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShare$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShare$viewModel$2)); @@ -183,7 +183,7 @@ public final class WidgetGuildInviteShare extends AppFragment { analyticsTracker.inviteSuggestionOpened(o, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } - TextView textView = getBinding().f1797c; + TextView textView = getBinding().f1799c; m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults"); textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8); RecyclerView recyclerView = getBinding().i; @@ -275,8 +275,8 @@ public final class WidgetGuildInviteShare extends AppFragment { if (longExtra != 0) { getViewModel().selectChannel(longExtra); } - AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887391 : null, null, 8, null); - setActionBarTitle(2131890540); + AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887393 : null, null, 8, null); + setActionBarTitle(2131890570); AppActivity appActivity = getAppActivity(); if (!(appActivity == null || (window = appActivity.getWindow()) == null)) { window.setSoftInputMode(32); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java index 25ffce95fe..1de799694e 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact$binding$2.java @@ -25,29 +25,29 @@ public final /* synthetic */ class WidgetGuildInviteShareCompact$binding$2 exten int i = 2131362153; View findViewById = view.findViewById(2131362153); if (findViewById != null) { - i = 2131363367; - TextView textView = (TextView) view.findViewById(2131363367); + i = 2131363369; + TextView textView = (TextView) view.findViewById(2131363369); if (textView != null) { - i = 2131363377; - TextView textView2 = (TextView) view.findViewById(2131363377); + i = 2131363379; + TextView textView2 = (TextView) view.findViewById(2131363379); if (textView2 != null) { - i = 2131363378; - ImageView imageView = (ImageView) view.findViewById(2131363378); + i = 2131363380; + ImageView imageView = (ImageView) view.findViewById(2131363380); if (imageView != null) { - i = 2131363379; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363379); + i = 2131363381; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363381); if (materialButton != null) { - i = 2131363380; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363380); + i = 2131363382; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363382); if (textInputLayout != null) { - i = 2131363383; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363383); + i = 2131363385; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363385); if (recyclerView != null) { - i = 2131363384; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363384); + i = 2131363386; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363386); if (appViewFlipper != null) { - i = 2131363629; - ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363629); + i = 2131363632; + ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363632); if (viewInviteSettingsSheet != null) { return new WidgetGuildInviteShareCompactBinding((CoordinatorLayout) view, findViewById, textView, textView2, imageView, materialButton, textInputLayout, recyclerView, appViewFlipper, viewInviteSettingsSheet); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java index 3d153cb969..3db95522b8 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java @@ -67,7 +67,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public Item(PrivateChannelAdapter privateChannelAdapter) { - super(2131559037, privateChannelAdapter); + super(2131559038, privateChannelAdapter); m.checkNotNullParameter(privateChannelAdapter, "adapter"); WidgetGuildInviteShareItemBinding a = WidgetGuildInviteShareItemBinding.a(this.itemView); m.checkNotNullExpressionValue(a, "WidgetGuildInviteShareItemBinding.bind(itemView)"); @@ -110,13 +110,13 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { m.checkNotNullExpressionValue(materialButton, "binding.itemSent"); int i2 = 0; materialButton.setVisibility(inviteSuggestionItem.hasSentInvite() ? 0 : 8); - MaterialButton materialButton2 = this.binding.f1800c; + MaterialButton materialButton2 = this.binding.f1802c; m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn"); if (!(!inviteSuggestionItem.hasSentInvite())) { i2 = 8; } materialButton2.setVisibility(i2); - this.binding.f1800c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem)); + this.binding.f1802c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem)); } } } @@ -145,7 +145,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { } public WidgetGuildInviteShareCompact() { - super(2131559035); + super(2131559036); WidgetGuildInviteShareCompact$viewModel$2 widgetGuildInviteShareCompact$viewModel$2 = new WidgetGuildInviteShareCompact$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShareCompact$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShareCompact$viewModel$2)); @@ -225,7 +225,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { analyticsTracker.inviteSuggestionOpened(o, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } - TextView textView = getBinding().f1798c; + TextView textView = getBinding().f1800c; m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults"); textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8); RecyclerView recyclerView = getBinding().h; @@ -303,8 +303,8 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { if (longExtra != 0) { getViewModel().selectChannel(longExtra); } - AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887391 : null, null, 8, null); - setActionBarTitle(2131890540); + AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887393 : null, null, 8, null); + setActionBarTitle(2131890570); AppFragment.setOnBackPressed$default(this, new WidgetGuildInviteShareCompact$onViewBound$1(this, booleanExtra), 0, 2, null); TextInputLayout textInputLayout = getBinding().g; m.checkNotNullExpressionValue(textInputLayout, "binding.guildInviteShareCompactSearch"); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java index 15881e595a..62b1562262 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions$binding$2.java @@ -22,20 +22,20 @@ public final /* synthetic */ class WidgetGuildInviteShareEmptySuggestions$bindin int i = 2131362153; View findViewById = view.findViewById(2131362153); if (findViewById != null) { - i = 2131363368; - TextView textView = (TextView) view.findViewById(2131363368); + i = 2131363370; + TextView textView = (TextView) view.findViewById(2131363370); if (textView != null) { - i = 2131363369; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363369); + i = 2131363371; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363371); if (materialButton != null) { - i = 2131363370; - ImageButton imageButton = (ImageButton) view.findViewById(2131363370); + i = 2131363372; + ImageButton imageButton = (ImageButton) view.findViewById(2131363372); if (imageButton != null) { - i = 2131363371; - TextView textView2 = (TextView) view.findViewById(2131363371); + i = 2131363373; + TextView textView2 = (TextView) view.findViewById(2131363373); if (textView2 != null) { - i = 2131363629; - ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363629); + i = 2131363632; + ViewInviteSettingsSheet viewInviteSettingsSheet = (ViewInviteSettingsSheet) view.findViewById(2131363632); if (viewInviteSettingsSheet != null) { return new WidgetGuildInviteShareEmptySuggestionsBinding((CoordinatorLayout) view, findViewById, textView, materialButton, imageButton, textView2, viewInviteSettingsSheet); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java index ed04852233..68547d6ac6 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java @@ -38,7 +38,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { private final Lazy viewModel$delegate; public WidgetGuildInviteShareEmptySuggestions() { - super(2131559036); + super(2131559037); WidgetGuildInviteShareEmptySuggestions$viewModel$2 widgetGuildInviteShareEmptySuggestions$viewModel$2 = new WidgetGuildInviteShareEmptySuggestions$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGuildInviteShareViewModel.class), new WidgetGuildInviteShareEmptySuggestions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGuildInviteShareEmptySuggestions$viewModel$2)); @@ -80,10 +80,10 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { private final CharSequence getHoursExpirationString(int i, CharSequence charSequence) { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755064, i, Integer.valueOf(i)); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755065, i, Integer.valueOf(i)); Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - return b.h(resources2, 2131890553, new Object[]{quantityString, charSequence}, null, 4); + return b.h(resources2, 2131890583, new Object[]{quantityString, charSequence}, null, 4); } private final String getInviteLink(ModelInvite modelInvite) { @@ -109,25 +109,25 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { WidgetInviteModel widgetInviteModel = loaded.getWidgetInviteModel(); getBinding().g.configureUi(widgetInviteModel); ModelInvite invite = widgetInviteModel.getInvite(); - TextView textView = getBinding().f1799c; + TextView textView = getBinding().f1801c; m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptySuggestionsInviteLink"); textView.setText(getInviteLink(invite)); - getBinding().f1799c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite)); + getBinding().f1801c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite)); getBinding().d.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$2(this, invite)); getBinding().e.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$3(this)); ModelInvite.Settings settings = widgetInviteModel.getSettings(); if (settings != null) { if (settings.getMaxUses() == 0) { - charSequence = getResources().getString(2131890973); + charSequence = getResources().getString(2131891004); m.checkNotNullExpressionValue(charSequence, "resources.getString(R.st…scription_unlimited_uses)"); } else { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755213, settings.getMaxUses(), Integer.valueOf(settings.getMaxUses())); + charSequence = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755214, settings.getMaxUses(), Integer.valueOf(settings.getMaxUses())); } int maxAge = widgetInviteModel.getSettings().getMaxAge(); if (maxAge == 0) { - String str = getResources().getString(2131890968) + ", " + charSequence; + String str = getResources().getString(2131890999) + ", " + charSequence; m.checkNotNullExpressionValue(str, "StringBuilder()\n … .toString()"); TextView textView2 = getBinding().f; m.checkNotNullExpressionValue(textView2, "binding.guildInviteEmpty…SettingsInviteLinkSubtext"); @@ -135,12 +135,12 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { } else if (maxAge == 1800) { Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755067, 30, 30); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755068, 30, 30); TextView textView3 = getBinding().f; m.checkNotNullExpressionValue(textView3, "binding.guildInviteEmpty…SettingsInviteLinkSubtext"); Resources resources3 = getResources(); m.checkNotNullExpressionValue(resources3, "resources"); - textView3.setText(b.h(resources3, 2131890553, new Object[]{quantityString, charSequence}, null, 4)); + textView3.setText(b.h(resources3, 2131890583, new Object[]{quantityString, charSequence}, null, 4)); } else if (maxAge == 3600) { TextView textView4 = getBinding().f; m.checkNotNullExpressionValue(textView4, "binding.guildInviteEmpty…SettingsInviteLinkSubtext"); @@ -156,21 +156,21 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { } else if (maxAge == 86400) { Resources resources4 = getResources(); m.checkNotNullExpressionValue(resources4, "resources"); - CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources4, requireContext(), 2131755062, 1, 1); + CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources4, requireContext(), 2131755063, 1, 1); TextView textView7 = getBinding().f; m.checkNotNullExpressionValue(textView7, "binding.guildInviteEmpty…SettingsInviteLinkSubtext"); Resources resources5 = getResources(); m.checkNotNullExpressionValue(resources5, "resources"); - textView7.setText(b.h(resources5, 2131890553, new Object[]{quantityString2, charSequence}, null, 4)); + textView7.setText(b.h(resources5, 2131890583, new Object[]{quantityString2, charSequence}, null, 4)); } else if (maxAge == 604800) { Resources resources6 = getResources(); m.checkNotNullExpressionValue(resources6, "resources"); - CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources6, requireContext(), 2131755062, 7, 7); + CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources6, requireContext(), 2131755063, 7, 7); TextView textView8 = getBinding().f; m.checkNotNullExpressionValue(textView8, "binding.guildInviteEmpty…SettingsInviteLinkSubtext"); Resources resources7 = getResources(); m.checkNotNullExpressionValue(resources7, "resources"); - textView8.setText(b.h(resources7, 2131890553, new Object[]{quantityString3, charSequence}, null, 4)); + textView8.setText(b.h(resources7, 2131890583, new Object[]{quantityString3, charSequence}, null, 4)); } } } @@ -192,7 +192,7 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { getViewModel().selectChannel(longExtra); } boolean booleanExtra = getMostRecentIntent().getBooleanExtra("INTENT_IS_NUX_FLOW", false); - AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887391 : null, null, 8, null); + AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, booleanExtra ? Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969393, 0, 2, (Object) null)) : null, booleanExtra ? 2131887393 : null, null, 8, null); AppFragment.setOnBackPressed$default(this, new WidgetGuildInviteShareEmptySuggestions$onViewBound$1(this, booleanExtra), 0, 2, null); BottomSheetBehavior from = BottomSheetBehavior.from(getBinding().g); m.checkNotNullExpressionValue(from, "BottomSheetBehavior.from…nviteSettingsBottomSheet)"); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java index b536d440ad..0217475496 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet$binding$2.java @@ -42,54 +42,54 @@ public final /* synthetic */ class WidgetGuildInviteShareSheet$binding$2 extends i = 2131362764; TextView textView2 = (TextView) view.findViewById(2131362764); if (textView2 != null) { - i = 2131363032; - TextView textView3 = (TextView) view.findViewById(2131363032); + i = 2131363034; + TextView textView3 = (TextView) view.findViewById(2131363034); if (textView3 != null) { - i = 2131363033; - ImageView imageView = (ImageView) view.findViewById(2131363033); + i = 2131363035; + ImageView imageView = (ImageView) view.findViewById(2131363035); if (imageView != null) { - i = 2131363034; - TextView textView4 = (TextView) view.findViewById(2131363034); + i = 2131363036; + TextView textView4 = (TextView) view.findViewById(2131363036); if (textView4 != null) { - i = 2131363035; - ImageButton imageButton = (ImageButton) view.findViewById(2131363035); + i = 2131363037; + ImageButton imageButton = (ImageButton) view.findViewById(2131363037); if (imageButton != null) { - i = 2131363036; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363036); + i = 2131363038; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363038); if (nestedScrollView != null) { - i = 2131363037; - TextView textView5 = (TextView) view.findViewById(2131363037); + i = 2131363039; + TextView textView5 = (TextView) view.findViewById(2131363039); if (textView5 != null) { - i = 2131363038; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363038); + i = 2131363040; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363040); if (materialButton != null) { - i = 2131363039; - TextView textView6 = (TextView) view.findViewById(2131363039); + i = 2131363041; + TextView textView6 = (TextView) view.findViewById(2131363041); if (textView6 != null) { - i = 2131363630; - FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363630); + i = 2131363633; + FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131363633); if (frameLayout2 != null) { - i = 2131363632; - TextView textView7 = (TextView) view.findViewById(2131363632); + i = 2131363635; + TextView textView7 = (TextView) view.findViewById(2131363635); if (textView7 != null) { - i = 2131363754; - Barrier barrier2 = (Barrier) view.findViewById(2131363754); + i = 2131363757; + Barrier barrier2 = (Barrier) view.findViewById(2131363757); if (barrier2 != null) { FrameLayout frameLayout3 = (FrameLayout) view; - i = 2131364529; - Barrier barrier3 = (Barrier) view.findViewById(2131364529); + i = 2131364532; + Barrier barrier3 = (Barrier) view.findViewById(2131364532); if (barrier3 != null) { - i = 2131364537; - SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364537); + i = 2131364540; + SearchInputView searchInputView = (SearchInputView) view.findViewById(2131364540); if (searchInputView != null) { - i = 2131364930; - CardView cardView = (CardView) view.findViewById(2131364930); + i = 2131364933; + CardView cardView = (CardView) view.findViewById(2131364933); if (cardView != null) { - i = 2131365145; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365145); + i = 2131365149; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365149); if (recyclerView != null) { - i = 2131365146; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365146); + i = 2131365150; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365150); if (appViewFlipper != null) { return new WidgetGuildInviteShareSheetBinding(frameLayout3, constraintLayout, frameLayout, barrier, textView, textView2, textView3, imageView, textView4, imageButton, nestedScrollView, textView5, materialButton, textView6, frameLayout2, textView7, barrier2, frameLayout3, barrier3, searchInputView, cardView, recyclerView, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java index 57d3ea5665..6e7693b6e6 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java @@ -186,7 +186,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet { } else { TextView textView3 = binding.d; m.checkNotNullExpressionValue(textView3, "emptyStateInviteLink"); - textView3.setText(getString(2131890787)); + textView3.setText(getString(2131890817)); TextView textView4 = binding.g; m.checkNotNullExpressionValue(textView4, "emptyStateSettingsSubtext"); textView4.setText((CharSequence) null); @@ -239,10 +239,10 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet { Channel channel = viewState.getChannel(); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - searchInputView.setHint(b.j(this, 2131890572, new Object[]{AnimatableValueParser.A0(channel, requireContext, false, 2)}, null, 4)); + searchInputView.setHint(b.j(this, 2131890602, new Object[]{AnimatableValueParser.A0(channel, requireContext, false, 2)}, null, 4)); } else { SearchInputView searchInputView2 = binding.k; - String string = getString(2131890571); + String string = getString(2131890601); m.checkNotNullExpressionValue(string, "getString(R.string.invite_your_friends)"); searchInputView2.setHint(string); } @@ -250,13 +250,13 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet { if (invite != null) { CardView cardView = binding.l; m.checkNotNullExpressionValue(cardView, "shareButton"); - cardView.setContentDescription(b.j(this, 2131893194, new Object[]{invite}, null, 4)); + cardView.setContentDescription(b.j(this, 2131893236, new Object[]{invite}, null, 4)); long expirationTimeMs = invite.getExpirationTimeMs() - ClockFactory.get().currentTimeMillis(); String link = invite.toLink(); Context requireContext2 = requireContext(); m.checkNotNullExpressionValue(requireContext2, "requireContext()"); CharSequence inviteSettingsText = GuildInviteUiHelperKt.getInviteSettingsText(requireContext2, expirationTimeMs); - TextView textView = binding.f1801c; + TextView textView = binding.f1803c; m.checkNotNullExpressionValue(textView, "copyLinkSubtitle"); textView.setText(link + ' ' + inviteSettingsText); binding.l.setOnClickListener(new WidgetGuildInviteShareSheet$configureNormalUI$$inlined$with$lambda$1(invite, this, searchQuery, viewState)); @@ -310,7 +310,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559038; + return 2131559039; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java index ddc7b881b8..83a315fe3d 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.java @@ -50,7 +50,7 @@ public final class WidgetGuildInviteShareViewModel$sendInviteToChannel$1 extends if (set == null) { set = n0.emptySet(); } - WidgetGuildInviteShareViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().getChannelId())))))); + WidgetGuildInviteShareViewModel.access$updateSentInvites(this.this$0, h0.plus(sentInvites, g0.mapOf(d0.o.to(this.$inviteLink, o0.plus(set, Long.valueOf(success.getMessage().i())))))); } } } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java index 05437d0fe6..d40ec93443 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java @@ -49,45 +49,45 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { public WidgetInviteInfo(Context context, AttributeSet attributeSet, int i) { super(context, attributeSet, i); m.checkNotNullParameter(context, "ctx"); - LayoutInflater.from(getContext()).inflate(2131559032, this); - int i2 = 2131363607; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363607); + LayoutInflater.from(getContext()).inflate(2131559033, this); + int i2 = 2131363609; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363609); if (simpleDraweeView != null) { - i2 = 2131363608; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById(2131363608); + i2 = 2131363610; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById(2131363610); if (simpleDraweeView2 != null) { - i2 = 2131363609; - CardView cardView = (CardView) findViewById(2131363609); + i2 = 2131363611; + CardView cardView = (CardView) findViewById(2131363611); if (cardView != null) { - i2 = 2131363610; - RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131363610); + i2 = 2131363612; + RelativeLayout relativeLayout = (RelativeLayout) findViewById(2131363612); if (relativeLayout != null) { - i2 = 2131363611; - RelativeLayout relativeLayout2 = (RelativeLayout) findViewById(2131363611); + i2 = 2131363613; + RelativeLayout relativeLayout2 = (RelativeLayout) findViewById(2131363613); if (relativeLayout2 != null) { - i2 = 2131363618; - ImageView imageView = (ImageView) findViewById(2131363618); + i2 = 2131363621; + ImageView imageView = (ImageView) findViewById(2131363621); if (imageView != null) { - i2 = 2131363621; - TextView textView = (TextView) findViewById(2131363621); + i2 = 2131363624; + TextView textView = (TextView) findViewById(2131363624); if (textView != null) { - i2 = 2131363622; - CardView cardView2 = (CardView) findViewById(2131363622); + i2 = 2131363625; + CardView cardView2 = (CardView) findViewById(2131363625); if (cardView2 != null) { - i2 = 2131363623; - TextView textView2 = (TextView) findViewById(2131363623); + i2 = 2131363626; + TextView textView2 = (TextView) findViewById(2131363626); if (textView2 != null) { - i2 = 2131363624; - CardView cardView3 = (CardView) findViewById(2131363624); + i2 = 2131363627; + CardView cardView3 = (CardView) findViewById(2131363627); if (cardView3 != null) { - i2 = 2131363625; - LinearLayout linearLayout = (LinearLayout) findViewById(2131363625); + i2 = 2131363628; + LinearLayout linearLayout = (LinearLayout) findViewById(2131363628); if (linearLayout != null) { - i2 = 2131363626; - TextView textView3 = (TextView) findViewById(2131363626); + i2 = 2131363629; + TextView textView3 = (TextView) findViewById(2131363629); if (textView3 != null) { - i2 = 2131363633; - TextView textView4 = (TextView) findViewById(2131363633); + i2 = 2131363636; + TextView textView4 = (TextView) findViewById(2131363636); if (textView4 != null) { WidgetGuildInviteInfoBinding widgetGuildInviteInfoBinding = new WidgetGuildInviteInfoBinding(this, simpleDraweeView, simpleDraweeView2, cardView, relativeLayout, relativeLayout2, imageView, textView, cardView2, textView2, cardView3, linearLayout, textView3, textView4); m.checkNotNullExpressionValue(widgetGuildInviteInfoBinding, "WidgetGuildInviteInfoBin…ater.from(context), this)"); @@ -146,7 +146,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { } z2 = false; if (z2) { - SimpleDraweeView simpleDraweeView2 = this.binding.f1795c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1797c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall"); IconUtils.setIcon$default(simpleDraweeView2, channel, 2131165290, null, 8, null); } @@ -178,7 +178,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatar"); User inviter = modelInvite.getInviter(); IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null), 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); - SimpleDraweeView simpleDraweeView2 = this.binding.f1795c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1797c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall"); Guild guild = modelInvite.getGuild(); Long valueOf = guild != null ? Long.valueOf(guild.o()) : null; @@ -201,7 +201,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { RelativeLayout relativeLayout = this.binding.e; m.checkNotNullExpressionValue(relativeLayout, "binding.inviteAvatarSmallWrap"); relativeLayout.setVisibility(z2 ? 0 : 8); - SimpleDraweeView simpleDraweeView4 = this.binding.f1795c; + SimpleDraweeView simpleDraweeView4 = this.binding.f1797c; m.checkNotNullExpressionValue(simpleDraweeView4, "binding.inviteAvatarSmall"); if (!z2) { i = 8; @@ -221,12 +221,12 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { if (!(guild7 == null || (l = guild7.l()) == null || !l.contains(GuildFeature.PARTNERED))) { TextView textView2 = this.binding.m; m.checkNotNullExpressionValue(textView2, "binding.inviteMessage"); - ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 2131231808, 0, 0, 0, 14, null); + ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 2131231811, 0, 0, 0, 14, null); } } else { TextView textView3 = this.binding.m; m.checkNotNullExpressionValue(textView3, "binding.inviteMessage"); - ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, 2131232033, 0, 0, 0, 14, null); + ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, 2131232036, 0, 0, 0, 14, null); } TextView textView4 = this.binding.n; m.checkNotNullExpressionValue(textView4, "binding.inviteTitle"); @@ -242,11 +242,11 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { } private final CharSequence getIntroText(String str) { - return str == null ? b.i(this, 2131890351, new Object[0], null, 4) : b.i(this, 2131886764, new Object[]{str}, null, 4); + return str == null ? b.i(this, 2131890381, new Object[0], null, 4) : b.i(this, 2131886764, new Object[]{str}, null, 4); } private final CharSequence getIntroTextForGroup(String str, String str2) { - return str2.length() > 0 ? b.i(this, 2131886764, new Object[]{str}, null, 4) : b.i(this, 2131890353, new Object[0], null, 4); + return str2.length() > 0 ? b.i(this, 2131886764, new Object[]{str}, null, 4) : b.i(this, 2131890383, new Object[0], null, 4); } private final CharSequence getMembersCount(int i) { @@ -254,13 +254,13 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { m.checkNotNullExpressionValue(resources, "resources"); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - return b.i(this, 2131890340, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755190, i, Integer.valueOf(i))}, null, 4); + return b.i(this, 2131890370, new Object[]{StringResourceUtilsKt.getQuantityString(resources, context, 2131755191, i, Integer.valueOf(i))}, null, 4); } private final CharSequence getMembersOnlineCount(int i) { Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - return b.i(this, 2131890339, new Object[]{StringUtilsKt.format(i, context)}, null, 4); + return b.i(this, 2131890369, new Object[]{StringUtilsKt.format(i, context)}, null, 4); } private final void parseAttributeSet(Context context, AttributeSet attributeSet, int i) { @@ -297,14 +297,14 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { } public final void configureUIFailure(Error error) { - this.binding.n.setText(2131890332); - this.binding.m.setText(2131890452); + this.binding.n.setText(2131890362); + this.binding.m.setText(2131890482); if (error != null) { Error.Response response = error.getResponse(); m.checkNotNullExpressionValue(response, "e.response"); if (response.getCode() == 30001) { - this.binding.n.setText(2131893914); - this.binding.m.setText(2131893913); + this.binding.n.setText(2131893953); + this.binding.m.setText(2131893952); this.binding.m.setTextSize(0, getResources().getDimension(2131165776)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java index fa4698f375..b23ae711ae 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteModel.java @@ -39,19 +39,19 @@ public final class WidgetInviteModel { } private final ModelInvite tryGetStaticInvite(Long l, Guild guild, Map map) { - StageInstance stageInstance; String d; if (guild == null) { return null; } + StageInstance stageInstance = map.get(l); + if (stageInstance != null && (d = stageInstance.d()) != null) { + return ModelInvite.createForStaticUrl(d, GuildUtilsKt.createApiGuild(guild)); + } String vanityUrlCode = guild.getVanityUrlCode(); if (vanityUrlCode != null) { return ModelInvite.createForStaticUrl(vanityUrlCode, GuildUtilsKt.createApiGuild(guild)); } - if (l == null || (stageInstance = map.get(l)) == null || (d = stageInstance.d()) == null) { - return null; - } - return ModelInvite.createForStaticUrl(d, GuildUtilsKt.createApiGuild(guild)); + return null; } /* JADX WARNING: Removed duplicated region for block: B:26:0x00a6 */ diff --git a/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java index 5dee1670e7..18d6e2227b 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java @@ -39,7 +39,7 @@ public final class ChannelViewHolder extends BaseChannelViewHolder { Long c2 = welcomeChannel.c(); String str = null; String imageUri = c2 != null ? ModelEmojiCustom.getImageUri(c2.longValue(), false, mediaProxySize) : null; - TextView textView = this.binding.f1810c; + TextView textView = this.binding.f1812c; m.checkNotNullExpressionValue(textView, "binding.guildWelcomeChannelDescription"); textView.setText(channelData.getWelcomeChannel().b()); TextView textView2 = this.binding.e; diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java index 2428592be3..88209e3a79 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetGuildJoin$binding$2 extends k implement public final WidgetGuildJoinBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363387; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363387); + int i = 2131363389; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363389); if (materialButton != null) { - i = 2131363389; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363389); + i = 2131363391; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363391); if (textInputLayout != null) { return new WidgetGuildJoinBinding((CoordinatorLayout) view, materialButton, textInputLayout); } diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java index c1c19e5c58..39e02ba3ac 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java @@ -74,7 +74,7 @@ public class WidgetGuildJoin extends AppFragment { /* JADX INFO: this call moved to the top of the method (can break code semantics) */ public /* synthetic */ WidgetGuildJoin(int i, int i2, DefaultConstructorMarker defaultConstructorMarker) { - this((i2 & 1) != 0 ? 2131559039 : i); + this((i2 & 1) != 0 ? 2131559040 : i); } public final WidgetGuildJoinBinding getBinding() { @@ -82,13 +82,13 @@ public class WidgetGuildJoin extends AppFragment { } public final void handleGuildJoin() { - TextInputLayout textInputLayout = getBinding().f1802c; + TextInputLayout textInputLayout = getBinding().f1804c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); if (textOrEmpty.length() > 0) { Intent selectInvite = IntentUtils.RouteBuilders.INSTANCE.selectInvite(textOrEmpty, "Join Guild Modal"); IntentUtils intentUtils = IntentUtils.INSTANCE; - TextInputLayout textInputLayout2 = getBinding().f1802c; + TextInputLayout textInputLayout2 = getBinding().f1804c; m.checkNotNullExpressionValue(textInputLayout2, "binding.guildJoinInvite"); Context context = textInputLayout2.getContext(); m.checkNotNullExpressionValue(context, "binding.guildJoinInvite.context"); @@ -101,7 +101,7 @@ public class WidgetGuildJoin extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - TextInputLayout textInputLayout = getBinding().f1802c; + TextInputLayout textInputLayout = getBinding().f1804c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetGuildJoin$onViewBound$1(this), 1, null); getBinding().b.setOnClickListener(new WidgetGuildJoin$onViewBound$2(this)); diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java index d658644c86..e515845a3d 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet$binding$2.java @@ -21,26 +21,26 @@ public final /* synthetic */ class WidgetGuildWelcomeSheet$binding$2 extends k i public final WidgetGuildWelcomeSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363474; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363474); + int i = 2131363476; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363476); if (recyclerView != null) { - i = 2131363475; - TextView textView = (TextView) view.findViewById(2131363475); + i = 2131363477; + TextView textView = (TextView) view.findViewById(2131363477); if (textView != null) { - i = 2131363476; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363476); + i = 2131363478; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363478); if (appViewFlipper != null) { - i = 2131363477; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363477); + i = 2131363479; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363479); if (simpleDraweeView != null) { - i = 2131363478; - CardView cardView = (CardView) view.findViewById(2131363478); + i = 2131363480; + CardView cardView = (CardView) view.findViewById(2131363480); if (cardView != null) { - i = 2131363479; - TextView textView2 = (TextView) view.findViewById(2131363479); + i = 2131363481; + TextView textView2 = (TextView) view.findViewById(2131363481); if (textView2 != null) { - i = 2131363480; - TextView textView3 = (TextView) view.findViewById(2131363480); + i = 2131363482; + TextView textView3 = (TextView) view.findViewById(2131363482); if (textView3 != null) { return new WidgetGuildWelcomeSheetBinding((NestedScrollView) view, recyclerView, textView, appViewFlipper, simpleDraweeView, cardView, textView2, textView3); } diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java index e9c8897528..b0152e9e0d 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java @@ -88,14 +88,14 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet { private final void configureGuildDetails(String str, String str2) { TextView textView = getBinding().g; m.checkNotNullExpressionValue(textView, "binding.guildWelcomeSheetName"); - b.n(textView, 2131894575, new Object[]{str}, null, 4); + b.n(textView, 2131894622, new Object[]{str}, null, 4); if (str2 != null) { - TextView textView2 = getBinding().f1811c; + TextView textView2 = getBinding().f1813c; m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeSheetDescription"); ViewExtensions.setTextAndVisibilityBy(textView2, str2); return; } - TextView textView3 = getBinding().f1811c; + TextView textView3 = getBinding().f1813c; m.checkNotNullExpressionValue(textView3, "binding.guildWelcomeSheetDescription"); textView3.setVisibility(8); } @@ -191,7 +191,7 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559048; + return 2131559049; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java index 070c848d1e..c04ffc1a8d 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheetChannelAdapter.java @@ -37,31 +37,31 @@ public final class WidgetGuildWelcomeSheetChannelAdapter extends RecyclerView.Ad public BaseChannelViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 0) { - View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559047, viewGroup, false); + View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559048, viewGroup, false); CardView cardView = (CardView) inflate; - int i2 = 2131363466; - TextView textView = (TextView) inflate.findViewById(2131363466); + int i2 = 2131363468; + TextView textView = (TextView) inflate.findViewById(2131363468); if (textView != null) { - i2 = 2131363467; - ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363467); + i2 = 2131363469; + ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363469); if (constraintLayout != null) { - i2 = 2131363468; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363468); + i2 = 2131363470; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131363470); if (simpleDraweeView != null) { - i2 = 2131363469; - ImageView imageView = (ImageView) inflate.findViewById(2131363469); + i2 = 2131363471; + ImageView imageView = (ImageView) inflate.findViewById(2131363471); if (imageView != null) { - i2 = 2131363470; - ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131363470); + i2 = 2131363472; + ConstraintLayout constraintLayout2 = (ConstraintLayout) inflate.findViewById(2131363472); if (constraintLayout2 != null) { - i2 = 2131363471; - TextView textView2 = (TextView) inflate.findViewById(2131363471); + i2 = 2131363473; + TextView textView2 = (TextView) inflate.findViewById(2131363473); if (textView2 != null) { - i2 = 2131363472; - ConstraintLayout constraintLayout3 = (ConstraintLayout) inflate.findViewById(2131363472); + i2 = 2131363474; + ConstraintLayout constraintLayout3 = (ConstraintLayout) inflate.findViewById(2131363474); if (constraintLayout3 != null) { - i2 = 2131363473; - TextView textView3 = (TextView) inflate.findViewById(2131363473); + i2 = 2131363475; + TextView textView3 = (TextView) inflate.findViewById(2131363475); if (textView3 != null) { WidgetGuildWelcomeChannelBinding widgetGuildWelcomeChannelBinding = new WidgetGuildWelcomeChannelBinding((CardView) inflate, cardView, textView, constraintLayout, simpleDraweeView, imageView, constraintLayout2, textView2, constraintLayout3, textView3); m.checkNotNullExpressionValue(widgetGuildWelcomeChannelBinding, "WidgetGuildWelcomeChanne….context), parent, false)"); diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java index edde6edcdb..4fce97ea2a 100644 --- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog$binding$2.java @@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetLeaveGuildDialog$binding$2 extends k im public final LeaveGuildDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363742; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363742); + int i = 2131363745; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363745); if (materialButton != null) { - i = 2131363743; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363743); + i = 2131363746; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363746); if (loadingButton != null) { - i = 2131363744; - TextView textView = (TextView) view.findViewById(2131363744); + i = 2131363747; + TextView textView = (TextView) view.findViewById(2131363747); if (textView != null) { - i = 2131363745; - TextView textView2 = (TextView) view.findViewById(2131363745); + i = 2131363748; + TextView textView2 = (TextView) view.findViewById(2131363748); if (textView2 != null) { - i = 2131364028; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364028); + i = 2131364030; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030); if (linearLayout != null) { return new LeaveGuildDialogBinding((LinearLayout) view, materialButton, loadingButton, textView, textView2, linearLayout); } diff --git a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java index f638e97861..cb95b40909 100644 --- a/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java +++ b/app/src/main/java/com/discord/widgets/guilds/leave/WidgetLeaveGuildDialog.java @@ -77,11 +77,11 @@ public final class WidgetLeaveGuildDialog extends AppDialog { TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.leaveGuildDialogHeader"); LeaveGuildDialogViewModel.ViewState.Valid valid = (LeaveGuildDialogViewModel.ViewState.Valid) viewState; - b.n(textView, 2131890763, new Object[]{valid.getGuild().getName()}, null, 4); + b.n(textView, 2131890793, new Object[]{valid.getGuild().getName()}, null, 4); TextView textView2 = getBinding().d; m.checkNotNullExpressionValue(textView2, "binding.leaveGuildDialogBody"); - b.n(textView2, 2131890762, new Object[]{valid.getGuild().getName()}, null, 4); - getBinding().f1615c.setIsLoading(valid.isLoading()); + b.n(textView2, 2131890792, new Object[]{valid.getGuild().getName()}, null, 4); + getBinding().f1617c.setIsLoading(valid.isLoading()); } else if (m.areEqual(viewState, LeaveGuildDialogViewModel.ViewState.Invalid.INSTANCE)) { dismiss(); } @@ -105,7 +105,7 @@ public final class WidgetLeaveGuildDialog extends AppDialog { public void onResume() { super.onResume(); requireDialog().setCanceledOnTouchOutside(true); - getBinding().f1615c.setOnClickListener(new WidgetLeaveGuildDialog$onResume$1(this)); + getBinding().f1617c.setOnClickListener(new WidgetLeaveGuildDialog$onResume$1(this)); getBinding().b.setOnClickListener(new WidgetLeaveGuildDialog$onResume$2(this)); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeViewState(), this), WidgetLeaveGuildDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetLeaveGuildDialog$onResume$3(this), 62, (Object) null); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle(getViewModel().observeEvents(), this), WidgetLeaveGuildDialog.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetLeaveGuildDialog$onResume$4(this), 62, (Object) null); diff --git a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java index 32dd9ffb8b..8e9e424ed9 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java @@ -69,26 +69,26 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { m.checkNotNullParameter(function12, "onLongPressed"); this.onClicked = function1; this.onLongPressed = function12; - int i = 2131363488; - ServerFolderView serverFolderView = (ServerFolderView) view.findViewById(2131363488); + int i = 2131363490; + ServerFolderView serverFolderView = (ServerFolderView) view.findViewById(2131363490); if (serverFolderView != null) { - i = 2131363489; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363489); + i = 2131363491; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363491); if (frameLayout != null) { - i = 2131363490; - View findViewById = view.findViewById(2131363490); + i = 2131363492; + View findViewById = view.findViewById(2131363492); if (findViewById != null) { - i = 2131363491; - TextView textView = (TextView) view.findViewById(2131363491); + i = 2131363493; + TextView textView = (TextView) view.findViewById(2131363493); if (textView != null) { - i = 2131363495; - View findViewById2 = view.findViewById(2131363495); + i = 2131363497; + View findViewById2 = view.findViewById(2131363497); if (findViewById2 != null) { - i = 2131363496; - ImageView imageView = (ImageView) view.findViewById(2131363496); + i = 2131363498; + ImageView imageView = (ImageView) view.findViewById(2131363498); if (imageView != null) { - i = 2131363497; - ImageView imageView2 = (ImageView) view.findViewById(2131363497); + i = 2131363499; + ImageView imageView2 = (ImageView) view.findViewById(2131363499); if (imageView2 != null) { WidgetGuildsListItemFolderBinding widgetGuildsListItemFolderBinding = new WidgetGuildsListItemFolderBinding((RelativeLayout) view, serverFolderView, frameLayout, findViewById, textView, findViewById2, imageView, imageView2); m.checkNotNullExpressionValue(widgetGuildsListItemFolderBinding, "WidgetGuildsListItemFolderBinding.bind(view)"); @@ -144,7 +144,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { GridLayout gridLayout = serverFolderView.j.g; m.checkNotNullExpressionValue(gridLayout, "binding.guildViews"); gridLayout.setVisibility(isOpen ? 0 : 8); - serverFolderView.j.b.setImageDrawable(ContextCompat.getDrawable(serverFolderView.getContext(), 2131231667)); + serverFolderView.j.b.setImageDrawable(ContextCompat.getDrawable(serverFolderView.getContext(), 2131231670)); } else { Long l = serverFolderView.k; boolean z2 = (l == null || l.longValue() != folderId || serverFolderView.l == isOpen) ? false : true; @@ -223,7 +223,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { ImageView imageView2 = this.binding.h; imageView2.setActivated(folderItem.isAnyGuildConnectedToVoice()); imageView2.setVisibility(!folderItem.isOpen() && folderItem.isAnyGuildConnectedToVoice() ? 0 : 8); - imageView2.setImageResource(folderItem.isAnyGuildConnectedToStageChannel() ? 2131231480 : 2131232052); + imageView2.setImageResource(folderItem.isAnyGuildConnectedToStageChannel() ? 2131231480 : 2131232055); View view2 = this.binding.d; m.checkNotNullExpressionValue(view2, "binding.guildsItemHighlight"); if (folderItem.isTargetedForFolderAddition()) { @@ -232,16 +232,16 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { view2.setVisibility(i5); int mentionCount = folderItem.getMentionCount(); if (mentionCount > 0) { - charSequence = StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755134, mentionCount, Integer.valueOf(mentionCount)); + charSequence = StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755135, mentionCount, Integer.valueOf(mentionCount)); } View view3 = this.itemView; m.checkNotNullExpressionValue(view3, "itemView"); - CharSequence i6 = b.i(view3, folderItem.isOpen() ? 2131888451 : 2131887414, new Object[0], null, 4); + CharSequence i6 = b.i(view3, folderItem.isOpen() ? 2131888461 : 2131887416, new Object[0], null, 4); View view4 = this.itemView; m.checkNotNullExpressionValue(view4, "itemView"); View view5 = this.itemView; m.checkNotNullExpressionValue(view5, "itemView"); - view4.setContentDescription(b.i(view5, 2131889233, new Object[]{folderItem.getName(), charSequence, i6}, null, 4)); + view4.setContentDescription(b.i(view5, 2131889243, new Object[]{folderItem.getName(), charSequence, i6}, null, 4)); View view6 = this.itemView; m.checkNotNullExpressionValue(view6, "itemView"); ViewExtensions.setOnLongClickListenerConsumeClick(view6, new GuildListViewHolder$FolderViewHolder$configure$4(this, folderItem)); @@ -301,14 +301,14 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { m.checkNotNullParameter(view, "view"); m.checkNotNullParameter(function1, "onClicked"); this.onClicked = function1; - int i = 2131363492; - ImageView imageView = (ImageView) view.findViewById(2131363492); + int i = 2131363494; + ImageView imageView = (ImageView) view.findViewById(2131363494); if (imageView != null) { - i = 2131363493; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363493); + i = 2131363495; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363495); if (frameLayout != null) { - i = 2131363494; - ImageView imageView2 = (ImageView) view.findViewById(2131363494); + i = 2131363496; + ImageView imageView2 = (ImageView) view.findViewById(2131363496); if (imageView2 != null) { WidgetGuildsListItemProfileBinding widgetGuildsListItemProfileBinding = new WidgetGuildsListItemProfileBinding((RelativeLayout) view, imageView, frameLayout, imageView2); m.checkNotNullExpressionValue(widgetGuildsListItemProfileBinding, "WidgetGuildsListItemProfileBinding.bind(view)"); @@ -331,16 +331,16 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { imageView.setVisibility(friendsItem.isSelected() ? 0 : 8); this.binding.a.setOnClickListener(new GuildListViewHolder$FriendsViewHolder$configure$1(this, friendsItem)); if (friendsItem.isSelected()) { - this.binding.f1817c.setBackgroundResource(2131231201); - FrameLayout frameLayout = this.binding.f1817c; + this.binding.f1819c.setBackgroundResource(2131231201); + FrameLayout frameLayout = this.binding.f1819c; m.checkNotNullExpressionValue(frameLayout, "binding.guildsItemProfileAvatarWrap"); frameLayout.setBackgroundTintList(null); } else { - this.binding.f1817c.setBackgroundResource(2131231070); - FrameLayout frameLayout2 = this.binding.f1817c; + this.binding.f1819c.setBackgroundResource(2131231070); + FrameLayout frameLayout2 = this.binding.f1819c; m.checkNotNullExpressionValue(frameLayout2, "binding.guildsItemProfileAvatarWrap"); int themedColor = ColorCompat.getThemedColor(frameLayout2, 2130968905); - FrameLayout frameLayout3 = this.binding.f1817c; + FrameLayout frameLayout3 = this.binding.f1819c; m.checkNotNullExpressionValue(frameLayout3, "binding.guildsItemProfileAvatarWrap"); frameLayout3.setBackgroundTintList(ColorStateList.valueOf(themedColor)); } @@ -349,7 +349,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { m.checkNotNullExpressionValue(imageView2, "binding.guildsItemProfileAvatar"); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getColor(view, 2131100427))); + imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getColor(view, 2131100428))); return; } ImageView imageView3 = this.binding.b; @@ -415,11 +415,11 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { this.overlayColorInFolder = i2; this.onClicked = function1; this.onLongPressed = function12; - int i3 = 2131363495; - ImageView imageView = (ImageView) view.findViewById(2131363495); + int i3 = 2131363497; + ImageView imageView = (ImageView) view.findViewById(2131363497); if (imageView != null) { - i3 = 2131363496; - ImageView imageView2 = (ImageView) view.findViewById(2131363496); + i3 = 2131363498; + ImageView imageView2 = (ImageView) view.findViewById(2131363498); if (imageView2 != null) { WidgetGuildsListItemGuildVerticalBinding widgetGuildsListItemGuildVerticalBinding = new WidgetGuildsListItemGuildVerticalBinding((RelativeLayout) view, imageView, imageView2); m.checkNotNullExpressionValue(widgetGuildsListItemGuildVerticalBinding, "WidgetGuildsListItemGuil…calBinding.bind(itemView)"); @@ -667,7 +667,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { if (guildItem.isSelected()) { TextView textView2 = this.bindingGuild.e; m.checkNotNullExpressionValue(textView2, "bindingGuild.guildsItemAvatarText"); - i = ColorCompat.getColor(textView2.getContext(), 2131100427); + i = ColorCompat.getColor(textView2.getContext(), 2131100428); } else { TextView textView3 = this.bindingGuild.e; m.checkNotNullExpressionValue(textView3, "bindingGuild.guildsItemAvatarText"); @@ -679,21 +679,21 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { m.checkNotNullExpressionValue(textView4, "bindingGuild.guildsItemMentions"); configureMentionsCount(textView4, guildItem.getMentionCount()); int mentionCount = guildItem.getMentionCount(); - String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755183, mentionCount, Integer.valueOf(mentionCount)) : ""; + String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755184, mentionCount, Integer.valueOf(mentionCount)) : ""; View view4 = this.itemView; m.checkNotNullExpressionValue(view4, "itemView"); View view5 = this.itemView; m.checkNotNullExpressionValue(view5, "itemView"); - view4.setContentDescription(b.i(view5, 2131890099, new Object[]{i18nPluralString, guildItem.getGuild().getName()}, null, 4)); + view4.setContentDescription(b.i(view5, 2131890112, new Object[]{i18nPluralString, guildItem.getGuild().getName()}, null, 4)); ImageView imageView = this.bindingGuild.h; int i2 = 8; imageView.setVisibility(guildItem.isConnectedToVoice() || guildItem.getHasActiveStageChannel() ? 0 : 8); imageView.setActivated(guildItem.isConnectedToVoice()); - imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? 2131231480 : 2131232052); - ImageView imageView2 = this.bindingGuild.f1815c; + imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? 2131231480 : 2131232055); + ImageView imageView2 = this.bindingGuild.f1817c; m.checkNotNullExpressionValue(imageView2, "bindingGuild.guildsItemApplicationStream"); imageView2.setVisibility(!guildItem.isConnectedToVoice() && guildItem.getHasOngoingApplicationStream() ? 0 : 8); - ImageView imageView3 = this.binding.f1816c; + ImageView imageView3 = this.binding.f1818c; m.checkNotNullExpressionValue(imageView3, "binding.guildsItemUnread"); imageView3.setVisibility(guildItem.isUnread() ? 0 : 8); ImageView imageView4 = this.binding.b; @@ -782,15 +782,15 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { public final void configure(GuildListItem.PrivateChannelItem privateChannelItem) { m.checkNotNullParameter(privateChannelItem, "data"); int mentionCount = privateChannelItem.getMentionCount(); - TextView textView = this.binding.f1813c; + TextView textView = this.binding.f1815c; m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount"); configureMentionsCount(textView, mentionCount); - String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755061, mentionCount, Integer.valueOf(mentionCount)) : ""; + String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755062, mentionCount, Integer.valueOf(mentionCount)) : ""; View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); - view.setContentDescription(b.i(view2, 2131888164, new Object[]{AnimatableValueParser.y0(privateChannelItem.getChannel()), i18nPluralString}, null, 4)); + view.setContentDescription(b.i(view2, 2131888174, new Object[]{AnimatableValueParser.y0(privateChannelItem.getChannel()), i18nPluralString}, null, 4)); SimpleDraweeView simpleDraweeView = this.binding.b; m.checkNotNullExpressionValue(simpleDraweeView, "binding.guildsItemDmAvatar"); IconUtils.setIcon$default(simpleDraweeView, privateChannelItem.getChannel(), 2131165289, null, 8, null); diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java index 39ae24f3f9..503bd02d4f 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildListAdapter.java @@ -387,37 +387,37 @@ public final class WidgetGuildListAdapter extends RecyclerView.Adapter mo1invoke() { StoreStream.Companion companion = StoreStream.Companion; - Observable g = Observable.g(companion.getGuildJoinRequests().observeGuildJoinRequests(), companion.getGuildJoinRequests().observePendingGuilds(), companion.getGuilds().observeGuildIds(), companion.getStageInstances().observeGuildIdsWithStageInstances(), companion.getChannels().observeGuildAndPrivateChannels(), AnonymousClass1.INSTANCE); + Observable g = Observable.g(companion.getGuildJoinRequests().observeGuildJoinRequests(), companion.getGuildJoinRequests().observePendingGuilds(), companion.getGuilds().observeGuildIds(), GuildIdsWithVisibleStageInstanceModel.observe$default(GuildIdsWithVisibleStageInstanceModel.INSTANCE, null, null, null, 7, null), companion.getChannels().observeGuildAndPrivateChannels(), AnonymousClass1.INSTANCE); m.checkNotNullExpressionValue(g, "Observable.combineLatest…ls,\n )\n }"); return g; } diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java index b077d090cb..bb905dd835 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsListViewModel.java @@ -11,7 +11,6 @@ import com.discord.api.guildjoinrequest.ApplicationStatus; import com.discord.api.guildjoinrequest.GuildJoinRequest; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelNotificationSettings; -import com.discord.models.experiments.domain.Experiment; import com.discord.models.guild.Guild; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreGuildsSorted; @@ -19,6 +18,7 @@ import com.discord.stores.StoreNavigation; import com.discord.stores.StoreStream; import com.discord.stores.StoreUser; import com.discord.utilities.channel.ChannelSelector; +import com.discord.utilities.features.GrowthTeamFeatures; import com.discord.utilities.guilds.MemberVerificationUtils; import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.rest.RestAPI; @@ -1735,49 +1735,40 @@ public final class WidgetGuildsListViewModel extends AppViewModel { m.checkNotNullParameter(guildListItem, "item"); m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(fragmentManager, "fragmentManager"); - StoreStream.Companion companion = StoreStream.Companion; - boolean z2 = true; - Experiment userExperiment = companion.getExperiments().getUserExperiment("2021-06_discord_u_android", true); - if (userExperiment != null && userExperiment.getBucket() == 1) { - z2 = false; - } + boolean z2 = !GrowthTeamFeatures.INSTANCE.isDiscordUEnabled(); if (guildListItem instanceof GuildListItem.GuildItem) { GuildListItem.GuildItem guildItem = (GuildListItem.GuildItem) guildListItem; if (guildItem.isPendingGuild()) { MemberVerificationUtils.maybeShowVerificationGate$default(MemberVerificationUtils.INSTANCE, context, fragmentManager, guildItem.getGuild().getId(), "Guilds List", null, WidgetGuildsListViewModel$onItemClicked$1.INSTANCE, 16, null); } else if (guildItem.isSelected()) { - StoreNavigation.setNavigationPanelAction$default(companion.getNavigation(), StoreNavigation.PanelAction.CLOSE, null, 2, null); + StoreNavigation.setNavigationPanelAction$default(StoreStream.Companion.getNavigation(), StoreNavigation.PanelAction.CLOSE, null, 2, null); } else if (!guildItem.getGuild().hasFeature(GuildFeature.HUB) || !z2) { - companion.getGuildSelected().set(guildItem.getGuild().getId()); + StoreStream.Companion.getGuildSelected().set(guildItem.getGuild().getId()); } else { - c.a.d.o.g(context, 2131888144, 0, null, 12); + c.a.d.o.g(context, 2131888154, 0, null, 12); } } else if (guildListItem instanceof GuildListItem.PrivateChannelItem) { ChannelSelector.selectChannel$default(ChannelSelector.Companion.getInstance(), 0, ((GuildListItem.PrivateChannelItem) guildListItem).getChannel().g(), null, null, 12, null); } else if (guildListItem instanceof GuildListItem.UnavailableItem) { - PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.ShowUnavailableGuilds(((GuildListItem.UnavailableItem) guildListItem).getUnavailableGuildCount())); + this.eventSubject.j.onNext(new Event.ShowUnavailableGuilds(((GuildListItem.UnavailableItem) guildListItem).getUnavailableGuildCount())); } else if (guildListItem instanceof GuildListItem.FriendsItem) { if (((GuildListItem.FriendsItem) guildListItem).isSelected()) { - StoreNavigation.setNavigationPanelAction$default(companion.getNavigation(), StoreNavigation.PanelAction.CLOSE, null, 2, null); + StoreNavigation.setNavigationPanelAction$default(StoreStream.Companion.getNavigation(), StoreNavigation.PanelAction.CLOSE, null, 2, null); } else { - companion.getGuildSelected().set(0); + StoreStream.Companion.getGuildSelected().set(0); } } else if (m.areEqual(guildListItem, GuildListItem.CreateItem.INSTANCE)) { - PublishSubject publishSubject2 = this.eventSubject; - publishSubject2.j.onNext(Event.ShowCreateGuild.INSTANCE); + this.eventSubject.j.onNext(Event.ShowCreateGuild.INSTANCE); } else if (m.areEqual(guildListItem, GuildListItem.HelpItem.INSTANCE)) { - PublishSubject publishSubject3 = this.eventSubject; - publishSubject3.j.onNext(Event.ShowHelp.INSTANCE); + this.eventSubject.j.onNext(Event.ShowHelp.INSTANCE); } else if (guildListItem instanceof GuildListItem.FolderItem) { GuildListItem.FolderItem folderItem = (GuildListItem.FolderItem) guildListItem; if (folderItem.isOpen()) { - companion.getExpandedGuildFolders().closeFolder(guildListItem.getItemId()); + StoreStream.Companion.getExpandedGuildFolders().closeFolder(guildListItem.getItemId()); } else { - companion.getExpandedGuildFolders().openFolder(guildListItem.getItemId()); + StoreStream.Companion.getExpandedGuildFolders().openFolder(guildListItem.getItemId()); } - PublishSubject publishSubject4 = this.eventSubject; - publishSubject4.j.onNext(new Event.AnnounceFolderToggleForAccessibility(folderItem)); + this.eventSubject.j.onNext(new Event.AnnounceFolderToggleForAccessibility(folderItem)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java index c62d2957c6..88358d8703 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/MoreEmojiViewHolder.java @@ -30,6 +30,6 @@ public final class MoreEmojiViewHolder extends BaseEmojiViewHolder { m.checkNotNullExpressionValue(view, "itemView"); Resources resources = view.getResources(); m.checkNotNullExpressionValue(resources, "itemView.resources"); - textView.setText(b.h(resources, 2131888481, new Object[]{String.valueOf(((EmojiItem.MoreEmoji) emojiItem).getExtraEmojiCount())}, null, 4)); + textView.setText(b.h(resources, 2131888491, new Object[]{String.valueOf(((EmojiItem.MoreEmoji) emojiItem).getExtraEmojiCount())}, null, 4)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java index db195d5420..2bf00f5bf0 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$binding$2.java @@ -27,140 +27,140 @@ public final /* synthetic */ class WidgetGuildProfileSheet$binding$2 extends k i public final WidgetGuildProfileSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363397; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363397); + int i = 2131363399; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363399); if (linearLayout != null) { - i = 2131363398; - Barrier barrier = (Barrier) view.findViewById(2131363398); + i = 2131363400; + Barrier barrier = (Barrier) view.findViewById(2131363400); if (barrier != null) { - i = 2131363399; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363399); + i = 2131363401; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363401); if (checkedSetting != null) { - i = 2131363400; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363400); + i = 2131363402; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363402); if (simpleDraweeView != null) { - i = 2131363401; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363401); + i = 2131363403; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363403); if (materialButton != null) { - i = 2131363402; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363402); + i = 2131363404; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363404); if (linearLayout2 != null) { - i = 2131363403; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363403); + i = 2131363405; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363405); if (linearLayout3 != null) { - i = 2131363404; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363404); + i = 2131363406; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131363406); if (linearLayout4 != null) { - i = 2131363405; - ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363405); + i = 2131363407; + ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131363407); if (constraintLayout != null) { - i = 2131363406; - LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131363406); + i = 2131363408; + LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131363408); if (linearLayout5 != null) { - i = 2131363407; - View findViewById = view.findViewById(2131363407); + i = 2131363409; + View findViewById = view.findViewById(2131363409); if (findViewById != null) { - i = 2131363408; - TextView textView = (TextView) view.findViewById(2131363408); + i = 2131363410; + TextView textView = (TextView) view.findViewById(2131363410); if (textView != null) { - i = 2131363409; - TextView textView2 = (TextView) view.findViewById(2131363409); + i = 2131363411; + TextView textView2 = (TextView) view.findViewById(2131363411); if (textView2 != null) { - i = 2131363410; - TextView textView3 = (TextView) view.findViewById(2131363410); + i = 2131363412; + TextView textView3 = (TextView) view.findViewById(2131363412); if (textView3 != null) { - i = 2131363411; - TextView textView4 = (TextView) view.findViewById(2131363411); + i = 2131363413; + TextView textView4 = (TextView) view.findViewById(2131363413); if (textView4 != null) { - i = 2131363412; - CardView cardView = (CardView) view.findViewById(2131363412); + i = 2131363414; + CardView cardView = (CardView) view.findViewById(2131363414); if (cardView != null) { - i = 2131363414; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363414); + i = 2131363416; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363416); if (recyclerView != null) { - i = 2131363415; - CardView cardView2 = (CardView) view.findViewById(2131363415); + i = 2131363417; + CardView cardView2 = (CardView) view.findViewById(2131363417); if (cardView2 != null) { - i = 2131363416; - TextView textView5 = (TextView) view.findViewById(2131363416); + i = 2131363418; + TextView textView5 = (TextView) view.findViewById(2131363418); if (textView5 != null) { - i = 2131363417; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363417); + i = 2131363419; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363419); if (appViewFlipper != null) { - i = 2131363418; - ImageView imageView = (ImageView) view.findViewById(2131363418); + i = 2131363420; + ImageView imageView = (ImageView) view.findViewById(2131363420); if (imageView != null) { - i = 2131363419; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363419); + i = 2131363421; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131363421); if (checkedSetting2 != null) { - i = 2131363420; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363420); + i = 2131363422; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131363422); if (simpleDraweeView2 != null) { - i = 2131363421; - CardView cardView3 = (CardView) view.findViewById(2131363421); + i = 2131363423; + CardView cardView3 = (CardView) view.findViewById(2131363423); if (cardView3 != null) { - i = 2131363422; - TextView textView6 = (TextView) view.findViewById(2131363422); + i = 2131363424; + TextView textView6 = (TextView) view.findViewById(2131363424); if (textView6 != null) { - i = 2131363423; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363423); + i = 2131363425; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363425); if (materialButton2 != null) { - i = 2131363424; - MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363424); + i = 2131363426; + MaterialButton materialButton3 = (MaterialButton) view.findViewById(2131363426); if (materialButton3 != null) { - i = 2131363425; - TextView textView7 = (TextView) view.findViewById(2131363425); + i = 2131363427; + TextView textView7 = (TextView) view.findViewById(2131363427); if (textView7 != null) { - i = 2131363426; - TextView textView8 = (TextView) view.findViewById(2131363426); + i = 2131363428; + TextView textView8 = (TextView) view.findViewById(2131363428); if (textView8 != null) { - i = 2131363427; - CardView cardView4 = (CardView) view.findViewById(2131363427); + i = 2131363429; + CardView cardView4 = (CardView) view.findViewById(2131363429); if (cardView4 != null) { - i = 2131363428; - LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131363428); + i = 2131363430; + LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131363430); if (linearLayout6 != null) { - i = 2131363429; - TextView textView9 = (TextView) view.findViewById(2131363429); + i = 2131363431; + TextView textView9 = (TextView) view.findViewById(2131363431); if (textView9 != null) { - i = 2131363430; - TextView textView10 = (TextView) view.findViewById(2131363430); + i = 2131363432; + TextView textView10 = (TextView) view.findViewById(2131363432); if (textView10 != null) { - i = 2131363431; - TextView textView11 = (TextView) view.findViewById(2131363431); + i = 2131363433; + TextView textView11 = (TextView) view.findViewById(2131363433); if (textView11 != null) { - i = 2131363432; - MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131363432); + i = 2131363434; + MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131363434); if (materialButton4 != null) { - i = 2131363433; - LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131363433); + i = 2131363435; + LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131363435); if (linearLayout7 != null) { - i = 2131363434; - TextView textView12 = (TextView) view.findViewById(2131363434); + i = 2131363436; + TextView textView12 = (TextView) view.findViewById(2131363436); if (textView12 != null) { - i = 2131363435; - ImageView imageView2 = (ImageView) view.findViewById(2131363435); + i = 2131363437; + ImageView imageView2 = (ImageView) view.findViewById(2131363437); if (imageView2 != null) { - i = 2131363436; - TextView textView13 = (TextView) view.findViewById(2131363436); + i = 2131363438; + TextView textView13 = (TextView) view.findViewById(2131363438); if (textView13 != null) { - i = 2131363437; - CardView cardView5 = (CardView) view.findViewById(2131363437); + i = 2131363439; + CardView cardView5 = (CardView) view.findViewById(2131363439); if (cardView5 != null) { - i = 2131363438; - CardView cardView6 = (CardView) view.findViewById(2131363438); + i = 2131363440; + CardView cardView6 = (CardView) view.findViewById(2131363440); if (cardView6 != null) { - i = 2131363439; - MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131363439); + i = 2131363441; + MaterialButton materialButton5 = (MaterialButton) view.findViewById(2131363441); if (materialButton5 != null) { - i = 2131363440; - LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131363440); + i = 2131363442; + LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131363442); if (linearLayout8 != null) { - i = 2131363441; - MaterialButton materialButton6 = (MaterialButton) view.findViewById(2131363441); + i = 2131363443; + MaterialButton materialButton6 = (MaterialButton) view.findViewById(2131363443); if (materialButton6 != null) { - i = 2131363442; - MaterialButton materialButton7 = (MaterialButton) view.findViewById(2131363442); + i = 2131363444; + MaterialButton materialButton7 = (MaterialButton) view.findViewById(2131363444); if (materialButton7 != null) { return new WidgetGuildProfileSheetBinding((NestedScrollView) view, linearLayout, barrier, checkedSetting, simpleDraweeView, materialButton, linearLayout2, linearLayout3, linearLayout4, constraintLayout, linearLayout5, findViewById, textView, textView2, textView3, textView4, cardView, recyclerView, cardView2, textView5, appViewFlipper, imageView, checkedSetting2, simpleDraweeView2, cardView3, textView6, materialButton2, materialButton3, textView7, textView8, cardView4, linearLayout6, textView9, textView10, textView11, materialButton4, linearLayout7, textView12, imageView2, textView13, cardView5, cardView6, materialButton5, linearLayout8, materialButton6, materialButton7); } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java index 848dc6052c..eb4d804ece 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet$showChangeNicknameDialog$2.java @@ -42,7 +42,7 @@ public final class WidgetGuildProfileSheet$showChangeNicknameDialog$2 implements public final void onClick(View view) { WidgetGuildProfileSheetViewModel access$getViewModel$p = WidgetGuildProfileSheet.access$getViewModel$p(this.this$0); long j = this.$guildId; - TextInputLayout textInputLayout = this.$binding.f1704c; + TextInputLayout textInputLayout = this.$binding.f1706c; m.checkNotNullExpressionValue(textInputLayout, "binding.channelsListActionsChangeNicknameEditText"); access$getViewModel$p.onClickSaveNickname(j, ViewExtensions.getTextOrEmpty(textInputLayout), new AnonymousClass1(this)); } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java index 014b30b54f..1e6482d6a9 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java @@ -177,7 +177,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { TextView textView3 = getBinding().G; textView3.setVisibility(true ^ (nick == null || nick.length() == 0) ? 0 : 8); textView3.setText(nick); - CheckedSetting checkedSetting = getBinding().f1803c; + CheckedSetting checkedSetting = getBinding().f1805c; checkedSetting.setChecked(actions.isAllowDMChecked()); checkedSetting.setOnCheckedListener(new WidgetGuildProfileSheet$configureActions$$inlined$apply$lambda$4(this, actions, j)); CheckedSetting checkedSetting2 = getBinding().u; @@ -204,7 +204,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { MaterialButton materialButton = getBinding().P; materialButton.setVisibility(showUploadEmoji ? 0 : 8); setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1(this, showUploadEmoji, j)); - MaterialButton materialButton2 = getBinding().f1807z; + MaterialButton materialButton2 = getBinding().f1809z; materialButton2.setVisibility(showJoinServer ? 0 : 8); setOnClickAndDismissListener(materialButton2, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$2(this, showJoinServer, j)); MaterialButton materialButton3 = getBinding().Q; @@ -230,7 +230,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { m.checkNotNullExpressionValue(textView, "binding.guildProfileSheetEmojisCount"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - textView.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755075, 2131891348, size, Integer.valueOf(size))); + textView.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755076, 2131891381, size, Integer.valueOf(size))); ImageView imageView = getBinding().K; m.checkNotNullExpressionValue(imageView, "binding.guildProfileSheetPremiumUpsellDotSeparator"); imageView.setVisibility(isPremium ^ true ? 0 : 8); @@ -318,7 +318,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { private final void configureGuildIcon(long j, String str, String str2) { String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(j), str, null, true, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165298))), 4, null); if (forGuild$default != null) { - TextView textView = getBinding().f1805x; + TextView textView = getBinding().f1807x; m.checkNotNullExpressionValue(textView, "binding.guildProfileSheetIconName"); textView.setVisibility(8); SimpleDraweeView simpleDraweeView = getBinding().v; @@ -329,10 +329,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { SimpleDraweeView simpleDraweeView2 = getBinding().v; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.guildProfileSheetIcon"); IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon_selected.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); - TextView textView2 = getBinding().f1805x; + TextView textView2 = getBinding().f1807x; m.checkNotNullExpressionValue(textView2, "binding.guildProfileSheetIconName"); textView2.setVisibility(0); - TextView textView3 = getBinding().f1805x; + TextView textView3 = getBinding().f1807x; m.checkNotNullExpressionValue(textView3, "binding.guildProfileSheetIconName"); textView3.setText(str2); } @@ -349,7 +349,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { m.checkNotNullExpressionValue(linearLayout2, "binding.guildProfileSheetOnlineCount"); Context context = linearLayout2.getContext(); m.checkNotNullExpressionValue(context, "binding.guildProfileSheetOnlineCount.context"); - b.n(textView, 2131890339, new Object[]{StringUtilsKt.format(intValue, context)}, null, 4); + b.n(textView, 2131890369, new Object[]{StringUtilsKt.format(intValue, context)}, null, 4); } else { LinearLayout linearLayout3 = getBinding().I; m.checkNotNullExpressionValue(linearLayout3, "binding.guildProfileSheetOnlineCount"); @@ -363,10 +363,10 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { m.checkNotNullExpressionValue(resources, "resources"); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext, 2131755190, num2.intValue(), num2); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext, 2131755191, num2.intValue(), num2); TextView textView2 = getBinding().E; m.checkNotNullExpressionValue(textView2, "binding.guildProfileSheetMemberCountText"); - b.n(textView2, 2131890340, new Object[]{quantityString}, null, 4); + b.n(textView2, 2131890370, new Object[]{quantityString}, null, 4); return; } LinearLayout linearLayout5 = getBinding().D; @@ -390,7 +390,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { MaterialButton materialButton = getBinding().e; Resources resources = materialButton.getResources(); m.checkNotNullExpressionValue(resources, "resources"); - materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755243, 2131892028, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); + materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, 2131755244, 2131892066, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); materialButton.setTextColor(themedColor); setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$1(this, premiumSubscriptionCount, themedColor, j)); MaterialButton materialButton2 = getBinding().H; @@ -402,7 +402,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { ColorCompatKt.setDrawableColor(materialButton3, themedColor); materialButton3.setTextColor(themedColor); setOnClickAndDismissListener(materialButton3, new WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$3(this, canAccessSettings, themedColor, j)); - MaterialButton materialButton4 = getBinding().f1806y; + MaterialButton materialButton4 = getBinding().f1808y; if (ableToInstantInvite) { i = 0; } @@ -612,13 +612,13 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { } private final void showLoadingView() { - AppViewFlipper appViewFlipper = getBinding().f1804s; + AppViewFlipper appViewFlipper = getBinding().f1806s; m.checkNotNullExpressionValue(appViewFlipper, "binding.guildProfileSheetFlipper"); appViewFlipper.setDisplayedChild(0); } private final void updateView(WidgetGuildProfileSheetViewModel.ViewState.Loaded loaded) { - AppViewFlipper appViewFlipper = getBinding().f1804s; + AppViewFlipper appViewFlipper = getBinding().f1806s; m.checkNotNullExpressionValue(appViewFlipper, "binding.guildProfileSheetFlipper"); appViewFlipper.setDisplayedChild(1); configureUI(loaded); @@ -626,7 +626,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559043; + return 2131559044; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java index 2a897c36a9..6700561075 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetEmojisAdapter.java @@ -65,14 +65,14 @@ public final class WidgetGuildProfileSheetEmojisAdapter extends RecyclerView.Ada public BaseEmojiViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 0) { - View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559042, viewGroup, false); + View inflate = LayoutInflater.from(viewGroup.getContext()).inflate(2131559043, viewGroup, false); Objects.requireNonNull(inflate, "rootView"); SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate; WidgetGuildProfileEmojiItemBinding widgetGuildProfileEmojiItemBinding = new WidgetGuildProfileEmojiItemBinding(simpleDraweeView, simpleDraweeView); m.checkNotNullExpressionValue(widgetGuildProfileEmojiItemBinding, "WidgetGuildProfileEmojiI….context), parent, false)"); return new EmojiViewHolder(widgetGuildProfileEmojiItemBinding); } else if (i == 1) { - View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131559041, viewGroup, false); + View inflate2 = LayoutInflater.from(viewGroup.getContext()).inflate(2131559042, viewGroup, false); Objects.requireNonNull(inflate2, "rootView"); WidgetGuildProfileEmojiExtraBinding widgetGuildProfileEmojiExtraBinding = new WidgetGuildProfileEmojiExtraBinding((TextView) inflate2); m.checkNotNullExpressionValue(widgetGuildProfileEmojiExtraBinding, "WidgetGuildProfileEmojiE….context), parent, false)"); diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java index bcc4e0176d..81916aacbc 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1.java @@ -19,6 +19,6 @@ public final class WidgetGuildProfileSheetViewModel$onClickMarkAsRead$1 extends /* renamed from: invoke */ public final void mo1invoke() { PublishSubject access$getEventSubject$p = WidgetGuildProfileSheetViewModel.access$getEventSubject$p(this.this$0); - access$getEventSubject$p.j.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(2131890905)); + access$getEventSubject$p.j.onNext(new WidgetGuildProfileSheetViewModel.Event.DismissAndShowToast(2131890935)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java index 97a3b8cad2..86919f94e5 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.java @@ -1220,45 +1220,40 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel list, boolean z2, List list2, boolean z3, boolean z4) { Integer num; List list3; - List e; + List d; int i; Integer num2 = null; if (guild.getFeatures().contains(GuildFeature.VERIFIED)) { - i = 2131232033; + i = 2131232036; } else if (guild.getFeatures().contains(GuildFeature.PARTNERED)) { - i = 2131231808; + i = 2131231811; } else { num = null; - Banner.Type type = !this.viewingGuild ? Banner.Type.BANNER : Banner.Type.SPLASH; - Banner banner = new Banner(guild.getId(), type != Banner.Type.BANNER ? guild.getBanner() : guild.getSplash(), type); + Banner banner = new Banner(guild.getId(), guild.getBanner(), Banner.Type.BANNER); ManageGuildContext manageGuildContext = guildChannelsInfo.getManageGuildContext(); TabItems tabItems = z3 ? new TabItems(manageGuildContext.canManage(), guildChannelsInfo.getAbleToInstantInvite(), guild.getPremiumSubscriptionCount()) : null; Actions actions = z3 ? new Actions(z4, manageGuildContext.getCanManageChannels(), guildChannelsInfo.getCanChangeNickname(), guildMember != null ? guildMember.getNick() : null, !list.contains(Long.valueOf(guild.getId())), guildChannelsInfo.getHideMutedChannels(), !guild.isOwner(meUser.getId()), z2) : null; if (z3) { list3 = list2; - } else if (guildPreview == null || (e = guildPreview.e()) == null) { + } else if (guildPreview == null || (d = guildPreview.d()) == null) { list3 = null; } else { - list3 = new ArrayList<>(d0.t.o.collectionSizeOrDefault(e, 10)); - for (GuildEmoji guildEmoji : e) { - list3.add(new ModelEmojiCustom(guildEmoji, guildPreview.h())); + list3 = new ArrayList<>(d0.t.o.collectionSizeOrDefault(d, 10)); + for (GuildEmoji guildEmoji : d) { + list3.add(new ModelEmojiCustom(guildEmoji, guildPreview.g())); } } BottomActions bottomActions = new BottomActions(z3 && manageGuildContext.getCanManageEmojis(), z3, true ^ this.viewingGuild); @@ -1279,9 +1274,7 @@ public final class WidgetGuildProfileSheetViewModel extends AppViewModel e = guildPreview.e(); - ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(e, 10)); - Iterator it = e.iterator(); + List d = guildPreview.d(); + ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(d, 10)); + Iterator it = d.iterator(); while (it.hasNext()) { - arrayList.add(new ModelEmojiCustom((GuildEmoji) it.next(), guildPreview.h())); + arrayList.add(new ModelEmojiCustom((GuildEmoji) it.next(), guildPreview.g())); it = it; bottomActions = bottomActions; } - updateViewState(new ViewState.Loaded(h, i2, computeShortName, g, d, i, banner, b, a, null, null, new EmojisData(z2, z3, arrayList), bottomActions)); + updateViewState(new ViewState.Loaded(g, h, computeShortName, f, c2, i, banner, b, a, null, null, new EmojisData(z2, z3, arrayList), bottomActions)); } private final void handleStoreState(StoreState storeState) { diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java index aec974d6d9..d40395623d 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$binding$2.java @@ -27,79 +27,79 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun public final WidgetHomeBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363762; - View findViewById = view.findViewById(2131363762); + int i = 2131363765; + View findViewById = view.findViewById(2131363765); if (findViewById != null) { - ImageView imageView = (ImageView) findViewById.findViewById(2131363769); + ImageView imageView = (ImageView) findViewById.findViewById(2131363772); if (imageView != null) { t4 t4Var = new t4((FrameLayout) findViewById, imageView); - i = 2131364109; - HomePanelsLayout homePanelsLayout = (HomePanelsLayout) view.findViewById(2131364109); + i = 2131364111; + HomePanelsLayout homePanelsLayout = (HomePanelsLayout) view.findViewById(2131364111); if (homePanelsLayout != null) { - i = 2131364130; - View findViewById2 = view.findViewById(2131364130); + i = 2131364132; + View findViewById2 = view.findViewById(2131364132); if (findViewById2 != null) { - int i2 = 2131363510; - ViewStub viewStub = (ViewStub) findViewById2.findViewById(2131363510); + int i2 = 2131363512; + ViewStub viewStub = (ViewStub) findViewById2.findViewById(2131363512); if (viewStub != null) { - i2 = 2131363513; - ViewStub viewStub2 = (ViewStub) findViewById2.findViewById(2131363513); + i2 = 2131363515; + ViewStub viewStub2 = (ViewStub) findViewById2.findViewById(2131363515); if (viewStub2 != null) { - i2 = 2131365337; - View findViewById3 = findViewById2.findViewById(2131365337); + i2 = 2131365342; + View findViewById3 = findViewById2.findViewById(2131365342); if (findViewById3 != null) { TextView textView = (TextView) findViewById3; r4 r4Var = new r4(textView, textView); - i2 = 2131365587; - View findViewById4 = findViewById2.findViewById(2131365587); + i2 = 2131365593; + View findViewById4 = findViewById2.findViewById(2131365593); if (findViewById4 != null) { - i2 = 2131365588; - FragmentContainerView fragmentContainerView = (FragmentContainerView) findViewById2.findViewById(2131365588); + i2 = 2131365594; + FragmentContainerView fragmentContainerView = (FragmentContainerView) findViewById2.findViewById(2131365594); if (fragmentContainerView != null) { - i2 = 2131365589; - FragmentContainerView fragmentContainerView2 = (FragmentContainerView) findViewById2.findViewById(2131365589); + i2 = 2131365595; + FragmentContainerView fragmentContainerView2 = (FragmentContainerView) findViewById2.findViewById(2131365595); if (fragmentContainerView2 != null) { - i2 = 2131365590; - FragmentContainerView fragmentContainerView3 = (FragmentContainerView) findViewById2.findViewById(2131365590); + i2 = 2131365596; + FragmentContainerView fragmentContainerView3 = (FragmentContainerView) findViewById2.findViewById(2131365596); if (fragmentContainerView3 != null) { - i2 = 2131365591; - FragmentContainerView fragmentContainerView4 = (FragmentContainerView) findViewById2.findViewById(2131365591); + i2 = 2131365597; + FragmentContainerView fragmentContainerView4 = (FragmentContainerView) findViewById2.findViewById(2131365597); if (fragmentContainerView4 != null) { - i2 = 2131365631; - FragmentContainerView fragmentContainerView5 = (FragmentContainerView) findViewById2.findViewById(2131365631); + i2 = 2131365637; + FragmentContainerView fragmentContainerView5 = (FragmentContainerView) findViewById2.findViewById(2131365637); if (fragmentContainerView5 != null) { - i2 = 2131365642; - FragmentContainerView fragmentContainerView6 = (FragmentContainerView) findViewById2.findViewById(2131365642); + i2 = 2131365648; + FragmentContainerView fragmentContainerView6 = (FragmentContainerView) findViewById2.findViewById(2131365648); if (fragmentContainerView6 != null) { q4 q4Var = new q4((RoundedRelativeLayout) findViewById2, viewStub, viewStub2, r4Var, findViewById4, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, fragmentContainerView6); - View findViewById5 = view.findViewById(2131364131); + View findViewById5 = view.findViewById(2131364133); if (findViewById5 != null) { - int i3 = 2131363391; - TextView textView2 = (TextView) findViewById5.findViewById(2131363391); + int i3 = 2131363393; + TextView textView2 = (TextView) findViewById5.findViewById(2131363393); if (textView2 != null) { - i3 = 2131365583; - FragmentContainerView fragmentContainerView7 = (FragmentContainerView) findViewById5.findViewById(2131365583); + i3 = 2131365589; + FragmentContainerView fragmentContainerView7 = (FragmentContainerView) findViewById5.findViewById(2131365589); if (fragmentContainerView7 != null) { - i3 = 2131365602; - FragmentContainerView fragmentContainerView8 = (FragmentContainerView) findViewById5.findViewById(2131365602); + i3 = 2131365608; + FragmentContainerView fragmentContainerView8 = (FragmentContainerView) findViewById5.findViewById(2131365608); if (fragmentContainerView8 != null) { - i3 = 2131365604; - FrameLayout frameLayout = (FrameLayout) findViewById5.findViewById(2131365604); + i3 = 2131365610; + FrameLayout frameLayout = (FrameLayout) findViewById5.findViewById(2131365610); if (frameLayout != null) { s4 s4Var = new s4((RelativeLayout) findViewById5, textView2, fragmentContainerView7, fragmentContainerView8, frameLayout); - View findViewById6 = view.findViewById(2131364132); + View findViewById6 = view.findViewById(2131364134); if (findViewById6 != null) { - int i4 = 2131363772; - RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) findViewById6.findViewById(2131363772); + int i4 = 2131363775; + RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) findViewById6.findViewById(2131363775); if (roundedRelativeLayout != null) { - i4 = 2131365577; - FragmentContainerView fragmentContainerView9 = (FragmentContainerView) findViewById6.findViewById(2131365577); + i4 = 2131365583; + FragmentContainerView fragmentContainerView9 = (FragmentContainerView) findViewById6.findViewById(2131365583); if (fragmentContainerView9 != null) { - i4 = 2131365582; - FragmentContainerView fragmentContainerView10 = (FragmentContainerView) findViewById6.findViewById(2131365582); + i4 = 2131365588; + FragmentContainerView fragmentContainerView10 = (FragmentContainerView) findViewById6.findViewById(2131365588); if (fragmentContainerView10 != null) { - i4 = 2131365594; - FragmentContainerView fragmentContainerView11 = (FragmentContainerView) findViewById6.findViewById(2131365594); + i4 = 2131365600; + FragmentContainerView fragmentContainerView11 = (FragmentContainerView) findViewById6.findViewById(2131365600); if (fragmentContainerView11 != null) { u4 u4Var = new u4((FrameLayout) findViewById6, roundedRelativeLayout, fragmentContainerView9, fragmentContainerView10, fragmentContainerView11); FrameLayout frameLayout2 = (FrameLayout) view; @@ -110,14 +110,14 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun } throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i4))); } - i = 2131364132; + i = 2131364134; } } } } throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(i3))); } - i = 2131364131; + i = 2131364133; } } } @@ -132,7 +132,7 @@ public final /* synthetic */ class WidgetHome$binding$2 extends k implements Fun } } } else { - throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131363769))); + throw new NullPointerException("Missing required view with ID: ".concat(findViewById.getResources().getResourceName(2131363772))); } } throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i))); diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java index d143bc02ed..f98ba6051d 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureFirstOpen$2.java @@ -45,7 +45,7 @@ public final class WidgetHome$configureFirstOpen$2 extends o implements Function @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - WidgetHome.access$getBinding$p(this.this$0.this$0).f1818c.openStartPanel(); + WidgetHome.access$getBinding$p(this.this$0.this$0).f1820c.openStartPanel(); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java index 4dcd9e2add..a2b2f0a55d 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureLeftPanel$1.java @@ -25,7 +25,7 @@ public final class WidgetHome$configureLeftPanel$1 extends o implements Function public final void invoke(OverlappingPanelsLayout.LockState lockState) { m.checkNotNullParameter(lockState, "lockState"); - WidgetHome.access$getBinding$p(this.this$0).f1818c.setStartPanelUseFullPortraitWidth(lockState == OverlappingPanelsLayout.LockState.OPEN); - WidgetHome.access$getBinding$p(this.this$0).f1818c.setStartPanelLockState(lockState); + WidgetHome.access$getBinding$p(this.this$0).f1820c.setStartPanelUseFullPortraitWidth(lockState == OverlappingPanelsLayout.LockState.OPEN); + WidgetHome.access$getBinding$p(this.this$0).f1820c.setStartPanelLockState(lockState); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java index f7c55b8d28..bcdba077b4 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHome$configureNavigationDrawerAction$1.java @@ -27,6 +27,6 @@ public final class WidgetHome$configureNavigationDrawerAction$1 extends o implem public final void invoke(StoreNavigation.PanelAction panelAction) { m.checkNotNullParameter(panelAction, "it"); - this.$this_configureNavigationDrawerAction.setNavigationPanelAction(panelAction, WidgetHome.access$getBinding$p(this.this$0).f1818c); + this.$this_configureNavigationDrawerAction.setNavigationPanelAction(panelAction, WidgetHome.access$getBinding$p(this.this$0).f1820c); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHome.java b/app/src/main/java/com/discord/widgets/home/WidgetHome.java index 5243857d55..e4c7aba1c2 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHome.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHome.java @@ -115,11 +115,11 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } public WidgetHome() { - super(2131559060); + super(2131559061); WidgetHome$viewModel$2 widgetHome$viewModel$2 = WidgetHome$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetHomeViewModel.class), new WidgetHome$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetHome$viewModel$2)); - this.fixedPositionViewIds = m0.setOf(2131365337); + this.fixedPositionViewIds = m0.setOf(2131365342); this.leftPanelManager = new LeftPanelManager(null, null, 3, null); this.localeManager = new LocaleManager(); this.onGuildListAddHintCreate = WidgetHome$onGuildListAddHintCreate$1.INSTANCE; @@ -199,8 +199,8 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } private final void configureOverlappingPanels() { - getBinding().f1818c.registerStartPanelStateListeners(new WidgetHome$configureOverlappingPanels$1(this)); - getBinding().f1818c.registerEndPanelStateListeners(new WidgetHome$configureOverlappingPanels$2(this)); + getBinding().f1820c.registerStartPanelStateListeners(new WidgetHome$configureOverlappingPanels$1(this)); + getBinding().f1820c.registerEndPanelStateListeners(new WidgetHome$configureOverlappingPanels$2(this)); } private final void configureUI(WidgetHomeModel widgetHomeModel) { @@ -223,13 +223,13 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } private final boolean handleBackPressed() { - int ordinal = getBinding().f1818c.getSelectedPanel().ordinal(); + int ordinal = getBinding().f1820c.getSelectedPanel().ordinal(); if (ordinal == 0) { requireActivity().moveTaskToBack(true); } else if (ordinal == 1) { handleCenterPanelBack(); } else if (ordinal == 2) { - getBinding().f1818c.closePanels(); + getBinding().f1820c.closePanels(); } return true; } @@ -248,16 +248,16 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen return; } } - getBinding().f1818c.openStartPanel(); + getBinding().f1820c.openStartPanel(); } private final void handleEvent(WidgetHomeViewModel.Event event) { if (m.areEqual(event, WidgetHomeViewModel.Event.OpenLeftPanel.INSTANCE)) { - getBinding().f1818c.openStartPanel(); + getBinding().f1820c.openStartPanel(); } else if (m.areEqual(event, WidgetHomeViewModel.Event.ClosePanels.INSTANCE)) { - getBinding().f1818c.closePanels(); + getBinding().f1820c.closePanels(); } else if (m.areEqual(event, WidgetHomeViewModel.Event.UnlockLeftPanel.INSTANCE)) { - getBinding().f1818c.setStartPanelLockState(OverlappingPanelsLayout.LockState.UNLOCKED); + getBinding().f1820c.setStartPanelLockState(OverlappingPanelsLayout.LockState.UNLOCKED); } else if (m.areEqual(event, WidgetHomeViewModel.Event.ShowChannelOnboardingSheet.INSTANCE)) { showChannelOnboardingSheet(); } else if (event instanceof WidgetHomeViewModel.Event.ShowGuildWelcomeSheet) { @@ -280,8 +280,8 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } private final void handleViewState(WidgetHomeViewModel.ViewState viewState) { - getBinding().f1818c.handleStartPanelState(viewState.getLeftPanelState()); - getBinding().f1818c.handleEndPanelState(viewState.getRightPanelState()); + getBinding().f1820c.handleStartPanelState(viewState.getLeftPanelState()); + getBinding().f1820c.handleEndPanelState(viewState.getRightPanelState()); } private final boolean isOnHomeTab() { @@ -304,7 +304,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen FrameLayout frameLayout = getBinding().g; m.checkNotNullExpressionValue(frameLayout, "binding.widgetHomeContainer"); ViewExtensions.setForwardingWindowInsetsListener(frameLayout); - HomePanelsLayout homePanelsLayout = getBinding().f1818c; + HomePanelsLayout homePanelsLayout = getBinding().f1820c; m.checkNotNullExpressionValue(homePanelsLayout, "binding.overlappingPanels"); ViewExtensions.setForwardingWindowInsetsListener(homePanelsLayout); s4 s4Var = getBinding().e; @@ -319,7 +319,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } private final void setUpToolbar() { - setActionBarDisplayHomeAsUpEnabled(true, 2131231733, 2131893897, Integer.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968946))); + setActionBarDisplayHomeAsUpEnabled(true, 2131231736, 2131893936, Integer.valueOf(ColorCompat.getThemedColor(requireContext(), 2130968946))); Toolbar toolbar = getToolbar(); if (toolbar != null) { toolbar.setNavigationOnClickListener(new WidgetHome$setUpToolbar$1(this)); @@ -374,7 +374,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } public final PanelLayout getPanelLayout() { - HomePanelsLayout homePanelsLayout = getBinding().f1818c; + HomePanelsLayout homePanelsLayout = getBinding().f1820c; m.checkNotNullExpressionValue(homePanelsLayout, "binding.overlappingPanels"); return homePanelsLayout; } @@ -396,7 +396,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen } public final void lockCloseRightPanel(boolean z2) { - getBinding().f1818c.setEndPanelLockState(z2 ? OverlappingPanelsLayout.LockState.CLOSE : OverlappingPanelsLayout.LockState.UNLOCKED); + getBinding().f1820c.setEndPanelLockState(z2 ? OverlappingPanelsLayout.LockState.CLOSE : OverlappingPanelsLayout.LockState.UNLOCKED); } @Override // androidx.fragment.app.Fragment @@ -411,7 +411,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen @Override // c.a.p.b.a public void onGestureRegionsUpdate(List list) { m.checkNotNullParameter(list, "gestureRegions"); - getBinding().f1818c.setChildGestureRegions(list); + getBinding().f1820c.setChildGestureRegions(list); } @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment @@ -437,7 +437,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen if (widgetHomeModel$app_productionGoogleRelease != null) { WidgetHomeHeaderManager.INSTANCE.configure(this, widgetHomeModel$app_productionGoogleRelease); } - if (getBinding().f1818c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) { + if (getBinding().f1820c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) { setActionBarTitleAccessibilityViewFocused(); } } @@ -463,11 +463,10 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen roundedRelativeLayout2.setLayoutParams(marginLayoutParams); setUpToolbar(); Fragment parentFragment = getParentFragment(); - Fragment parentFragment2 = parentFragment != null ? parentFragment.getParentFragment() : null; - if (!(parentFragment2 instanceof WidgetTabsHost)) { - parentFragment2 = null; + if (!(parentFragment instanceof WidgetTabsHost)) { + parentFragment = null; } - WidgetTabsHost widgetTabsHost = (WidgetTabsHost) parentFragment2; + WidgetTabsHost widgetTabsHost = (WidgetTabsHost) parentFragment; if (widgetTabsHost != null) { widgetTabsHost.registerTabSelectionListener(NavigationTab.HOME, this); } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java index 01febb4e18..8abe4900eb 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.java @@ -20,44 +20,44 @@ public final class WidgetHomeHeaderManager$getOnConfigureAction$1 implements Channel channel = this.$this_getOnConfigureAction.getChannel(); Integer valueOf = channel != null ? Integer.valueOf(channel.z()) : null; if ((valueOf != null && valueOf.intValue() == 3) || (valueOf != null && valueOf.intValue() == 1)) { - MenuItem findItem = menu.findItem(2131363869); + MenuItem findItem = menu.findItem(2131363871); m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_chat_search)"); findItem.setVisible(false); - MenuItem findItem2 = menu.findItem(2131363870); + MenuItem findItem2 = menu.findItem(2131363872); m.checkNotNullExpressionValue(findItem2, "menu.findItem(R.id.menu_chat_side_panel)"); findItem2.setVisible(true); - MenuItem findItem3 = menu.findItem(2131363875); + MenuItem findItem3 = menu.findItem(2131363877); m.checkNotNullExpressionValue(findItem3, "menu.findItem(R.id.menu_chat_thread_browser)"); findItem3.setVisible(false); } else if ((valueOf != null && valueOf.intValue() == 5) || (valueOf != null && valueOf.intValue() == 0)) { - MenuItem findItem4 = menu.findItem(2131363870); + MenuItem findItem4 = menu.findItem(2131363872); m.checkNotNullExpressionValue(findItem4, "menu.findItem(R.id.menu_chat_side_panel)"); findItem4.setVisible(true); - MenuItem findItem5 = menu.findItem(2131363869); + MenuItem findItem5 = menu.findItem(2131363871); m.checkNotNullExpressionValue(findItem5, "menu.findItem(R.id.menu_chat_search)"); findItem5.setVisible(!this.$this_getOnConfigureAction.getThreadExperimentEnabled()); - MenuItem findItem6 = menu.findItem(2131363875); + MenuItem findItem6 = menu.findItem(2131363877); m.checkNotNullExpressionValue(findItem6, "menu.findItem(R.id.menu_chat_thread_browser)"); findItem6.setVisible(this.$this_getOnConfigureAction.getThreadExperimentEnabled()); } else if ((valueOf != null && valueOf.intValue() == 10) || ((valueOf != null && valueOf.intValue() == 12) || (valueOf != null && valueOf.intValue() == 11))) { - MenuItem findItem7 = menu.findItem(2131363870); + MenuItem findItem7 = menu.findItem(2131363872); m.checkNotNullExpressionValue(findItem7, "menu.findItem(R.id.menu_chat_side_panel)"); findItem7.setVisible(false); - MenuItem findItem8 = menu.findItem(2131363869); + MenuItem findItem8 = menu.findItem(2131363871); m.checkNotNullExpressionValue(findItem8, "menu.findItem(R.id.menu_chat_search)"); findItem8.setVisible(false); - MenuItem findItem9 = menu.findItem(2131363875); + MenuItem findItem9 = menu.findItem(2131363877); m.checkNotNullExpressionValue(findItem9, "menu.findItem(R.id.menu_chat_thread_browser)"); findItem9.setVisible(true); } boolean z4 = this.$this_getOnConfigureAction.getChannel() != null && AnimatableValueParser.r1(this.$this_getOnConfigureAction.getChannel()); - MenuItem findItem10 = menu.findItem(2131363871); + MenuItem findItem10 = menu.findItem(2131363873); m.checkNotNullExpressionValue(findItem10, "menu.findItem(R.id.menu_chat_start_call)"); findItem10.setVisible(!this.$this_getOnConfigureAction.isCallConnected() && z4 && !z3); - MenuItem findItem11 = menu.findItem(2131363873); + MenuItem findItem11 = menu.findItem(2131363875); m.checkNotNullExpressionValue(findItem11, "menu.findItem(R.id.menu_chat_start_video_call)"); findItem11.setVisible(!this.$this_getOnConfigureAction.isCallConnected() && z4 && !z3); - MenuItem findItem12 = menu.findItem(2131363874); + MenuItem findItem12 = menu.findItem(2131363876); m.checkNotNullExpressionValue(findItem12, "menu.findItem(R.id.menu_chat_stop_call)"); if (this.$this_getOnConfigureAction.isCallConnected() && !z3) { z2 = true; diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java index e7019f7a80..886eddf52e 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java @@ -46,25 +46,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager"); PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager); switch (menuItem.getItemId()) { - case 2131363868: + case 2131363870: WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null); break; - case 2131363869: + case 2131363871: launchForSearch(context); break; - case 2131363870: + case 2131363872: this.$panelLayout.openEndPanel(); break; - case 2131363871: + case 2131363873: privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId()); break; - case 2131363872: + case 2131363874: ChannelInviteLaunchUtils.INSTANCE.inviteToChannel(this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar"); break; - case 2131363873: + case 2131363875: privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId()); break; - case 2131363874: + case 2131363876: StoreStream.Companion.getVoiceChannelSelected().clear(); break; } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java index 8584e9e538..b580a64c1b 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager.java @@ -154,8 +154,8 @@ public final class WidgetHomeHeaderManager { if (channel != null) { int threadCount = widgetHomeModel.getThreadCount(); View view = null; - MenuItem findItem = (toolbar == null || (menu = toolbar.getMenu()) == null) ? null : menu.findItem(2131363875); - TextView textView = (findItem == null || (actionView2 = findItem.getActionView()) == null) ? null : (TextView) actionView2.findViewById(2131365229); + MenuItem findItem = (toolbar == null || (menu = toolbar.getMenu()) == null) ? null : menu.findItem(2131363877); + TextView textView = (findItem == null || (actionView2 = findItem.getActionView()) == null) ? null : (TextView) actionView2.findViewById(2131365233); if (textView != null) { textView.setText(String.valueOf(Math.min(99, threadCount))); } @@ -163,7 +163,7 @@ public final class WidgetHomeHeaderManager { ViewKt.setVisible(textView, threadCount != 0); } if (!(findItem == null || (actionView = findItem.getActionView()) == null)) { - view = actionView.findViewById(2131365239); + view = actionView.findViewById(2131365243); } if (view != null) { view.setOnClickListener(new WidgetHomeHeaderManager$configureThreadBrowserIconBehavior$1(context, channel)); @@ -180,12 +180,12 @@ public final class WidgetHomeHeaderManager { Channel channel = widgetHomeModel.getChannel(); Integer valueOf = channel != null ? Integer.valueOf(channel.z()) : null; if (valueOf == null) { - return new HeaderData(context.getString(2131887355), null, null, false, 10, null); + return new HeaderData(context.getString(2131887357), null, null, false, 10, null); } if (valueOf.intValue() == 3) { - headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231657, false, 10, null); + headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231660, false, 10, null); } else if (valueOf.intValue() == 1) { - headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231557, false, 10, null); + headerData = new HeaderData(AnimatableValueParser.z0(widgetHomeModel.getChannel(), context, false), null, 2131231558, false, 10, null); } else if (widgetHomeModel.getChannel().g() <= 0) { return new HeaderData(null, null, null, false, 10, null); } else { @@ -203,7 +203,7 @@ public final class WidgetHomeHeaderManager { } else if (!(selectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) { return new HeaderData(null, null, null, false, 14, null); } else { - headerData = new HeaderData(context.getString(2131887894), AnimatableValueParser.z0(((StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) widgetHomeModel.getSelectedChannel()).getParentChannel(), context, true), null, true); + headerData = new HeaderData(context.getString(2131887964), AnimatableValueParser.z0(((StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) widgetHomeModel.getSelectedChannel()).getParentChannel(), context, true), null, true); } return headerData; } @@ -237,7 +237,7 @@ public final class WidgetHomeHeaderManager { widgetHome.setActionBarSubtitle(component2); Toolbar toolbar = widgetHome.getToolbar(); if (toolbar != null) { - toolbar.setNavigationIcon(ContextCompat.getDrawable(context, component4 ? DrawableCompat.getThemedDrawableRes$default(context, 2130969368, 0, 2, (Object) null) : 2131231733)); + toolbar.setNavigationIcon(ContextCompat.getDrawable(context, component4 ? DrawableCompat.getThemedDrawableRes$default(context, 2130969368, 0, 2, (Object) null) : 2131231736)); } } widgetHome.setActionBarTitleClick(new WidgetHomeHeaderManager$configure$$inlined$apply$lambda$1(widgetHomeModel, widgetHome, widgetHomeModel)); diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java index 19c1203b3a..42bdb2d938 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java @@ -83,7 +83,7 @@ public final class WidgetHomePanelNsfw { FragmentManager fragmentManager = this.fragmentManager.get(); if (fragmentManager != null) { m.checkNotNullExpressionValue(fragmentManager, "fragmentManager.get() ?: return"); - Fragment findFragmentById = fragmentManager.findFragmentById(2131365589); + Fragment findFragmentById = fragmentManager.findFragmentById(2131365595); if (findFragmentById != null) { m.checkNotNullExpressionValue(findFragmentById, "fragmentManager.findFrag…dget_chat_list) ?: return"); FragmentTransaction beginTransaction = fragmentManager.beginTransaction(); @@ -140,23 +140,23 @@ public final class WidgetHomePanelNsfw { ViewStub viewStub = this.stub; if (!(viewStub == null || (inflate = viewStub.inflate()) == null)) { this.stub = null; - int i = 2131363514; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363514); + int i = 2131363516; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131363516); if (linearLayout != null) { - i = 2131363515; - ImageView imageView2 = (ImageView) inflate.findViewById(2131363515); + i = 2131363517; + ImageView imageView2 = (ImageView) inflate.findViewById(2131363517); if (imageView2 != null) { - i = 2131363516; - MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131363516); + i = 2131363518; + MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131363518); if (materialButton3 != null) { - i = 2131363517; - MaterialButton materialButton4 = (MaterialButton) inflate.findViewById(2131363517); + i = 2131363519; + MaterialButton materialButton4 = (MaterialButton) inflate.findViewById(2131363519); if (materialButton4 != null) { - i = 2131363518; - LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363518); + i = 2131363520; + LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) inflate.findViewById(2131363520); if (linkifiedTextView3 != null) { - i = 2131363519; - TextView textView2 = (TextView) inflate.findViewById(2131363519); + i = 2131363521; + TextView textView2 = (TextView) inflate.findViewById(2131363521); if (textView2 != null) { this.binding = new WidgetHomePanelCenterNsfwBinding((LinearLayout) inflate, linearLayout, imageView2, materialButton3, materialButton4, linkifiedTextView3, textView2); ViewCompat.setOnApplyWindowInsetsListener(inflate, WidgetHomePanelNsfw$toggleContainerVisibility$1$1.INSTANCE); @@ -171,12 +171,12 @@ public final class WidgetHomePanelNsfw { } if (z4) { WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding = this.binding; - if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f1819c) == null)) { + if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f1821c) == null)) { ViewKt.setVisible(materialButton2, false); } WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding; if (!(widgetHomePanelCenterNsfwBinding2 == null || (imageView = widgetHomePanelCenterNsfwBinding2.b) == null)) { - imageView.setImageResource(2131232102); + imageView.setImageResource(2131232105); } WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding3 = this.binding; if (!(widgetHomePanelCenterNsfwBinding3 == null || (materialButton = widgetHomePanelCenterNsfwBinding3.d) == null)) { @@ -214,7 +214,7 @@ public final class WidgetHomePanelNsfw { materialButton2.setOnClickListener(new WidgetHomePanelNsfw$configureUI$1(this, widgetHomeModel)); } WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding; - if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f1819c) != null) { + if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f1821c) != null) { materialButton.setOnClickListener(new WidgetHomePanelNsfw$configureUI$2(this, widgetHomeModel)); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java b/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java index d858cc071e..162a0ab1f6 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetMainSurveyDialog.java @@ -88,12 +88,12 @@ public final class WidgetMainSurveyDialog extends AppDialog { textView2.setText(string2); MaterialButton materialButton = getBinding().b; m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationCancel"); - materialButton.setText(getString(2131891390)); + materialButton.setText(getString(2131891423)); getBinding().b.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$1(this)); - MaterialButton materialButton2 = getBinding().f1647c; + MaterialButton materialButton2 = getBinding().f1649c; m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationConfirm"); - materialButton2.setText(getString(2131891633)); - getBinding().f1647c.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$2(this, string)); + materialButton2.setText(getString(2131891666)); + getBinding().f1649c.setOnClickListener(new WidgetMainSurveyDialog$onViewBound$2(this, string)); AnalyticsTracker.INSTANCE.surveyViewed(string3); return; } diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java index 48f75608e6..90ea397f71 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$binding$2.java @@ -25,17 +25,17 @@ public final /* synthetic */ class WidgetMedia$binding$2 extends k implements Fu AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(2131361872); if (appBarLayout != null) { FrameLayout frameLayout = (FrameLayout) view; - i = 2131363814; - ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) view.findViewById(2131363814); + i = 2131363817; + ZoomableDraweeView zoomableDraweeView = (ZoomableDraweeView) view.findViewById(2131363817); if (zoomableDraweeView != null) { - i = 2131363815; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131363815); + i = 2131363818; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131363818); if (progressBar != null) { - i = 2131363816; - PlayerControlView playerControlView = (PlayerControlView) view.findViewById(2131363816); + i = 2131363819; + PlayerControlView playerControlView = (PlayerControlView) view.findViewById(2131363819); if (playerControlView != null) { - i = 2131363817; - PlayerView playerView = (PlayerView) view.findViewById(2131363817); + i = 2131363820; + PlayerView playerView = (PlayerView) view.findViewById(2131363820); if (playerView != null) { return new WidgetMediaBinding(frameLayout, appBarLayout, frameLayout, zoomableDraweeView, progressBar, playerControlView, playerView); } diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java index 5d296c4ea7..bccb7c2fbf 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java @@ -53,7 +53,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$1 implements Action WidgetMedia widgetMedia = r0.this$0.this$0; Context context = r0.$context; m.checkNotNullExpressionValue(context, "context"); - c.a.d.o.j(widgetMedia, b.g(context, 2131888175, new Object[]{str}, null, 4), 0, 4); + c.a.d.o.j(widgetMedia, b.g(context, 2131888185, new Object[]{str}, null, 4), 0, 4); } } } @@ -81,7 +81,7 @@ public final class WidgetMedia$onViewBoundOrOnResume$1 implements Action m.checkNotNullParameter(th, "it"); if (this.this$0.this$0.this$0.isAdded()) { WidgetMedia widgetMedia = this.this$0.this$0.this$0; - c.a.d.o.j(widgetMedia, widgetMedia.getString(2131888174), 0, 4); + c.a.d.o.j(widgetMedia, widgetMedia.getString(2131888184), 0, 4); } } } @@ -115,16 +115,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1 implements Action public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case 2131363891: + case 2131363893: m.checkNotNullExpressionValue(context, "context"); String uri = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri, "sourceUri.toString()"); UriHandler.handleOrUntrusted$default(context, uri, null, 4, null); return; - case 2131363892: + case 2131363894: this.this$0.requestMediaDownload(new AnonymousClass1(this, context)); return; - case 2131363893: + case 2131363895: m.checkNotNullExpressionValue(context, "context"); String uri2 = this.$sourceUri.toString(); m.checkNotNullExpressionValue(uri2, "sourceUri.toString()"); diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java index ed75c5079e..90c217bd6a 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java @@ -164,7 +164,7 @@ public final class WidgetMedia extends AppFragment { String str3 = previewImage == null ? previewImage.a : null; Integer num2 = previewImage == null ? previewImage.b : null; if (previewImage != null) { - num = previewImage.f2004c; + num = previewImage.f2006c; } launch(context, j, l, str, str3, num2, num, mediaType); } @@ -191,7 +191,7 @@ public final class WidgetMedia extends AppFragment { } public WidgetMedia() { - super(2131559077); + super(2131559078); WidgetMedia$viewModel$2 widgetMedia$viewModel$2 = WidgetMedia$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetMediaViewModel.class), new WidgetMedia$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMedia$viewModel$2)); @@ -464,7 +464,7 @@ public final class WidgetMedia extends AppFragment { if (videoSurfaceView != null) { videoSurfaceView.setOnClickListener(new WidgetMedia$onViewBound$1(this)); } - getBinding().f1826c.setOnClickListener(new WidgetMedia$onViewBound$2(this)); + getBinding().f1828c.setOnClickListener(new WidgetMedia$onViewBound$2(this)); AppBarLayout appBarLayout = getBinding().b; m.checkNotNullExpressionValue(appBarLayout, "binding.actionBarToolbarLayout"); ViewExtensions.addOnHeightChangedListener(appBarLayout, new WidgetMedia$onViewBound$3(this)); @@ -519,7 +519,7 @@ public final class WidgetMedia extends AppFragment { str = stringExtra; } AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131894453); + setActionBarTitle(2131894500); setActionBarSubtitle(str); AppFragment.setActionBarOptionsMenu$default(this, 2131623956, new WidgetMedia$onViewBoundOrOnResume$1(this, parse, uri, stringExtra, str), null, 4, null); configureMediaImage(); diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java index dea223f0de..3a8bb1fec9 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetQRScanner$binding$2 extends k implement public final WidgetQrScannerBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364382; - ZXingScannerView zXingScannerView = (ZXingScannerView) view.findViewById(2131364382); + int i = 2131364385; + ZXingScannerView zXingScannerView = (ZXingScannerView) view.findViewById(2131364385); if (zXingScannerView != null) { - i = 2131364383; - Chip chip = (Chip) view.findViewById(2131364383); + i = 2131364386; + Chip chip = (Chip) view.findViewById(2131364386); if (chip != null) { return new WidgetQrScannerBinding((FrameLayout) view, zXingScannerView, chip); } diff --git a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java index b2cb470739..36cd7528f5 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java @@ -61,7 +61,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi } public WidgetQRScanner() { - super(2131559111); + super(2131559112); } public static final /* synthetic */ WidgetQrScannerBinding access$getBinding$p(WidgetQRScanner widgetQRScanner) { @@ -96,7 +96,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi IntentUtils intentUtils = IntentUtils.INSTANCE; m.checkNotNullExpressionValue(parse, "uri"); if (!intentUtils.isDiscordAppUri(parse)) { - o.i(this, 2131892425, 0, 4); + o.i(this, 2131892467, 0, 4); requireActivity().finish(); } String path = parse.getPath(); @@ -140,9 +140,9 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi int i = 0; ColorCompat.setStatusBarColor$default((Fragment) this, ColorCompat.getColor(this, 2131099689), false, 4, (Object) null); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131890854); + setActionBarTitle(2131890884); boolean booleanExtra = getMostRecentIntent().getBooleanExtra("SHOW_HELP_CHIP", false); - Chip chip = getBinding().f1847c; + Chip chip = getBinding().f1849c; m.checkNotNullExpressionValue(chip, "binding.qrScannerChip"); if (!booleanExtra) { i = 8; diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java index a6e1075a49..d0880daabe 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBottomButton.java @@ -33,17 +33,17 @@ public final class MobileReportsBottomButton extends LinearLayout { super(context, attributeSet, i); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558763, this); - int i2 = 2131364414; - LoadingButton loadingButton = (LoadingButton) findViewById(2131364414); + int i2 = 2131364417; + LoadingButton loadingButton = (LoadingButton) findViewById(2131364417); if (loadingButton != null) { - i2 = 2131364415; - MaterialButton materialButton = (MaterialButton) findViewById(2131364415); + i2 = 2131364418; + MaterialButton materialButton = (MaterialButton) findViewById(2131364418); if (materialButton != null) { - i2 = 2131364416; - TextView textView = (TextView) findViewById(2131364416); + i2 = 2131364419; + TextView textView = (TextView) findViewById(2131364419); if (textView != null) { - i2 = 2131364417; - TextView textView2 = (TextView) findViewById(2131364417); + i2 = 2131364420; + TextView textView2 = (TextView) findViewById(2131364420); if (textView2 != null) { ViewMobileReportsBottomButtonBinding viewMobileReportsBottomButtonBinding = new ViewMobileReportsBottomButtonBinding(this, loadingButton, materialButton, textView, textView2); m.checkNotNullExpressionValue(viewMobileReportsBottomButtonBinding, "ViewMobileReportsBottomB…ater.from(context), this)"); @@ -62,20 +62,20 @@ public final class MobileReportsBottomButton extends LinearLayout { } public final void setup(ReportNodeBottomButton reportNodeBottomButton, MobileReportsViewModel.SubmitState submitState, Function1 function1) { - this.binding.f1654c.setOnClickListener(null); + this.binding.f1656c.setOnClickListener(null); this.binding.b.setOnClickListener(null); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.reportNodeBottomButtonDescription"); boolean z2 = reportNodeBottomButton instanceof ReportNodeBottomButton.Submit; int i = 8; textView.setVisibility(z2 ? 0 : 8); - MaterialButton materialButton = this.binding.f1654c; + MaterialButton materialButton = this.binding.f1656c; m.checkNotNullExpressionValue(materialButton, "binding.reportNodeBottomButtonCancel"); boolean z3 = reportNodeBottomButton instanceof ReportNodeBottomButton.Cancel; materialButton.setVisibility(z3 ? 0 : 8); LoadingButton loadingButton = this.binding.b; m.checkNotNullExpressionValue(loadingButton, "binding.reportNodeBottomButton"); - MaterialButton materialButton2 = this.binding.f1654c; + MaterialButton materialButton2 = this.binding.f1656c; m.checkNotNullExpressionValue(materialButton2, "binding.reportNodeBottomButtonCancel"); loadingButton.setVisibility((materialButton2.getVisibility() == 0) ^ true ? 0 : 8); boolean z4 = submitState instanceof MobileReportsViewModel.SubmitState.Loading; @@ -94,18 +94,18 @@ public final class MobileReportsBottomButton extends LinearLayout { m.checkNotNullExpressionValue(textView3, "binding.reportNodeBottomButtonDescription"); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - textView3.setText(b.g(context, 2131891197, new Object[0], null, 4)); - this.binding.b.setText(getContext().getString(2131891198)); + textView3.setText(b.g(context, 2131891230, new Object[0], null, 4)); + this.binding.b.setText(getContext().getString(2131891231)); this.binding.b.setBackgroundColor(ColorCompat.getColor(getContext(), 2131100311)); this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$1(function1, reportNodeBottomButton)); } else if (reportNodeBottomButton instanceof ReportNodeBottomButton.Done) { - this.binding.b.setText(getContext().getString(2131888166)); + this.binding.b.setText(getContext().getString(2131888176)); this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$2(function1, reportNodeBottomButton)); } else if (reportNodeBottomButton instanceof ReportNodeBottomButton.Next) { - this.binding.b.setText(getContext().getString(2131891329)); + this.binding.b.setText(getContext().getString(2131891362)); this.binding.b.setOnClickListener(new MobileReportsBottomButton$setup$3(function1, reportNodeBottomButton)); } else if (z3) { - this.binding.f1654c.setOnClickListener(new MobileReportsBottomButton$setup$4(function1, reportNodeBottomButton)); + this.binding.f1656c.setOnClickListener(new MobileReportsBottomButton$setup$4(function1, reportNodeBottomButton)); } } } diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java index 929914e7a3..518dde094e 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsBreadcrumbs.java @@ -56,11 +56,11 @@ public final class MobileReportsBreadcrumbs extends LinearLayout { ViewGroup viewGroup = (ViewGroup) view; View inflate = from.inflate(2131558765, viewGroup, false); viewGroup.addView(inflate); - int i = 2131364425; - View findViewById = inflate.findViewById(2131364425); + int i = 2131364428; + View findViewById = inflate.findViewById(2131364428); if (findViewById != null) { - i = 2131364426; - TextView textView = (TextView) inflate.findViewById(2131364426); + i = 2131364429; + TextView textView = (TextView) inflate.findViewById(2131364429); if (textView != null) { ViewMobileReportsBreadcrumbsItemBinding viewMobileReportsBreadcrumbsItemBinding = new ViewMobileReportsBreadcrumbsItemBinding((ConstraintLayout) inflate, findViewById, textView); m.checkNotNullExpressionValue(viewMobileReportsBreadcrumbsItemBinding, "ViewMobileReportsBreadcr…ach to parent */ true\n )"); diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java index 2d7e421012..5ea185a34c 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel$Companion$getStoreState$1.java @@ -1,26 +1,26 @@ package com.discord.widgets.mobile_reports; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.stageinstance.StageInstance; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.widgets.mobile_reports.MobileReportsViewModel; import d0.z.d.m; import java.util.Map; import rx.functions.Func5; /* compiled from: MobileReportsViewModel.kt */ -public final class MobileReportsViewModel$Companion$getStoreState$1 implements Func5, MobileReportsViewModel.StoreState> { +public final class MobileReportsViewModel$Companion$getStoreState$1 implements Func5, MobileReportsViewModel.StoreState> { public static final MobileReportsViewModel$Companion$getStoreState$1 INSTANCE = new MobileReportsViewModel$Companion$getStoreState$1(); - public final MobileReportsViewModel.StoreState call(ModelMessage modelMessage, Channel channel, Guild guild, StageInstance stageInstance, Map map) { + public final MobileReportsViewModel.StoreState call(Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map) { m.checkNotNullExpressionValue(map, "blockedUsers"); - return new MobileReportsViewModel.StoreState(modelMessage, channel, guild, stageInstance, map); + return new MobileReportsViewModel.StoreState(message, channel, guild, stageInstance, map); } /* 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ @Override // rx.functions.Func5 - public /* bridge */ /* synthetic */ MobileReportsViewModel.StoreState call(ModelMessage modelMessage, Channel channel, Guild guild, StageInstance stageInstance, Map map) { - return call(modelMessage, channel, guild, stageInstance, (Map) map); + public /* bridge */ /* synthetic */ MobileReportsViewModel.StoreState call(Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map) { + return call(message, channel, guild, stageInstance, (Map) map); } } diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java index 5ead80ddb5..4904a79894 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/MobileReportsViewModel.java @@ -3,6 +3,7 @@ package com.discord.widgets.mobile_reports; import android.content.Context; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.report.MenuAPIResponse; import com.discord.api.report.NodeElementResult; import com.discord.api.report.NodeResult; @@ -16,7 +17,6 @@ import com.discord.api.report.ReportType; import com.discord.api.stageinstance.StageInstance; import com.discord.app.AppLog; import com.discord.app.AppViewModel; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.user.User; @@ -24,12 +24,12 @@ import com.discord.stores.StoreStream; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.error.Error; import com.discord.utilities.logging.Logger; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.textprocessing.DiscordParser; import com.discord.utilities.textprocessing.MessagePreprocessor; import com.discord.utilities.textprocessing.MessageRenderContext; -import com.discord.utilities.textprocessing.MessageUtils; import com.discord.utilities.time.Clock; import com.discord.utilities.time.ClockFactory; import com.facebook.drawee.span.DraweeSpanStringBuilder; @@ -910,12 +910,12 @@ public final class MobileReportsViewModel extends AppViewModel { private final Map blockedUsers; private final Channel channel; private final Guild guild; - private final ModelMessage message; + private final Message message; private final StageInstance stageInstance; - public StoreState(ModelMessage modelMessage, Channel channel, Guild guild, StageInstance stageInstance, Map map) { + public StoreState(Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map) { m.checkNotNullParameter(map, "blockedUsers"); - this.message = modelMessage; + this.message = message; this.channel = channel; this.guild = guild; this.stageInstance = stageInstance; @@ -924,9 +924,9 @@ public final class MobileReportsViewModel extends AppViewModel { /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: com.discord.widgets.mobile_reports.MobileReportsViewModel$StoreState */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ StoreState copy$default(StoreState storeState, ModelMessage modelMessage, Channel channel, Guild guild, StageInstance stageInstance, Map map, int i, Object obj) { + public static /* synthetic */ StoreState copy$default(StoreState storeState, Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map, int i, Object obj) { if ((i & 1) != 0) { - modelMessage = storeState.message; + message = storeState.message; } if ((i & 2) != 0) { channel = storeState.channel; @@ -940,10 +940,10 @@ public final class MobileReportsViewModel extends AppViewModel { if ((i & 16) != 0) { map = storeState.blockedUsers; } - return storeState.copy(modelMessage, channel, guild, stageInstance, map); + return storeState.copy(message, channel, guild, stageInstance, map); } - public final ModelMessage component1() { + public final Message component1() { return this.message; } @@ -963,9 +963,9 @@ public final class MobileReportsViewModel extends AppViewModel { return this.blockedUsers; } - public final StoreState copy(ModelMessage modelMessage, Channel channel, Guild guild, StageInstance stageInstance, Map map) { + public final StoreState copy(Message message, Channel channel, Guild guild, StageInstance stageInstance, Map map) { m.checkNotNullParameter(map, "blockedUsers"); - return new StoreState(modelMessage, channel, guild, stageInstance, map); + return new StoreState(message, channel, guild, stageInstance, map); } public boolean equals(Object obj) { @@ -991,7 +991,7 @@ public final class MobileReportsViewModel extends AppViewModel { return this.guild; } - public final ModelMessage getMessage() { + public final Message getMessage() { return this.message; } @@ -1000,9 +1000,9 @@ public final class MobileReportsViewModel extends AppViewModel { } public int hashCode() { - ModelMessage modelMessage = this.message; + Message message = this.message; int i = 0; - int hashCode = (modelMessage != null ? modelMessage.hashCode() : 0) * 31; + int hashCode = (message != null ? message.hashCode() : 0) * 31; Channel channel = this.channel; int hashCode2 = (hashCode + (channel != null ? channel.hashCode() : 0)) * 31; Guild guild = this.guild; @@ -1448,45 +1448,59 @@ public final class MobileReportsViewModel extends AppViewModel { } private final MessagePreview parseMessagePreview(StoreState storeState) { - ModelMessage message; + Message message; + Map map; + Long l; Context context = this.context.get(); - MessagePreview messagePreview = null; - String str = null; - messagePreview = null; - messagePreview = null; - messagePreview = null; + Long l2 = null; if (context != null) { m.checkNotNullExpressionValue(context, "context.get() ?: return null"); Channel channel = storeState.getChannel(); if (!(channel == null || (message = storeState.getMessage()) == null)) { StoreStream.Companion companion = StoreStream.Companion; - User user = companion.getUsers().getUsers().get(Long.valueOf(message.getAuthor().i())); - if (user != null) { - if (getViewState() instanceof ViewState.Invalid) { - return null; - } - long id2 = companion.getUsers().getMe().getId(); - Map map = (Map) a.c(channel, companion.getGuilds().getMembers()); - if (map == null) { - map = new HashMap(); - } - Map map2 = (Map) a.c(channel, companion.getGuilds().getRoles()); - Map channelNames = companion.getChannels().getChannelNames(); - Map nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map, channel.m()); - String content = message.getContent(); - if (content != null) { - str = new Regex("\n").replace(content, " "); - } - DraweeSpanStringBuilder parseChannelMessage = DiscordParser.parseChannelMessage(context, str, new MessageRenderContext(context, id2, false, nickOrUsernames, channelNames, map2, 0, null, null, 0, 0, null, null, null, 16320, null), new MessagePreprocessor(id2, null, null, false, 50, 6, null), DiscordParser.ParserOptions.REPLY, false); - String str2 = nickOrUsernames.get(Long.valueOf(message.getAuthor().i())); - if (str2 == null) { - str2 = message.getAuthor().r(); - } - messagePreview = new MessagePreview(parseChannelMessage, str2, GuildMember.Companion.getColor((GuildMember) map.get(Long.valueOf(message.getAuthor().i())), ColorCompat.getThemedColor(context, 2130968932)), user, message.hasEmbeds() || message.hasAttachments()); + Map users = companion.getUsers().getUsers(); + com.discord.api.user.User g = message.g(); + User user = users.get(g != null ? Long.valueOf(g.i()) : null); + if (user == null || (getViewState() instanceof ViewState.Invalid)) { + return null; } + long id2 = companion.getUsers().getMe().getId(); + Map map2 = (Map) a.c(channel, companion.getGuilds().getMembers()); + if (map2 == null) { + map2 = new HashMap(); + } + Map map3 = (Map) a.c(channel, companion.getGuilds().getRoles()); + Map channelNames = companion.getChannels().getChannelNames(); + Map nickOrUsernames = MessageUtils.getNickOrUsernames(message, channel, map2, channel.m()); + String k = message.k(); + DraweeSpanStringBuilder parseChannelMessage = DiscordParser.parseChannelMessage(context, k != null ? new Regex("\n").replace(k, " ") : null, new MessageRenderContext(context, id2, false, nickOrUsernames, channelNames, map3, 0, null, null, 0, 0, null, null, null, 16320, null), new MessagePreprocessor(id2, null, null, false, 50, 6, null), DiscordParser.ParserOptions.REPLY, false); + com.discord.api.user.User g2 = message.g(); + if (g2 != null) { + l = Long.valueOf(g2.i()); + map = nickOrUsernames; + } else { + map = nickOrUsernames; + l = null; + } + String str = map.get(l); + if (str == null) { + com.discord.api.user.User g3 = message.g(); + str = g3 != null ? g3.r() : null; + } + if (str == null) { + str = ""; + } + GuildMember.Companion companion2 = GuildMember.Companion; + com.discord.api.user.User g4 = message.g(); + if (g4 != null) { + l2 = Long.valueOf(g4.i()); + } + int color = companion2.getColor((GuildMember) map2.get(l2), ColorCompat.getThemedColor(context, 2130968932)); + MessageUtils messageUtils = MessageUtils.INSTANCE; + return new MessagePreview(parseChannelMessage, str, color, user, messageUtils.hasEmbeds(message) || messageUtils.hasAttachments(message)); } } - return messagePreview; + return null; } public final boolean handleBack() { diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java b/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java index 16a76193b1..63e2788425 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/ReportsMenuNode.java @@ -166,10 +166,10 @@ public final class ReportsMenuNode extends ConstraintLayout { m.checkNotNullExpressionValue(materialButton2, "binding.mobileReportsNod…ileReportsBlockUserButton"); if (isBlocked) { context = getContext(); - i = 2131887030; + i = 2131887031; } else { context = getContext(); - i = 2131887029; + i = 2131887030; } materialButton2.setText(context.getString(i)); } @@ -268,11 +268,11 @@ public final class ReportsMenuNode extends ConstraintLayout { LinearLayout linearLayout2 = this.binding.i; View inflate = from.inflate(2131558767, (ViewGroup) linearLayout2, false); linearLayout2.addView(inflate); - int i = 2131363933; - CardView cardView = (CardView) inflate.findViewById(2131363933); + int i = 2131363935; + CardView cardView = (CardView) inflate.findViewById(2131363935); if (cardView != null) { - i = 2131363934; - TextView textView = (TextView) inflate.findViewById(2131363934); + i = 2131363936; + TextView textView = (TextView) inflate.findViewById(2131363936); if (textView != null) { FrameLayout frameLayout = (FrameLayout) inflate; m.checkNotNullExpressionValue(new e2(frameLayout, cardView, textView), "childView"); @@ -291,30 +291,30 @@ public final class ReportsMenuNode extends ConstraintLayout { ViewReportsMenuNodeBinding viewReportsMenuNodeBinding = this.binding; int i = 8; if (messagePreviewElement != null) { - TextView textView = viewReportsMenuNodeBinding.f1656c.e; + TextView textView = viewReportsMenuNodeBinding.f1658c.e; m.checkNotNullExpressionValue(textView, "mobileReportsMessagePrev…atListAdapterItemTextName"); textView.setText(messagePreviewElement.getAuthorName()); - viewReportsMenuNodeBinding.f1656c.e.setTextColor(messagePreviewElement.getAuthorNameColor()); - SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.f1656c.d; + viewReportsMenuNodeBinding.f1658c.e.setTextColor(messagePreviewElement.getAuthorNameColor()); + SimpleDraweeView simpleDraweeView = viewReportsMenuNodeBinding.f1658c.d; m.checkNotNullExpressionValue(simpleDraweeView, "mobileReportsMessagePrev…ListAdapterItemTextAvatar"); IconUtils.setIcon$default(simpleDraweeView, messagePreviewElement.getAuthor(), 2131165295, null, null, null, 56, null); - LinkifiedTextView linkifiedTextView = viewReportsMenuNodeBinding.f1656c.f106c; + LinkifiedTextView linkifiedTextView = viewReportsMenuNodeBinding.f1658c.f106c; m.checkNotNullExpressionValue(linkifiedTextView, "mobileReportsMessagePrev…w.chatListAdapterItemText"); linkifiedTextView.setText(messagePreviewElement.getText()); - ImageView imageView = viewReportsMenuNodeBinding.f1656c.b; + ImageView imageView = viewReportsMenuNodeBinding.f1658c.b; m.checkNotNullExpressionValue(imageView, "mobileReportsMessagePrev…terItemChatAttachmentIcon"); if (messagePreviewElement.getHasEmbeds()) { i = 0; } imageView.setVisibility(i); - i4 i4Var = viewReportsMenuNodeBinding.f1656c; + i4 i4Var = viewReportsMenuNodeBinding.f1658c; m.checkNotNullExpressionValue(i4Var, "mobileReportsMessagePreview"); ConstraintLayout constraintLayout = i4Var.a; m.checkNotNullExpressionValue(constraintLayout, "mobileReportsMessagePreview.root"); constraintLayout.setVisibility(0); return; } - i4 i4Var2 = viewReportsMenuNodeBinding.f1656c; + i4 i4Var2 = viewReportsMenuNodeBinding.f1658c; m.checkNotNullExpressionValue(i4Var2, "mobileReportsMessagePreview"); ConstraintLayout constraintLayout2 = i4Var2.a; m.checkNotNullExpressionValue(constraintLayout2, "mobileReportsMessagePreview.root"); diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java index 384fb5e0d4..975ed0777a 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetMobileReports$binding$2 extends k imple public final WidgetMobileReportsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363899; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363899); + int i = 2131363901; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131363901); if (frameLayout != null) { - i = 2131363948; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131363948); + i = 2131363950; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131363950); if (progressBar != null) { return new WidgetMobileReportsBinding((CoordinatorLayout) view, frameLayout, progressBar); } diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java index 11721899de..24375be035 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java @@ -56,7 +56,7 @@ public final class WidgetMobileReports extends AppFragment { } public WidgetMobileReports() { - super(2131559088); + super(2131559089); WidgetMobileReports$viewModel$2 widgetMobileReports$viewModel$2 = new WidgetMobileReports$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(MobileReportsViewModel.class), new WidgetMobileReports$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMobileReports$viewModel$2)); @@ -80,7 +80,7 @@ public final class WidgetMobileReports extends AppFragment { private final void configureUI(MobileReportsViewModel.ViewState.Menu menu) { setActionBarDisplayHomeAsUpEnabled(!menu.shouldHideBackArrow()); - ProgressBar progressBar = getBinding().f1831c; + ProgressBar progressBar = getBinding().f1833c; m.checkNotNullExpressionValue(progressBar, "binding.mobileReportsProgressBar"); progressBar.setVisibility(8); ReportsMenuNode reportsMenuNode = (ReportsMenuNode) getBinding().b.getChildAt(0); diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java index 0eb55fe6f8..3f9f221adf 100644 --- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java +++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java @@ -15,23 +15,23 @@ public final class NoticePopup$enqueue$notice$1$3$2 implements Runnable { @Override // java.lang.Runnable public final void run() { - SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f1837c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f1839c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.popupBody"); Layout layout = simpleDraweeSpanTextView.getLayout(); int lineCount = layout != null ? layout.getLineCount() : 0; - SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f1837c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f1839c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.popupBody"); if (lineCount > simpleDraweeSpanTextView2.getMaxLines()) { - SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f1837c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f1839c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.popupBody"); Layout layout2 = simpleDraweeSpanTextView3.getLayout(); - SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f1837c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f1839c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.popupBody"); int lineEnd = layout2.getLineEnd(simpleDraweeSpanTextView4.getMaxLines() - 1); - SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f1837c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f1839c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView5, "binding.popupBody"); CharSequence subSequence = simpleDraweeSpanTextView5.getText().subSequence(0, lineEnd - 1); - SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f1837c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f1839c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView6, "binding.popupBody"); simpleDraweeSpanTextView6.setText(new SpannableStringBuilder(subSequence).append((CharSequence) "…")); } diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java index 8890cb0598..a7e51bc6f9 100644 --- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java +++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1.java @@ -167,7 +167,7 @@ public final class NoticePopup$enqueue$notice$1 extends o implements Function1, Long, User, Map, Map, NoticePopupChannel.Model> { +public final /* synthetic */ class NoticePopupChannel$enqueue$1 extends k implements Function9, Long, User, Map, Map, NoticePopupChannel.Model> { public NoticePopupChannel$enqueue$1(NoticePopupChannel noticePopupChannel) { - super(9, noticePopupChannel, NoticePopupChannel.class, "createModel", "createModel(Landroid/content/Context;Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/guild/Guild;Lcom/discord/api/channel/Channel;Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/user/User;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/notice/NoticePopupChannel$Model;", 0); + super(9, noticePopupChannel, NoticePopupChannel.class, "createModel", "createModel(Landroid/content/Context;Lcom/discord/api/message/Message;Lcom/discord/models/guild/Guild;Lcom/discord/api/channel/Channel;Ljava/util/Map;Ljava/lang/Long;Lcom/discord/models/user/User;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/notice/NoticePopupChannel$Model;", 0); } - public final NoticePopupChannel.Model invoke(Context context, ModelMessage modelMessage, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { + public final NoticePopupChannel.Model invoke(Context context, Message message, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { m.checkNotNullParameter(context, "p1"); - m.checkNotNullParameter(modelMessage, "p2"); + m.checkNotNullParameter(message, "p2"); m.checkNotNullParameter(map, "p5"); m.checkNotNullParameter(user, "p7"); m.checkNotNullParameter(map2, "p8"); m.checkNotNullParameter(map3, "p9"); - return NoticePopupChannel.access$createModel((NoticePopupChannel) this.receiver, context, modelMessage, guild, channel, map, l, user, map2, map3); + return NoticePopupChannel.access$createModel((NoticePopupChannel) this.receiver, context, message, guild, channel, map, l, user, map2, map3); } /* 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, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ @Override // kotlin.jvm.functions.Function9 - public /* bridge */ /* synthetic */ NoticePopupChannel.Model invoke(Context context, ModelMessage modelMessage, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { - return invoke(context, modelMessage, guild, channel, (Map) map, l, user, (Map) map2, (Map) map3); + public /* bridge */ /* synthetic */ NoticePopupChannel.Model invoke(Context context, Message message, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { + return invoke(context, message, guild, channel, (Map) map, l, user, (Map) map2, (Map) map3); } } diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java index 128fd260fc..8c4a6f3b77 100644 --- a/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java +++ b/app/src/main/java/com/discord/widgets/notice/NoticePopupChannel.java @@ -10,12 +10,12 @@ import androidx.core.content.ContextCompat; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.attachment.MessageAttachment; import com.discord.api.message.attachment.MessageAttachmentType; import com.discord.api.message.embed.MessageEmbed; import com.discord.api.role.GuildRole; import com.discord.api.sticker.Sticker; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.models.user.CoreUser; @@ -27,12 +27,12 @@ import com.discord.stores.StoreUser; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.drawable.DrawableCompat; import com.discord.utilities.icon.IconUtils; +import com.discord.utilities.message.MessageUtils; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.textprocessing.AstRenderer; import com.discord.utilities.textprocessing.DiscordParser; import com.discord.utilities.textprocessing.MessageParseState; import com.discord.utilities.textprocessing.MessageRenderContext; -import com.discord.utilities.textprocessing.MessageUtils; import com.facebook.drawee.span.DraweeSpanStringBuilder; import d0.g0.t; import d0.o; @@ -250,18 +250,18 @@ public final class NoticePopupChannel { private NoticePopupChannel() { } - public static final /* synthetic */ Model access$createModel(NoticePopupChannel noticePopupChannel, Context context, ModelMessage modelMessage, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { - return noticePopupChannel.createModel(context, modelMessage, guild, channel, map, l, user, map2, map3); + public static final /* synthetic */ Model access$createModel(NoticePopupChannel noticePopupChannel, Context context, Message message, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { + return noticePopupChannel.createModel(context, message, guild, channel, map, l, user, map2, map3); } /* JADX WARN: Multi-variable type inference failed */ - /* JADX WARNING: Code restructure failed: missing block: B:9:0x007d, code lost: - if (r0 != null) goto L_0x0087; + /* JADX WARNING: Code restructure failed: missing block: B:9:0x0076, code lost: + if (r0 != null) goto L_0x0080; */ /* JADX WARNING: Unknown variable types count: 1 */ - private final Model createModel(Context context, ModelMessage modelMessage, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { + private final Model createModel(Context context, Message message, Guild guild, Channel channel, Map map, Long l, User user, Map map2, Map map3) { int i; - ?? r2; + ?? r1; DraweeSpanStringBuilder draweeSpanStringBuilder; Pair pair; Channel channel2; @@ -271,31 +271,28 @@ public final class NoticePopupChannel { Drawable drawable2; String str2; String str3; + MessageEmbed messageEmbed; boolean z2; if (channel != null) { long g = channel.g(); if (l == null || l.longValue() != g) { - MessageRenderContext messageRenderContext = new MessageRenderContext(context, user.getId(), true, MessageUtils.getNickOrUsernames$default(modelMessage, channel, map, null, 8, null), map2, map3, 0, null, NoticePopupChannel$createModel$messageRenderContext$1.INSTANCE, ColorCompat.getThemedColor(context, 2130970180), 0, null, null, null, 15552, null); - String content = modelMessage.getContent(); - if (content != null) { + MessageRenderContext messageRenderContext = new MessageRenderContext(context, user.getId(), true, MessageUtils.getNickOrUsernames$default(message, channel, map, null, 8, null), map2, map3, 0, null, NoticePopupChannel$createModel$messageRenderContext$1.INSTANCE, ColorCompat.getThemedColor(context, 2130970180), 0, null, null, null, 15552, null); + String k = message.k(); + if (k != null) { z2 = false; - r2 = 0; + r1 = 0; i = 0; - Parser createParser$default = DiscordParser.createParser$default(false, true, false, 4, null); - m.checkNotNullExpressionValue(content, "content"); - draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(createParser$default, content, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext); + draweeSpanStringBuilder = AstRenderer.render(Parser.parse$default(DiscordParser.createParser$default(false, true, false, 4, null), k, MessageParseState.Companion.getInitialState(), null, 4, null), messageRenderContext); } else { i = 0; z2 = false; } draweeSpanStringBuilder = new DraweeSpanStringBuilder(); - r2 = z2; + r1 = z2; String str4 = ""; if (t.isBlank(draweeSpanStringBuilder)) { - List embeds = modelMessage.getEmbeds(); - m.checkNotNullExpressionValue(embeds, "message.embeds"); - MessageEmbed messageEmbed = (MessageEmbed) u.firstOrNull((List) embeds); - String j = messageEmbed != null ? messageEmbed.j() : r2; + List m = message.m(); + String j = (m == null || (messageEmbed = (MessageEmbed) u.firstOrNull(m)) == null) ? r1 : messageEmbed.j(); if (j == null) { j = str4; } @@ -303,9 +300,9 @@ public final class NoticePopupChannel { } long e = channel.e(); if (e == -1 || e == 0) { - pair = o.to(AnimatableValueParser.y0(channel), r2); + pair = o.to(AnimatableValueParser.y0(channel), r1); } else { - String name = guild != null ? guild.getName() : r2; + String name = guild != null ? guild.getName() : r1; if (name != null) { str4 = name; } @@ -320,12 +317,12 @@ public final class NoticePopupChannel { channel2 = channel; } else { channel2 = channel; - str = IconUtils.getForChannel$default(channel2, r2, 2, r2); + str = IconUtils.getForChannel$default(channel2, r1, 2, r1); } if (!AnimatableValueParser.g1(channel)) { - com.discord.api.user.User author = modelMessage.getAuthor(); - m.checkNotNullExpressionValue(author, "message.author"); - CoreUser coreUser = new CoreUser(author); + com.discord.api.user.User g2 = message.g(); + m.checkNotNull(g2); + CoreUser coreUser = new CoreUser(g2); SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(a.u(GuildMember.Companion.getNickOrUsername$default(GuildMember.Companion, coreUser, map.get(Long.valueOf(coreUser.getId())), channel, null, 8, null), ": ")); context2 = context; Object[] objArr = new Object[2]; @@ -338,61 +335,57 @@ public final class NoticePopupChannel { } else { context2 = context; } - List attachments = modelMessage.getAttachments(); - MessageAttachment messageAttachment = attachments != null ? (MessageAttachment) u.firstOrNull((List) attachments) : r2; + List f = message.f(); + MessageAttachment messageAttachment = f != null ? (MessageAttachment) u.firstOrNull((List) f) : r1; if (messageAttachment == null || !messageAttachment.h()) { - if ((messageAttachment != null ? messageAttachment.e() : r2) == MessageAttachmentType.IMAGE) { + if ((messageAttachment != null ? messageAttachment.e() : r1) == MessageAttachmentType.IMAGE) { str2 = messageAttachment.c(); - str3 = r2; - } else if ((messageAttachment != null ? messageAttachment.e() : r2) == MessageAttachmentType.VIDEO) { - Drawable drawable$default = DrawableCompat.getDrawable$default(context, 2131232298, ColorCompat.getThemedColor(context2, 2130968905), false, 4, null); - drawable2 = DrawableCompat.getDrawable$default(context, 2131231846, ColorCompat.getThemedColor(context2, 2130968946), false, 4, null); - str2 = r2; + str3 = r1; + } else if ((messageAttachment != null ? messageAttachment.e() : r1) == MessageAttachmentType.VIDEO) { + Drawable drawable$default = DrawableCompat.getDrawable$default(context, 2131232301, ColorCompat.getThemedColor(context2, 2130968905), false, 4, null); + drawable2 = DrawableCompat.getDrawable$default(context, 2131231849, ColorCompat.getThemedColor(context2, 2130968946), false, 4, null); + str2 = r1; drawable = drawable$default; } else { - str2 = r2; + str2 = r1; str3 = str2; } drawable = str3; drawable2 = str3; } else { - drawable2 = ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, 2130970180, i, 2, (Object) r2)); - str2 = r2; + drawable2 = ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, 2130970180, i, 2, (Object) r1)); + str2 = r1; drawable = str2; } - return new Model(str5, str6, draweeSpanStringBuilder, str, drawable, str2, drawable2, ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, AnimatableValueParser.r1(channel) ? 2130969393 : 2130969449, i, 2, (Object) r2)), new NoticePopupChannel$createModel$onClickTopRightIcon$1(channel2, context2), modelMessage.getStickers()); + return new Model(str5, str6, draweeSpanStringBuilder, str, drawable, str2, drawable2, ContextCompat.getDrawable(context2, DrawableCompat.getThemedDrawableRes$default(context2, AnimatableValueParser.r1(channel) ? 2130969393 : 2130969449, i, 2, (Object) r1)), new NoticePopupChannel$createModel$onClickTopRightIcon$1(channel2, context2), message.I()); } } return null; } - public final void enqueue(Context context, String str, ModelMessage modelMessage, Function1 function1) { + public final void enqueue(Context context, String str, Message message, Function1 function1) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(str, "noticeName"); - m.checkNotNullParameter(modelMessage, "message"); + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(function1, "onClick"); j jVar = new j(context); - j jVar2 = new j(modelMessage); + j jVar2 = new j(message); StoreStream.Companion companion = StoreStream.Companion; - Observable observeFromChannelId = companion.getGuilds().observeFromChannelId(modelMessage.getChannelId()); - Observable observeChannel = companion.getChannels().observeChannel(modelMessage.getChannelId()); + Observable observeFromChannelId = companion.getGuilds().observeFromChannelId(message.i()); + Observable observeChannel = companion.getChannels().observeChannel(message.i()); StoreGuilds guilds = companion.getGuilds(); - Long guildId = modelMessage.getGuildId(); - if (guildId == null) { - guildId = 0L; - } - m.checkNotNullExpressionValue(guildId, "message.guildId ?: 0"); - Observable> observeComputed = guilds.observeComputed(guildId.longValue()); + Long o = message.o(); + long j = 0; + Observable> observeComputed = guilds.observeComputed(o != null ? o.longValue() : 0); Observable observeId = companion.getChannelsSelected().observeId(); Observable observeMe$default = StoreUser.observeMe$default(companion.getUsers(), false, 1, null); Observable> observeNames = companion.getChannels().observeNames(); StoreGuilds guilds2 = companion.getGuilds(); - Long guildId2 = modelMessage.getGuildId(); - if (guildId2 == null) { - guildId2 = 0L; + Long o2 = message.o(); + if (o2 != null) { + j = o2.longValue(); } - m.checkNotNullExpressionValue(guildId2, "message.guildId ?: 0"); - Observable c2 = Observable.c(jVar, jVar2, observeFromChannelId, observeChannel, observeComputed, observeId, observeMe$default, observeNames, guilds2.observeRoles(guildId2.longValue()), new NoticePopupChannel$sam$rx_functions_Func9$0(new NoticePopupChannel$enqueue$1(this))); + Observable c2 = Observable.c(jVar, jVar2, observeFromChannelId, observeChannel, observeComputed, observeId, observeMe$default, observeNames, guilds2.observeRoles(j), new NoticePopupChannel$sam$rx_functions_Func9$0(new NoticePopupChannel$enqueue$1(this))); m.checkNotNullExpressionValue(c2, "Observable\n .comb…is::createModel\n )"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.takeSingleUntilTimeout$default(c2, 0, false, 3, null))), NoticePopupChannel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new NoticePopupChannel$enqueue$2(str, function1), 62, (Object) null); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java index 75c84810d6..d2bafee6c0 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$1.java @@ -32,7 +32,7 @@ public final class WidgetNoticeDialog$Companion$showInputModal$1 extends o imple Function2 function2 = this.$onOKClicked; Context context = view.getContext(); m.checkNotNullExpressionValue(context, "view.context"); - View findViewById = view.findViewById(2131365487); + View findViewById = view.findViewById(2131365493); m.checkNotNullExpressionValue(findViewById, "view.findViewById(R.id.view_input)"); function2.invoke(context, ViewExtensions.getTextOrEmpty((TextInputLayout) findViewById)); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java index 7ffff50f38..2b124dbcae 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$Companion$showInputModal$3.java @@ -26,7 +26,7 @@ public final class WidgetNoticeDialog$Companion$showInputModal$3 extends o imple public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - View findViewById = view.findViewById(2131365487); + View findViewById = view.findViewById(2131365493); m.checkNotNullExpressionValue(findViewById, "view.findViewById(R.id.view_input)"); ((TextInputLayout) findViewById).setHint(this.$hintText); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java index 88e2f8bdd4..9e93e28562 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog$binding$2.java @@ -19,23 +19,23 @@ public final /* synthetic */ class WidgetNoticeDialog$binding$2 extends k implem public final WidgetNoticeDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364023; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364023); + int i = 2131364025; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364025); if (linearLayout != null) { - i = 2131364024; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364024); + i = 2131364026; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364026); if (linkifiedTextView != null) { - i = 2131364025; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364025); + i = 2131364027; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364027); if (materialButton != null) { - i = 2131364027; - TextView textView = (TextView) view.findViewById(2131364027); + i = 2131364029; + TextView textView = (TextView) view.findViewById(2131364029); if (textView != null) { - i = 2131364028; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364028); + i = 2131364030; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364030); if (linearLayout2 != null) { - i = 2131364030; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364030); + i = 2131364032; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364032); if (materialButton2 != null) { return new WidgetNoticeDialogBinding((LinearLayout) view, linearLayout, linkifiedTextView, materialButton, textView, linearLayout2, materialButton2); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java index 65f2a16015..605218b153 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java @@ -59,9 +59,9 @@ public final class WidgetNoticeDialog extends AppDialog { private static final String ARG_OK_TEXT = "ok_text"; private static final String ARG_STACK_TRACE_CALLER_FRAME = "stack_trace_caller_frame"; private static final String ARG_THEME_ID = "theme_id"; - public static final int CANCEL_BUTTON = 2131364025; + public static final int CANCEL_BUTTON = 2131364027; public static final Companion Companion = new Companion(null); - public static final int OK_BUTTON = 2131364030; + public static final int OK_BUTTON = 2131364032; public static final int ON_SHOW = 0; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null); private Map> listenerMap; @@ -223,7 +223,7 @@ public final class WidgetNoticeDialog extends AppDialog { public final void show(FragmentManager fragmentManager) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); - Companion.show$default(WidgetNoticeDialog.Companion, fragmentManager, this.title, this.message, this.confirmText, this.cancelText, h0.mapOf(o.to(2131364030, this.onConfirm), o.to(2131364025, this.onCancel)), null, null, null, this.themeId, null, null, 0, null, 15808, null); + Companion.show$default(WidgetNoticeDialog.Companion, fragmentManager, this.title, this.message, this.confirmText, this.cancelText, h0.mapOf(o.to(2131364032, this.onConfirm), o.to(2131364027, this.onCancel)), null, null, null, this.themeId, null, null, 0, null, 15808, null); } } @@ -291,19 +291,19 @@ public final class WidgetNoticeDialog extends AppDialog { m.checkNotNullParameter(charSequence3, "hintText"); m.checkNotNullParameter(function2, "onOKClicked"); HashMap hashMap = new HashMap(); - hashMap.put(2131364030, new WidgetNoticeDialog$Companion$showInputModal$1(function2)); + hashMap.put(2131364032, new WidgetNoticeDialog$Companion$showInputModal$1(function2)); if (function0 != null) { - hashMap.put(2131364025, new WidgetNoticeDialog$Companion$showInputModal$2(function0)); + hashMap.put(2131364027, new WidgetNoticeDialog$Companion$showInputModal$2(function0)); } hashMap.put(0, new WidgetNoticeDialog$Companion$showInputModal$3(charSequence3)); FragmentManager supportFragmentManager = appActivity.getSupportFragmentManager(); m.checkNotNullExpressionValue(supportFragmentManager, "activity.supportFragmentManager"); - show$default(this, supportFragmentManager, charSequence, charSequence2, appActivity.getString(2131887487), appActivity.getString(2131887177), hashMap, null, null, 2131558756, null, bool, null, 0, null, 15040, null); + show$default(this, supportFragmentManager, charSequence, charSequence2, appActivity.getString(2131887489), appActivity.getString(2131887178), hashMap, null, null, 2131558756, null, bool, null, 0, null, 15040, null); } } public WidgetNoticeDialog() { - super(2131559095); + super(2131559096); } private final WidgetNoticeDialogBinding getBinding() { @@ -402,16 +402,16 @@ public final class WidgetNoticeDialog extends AppDialog { LinearLayout linearLayout = getBinding().f; m.checkNotNullExpressionValue(linearLayout, "binding.noticeHeaderContainer"); linearLayout.setVisibility((charSequence2 == null || t.isBlank(charSequence2)) ^ true ? 0 : 8); - LinkifiedTextView linkifiedTextView = getBinding().f1834c; + LinkifiedTextView linkifiedTextView = getBinding().f1836c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.noticeBodyText"); Bundle arguments4 = getArguments(); linkifiedTextView.setText(arguments4 != null ? arguments4.getCharSequence("body_text") : null); if (isCancelable()) { - LinkifiedTextView linkifiedTextView2 = getBinding().f1834c; + LinkifiedTextView linkifiedTextView2 = getBinding().f1836c; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.noticeBodyText"); linkifiedTextView2.setMovementMethod(new ActionLinkMovementMethod(new WidgetNoticeDialog$onViewBound$2(this))); } - LinkifiedTextView linkifiedTextView3 = getBinding().f1834c; + LinkifiedTextView linkifiedTextView3 = getBinding().f1836c; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.noticeBodyText"); Bundle arguments5 = getArguments(); linkifiedTextView3.setTextAlignment(arguments5 != null ? arguments5.getInt("body_text_alignment") : 2); diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java index 1932628251..1bb0053b5d 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$binding$2.java @@ -20,8 +20,8 @@ public final /* synthetic */ class WidgetNoticeNuxOverlay$binding$2 extends k im int i = 2131362215; MaterialButton materialButton = (MaterialButton) view.findViewById(2131362215); if (materialButton != null) { - i = 2131363041; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363041); + i = 2131363043; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363043); if (materialButton2 != null) { return new WidgetNoticeNuxOverlayBinding((LinearLayout) view, materialButton, materialButton2); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java index 3532e18bf5..a541ffb6bb 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay$onViewBound$1.java @@ -13,7 +13,7 @@ public final class WidgetNoticeNuxOverlay$onViewBound$1 implements View.OnClickL @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetSettingsVoice.Companion.launch(a.T(view, "it", "it.context"), 2131364916, true); + WidgetSettingsVoice.Companion.launch(a.T(view, "it", "it.context"), 2131364919, true); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java index 14ee464db9..ae04207790 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java @@ -34,7 +34,7 @@ public final class WidgetNoticeNuxOverlay extends AppDialog { } public WidgetNoticeNuxOverlay() { - super(2131559096); + super(2131559097); } private final WidgetNoticeNuxOverlayBinding getBinding() { @@ -46,7 +46,7 @@ public final class WidgetNoticeNuxOverlay extends AppDialog { m.checkNotNullParameter(view, "view"); super.onViewBound(view); StoreStream.Companion.getNotices().markDialogSeen("NUX/Overlay"); - getBinding().f1835c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this)); + getBinding().f1837c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this)); getBinding().b.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java index bb0cf14000..e7ad278409 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink$binding$2.java @@ -20,8 +20,8 @@ public final /* synthetic */ class WidgetNoticeNuxSamsungLink$binding$2 extends int i = 2131362215; MaterialButton materialButton = (MaterialButton) view.findViewById(2131362215); if (materialButton != null) { - i = 2131363041; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363041); + i = 2131363043; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363043); if (materialButton2 != null) { return new WidgetNoticeNuxSamsungLinkBinding((LinearLayout) view, materialButton, materialButton2); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java index e0cf3712b7..f5a9e9b7c8 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java @@ -74,7 +74,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog { } public WidgetNoticeNuxSamsungLink() { - super(2131559097); + super(2131559098); } private final WidgetNoticeNuxSamsungLinkBinding getBinding() { @@ -87,7 +87,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog { super.onViewBound(view); StoreStream.Companion.getNotices().markDialogSeen("NUX/SamsungLink"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getOAuthTokens(), false, 1, null)), 0, false, 1, null), this, null, 2, null), WidgetNoticeNuxSamsungLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetNoticeNuxSamsungLink$onViewBound$1(this), 62, (Object) null); - getBinding().f1836c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this)); + getBinding().f1838c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this)); getBinding().b.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$3(this)); } } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java index 1d3edd0e1f..0126ccaa90 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$binding$2.java @@ -20,41 +20,41 @@ public final /* synthetic */ class WidgetGuildTemplates$binding$2 extends k impl public final WidgetNuxGuildTemplateBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364051; - MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364051); + int i = 2131364053; + MaterialCardView materialCardView = (MaterialCardView) view.findViewById(2131364053); if (materialCardView != null) { - i = 2131364052; - MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131364052); + i = 2131364054; + MaterialCardView materialCardView2 = (MaterialCardView) view.findViewById(2131364054); if (materialCardView2 != null) { - i = 2131364053; - MaterialCardView materialCardView3 = (MaterialCardView) view.findViewById(2131364053); + i = 2131364055; + MaterialCardView materialCardView3 = (MaterialCardView) view.findViewById(2131364055); if (materialCardView3 != null) { - i = 2131364054; - MaterialCardView materialCardView4 = (MaterialCardView) view.findViewById(2131364054); + i = 2131364056; + MaterialCardView materialCardView4 = (MaterialCardView) view.findViewById(2131364056); if (materialCardView4 != null) { - i = 2131364055; - MaterialCardView materialCardView5 = (MaterialCardView) view.findViewById(2131364055); + i = 2131364057; + MaterialCardView materialCardView5 = (MaterialCardView) view.findViewById(2131364057); if (materialCardView5 != null) { - i = 2131364056; - MaterialCardView materialCardView6 = (MaterialCardView) view.findViewById(2131364056); + i = 2131364058; + MaterialCardView materialCardView6 = (MaterialCardView) view.findViewById(2131364058); if (materialCardView6 != null) { - i = 2131364057; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364057); + i = 2131364059; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364059); if (materialButton != null) { - i = 2131364058; - MaterialCardView materialCardView7 = (MaterialCardView) view.findViewById(2131364058); + i = 2131364060; + MaterialCardView materialCardView7 = (MaterialCardView) view.findViewById(2131364060); if (materialCardView7 != null) { - i = 2131364059; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364059); + i = 2131364061; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364061); if (linearLayout != null) { - i = 2131364060; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364060); + i = 2131364062; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364062); if (nestedScrollView != null) { - i = 2131364061; - TextView textView = (TextView) view.findViewById(2131364061); + i = 2131364063; + TextView textView = (TextView) view.findViewById(2131364063); if (textView != null) { - i = 2131364062; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364062); + i = 2131364064; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364064); if (linearLayout2 != null) { return new WidgetNuxGuildTemplateBinding((LinearLayout) view, materialCardView, materialCardView2, materialCardView3, materialCardView4, materialCardView5, materialCardView6, materialButton, materialCardView7, linearLayout, nestedScrollView, textView, linearLayout2); } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java index 7885325617..3642e4fdd7 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates$onViewBound$guildCreateClickListener$1.java @@ -15,8 +15,8 @@ public final class WidgetGuildTemplates$onViewBound$guildCreateClickListener$1 i @Override // android.view.View.OnClickListener public final void onClick(View view) { - StockGuildTemplate stockGuildTemplate = m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f) ? StockGuildTemplate.FRIEND_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).i) ? StockGuildTemplate.STUDY_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).g) ? StockGuildTemplate.GAMING_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).e) ? StockGuildTemplate.CONTENT_CREATOR : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).b) ? StockGuildTemplate.CLUB : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f1839c) ? StockGuildTemplate.LOCAL_COMMUNITY : StockGuildTemplate.CREATE; + StockGuildTemplate stockGuildTemplate = m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f) ? StockGuildTemplate.FRIEND_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).i) ? StockGuildTemplate.STUDY_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).g) ? StockGuildTemplate.GAMING_GROUP : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).e) ? StockGuildTemplate.CONTENT_CREATOR : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).b) ? StockGuildTemplate.CLUB : m.areEqual(view, WidgetGuildTemplates.access$getBinding$p(this.this$0).f1841c) ? StockGuildTemplate.LOCAL_COMMUNITY : StockGuildTemplate.CREATE; WidgetGuildTemplates.access$trackPostRegistrationTransition(this.this$0, "Guild Template", "Server Intent Discovery"); - WidgetCreationIntent.Companion.show(this.this$0.requireContext(), this.this$0.getTrigger(), new WidgetGuildCreate.Options(this.this$0.getLocation(), stockGuildTemplate, stockGuildTemplate == StockGuildTemplate.CREATE, this.this$0.getString(2131889176))); + WidgetCreationIntent.Companion.show(this.this$0.requireContext(), this.this$0.getTrigger(), new WidgetGuildCreate.Options(this.this$0.getLocation(), stockGuildTemplate, stockGuildTemplate == StockGuildTemplate.CREATE, this.this$0.getString(2131889186))); } } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java index bdbd2b7afa..9eeff94bab 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java @@ -51,7 +51,7 @@ public final class WidgetGuildTemplates extends AppFragment { } public WidgetGuildTemplates() { - super(2131559100); + super(2131559101); } public static final /* synthetic */ WidgetNuxGuildTemplateBinding access$getBinding$p(WidgetGuildTemplates widgetGuildTemplates) { @@ -112,7 +112,7 @@ public final class WidgetGuildTemplates extends AppFragment { trackPostRegistrationTransition("Registration", "Guild Template"); AppFragment.setOnBackPressed$default(this, new WidgetGuildTemplates$onViewBound$1(this), 0, 2, null); WidgetGuildTemplates$onViewBound$guildCreateClickListener$1 widgetGuildTemplates$onViewBound$guildCreateClickListener$1 = new WidgetGuildTemplates$onViewBound$guildCreateClickListener$1(this); - for (MaterialCardView materialCardView : n.listOf((Object[]) new MaterialCardView[]{getBinding().d, getBinding().f, getBinding().i, getBinding().g, getBinding().b, getBinding().e, getBinding().f1839c})) { + for (MaterialCardView materialCardView : n.listOf((Object[]) new MaterialCardView[]{getBinding().d, getBinding().f, getBinding().i, getBinding().g, getBinding().b, getBinding().e, getBinding().f1841c})) { materialCardView.setOnClickListener(widgetGuildTemplates$onViewBound$guildCreateClickListener$1); } getBinding().h.setOnClickListener(new WidgetGuildTemplates$onViewBound$guildJoinClickListener$1(this)); diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java index e78bc216aa..a8138936db 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp$binding$2.java @@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetNavigationHelp$binding$2 extends k impl public final WidgetNavigationHelpBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363995; - ImageView imageView = (ImageView) view.findViewById(2131363995); + int i = 2131363997; + ImageView imageView = (ImageView) view.findViewById(2131363997); if (imageView != null) { - i = 2131363996; - TabLayout tabLayout = (TabLayout) view.findViewById(2131363996); + i = 2131363998; + TabLayout tabLayout = (TabLayout) view.findViewById(2131363998); if (tabLayout != null) { - i = 2131363997; - ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131363997); + i = 2131363999; + ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131363999); if (viewPager2 != null) { return new WidgetNavigationHelpBinding((LinearLayout) view, imageView, tabLayout, viewPager2); } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java index abba7ecbd6..57a5f70e89 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java @@ -63,11 +63,11 @@ public final class WidgetNavigationHelp extends AppDialog { public Fragment createFragment(int i) { int i2; if (i == 0) { - i2 = 2131559094; + i2 = 2131559095; } else if (i == 1) { - i2 = 2131559092; - } else if (i == 2) { i2 = 2131559093; + } else if (i == 2) { + i2 = 2131559094; } else { throw new IllegalStateException(a.l("unknown nux page: ", i)); } @@ -81,7 +81,7 @@ public final class WidgetNavigationHelp extends AppDialog { } public WidgetNavigationHelp() { - super(2131559091); + super(2131559092); } private final WidgetNavigationHelpBinding getBinding() { @@ -109,7 +109,7 @@ public final class WidgetNavigationHelp extends AppDialog { ViewPager2 viewPager2 = getBinding().d; m.checkNotNullExpressionValue(viewPager2, "binding.navigationHelpNuxPager"); viewPager2.setAdapter(new NuxPagerAdapter(this)); - TabLayout tabLayout = getBinding().f1833c; + TabLayout tabLayout = getBinding().f1835c; m.checkNotNullExpressionValue(tabLayout, "binding.navigationHelpIndicators"); ViewPager2 viewPager22 = getBinding().d; m.checkNotNullExpressionValue(viewPager22, "binding.navigationHelpNuxPager"); diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java index 46a01034fc..c200770c74 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$binding$2.java @@ -21,26 +21,26 @@ public final /* synthetic */ class WidgetNuxChannelPrompt$binding$2 extends k im public final WidgetNuxChannelPromptBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364044; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364044); + int i = 2131364046; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364046); if (loadingButton != null) { - i = 2131364045; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364045); + i = 2131364047; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364047); if (simpleDraweeView != null) { - i = 2131364046; - TextView textView = (TextView) view.findViewById(2131364046); + i = 2131364048; + TextView textView = (TextView) view.findViewById(2131364048); if (textView != null) { - i = 2131364047; - TextView textView2 = (TextView) view.findViewById(2131364047); + i = 2131364049; + TextView textView2 = (TextView) view.findViewById(2131364049); if (textView2 != null) { - i = 2131364048; - TextView textView3 = (TextView) view.findViewById(2131364048); + i = 2131364050; + TextView textView3 = (TextView) view.findViewById(2131364050); if (textView3 != null) { - i = 2131364049; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364049); + i = 2131364051; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364051); if (textInputLayout != null) { - i = 2131365289; - Toolbar toolbar = (Toolbar) view.findViewById(2131365289); + i = 2131365294; + Toolbar toolbar = (Toolbar) view.findViewById(2131365294); if (toolbar != null) { return new WidgetNuxChannelPromptBinding((RelativeLayout) view, loadingButton, simpleDraweeView, textView, textView2, textView3, textInputLayout, toolbar); } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java index e2e49ff6d3..1a64129a0a 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java @@ -83,6 +83,6 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu TextInputLayout textInputLayout = WidgetNuxChannelPrompt.access$getBinding$p(this.this$0).g; m.checkNotNullExpressionValue(textInputLayout, "binding.nufChannelPromptTopicWrap"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); - ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.q()), null, b.j(this.this$0, 2131891531, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this))); + ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.q()), null, b.j(this.this$0, 2131891564, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(q.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this))); } } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java index 1f70e78d7c..3df1bfed97 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java @@ -59,7 +59,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment { } public WidgetNuxChannelPrompt() { - super(2131559099); + super(2131559100); } public static final /* synthetic */ void access$finishActivity(WidgetNuxChannelPrompt widgetNuxChannelPrompt, long j) { @@ -107,7 +107,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment { TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.nufChannelPromptGuildIconName"); textView.setVisibility(8); - SimpleDraweeView simpleDraweeView = getBinding().f1838c; + SimpleDraweeView simpleDraweeView = getBinding().f1840c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.nufChannelPromptGuildIcon"); IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); } else { @@ -117,7 +117,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment { TextView textView3 = getBinding().d; m.checkNotNullExpressionValue(textView3, "binding.nufChannelPromptGuildIconName"); textView3.setText(guild.getShortName()); - SimpleDraweeView simpleDraweeView2 = getBinding().f1838c; + SimpleDraweeView simpleDraweeView2 = getBinding().f1840c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.nufChannelPromptGuildIcon"); IconUtils.setIcon$default(simpleDraweeView2, "asset://asset/images/default_icon.jpg", 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java index 71d977411a..be29418b32 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java @@ -19,7 +19,7 @@ public final class WidgetNuxPostRegistrationJoin$onViewBound$1 implements View.O @Override // android.view.View.OnClickListener public final void onClick(View view) { - TextInputLayout textInputLayout = this.this$0.getBinding().f1802c; + TextInputLayout textInputLayout = this.this$0.getBinding().f1804c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); if (t.isBlank(ViewExtensions.getTextOrEmpty(textInputLayout))) { AnalyticsTracker.INSTANCE.newUserOnboarding("Mobile NUX Post Reg", "Ask to join", "Friend List", Long.valueOf(this.$startTimeMs), true); diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java index 23f126f50a..0ecc1bd9fa 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.java @@ -26,6 +26,6 @@ public final class WidgetNuxPostRegistrationJoin$onViewBound$2 extends o impleme public final void invoke(Editable editable) { m.checkNotNullParameter(editable, "editable"); - this.this$0.getBinding().b.setText(t.isBlank(editable) ? 2131891590 : 2131890612); + this.this$0.getBinding().b.setText(t.isBlank(editable) ? 2131891623 : 2131890642); } } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java index 20dc37a5e2..9e5674f59e 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java @@ -32,7 +32,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin { } public WidgetNuxPostRegistrationJoin() { - super(2131559101); + super(2131559102); } public static final /* synthetic */ void access$handleGuildJoin(WidgetNuxPostRegistrationJoin widgetNuxPostRegistrationJoin) { @@ -46,7 +46,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin { setActionBarDisplayHomeAsUpEnabled(false); AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, "Mobile NUX Post Reg", "Registration", "Ask to join", null, false, 24, null); getBinding().b.setOnClickListener(new WidgetNuxPostRegistrationJoin$onViewBound$1(this, ClockFactory.get().currentTimeMillis())); - TextInputLayout textInputLayout = getBinding().f1802c; + TextInputLayout textInputLayout = getBinding().f1804c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetNuxPostRegistrationJoin$onViewBound$2(this)); } diff --git a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java index 4d792e479f..59125f0b87 100644 --- a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java +++ b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapter.java @@ -40,18 +40,18 @@ public final class PhoneCountryCodeAdapter extends RecyclerView.Adapter o = this.nameFilterSubject.o(200, TimeUnit.MILLISECONDS); diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java index a82633961c..1b8b833673 100644 --- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetQuickMentionsDialog$binding$2 extends k public final WidgetQuickMentionsDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365166; - ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131365166); + int i = 2131365170; + ViewPager2 viewPager2 = (ViewPager2) view.findViewById(2131365170); if (viewPager2 != null) { - i = 2131365167; - TabLayout tabLayout = (TabLayout) view.findViewById(2131365167); + i = 2131365171; + TabLayout tabLayout = (TabLayout) view.findViewById(2131365171); if (tabLayout != null) { return new WidgetQuickMentionsDialogBinding((ConstraintLayout) view, viewPager2, tabLayout); } diff --git a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java index 43ee99e14e..5d70754bd1 100644 --- a/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java +++ b/app/src/main/java/com/discord/widgets/quickmentions/WidgetQuickMentionsDialog.java @@ -104,17 +104,17 @@ public final class WidgetQuickMentionsDialog extends AppDialog { public final int getItemTitleResId(int i) { if (i == 0) { - return 2131893005; + return 2131893047; } if (i == 1) { - return 2131891123; + return 2131891154; } throw new UnsupportedOperationException(); } } public WidgetQuickMentionsDialog() { - super(2131559112); + super(2131559113); } private final WidgetQuickMentionsDialogBinding getBinding() { @@ -154,7 +154,7 @@ public final class WidgetQuickMentionsDialog extends AppDialog { ViewPager2 viewPager2 = getBinding().b; m.checkNotNullExpressionValue(viewPager2, "binding.tabContents"); viewPager2.setAdapter(tabsAdapter); - TabLayout tabLayout = getBinding().f1848c; + TabLayout tabLayout = getBinding().f1850c; m.checkNotNullExpressionValue(tabLayout, "binding.tabs"); ViewPager2 viewPager22 = getBinding().b; m.checkNotNullExpressionValue(viewPager22, "binding.tabContents"); diff --git a/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java index a1de884ed5..49ddff76a0 100644 --- a/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/roles/RolesListView$updateView$$inlined$forEach$lambda$1.java @@ -24,6 +24,6 @@ public final class RolesListView$updateView$$inlined$forEach$lambda$1 implements public final void onClick(View view) { Context context = this.this$0.getContext(); m.checkNotNullExpressionValue(context, "context"); - o.b(context, String.valueOf(this.$role.getId()), b.i(this.this$0, 2131892685, new Object[]{this.$role.f()}, null, 4)); + o.b(context, String.valueOf(this.$role.getId()), b.i(this.this$0, 2131892727, new Object[]{this.$role.f()}, null, 4)); } } diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java index 74f0011de2..f7d4701acf 100644 --- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java +++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$binding$2.java @@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetSearch$binding$2 extends k implements F public final WidgetSearchBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364542; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364542); + int i = 2131364545; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364545); if (floatingActionButton != null) { - i = 2131365605; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365605); + i = 2131365611; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365611); if (textInputLayout != null) { - i = 2131365606; - FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365606); + i = 2131365612; + FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365612); if (fragmentContainerView != null) { - i = 2131365607; - FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365607); + i = 2131365613; + FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365613); if (fragmentContainerView2 != null) { return new WidgetSearchBinding((CoordinatorLayout) view, floatingActionButton, textInputLayout, fragmentContainerView, fragmentContainerView2); } diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java index 5117dbd83a..e66d8d6b4f 100644 --- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java +++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$1.java @@ -36,7 +36,7 @@ public final class WidgetSearch$configureSearchInput$1 extends o implements Func } AppFragment.hideKeyboard$default(this.this$0, null, 1, null); StoreSearch search = StoreStream.Companion.getSearch(); - TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1851c; + TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1853c; m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); Context context = textView.getContext(); diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java index 8e111c73b3..21148bc84c 100644 --- a/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java +++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch$configureSearchInput$5.java @@ -25,10 +25,10 @@ public final class WidgetSearch$configureSearchInput$5 extends o implements Func } public final void invoke(String str) { - TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1851c; + TextInputLayout textInputLayout = WidgetSearch.access$getBinding$p(this.this$0).f1853c; m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput"); ViewExtensions.setText(textInputLayout, str); - TextInputLayout textInputLayout2 = WidgetSearch.access$getBinding$p(this.this$0).f1851c; + TextInputLayout textInputLayout2 = WidgetSearch.access$getBinding$p(this.this$0).f1853c; m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput"); ViewExtensions.setSelectionEnd(textInputLayout2); } diff --git a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java index a56a272e0f..6e9082b6e5 100644 --- a/app/src/main/java/com/discord/widgets/search/WidgetSearch.java +++ b/app/src/main/java/com/discord/widgets/search/WidgetSearch.java @@ -211,7 +211,7 @@ public final class WidgetSearch extends AppFragment { } public WidgetSearch() { - super(2131559118); + super(2131559119); } public static final /* synthetic */ void access$configureUI(WidgetSearch widgetSearch, Model model) { @@ -227,10 +227,10 @@ public final class WidgetSearch extends AppFragment { } private final void configureSearchInput() { - TextInputLayout textInputLayout = getBinding().f1851c; + TextInputLayout textInputLayout = getBinding().f1853c; m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput"); ViewExtensions.setOnEditorActionListener(textInputLayout, new WidgetSearch$configureSearchInput$1(this)); - TextInputLayout textInputLayout2 = getBinding().f1851c; + TextInputLayout textInputLayout2 = getBinding().f1853c; m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput"); ViewExtensions.addBindedTextWatcher(textInputLayout2, this, WidgetSearch$configureSearchInput$2.INSTANCE); Observable G = ObservableExtensionsKt.ui$default(StoreStream.Companion.getSearch().getStoreSearchInput().getForcedInput(), this, null, 2, null).G(new WidgetSearch$configureSearchInput$3(this)).G(WidgetSearch$configureSearchInput$4.INSTANCE); @@ -251,20 +251,20 @@ public final class WidgetSearch extends AppFragment { int i = this.targetType; int i2 = 0; if (i == 0) { - TextInputLayout textInputLayout = getBinding().f1851c; + TextInputLayout textInputLayout = getBinding().f1853c; m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput"); Object[] objArr = new Object[1]; Guild guild = model.getGuild(); objArr[0] = guild != null ? guild.getName() : null; - ViewExtensions.setSingleLineHint(textInputLayout, b.j(this, 2131893059, objArr, null, 4)); + ViewExtensions.setSingleLineHint(textInputLayout, b.j(this, 2131893101, objArr, null, 4)); } else if (i == 1) { Channel channel = model.getChannel(); String z0 = channel != null ? AnimatableValueParser.z0(channel, requireContext(), false) : null; - TextInputLayout textInputLayout2 = getBinding().f1851c; + TextInputLayout textInputLayout2 = getBinding().f1853c; m.checkNotNullExpressionValue(textInputLayout2, "binding.widgetSearchInput"); Channel channel2 = model.getChannel(); Integer valueOf = channel2 != null ? Integer.valueOf(channel2.z()) : null; - ViewExtensions.setSingleLineHint(textInputLayout2, (valueOf != null && valueOf.intValue() == 1) ? b.j(this, 2131893028, new Object[]{z0}, null, 4) : (valueOf != null && valueOf.intValue() == 3) ? b.j(this, 2131893059, new Object[]{z0}, null, 4) : b.j(this, 2131893005, new Object[0], null, 4)); + ViewExtensions.setSingleLineHint(textInputLayout2, (valueOf != null && valueOf.intValue() == 1) ? b.j(this, 2131893070, new Object[]{z0}, null, 4) : (valueOf != null && valueOf.intValue() == 3) ? b.j(this, 2131893101, new Object[]{z0}, null, 4) : b.j(this, 2131893047, new Object[0], null, 4)); } StoreSearch.DisplayState displayState = model.getDisplayState(); if (displayState != null) { @@ -303,7 +303,7 @@ public final class WidgetSearch extends AppFragment { private final void sendQuery(Context context) { AppFragment.hideKeyboard$default(this, null, 1, null); StoreSearch search = StoreStream.Companion.getSearch(); - TextInputLayout textInputLayout = getBinding().f1851c; + TextInputLayout textInputLayout = getBinding().f1853c; m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput"); search.loadInitial(ViewExtensions.getTextOrEmpty(textInputLayout), new ContextSearchStringProvider(context)); } @@ -330,7 +330,7 @@ public final class WidgetSearch extends AppFragment { this.targetId = getMostRecentIntent().getLongExtra("INTENT_EXTRA_TARGET_ID", 0); this.targetType = getMostRecentIntent().getIntExtra("INTENT_EXTRA_SEARCH_TYPE", -1); if (!isRecreated()) { - TextInputLayout textInputLayout = getBinding().f1851c; + TextInputLayout textInputLayout = getBinding().f1853c; m.checkNotNullExpressionValue(textInputLayout, "binding.widgetSearchInput"); showKeyboard(textInputLayout); } @@ -348,7 +348,7 @@ public final class WidgetSearch extends AppFragment { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(this.targetType, this.targetId), this, null, 2, null), WidgetSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSearch$onViewBoundOrOnResume$1(this), 62, (Object) null); configureSearchInput(); getBinding().b.setOnClickListener(new WidgetSearch$onViewBoundOrOnResume$2(this)); - getBinding().f1851c.setStartIconOnClickListener(new WidgetSearch$onViewBoundOrOnResume$3(this)); + getBinding().f1853c.setStartIconOnClickListener(new WidgetSearch$onViewBoundOrOnResume$3(this)); } public final void setTargetId(long j) { diff --git a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java index 058df7b305..749da89723 100644 --- a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults$Model$Companion$get$1.java @@ -2,8 +2,8 @@ package com.discord.widgets.search.results; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.stores.StoreStream; @@ -64,24 +64,24 @@ public final class WidgetSearchResults$Model$Companion$get$1 implements b< HashSet hashSet = new HashSet(); Long l2 = null; if (this.$searchState.getQueryFetchState() == QueryFetchState.COMPLETED || this.$searchState.getQueryFetchState() == QueryFetchState.LOADING_MORE) { - List messages = messagesWithMetadata.getMessages(); + List messages = messagesWithMetadata.getMessages(); if (!messages.isEmpty()) { - Long valueOf = Long.valueOf(messages.get(messages.size() - 1).getId()); + Long valueOf = Long.valueOf(messages.get(messages.size() - 1).r()); arrayList.add(new SearchResultCountEntry(this.$searchState.getTotalResults())); l = valueOf; } else { l = null; } - for (ModelMessage modelMessage : messages) { - Channel channel = map5.get(Long.valueOf(modelMessage.getChannelId())); + for (Message message : messages) { + Channel channel = map5.get(Long.valueOf(message.i())); if (channel != null) { Map map8 = (Map) a.c(channel, map7); if (map8 == null || (guildMember = (GuildMember) map8.get(Long.valueOf(j))) == null || (list = guildMember.getRoles()) == null) { list = n.emptyList(); } hashSet.addAll(list); - arrayList.add(MessageHeaderEntry.Companion.create(modelMessage, channel, (Guild) a.c(channel, map6))); - Map map9 = (Map) map7.get(Long.valueOf(modelMessage.getChannelId())); + arrayList.add(MessageHeaderEntry.Companion.create(message, channel, (Guild) a.c(channel, map6))); + Map map9 = (Map) map7.get(Long.valueOf(message.i())); if (map9 == null) { map9 = h0.emptyMap(); } @@ -89,7 +89,7 @@ public final class WidgetSearchResults$Model$Companion$get$1 implements b< if (map10 == null) { map10 = h0.emptyMap(); } - arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map9, map10, new HashMap(), messagesWithMetadata.getMessageThreads().get(Long.valueOf(modelMessage.getId())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(modelMessage.getId())), modelMessage, messagesWithMetadata.getMessageState().get(Long.valueOf(modelMessage.getId())), new HashMap(), false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, new HashMap(), inviteEmbedModel, false, 262144, null)); + arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map9, map10, new HashMap(), messagesWithMetadata.getMessageThreads().get(Long.valueOf(message.r())), messagesWithMetadata.getThreadCountsAndLatestMessages().get(Long.valueOf(message.r())), message, messagesWithMetadata.getMessageState().get(Long.valueOf(message.r())), new HashMap(), false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, new HashMap(), inviteEmbedModel, false, 262144, null)); } map6 = map2; map7 = map3; @@ -120,7 +120,7 @@ public final class WidgetSearchResults$Model$Companion$get$1 implements b< public final Observable call(SearchState searchState) { WidgetChatListModelMessages.MessagesWithMetadata.Companion companion = WidgetChatListModelMessages.MessagesWithMetadata.Companion; - List hits = searchState.getHits(); + List hits = searchState.getHits(); if (hits == null) { hits = new ArrayList<>(); } diff --git a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java index 795f73b7f2..d83cc82f63 100644 --- a/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java +++ b/app/src/main/java/com/discord/widgets/search/results/WidgetSearchResults.java @@ -12,13 +12,13 @@ import c.d.b.a.a; import com.discord.api.activity.Activity; import com.discord.api.application.Application; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.message.reaction.MessageReaction; import com.discord.api.sticker.BaseSticker; import com.discord.api.sticker.Sticker; import com.discord.app.AppFragment; import com.discord.databinding.WidgetSearchResultsBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.restapi.RestAPIParams; import com.discord.stores.SelectedChannelAnalyticsLocation; @@ -250,8 +250,8 @@ public final class WidgetSearchResults extends AppFragment { this.channelSelector = channelSelector; } - private final void jumpToChat(ModelMessage modelMessage) { - StoreStream.Companion.getMessagesLoader().jumpToMessage(modelMessage.getChannelId(), modelMessage.getId()); + private final void jumpToChat(Message message) { + StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r()); l.c(this.context, false, null, 6); } @@ -270,8 +270,8 @@ public final class WidgetSearchResults extends AppFragment { } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onDismissClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); + public void onDismissClicked(Message message) { + m.checkNotNullParameter(message, "message"); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -287,40 +287,40 @@ public final class WidgetSearchResults extends AppFragment { } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorAvatarClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToChat(modelMessage); + public void onMessageAuthorAvatarClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorLongClicked(ModelMessage modelMessage, Long l) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToChat(modelMessage); + public void onMessageAuthorLongClicked(Message message, Long l) { + m.checkNotNullParameter(message, "message"); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorNameClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToChat(modelMessage); + public void onMessageAuthorNameClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageBlockedGroupClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToChat(modelMessage); + public void onMessageBlockedGroupClicked(Message message) { + m.checkNotNullParameter(message, "message"); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageClicked(ModelMessage modelMessage, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToChat(modelMessage); + public void onMessageClicked(Message message, boolean z2) { + m.checkNotNullParameter(message, "message"); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageLongClicked(ModelMessage modelMessage, CharSequence charSequence, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); + public void onMessageLongClicked(Message message, CharSequence charSequence, boolean z2) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(charSequence, "formattedMessage"); - jumpToChat(modelMessage); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -329,8 +329,8 @@ public final class WidgetSearchResults extends AppFragment { } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onOpenPinsClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); + public void onOpenPinsClicked(Message message) { + m.checkNotNullParameter(message, "message"); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -361,10 +361,10 @@ public final class WidgetSearchResults extends AppFragment { } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onStickerClicked(ModelMessage modelMessage, BaseSticker baseSticker) { - m.checkNotNullParameter(modelMessage, "message"); + public void onStickerClicked(Message message, BaseSticker baseSticker) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(baseSticker, "sticker"); - jumpToChat(modelMessage); + jumpToChat(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -397,7 +397,7 @@ public final class WidgetSearchResults extends AppFragment { } public WidgetSearchResults() { - super(2131559119); + super(2131559120); } public static final /* synthetic */ void access$configureUI(WidgetSearchResults widgetSearchResults, Model model) { diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java index eb8f88bb45..cbad85c571 100644 --- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java +++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestions.java @@ -191,7 +191,7 @@ public final class WidgetSearchSuggestions extends AppFragment { } public WidgetSearchSuggestions() { - super(2131559122); + super(2131559123); } public static final /* synthetic */ void access$configureUI(WidgetSearchSuggestions widgetSearchSuggestions, Model model) { diff --git a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java index ce2f367afe..0d068e21b2 100644 --- a/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java +++ b/app/src/main/java/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter.java @@ -149,18 +149,18 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public FilterViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559126, widgetSearchSuggestionsAdapter); + super(2131559127, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter"); View view = this.itemView; - int i = 2131365137; - TextView textView = (TextView) view.findViewById(2131365137); + int i = 2131365141; + TextView textView = (TextView) view.findViewById(2131365141); if (textView != null) { RelativeLayout relativeLayout = (RelativeLayout) view; - i = 2131365139; - TextView textView2 = (TextView) view.findViewById(2131365139); + i = 2131365143; + TextView textView2 = (TextView) view.findViewById(2131365143); if (textView2 != null) { - i = 2131365140; - ImageView imageView = (ImageView) view.findViewById(2131365140); + i = 2131365144; + ImageView imageView = (ImageView) view.findViewById(2131365144); if (imageView != null) { WidgetSearchSuggestionsItemSuggestionBinding widgetSearchSuggestionsItemSuggestionBinding = new WidgetSearchSuggestionsItemSuggestionBinding(relativeLayout, textView, relativeLayout, textView2, imageView); m.checkNotNullExpressionValue(widgetSearchSuggestionsItemSuggestionBinding, "WidgetSearchSuggestionsI…ionBinding.bind(itemView)"); @@ -180,16 +180,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl private final int getAnswerText(FilterType filterType) { int ordinal = filterType.ordinal(); if (ordinal == 0) { - return 2131893010; + return 2131893052; } if (ordinal == 1) { - return 2131893020; + return 2131893062; } if (ordinal == 2) { - return 2131893011; + return 2131893053; } if (ordinal == 3) { - return 2131893018; + return 2131893060; } throw new NoWhenBranchMatchedException(); } @@ -198,16 +198,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl private final int getFilterText(FilterType filterType) { int ordinal = filterType.ordinal(); if (ordinal == 0) { - return 2131893036; + return 2131893078; } if (ordinal == 1) { - return 2131893040; + return 2131893082; } if (ordinal == 2) { - return 2131893037; + return 2131893079; } if (ordinal == 3) { - return 2131893038; + return 2131893080; } throw new NoWhenBranchMatchedException(); } @@ -215,16 +215,16 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl private final Drawable getIconDrawable(Context context, FilterType filterType) { int ordinal = filterType.ordinal(); if (ordinal == 0) { - return ContextCompat.getDrawable(context, 2131231731); + return ContextCompat.getDrawable(context, 2131231734); } if (ordinal == 1) { - return ContextCompat.getDrawable(context, 2131231732); + return ContextCompat.getDrawable(context, 2131231735); } if (ordinal == 2) { return ContextCompat.getDrawable(context, 2131231401); } if (ordinal == 3) { - return ContextCompat.getDrawable(context, 2131231985); + return ContextCompat.getDrawable(context, 2131231988); } throw new NoWhenBranchMatchedException(); } @@ -236,7 +236,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl FilterType filterType = ((FilterSuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData()).getFilterType(); int filterText = getFilterText(filterType); int answerText = getAnswerText(filterType); - this.binding.f1855c.setOnClickListener(new WidgetSearchSuggestionsAdapter$FilterViewHolder$onConfigure$1(this, filterType)); + this.binding.f1857c.setOnClickListener(new WidgetSearchSuggestionsAdapter$FilterViewHolder$onConfigure$1(this, filterType)); ImageView imageView = this.binding.e; m.checkNotNullExpressionValue(imageView, "binding.suggestionExampleIcon"); Context context = imageView.getContext(); @@ -291,22 +291,22 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl private final int getIconRes(HasAnswerOption hasAnswerOption) { int ordinal = hasAnswerOption.ordinal(); if (ordinal == 0) { - return 2131231556; + return 2131231557; } if (ordinal == 1) { - return 2131231568; + return 2131231571; } if (ordinal == 2) { return 2131231401; } if (ordinal == 3) { - return 2131231846; + return 2131231849; } if (ordinal == 4) { - return 2131231986; + return 2131231989; } if (ordinal == 5) { - return 2131231932; + return 2131231935; } throw new NoWhenBranchMatchedException(); } @@ -314,15 +314,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public HasViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559124, widgetSearchSuggestionsAdapter); + super(2131559125, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter"); View view = this.itemView; RelativeLayout relativeLayout = (RelativeLayout) view; - int i = 2131364550; - ImageView imageView = (ImageView) view.findViewById(2131364550); + int i = 2131364553; + ImageView imageView = (ImageView) view.findViewById(2131364553); if (imageView != null) { - i = 2131364551; - TextView textView = (TextView) view.findViewById(2131364551); + i = 2131364554; + TextView textView = (TextView) view.findViewById(2131364554); if (textView != null) { WidgetSearchSuggestionsItemHasBinding widgetSearchSuggestionsItemHasBinding = new WidgetSearchSuggestionsItemHasBinding((RelativeLayout) view, relativeLayout, imageView, textView); m.checkNotNullExpressionValue(widgetSearchSuggestionsItemHasBinding, "WidgetSearchSuggestionsI…HasBinding.bind(itemView)"); @@ -349,7 +349,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemHasText"); textView.setText(hasSuggestion.getHasAnswerOption().getLocalizedInputText(this.searchStringProvider)); - this.binding.f1853c.setImageResource(Companion.access$getIconRes(Companion, hasSuggestion.getHasAnswerOption())); + this.binding.f1855c.setImageResource(Companion.access$getIconRes(Companion, hasSuggestion.getHasAnswerOption())); this.binding.b.setOnClickListener(new WidgetSearchSuggestionsAdapter$HasViewHolder$onConfigure$1(this, hasSuggestion)); } } @@ -376,7 +376,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public HeaderViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559120, widgetSearchSuggestionsAdapter); + super(2131559121, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -390,22 +390,22 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl if (category != null) { int ordinal = category.ordinal(); if (ordinal == 0) { - return 2131893056; + return 2131893098; } if (ordinal == 1) { - return 2131893055; + return 2131893097; } if (ordinal == 2) { - return 2131893051; + return 2131893093; } if (ordinal == 3) { - return 2131893052; + return 2131893094; } if (ordinal == 4) { - return 2131893049; + return 2131893091; } if (ordinal == 5) { - return 2131893048; + return 2131893090; } } throw new IllegalArgumentException("couldn't resolve category: " + category); @@ -424,17 +424,17 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public HistoryHeaderViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559121, widgetSearchSuggestionsAdapter); + super(2131559122, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter"); View view = this.itemView; - int i = 2131365142; - ImageView imageView = (ImageView) view.findViewById(2131365142); + int i = 2131365146; + ImageView imageView = (ImageView) view.findViewById(2131365146); if (imageView != null) { - i = 2131365143; - View findViewById = view.findViewById(2131365143); + i = 2131365147; + View findViewById = view.findViewById(2131365147); if (findViewById != null) { - i = 2131365144; - TextView textView = (TextView) view.findViewById(2131365144); + i = 2131365148; + TextView textView = (TextView) view.findViewById(2131365148); if (textView != null) { WidgetSearchSuggestionItemHeaderHistoryBinding widgetSearchSuggestionItemHeaderHistoryBinding = new WidgetSearchSuggestionItemHeaderHistoryBinding((RelativeLayout) view, imageView, findViewById, textView); m.checkNotNullExpressionValue(widgetSearchSuggestionItemHeaderHistoryBinding, "WidgetSearchSuggestionIt…oryBinding.bind(itemView)"); @@ -463,15 +463,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public InChannelViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559123, widgetSearchSuggestionsAdapter); + super(2131559124, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter"); View view = this.itemView; RelativeLayout relativeLayout = (RelativeLayout) view; - int i = 2131364548; - ImageView imageView = (ImageView) view.findViewById(2131364548); + int i = 2131364551; + ImageView imageView = (ImageView) view.findViewById(2131364551); if (imageView != null) { - i = 2131364549; - TextView textView = (TextView) view.findViewById(2131364549); + i = 2131364552; + TextView textView = (TextView) view.findViewById(2131364552); if (textView != null) { WidgetSearchSuggestionsItemChannelBinding widgetSearchSuggestionsItemChannelBinding = new WidgetSearchSuggestionsItemChannelBinding((RelativeLayout) view, relativeLayout, imageView, textView); m.checkNotNullExpressionValue(widgetSearchSuggestionsItemChannelBinding, "WidgetSearchSuggestionsI…nelBinding.bind(itemView)"); @@ -490,7 +490,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl m.checkNotNullParameter(mGRecyclerDataPayload, "data"); super.onConfigure(i, (int) mGRecyclerDataPayload); ChannelSuggestion channelSuggestion = (ChannelSuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData(); - TextView textView = this.binding.f1852c; + TextView textView = this.binding.f1854c; m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemChannelText"); textView.setText(channelSuggestion.getChannelName()); this.binding.b.setOnClickListener(new WidgetSearchSuggestionsAdapter$InChannelViewHolder$onConfigure$1(this, channelSuggestion)); @@ -503,15 +503,15 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public RecentQueryViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559125, widgetSearchSuggestionsAdapter); + super(2131559126, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "widgetSearchSuggestionsAdapter"); View view = this.itemView; RelativeLayout relativeLayout = (RelativeLayout) view; - int i = 2131364552; - ImageView imageView = (ImageView) view.findViewById(2131364552); + int i = 2131364555; + ImageView imageView = (ImageView) view.findViewById(2131364555); if (imageView != null) { - i = 2131364553; - TextView textView = (TextView) view.findViewById(2131364553); + i = 2131364556; + TextView textView = (TextView) view.findViewById(2131364556); if (textView != null) { WidgetSearchSuggestionsItemRecentQueryBinding widgetSearchSuggestionsItemRecentQueryBinding = new WidgetSearchSuggestionsItemRecentQueryBinding((RelativeLayout) view, relativeLayout, imageView, textView); m.checkNotNullExpressionValue(widgetSearchSuggestionsItemRecentQueryBinding, "WidgetSearchSuggestionsI…eryBinding.bind(itemView)"); @@ -530,7 +530,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl m.checkNotNullParameter(mGRecyclerDataPayload, "data"); super.onConfigure(i, (int) mGRecyclerDataPayload); List query = ((RecentQuerySuggestion) ((SingleTypePayload) mGRecyclerDataPayload).getData()).getQuery(); - TextView textView = this.binding.f1854c; + TextView textView = this.binding.f1856c; m.checkNotNullExpressionValue(textView, "binding.searchSuggestionsItemRecentQueryText"); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); @@ -547,7 +547,7 @@ public final class WidgetSearchSuggestionsAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public UserViewHolder(WidgetSearchSuggestionsAdapter widgetSearchSuggestionsAdapter) { - super(2131559127, widgetSearchSuggestionsAdapter); + super(2131559128, widgetSearchSuggestionsAdapter); m.checkNotNullParameter(widgetSearchSuggestionsAdapter, "searchSuggestionsAdapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java index 1d3018d84b..3e95dc9a0f 100644 --- a/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java +++ b/app/src/main/java/com/discord/widgets/servers/NotificationMuteSettingsView.java @@ -197,14 +197,14 @@ public final class NotificationMuteSettingsView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558596, (ViewGroup) this, false); addView(inflate); - int i = 2131364035; - TextView textView = (TextView) inflate.findViewById(2131364035); + int i = 2131364037; + TextView textView = (TextView) inflate.findViewById(2131364037); if (textView != null) { - i = 2131364036; - TextView textView2 = (TextView) inflate.findViewById(2131364036); + i = 2131364038; + TextView textView2 = (TextView) inflate.findViewById(2131364038); if (textView2 != null) { - i = 2131364037; - TextView textView3 = (TextView) inflate.findViewById(2131364037); + i = 2131364039; + TextView textView3 = (TextView) inflate.findViewById(2131364039); if (textView3 != null) { NotificationMuteSettingsViewBinding notificationMuteSettingsViewBinding = new NotificationMuteSettingsViewBinding((LinearLayout) inflate, textView, textView2, textView3); m.checkNotNullExpressionValue(notificationMuteSettingsViewBinding, "NotificationMuteSettings…rom(context), this, true)"); @@ -250,7 +250,7 @@ public final class NotificationMuteSettingsView extends LinearLayout { TextView textView3 = this.binding.d; m.checkNotNullExpressionValue(textView3, "binding.notificationMuteSettingsMuteItemStatus"); textView3.setVisibility(isMuted ? 0 : 8); - TextView textView4 = this.binding.f1616c; + TextView textView4 = this.binding.f1618c; m.checkNotNullExpressionValue(textView4, "binding.notificationMute…ttingsMuteItemDescription"); if (muteDescriptionText == null) { z2 = false; @@ -259,7 +259,7 @@ public final class NotificationMuteSettingsView extends LinearLayout { i = 8; } textView4.setVisibility(i); - TextView textView5 = this.binding.f1616c; + TextView textView5 = this.binding.f1618c; m.checkNotNullExpressionValue(textView5, "binding.notificationMute…ttingsMuteItemDescription"); textView5.setText(muteDescriptionText); } diff --git a/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java b/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java index 88ab595642..9a46906a53 100644 --- a/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/NotificationsOverridesAdapter.java @@ -116,8 +116,8 @@ public final class NotificationsOverridesAdapter extends RecyclerView.Adapter implements Ac public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363901) { + if (menuItem.getItemId() == 2131363903) { WidgetServerDeleteDialog.Companion companion = WidgetServerDeleteDialog.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java index 72bca5e3db..b21248a885 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettings.java @@ -153,7 +153,7 @@ public final class WidgetServerSettings extends AppFragment { } public WidgetServerSettings() { - super(2131559135); + super(2131559136); } public static final /* synthetic */ void access$configureUI(WidgetServerSettings widgetServerSettings, Model model) { @@ -197,7 +197,7 @@ public final class WidgetServerSettings extends AppFragment { } z2 = false; linearLayout.setVisibility(z2 ? 0 : 8); - View view = getBinding().f1870s; + View view = getBinding().f1872s; m.checkNotNullExpressionValue(view, "binding.serverSettingsSectionUserManagementDivider"); if (!z8 || !listOf.isEmpty()) { Iterator it2 = listOf.iterator(); @@ -319,12 +319,12 @@ public final class WidgetServerSettings extends AppFragment { LinearLayout linearLayout = getBinding().p; m.checkNotNullExpressionValue(linearLayout, "binding.serverSettingsSectionCommunity"); linearLayout.setVisibility(manageGuildContext.getCanManageServer() ? 0 : 8); - TextView textView8 = getBinding().f1869c; + TextView textView8 = getBinding().f1871c; m.checkNotNullExpressionValue(textView8, "binding.serverSettingsCommunityOverviewOption"); Set features = model.getGuild().getFeatures(); GuildFeature guildFeature = GuildFeature.COMMUNITY; textView8.setVisibility(features.contains(guildFeature) ? 0 : 8); - getBinding().f1869c.setOnClickListener(new WidgetServerSettings$configureUI$8(model)); + getBinding().f1871c.setOnClickListener(new WidgetServerSettings$configureUI$8(model)); TextView textView9 = getBinding().e; m.checkNotNullExpressionValue(textView9, "binding.serverSettingsEnableCommunityOption"); textView9.setVisibility(model.getGuild().getFeatures().contains(guildFeature) ^ true ? 0 : 8); @@ -361,7 +361,7 @@ public final class WidgetServerSettings extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131893143); + setActionBarTitle(2131893185); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java index e442e89412..6ccdd7d95b 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans$binding$2.java @@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetServerSettingsBans$binding$2 extends k public final WidgetServerSettingsBansBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364011; - TextView textView = (TextView) view.findViewById(2131364011); + int i = 2131364013; + TextView textView = (TextView) view.findViewById(2131364013); if (textView != null) { - i = 2131364017; - TextView textView2 = (TextView) view.findViewById(2131364017); + i = 2131364019; + TextView textView2 = (TextView) view.findViewById(2131364019); if (textView2 != null) { - i = 2131364598; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364598); + i = 2131364601; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364601); if (recyclerView != null) { - i = 2131364599; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364599); + i = 2131364602; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364602); if (textInputLayout != null) { - i = 2131364600; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364600); + i = 2131364603; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364603); if (appViewFlipper != null) { return new WidgetServerSettingsBansBinding((CoordinatorLayout) view, textView, textView2, recyclerView, textInputLayout, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java index ac02f6b6d2..874ef6f45d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsBans.java @@ -75,7 +75,7 @@ public final class WidgetServerSettingsBans extends AppFragment { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public BanListItem(Adapter adapter, Adapter adapter2) { - super(2131559142, adapter2); + super(2131559143, adapter2); m.checkNotNullParameter(adapter2, "adapter"); this.this$0 = adapter; View view = this.itemView; @@ -109,7 +109,7 @@ public final class WidgetServerSettingsBans extends AppFragment { ModelBan ban = banItem.getBan(); CoreUser coreUser = null; textView.setText((ban == null || (user2 = ban.getUser()) == null) ? null : user2.r()); - SimpleDraweeView simpleDraweeView = this.binding.f1867c; + SimpleDraweeView simpleDraweeView = this.binding.f1869c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.banListItemAvatar"); ModelBan ban2 = banItem.getBan(); if (!(ban2 == null || (user = ban2.getUser()) == null)) { @@ -438,7 +438,7 @@ public final class WidgetServerSettingsBans extends AppFragment { } public WidgetServerSettingsBans() { - super(2131559143); + super(2131559144); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsBans widgetServerSettingsBans, Model model) { @@ -506,7 +506,7 @@ public final class WidgetServerSettingsBans extends AppFragment { private final void showConfirmUnbanDialog(long j, ModelBan modelBan) { String reason = modelBan.getReason(); if (reason == null) { - reason = getString(2131891338); + reason = getString(2131891371); } m.checkNotNullExpressionValue(reason, "ban.reason ?: getString(R.string.no_ban_reason)"); StringBuilder sb = new StringBuilder(); @@ -519,7 +519,7 @@ public final class WidgetServerSettingsBans extends AppFragment { sb.append(upperCase); sb.append("\n"); sb.append(reason); - WidgetNoticeDialog.Builder dialogAttrTheme = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(c.a.l.b.g(requireContext(), 2131894008, new Object[]{modelBan.getUser().r()}, null, 4).toString()).setMessage(sb.toString()), 2131887177, (Function1) null, 2, (Object) null).setPositiveButton(2131894006, new WidgetServerSettingsBans$showConfirmUnbanDialog$1(this, j, modelBan)).setDialogAttrTheme(2130969788); + WidgetNoticeDialog.Builder dialogAttrTheme = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(c.a.l.b.g(requireContext(), 2131894047, new Object[]{modelBan.getUser().r()}, null, 4).toString()).setMessage(sb.toString()), 2131887178, (Function1) null, 2, (Object) null).setPositiveButton(2131894045, new WidgetServerSettingsBans$showConfirmUnbanDialog$1(this, j, modelBan)).setDialogAttrTheme(2130969788); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); dialogAttrTheme.show(parentFragmentManager); @@ -539,10 +539,10 @@ public final class WidgetServerSettingsBans extends AppFragment { public void onResume() { super.onResume(); BehaviorSubject behaviorSubject = this.filterPublisher; - TextInputLayout textInputLayout = getBinding().f1868c; + TextInputLayout textInputLayout = getBinding().f1870c; m.checkNotNullExpressionValue(textInputLayout, "binding.serverSettingsBansSearch"); behaviorSubject.onNext(ViewExtensions.getTextOrEmpty(textInputLayout)); - TextInputLayout textInputLayout2 = getBinding().f1868c; + TextInputLayout textInputLayout2 = getBinding().f1870c; m.checkNotNullExpressionValue(textInputLayout2, "binding.serverSettingsBansSearch"); ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetServerSettingsBans$onResume$1(this)); Model.Companion companion = Model.Companion; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java index ff220b6ac2..696b61039f 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$binding$2.java @@ -23,14 +23,14 @@ public final /* synthetic */ class WidgetServerSettingsChannels$binding$2 extend int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364601; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364601); + i = 2131364604; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364604); if (floatingActionButton != null) { - i = 2131364605; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364605); + i = 2131364608; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364608); if (recyclerView != null) { - i = 2131365608; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365608); + i = 2131365614; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365614); if (frameLayout != null) { return new WidgetServerSettingsChannelsBinding((CoordinatorLayout) view, dimmerView, floatingActionButton, recyclerView, frameLayout); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java index aac3d6a1af..07414596a7 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$1.java @@ -41,6 +41,6 @@ public final class WidgetServerSettingsChannels$configureFabVisibility$1 impleme FragmentManager childFragmentManager = this.this$0.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager"); companion.show(id2, childFragmentManager, new AnonymousClass1(this)); - WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1871c.hide(); + WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1873c.hide(); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java index 9a5661867f..ea543b6b8b 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.java @@ -20,9 +20,9 @@ public final class WidgetServerSettingsChannels$configureFabVisibility$setFabVis /* renamed from: invoke */ public final void mo1invoke() { if (!this.$model.isSorting()) { - WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1871c.show(); + WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1873c.show(); } else { - WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1871c.hide(); + WidgetServerSettingsChannels.access$getBinding$p(this.this$0).f1873c.hide(); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java index e4763ba6b5..c2f2cd11dd 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java @@ -44,13 +44,13 @@ public final class WidgetServerSettingsChannels$configureUI$1 implements public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case 2131363909: + case 2131363911: WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion; FragmentManager childFragmentManager = this.this$0.getChildFragmentManager(); m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager"); companion.show(childFragmentManager, new AnonymousClass1(this)); return; - case 2131363910: + case 2131363912: WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1); return; default: diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java index a0885ed81b..bd0be2a603 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$2.java @@ -14,10 +14,10 @@ public final class WidgetServerSettingsChannels$configureUI$2 implements Acti } public final void call(Menu menu) { - MenuItem findItem = menu.findItem(2131363909); + MenuItem findItem = menu.findItem(2131363911); m.checkNotNullExpressionValue(findItem, "menu.findItem(R.id.menu_sort_channel)"); findItem.setVisible(!this.$model.isSorting()); - MenuItem findItem2 = menu.findItem(2131363910); + MenuItem findItem2 = menu.findItem(2131363912); m.checkNotNullExpressionValue(findItem2, "menu.findItem(R.id.menu_sort_done)"); findItem2.setVisible(this.$model.isSorting()); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java index a36f0df834..952c561e4c 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$reorderChannels$1.java @@ -22,6 +22,6 @@ public final class WidgetServerSettingsChannels$reorderChannels$1 extends o impl } public final void invoke(Void r4) { - c.a.d.o.i(this.this$0, 2131887286, 0, 4); + c.a.d.o.i(this.this$0, 2131887288, 0, 4); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java index 38500e593c..1e9f0e491a 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels.java @@ -236,7 +236,7 @@ public final class WidgetServerSettingsChannels extends AppFragment { } public WidgetServerSettingsChannels() { - super(2131559144); + super(2131559145); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsChannels widgetServerSettingsChannels, Model model) { @@ -258,7 +258,7 @@ public final class WidgetServerSettingsChannels extends AppFragment { private final void configureFabVisibility(Model model) { WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1 widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1 = new WidgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1(this, model); widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1.mo1invoke(); - getBinding().f1871c.setOnClickListener(new WidgetServerSettingsChannels$configureFabVisibility$1(this, model, widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1)); + getBinding().f1873c.setOnClickListener(new WidgetServerSettingsChannels$configureFabVisibility$1(this, model, widgetServerSettingsChannels$configureFabVisibility$setFabVisibility$1)); } private final void configureUI(Model model) { @@ -271,7 +271,7 @@ public final class WidgetServerSettingsChannels extends AppFragment { return; } setActionBarDisplayHomeAsUpEnabled(!model.isSorting()); - setActionBarTitle(!model.isSorting() ? 2131887352 : 2131893226); + setActionBarTitle(!model.isSorting() ? 2131887354 : 2131893268); setActionBarSubtitle(model.getGuild().getName()); setActionBarOptionsMenu(2131623942, new WidgetServerSettingsChannels$configureUI$1(this), new WidgetServerSettingsChannels$configureUI$2(model)); configureFabVisibility(model); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java index 87edf0df24..6c7e5cd7c4 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment$binding$2.java @@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetServerSettingsChannelsFabMenuFragment$b public final WidgetServerSettingsChannelsSortFabMenuBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363152; - TableRow tableRow = (TableRow) view.findViewById(2131363152); + int i = 2131363154; + TableRow tableRow = (TableRow) view.findViewById(2131363154); if (tableRow != null) { - i = 2131363153; - TableRow tableRow2 = (TableRow) view.findViewById(2131363153); + i = 2131363155; + TableRow tableRow2 = (TableRow) view.findViewById(2131363155); if (tableRow2 != null) { - i = 2131363154; - TableRow tableRow3 = (TableRow) view.findViewById(2131363154); + i = 2131363156; + TableRow tableRow3 = (TableRow) view.findViewById(2131363156); if (tableRow3 != null) { - i = 2131363155; - TableRow tableRow4 = (TableRow) view.findViewById(2131363155); + i = 2131363157; + TableRow tableRow4 = (TableRow) view.findViewById(2131363157); if (tableRow4 != null) { - i = 2131363156; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363156); + i = 2131363158; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363158); if (floatingActionButton != null) { TableLayout tableLayout = (TableLayout) view; return new WidgetServerSettingsChannelsSortFabMenuBinding(tableLayout, tableRow, tableRow2, tableRow3, tableRow4, floatingActionButton, tableLayout); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java index f90c76deb8..6c028befc8 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsFabMenuFragment.java @@ -44,12 +44,12 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment bundle.putLong("INTENT_EXTRA_GUILD_ID", j); widgetServerSettingsChannelsFabMenuFragment.setArguments(bundle); WidgetServerSettingsChannelsFabMenuFragment.access$setDismissHandler$p(widgetServerSettingsChannelsFabMenuFragment, action0); - fragmentManager.beginTransaction().setCustomAnimations(2130772015, 2130772017).add(2131365608, widgetServerSettingsChannelsFabMenuFragment, "channels fab menu").addToBackStack("channels fab menu").commit(); + fragmentManager.beginTransaction().setCustomAnimations(2130772015, 2130772017).add(2131365614, widgetServerSettingsChannelsFabMenuFragment, "channels fab menu").addToBackStack("channels fab menu").commit(); } } public WidgetServerSettingsChannelsFabMenuFragment() { - super(2131559146); + super(2131559147); } public static final /* synthetic */ void access$dismiss(WidgetServerSettingsChannelsFabMenuFragment widgetServerSettingsChannelsFabMenuFragment) { @@ -103,8 +103,8 @@ public final class WidgetServerSettingsChannelsFabMenuFragment extends Fragment } Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(2131363152, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(2131363154, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(2131363153, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(2131363155, createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE)))); - TableLayout tableLayout = getBinding().f1873c; + FloatingButtonMenuInitializer floatingButtonMenuInitializer = new FloatingButtonMenuInitializer(requireContext, h0.mapOf(o.to(2131363154, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$2(this, j))), o.to(2131363156, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$3(this, j))), o.to(2131363155, createListener(new WidgetServerSettingsChannelsFabMenuFragment$onResume$4(this, j))), o.to(2131363157, createListener(WidgetServerSettingsChannelsFabMenuFragment$onResume$5.INSTANCE)))); + TableLayout tableLayout = getBinding().f1875c; m.checkNotNullExpressionValue(tableLayout, "binding.fabMenuTable"); FloatingActionButton floatingActionButton = getBinding().b; m.checkNotNullExpressionValue(floatingActionButton, "binding.fabMenuMainFab"); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java index e0d5620a43..90140236bc 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions$binding$2.java @@ -17,17 +17,17 @@ public final /* synthetic */ class WidgetServerSettingsChannelsSortActions$bindi public final WidgetServerSettingsChannelsSortActionsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363340; - TextView textView = (TextView) view.findViewById(2131363340); + int i = 2131363342; + TextView textView = (TextView) view.findViewById(2131363342); if (textView != null) { - i = 2131364602; - TextView textView2 = (TextView) view.findViewById(2131364602); + i = 2131364605; + TextView textView2 = (TextView) view.findViewById(2131364605); if (textView2 != null) { - i = 2131364603; - TextView textView3 = (TextView) view.findViewById(2131364603); + i = 2131364606; + TextView textView3 = (TextView) view.findViewById(2131364606); if (textView3 != null) { - i = 2131364604; - TextView textView4 = (TextView) view.findViewById(2131364604); + i = 2131364607; + TextView textView4 = (TextView) view.findViewById(2131364607); if (textView4 != null) { return new WidgetServerSettingsChannelsSortActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java index b83b492404..0dea59dbb2 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannelsSortActions.java @@ -46,7 +46,7 @@ public final class WidgetServerSettingsChannelsSortActions extends AppBottomShee private final void configureUI() { getBinding().b.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$1(this)); getBinding().d.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$2(this)); - getBinding().f1872c.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$3(this)); + getBinding().f1874c.setOnClickListener(new WidgetServerSettingsChannelsSortActions$configureUI$3(this)); } private final WidgetServerSettingsChannelsSortActionsBinding getBinding() { @@ -55,7 +55,7 @@ public final class WidgetServerSettingsChannelsSortActions extends AppBottomShee @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559145; + return 2131559146; } /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1 */ diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java index 4f125456cd..72daf5efa5 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$binding$2.java @@ -28,80 +28,80 @@ public final /* synthetic */ class WidgetServerSettingsEditIntegration$binding$2 int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131362964; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362964); + i = 2131362966; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362966); if (linearLayout != null) { - i = 2131362965; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362965); + i = 2131362967; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131362967); if (checkedSetting != null) { - i = 2131362966; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362966); + i = 2131362968; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131362968); if (checkedSetting2 != null) { - i = 2131362967; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362967); + i = 2131362969; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131362969); if (checkedSetting3 != null) { - i = 2131362968; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362968); + i = 2131362970; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362970); if (linearLayout2 != null) { - i = 2131362969; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362969); + i = 2131362971; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131362971); if (linearLayout3 != null) { - i = 2131362970; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362970); + i = 2131362972; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131362972); if (checkedSetting4 != null) { - i = 2131362971; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131362971); + i = 2131362973; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131362973); if (checkedSetting5 != null) { - i = 2131362972; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131362972); + i = 2131362974; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131362974); if (checkedSetting6 != null) { - i = 2131362973; - CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131362973); + i = 2131362975; + CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131362975); if (checkedSetting7 != null) { - i = 2131362974; - CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131362974); + i = 2131362976; + CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131362976); if (checkedSetting8 != null) { - i = 2131362975; - ImageView imageView = (ImageView) view.findViewById(2131362975); + i = 2131362977; + ImageView imageView = (ImageView) view.findViewById(2131362977); if (imageView != null) { - i = 2131362977; - TextView textView = (TextView) view.findViewById(2131362977); + i = 2131362979; + TextView textView = (TextView) view.findViewById(2131362979); if (textView != null) { - i = 2131362978; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362978); + i = 2131362980; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131362980); if (linearLayout4 != null) { - i = 2131362979; - TextView textView2 = (TextView) view.findViewById(2131362979); + i = 2131362981; + TextView textView2 = (TextView) view.findViewById(2131362981); if (textView2 != null) { - i = 2131362980; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362980); + i = 2131362982; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362982); if (floatingActionButton != null) { - i = 2131362981; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362981); + i = 2131362983; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131362983); if (nestedScrollView != null) { - i = 2131362986; - LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131362986); + i = 2131362988; + LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131362988); if (linearLayout5 != null) { - i = 2131362990; - LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131362990); + i = 2131362992; + LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131362992); if (linearLayout6 != null) { - i = 2131365156; - View findViewById = view.findViewById(2131365156); + i = 2131365160; + View findViewById = view.findViewById(2131365160); if (findViewById != null) { - int i2 = 2131362976; - TextView textView3 = (TextView) findViewById.findViewById(2131362976); + int i2 = 2131362978; + TextView textView3 = (TextView) findViewById.findViewById(2131362978); if (textView3 != null) { - i2 = 2131362982; - TextView textView4 = (TextView) findViewById.findViewById(2131362982); + i2 = 2131362984; + TextView textView4 = (TextView) findViewById.findViewById(2131362984); if (textView4 != null) { - i2 = 2131362983; - RelativeLayout relativeLayout = (RelativeLayout) findViewById.findViewById(2131362983); + i2 = 2131362985; + RelativeLayout relativeLayout = (RelativeLayout) findViewById.findViewById(2131362985); if (relativeLayout != null) { - i2 = 2131362984; - TextView textView5 = (TextView) findViewById.findViewById(2131362984); + i2 = 2131362986; + TextView textView5 = (TextView) findViewById.findViewById(2131362986); if (textView5 != null) { - i2 = 2131362985; - RelativeLayout relativeLayout2 = (RelativeLayout) findViewById.findViewById(2131362985); + i2 = 2131362987; + RelativeLayout relativeLayout2 = (RelativeLayout) findViewById.findViewById(2131362987); if (relativeLayout2 != null) { return new WidgetServerSettingsEditIntegrationBinding((CoordinatorLayout) view, dimmerView, linearLayout, checkedSetting, checkedSetting2, checkedSetting3, linearLayout2, linearLayout3, checkedSetting4, checkedSetting5, checkedSetting6, checkedSetting7, checkedSetting8, imageView, textView, linearLayout4, textView2, floatingActionButton, nestedScrollView, linearLayout5, linearLayout6, new v((LinearLayout) findViewById, textView3, textView4, relativeLayout, textView5, relativeLayout2)); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java index ec06421352..6b20500715 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration$onViewBound$2.java @@ -18,7 +18,7 @@ public final class WidgetServerSettingsEditIntegration$onViewBound$2 implements StatefulViews access$getState$p = WidgetServerSettingsEditIntegration.access$getState$p(this.this$0); CheckedSetting checkedSetting = WidgetServerSettingsEditIntegration.access$getBinding$p(this.this$0).d; m.checkNotNullExpressionValue(checkedSetting, "binding.editIntegrationCustomEmotesToggle"); - access$getState$p.put(2131362965, Boolean.valueOf(checkedSetting.isChecked())); + access$getState$p.put(2131362967, Boolean.valueOf(checkedSetting.isChecked())); WidgetServerSettingsEditIntegration.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsEditIntegration.access$getBinding$p(this.this$0).o); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java index 1566a17739..c0474e3901 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java @@ -50,16 +50,16 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { public static final Companion Companion = new Companion(null); private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private static final String INTENT_EXTRA_INTEGRATION_ID = "INTENT_EXTRA_INTEGRATION_ID"; - private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131362965; - private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131362968; - private static final int STATE_KEY_GRACE_PERIOD = 2131362969; + private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131362967; + private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131362970; + private static final int STATE_KEY_GRACE_PERIOD = 2131362971; private static final int[] gracePeriodDays = {1, 3, 7, 14, 30}; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditIntegration$binding$2.INSTANCE, null, 2, null); private RadioManager expiryBehaviorRadioManager; private final Lazy expiryBehaviorRadios$delegate = g.lazy(new WidgetServerSettingsEditIntegration$expiryBehaviorRadios$2(this)); private RadioManager gracePeriodRadioManager; private final Lazy gracePeriodRadios$delegate = g.lazy(new WidgetServerSettingsEditIntegration$gracePeriodRadios$2(this)); - private final StatefulViews state = new StatefulViews(2131362965, 2131362968, 2131362969); + private final StatefulViews state = new StatefulViews(2131362967, 2131362970, 2131362971); /* compiled from: WidgetServerSettingsEditIntegration.kt */ public static final class Companion { @@ -193,7 +193,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { } public WidgetServerSettingsEditIntegration() { - super(2131559152); + super(2131559153); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEditIntegration widgetServerSettingsEditIntegration, Model model) { @@ -245,7 +245,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { } return; } - setActionBarTitle(2131890362); + setActionBarTitle(2131890392); setActionBarSubtitle(model.getGuild().getName()); boolean areEqual = m.areEqual(model.getIntegration().getType(), "twitch"); TextView textView = getBinding().m; @@ -278,7 +278,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { m.checkNotNullExpressionValue(coordinatorLayout2, "binding.root"); Context context2 = coordinatorLayout2.getContext(); m.checkNotNullExpressionValue(context2, "binding.root.context"); - textView4.setText(b.k(StringResourceUtilsKt.getQuantityString(resources, context2, areEqual ? 2131755229 : 2131755228, model.getIntegration().getSubscriberCount(), Integer.valueOf(model.getIntegration().getSubscriberCount())), new Object[0], null, 2)); + textView4.setText(b.k(StringResourceUtilsKt.getQuantityString(resources, context2, areEqual ? 2131755230 : 2131755229, model.getIntegration().getSubscriberCount(), Integer.valueOf(model.getIntegration().getSubscriberCount())), new Object[0], null, 2)); RelativeLayout relativeLayout = getBinding().p.f; if (model.getRole() != null) { widgetServerSettingsEditIntegration$configureUI$2 = new WidgetServerSettingsEditIntegration$configureUI$2(model); @@ -288,19 +288,19 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { m.checkNotNullExpressionValue(textView5, "binding.syncSettings.editIntegrationSyncedRole"); textView5.setText(model.getRole() != null ? model.getRole().f() : "None"); getBinding().p.e.setTextColor(RoleUtils.getOpaqueColor(model.getRole(), ColorCompat.getColor(this, 2131100121))); - int intValue = ((Number) this.state.get(2131362968, Integer.valueOf(model.getIntegration().getExpireBehavior()))).intValue(); + int intValue = ((Number) this.state.get(2131362970, Integer.valueOf(model.getIntegration().getExpireBehavior()))).intValue(); RadioManager radioManager = this.expiryBehaviorRadioManager; if (radioManager == null) { m.throwUninitializedPropertyAccessException("expiryBehaviorRadioManager"); } radioManager.a(getExpiryBehaviorRadios().get(intValue)); - int intValue2 = ((Number) this.state.get(2131362969, Integer.valueOf(getGracePeriodPosition(model.getIntegration().getExpireGracePeriod())))).intValue(); + int intValue2 = ((Number) this.state.get(2131362971, Integer.valueOf(getGracePeriodPosition(model.getIntegration().getExpireGracePeriod())))).intValue(); RadioManager radioManager2 = this.gracePeriodRadioManager; if (radioManager2 == null) { m.throwUninitializedPropertyAccessException("gracePeriodRadioManager"); } radioManager2.a(getGracePeriodRadios().get(intValue2)); - LinearLayout linearLayout = getBinding().f1878c; + LinearLayout linearLayout = getBinding().f1880c; m.checkNotNullExpressionValue(linearLayout, "binding.editIntegrationCustomEmotesContainer"); if (!areEqual) { i = 8; @@ -370,8 +370,8 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); setRetainInstance(true); - this.expiryBehaviorRadioManager = setupRadioManager(getExpiryBehaviorRadios(), 2131362968); - this.gracePeriodRadioManager = setupRadioManager(getGracePeriodRadios(), 2131362969); + this.expiryBehaviorRadioManager = setupRadioManager(getExpiryBehaviorRadios(), 2131362970); + this.gracePeriodRadioManager = setupRadioManager(getGracePeriodRadios(), 2131362971); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); this.state.setupUnsavedChangesConfirmation(this); List gracePeriodRadios = getGracePeriodRadios(); @@ -388,7 +388,7 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment { Context context = checkedSetting.getContext(); m.checkNotNullExpressionValue(context, "radio.context"); int[] iArr = gracePeriodDays; - checkedSetting.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755220, iArr[i], Integer.valueOf(iArr[i]))); + checkedSetting.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755221, iArr[i], Integer.valueOf(iArr[i]))); arrayList.add(Unit.a); i = i2; } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java index 8204236b10..d3f12a3562 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$binding$2.java @@ -21,29 +21,29 @@ public final /* synthetic */ class WidgetServerSettingsEditMember$binding$2 exte public final WidgetServerSettingsEditMemberBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362986; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362986); + int i = 2131362988; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131362988); if (linearLayout != null) { - i = 2131362987; - TextView textView = (TextView) view.findViewById(2131362987); + i = 2131362989; + TextView textView = (TextView) view.findViewById(2131362989); if (textView != null) { - i = 2131362988; - TextView textView2 = (TextView) view.findViewById(2131362988); + i = 2131362990; + TextView textView2 = (TextView) view.findViewById(2131362990); if (textView2 != null) { - i = 2131362989; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362989); + i = 2131362991; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362991); if (textInputLayout != null) { - i = 2131362990; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362990); + i = 2131362992; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131362992); if (linearLayout2 != null) { - i = 2131362991; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362991); + i = 2131362993; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362993); if (recyclerView != null) { - i = 2131362992; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362992); + i = 2131362994; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362994); if (floatingActionButton != null) { - i = 2131362993; - TextView textView3 = (TextView) view.findViewById(2131362993); + i = 2131362995; + TextView textView3 = (TextView) view.findViewById(2131362995); if (textView3 != null) { return new WidgetServerSettingsEditMemberBinding((CoordinatorLayout) view, linearLayout, textView, textView2, textInputLayout, linearLayout2, recyclerView, floatingActionButton, textView3); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java index 6043c476b6..b174518aa9 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember$configureUI$4.java @@ -20,7 +20,7 @@ public final class WidgetServerSettingsEditMember$configureUI$4 implements View. @Override // android.view.View.OnClickListener public final void onClick(View view) { if (this.$data.getGuild().getFeatures().contains(GuildFeature.VERIFIED) || this.$data.getGuild().getFeatures().contains(GuildFeature.PARTNERED)) { - o.i(this.this$0, 2131893923, 0, 4); + o.i(this.this$0, 2131893962, 0, 4); return; } WidgetServerSettingsTransferOwnership.Companion companion = WidgetServerSettingsTransferOwnership.Companion; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java index c2228618ee..2ad3d91d60 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMember.java @@ -46,7 +46,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment { private static final String INTENT_EXTRA_USER_ID = "INTENT_EXTRA_USER_ID"; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditMember$binding$2.INSTANCE, null, 2, null); private WidgetServerSettingsEditMemberRolesAdapter rolesAdapter; - private final StatefulViews state = new StatefulViews(2131362989); + private final StatefulViews state = new StatefulViews(2131362991); /* compiled from: WidgetServerSettingsEditMember.kt */ public static final class Companion { @@ -312,7 +312,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment { } public WidgetServerSettingsEditMember() { - super(2131559153); + super(2131559154); } public static final /* synthetic */ void access$changeNickname(WidgetServerSettingsEditMember widgetServerSettingsEditMember, Model model, String str) { @@ -352,7 +352,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment { boolean z2 = true; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); Context context = getContext(); - setActionBarTitle(context != null ? c.a.l.b.g(context, 2131889253, new Object[]{model.getGuild().getName()}, null, 4) : null); + setActionBarTitle(context != null ? c.a.l.b.g(context, 2131889263, new Object[]{model.getGuild().getName()}, null, 4) : null); GuildMember.Companion companion = GuildMember.Companion; setActionBarSubtitle(companion.getNickOrUsername(model.getUserComputed(), model.getUser())); setupNickname(model); @@ -363,7 +363,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment { if (model.getCanKick()) { TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.editMemberKickButton"); - c.a.l.b.n(textView, 2131890735, new Object[]{nickOrUsername}, null, 4); + c.a.l.b.n(textView, 2131890765, new Object[]{nickOrUsername}, null, 4); TextView textView2 = getBinding().d; m.checkNotNullExpressionValue(textView2, "binding.editMemberKickButton"); textView2.setVisibility(0); @@ -375,18 +375,18 @@ public final class WidgetServerSettingsEditMember extends AppFragment { getBinding().d.setOnClickListener(null); } if (model.getCanBan()) { - TextView textView4 = getBinding().f1879c; + TextView textView4 = getBinding().f1881c; m.checkNotNullExpressionValue(textView4, "binding.editMemberBanButton"); c.a.l.b.n(textView4, 2131886823, new Object[]{nickOrUsername}, null, 4); - TextView textView5 = getBinding().f1879c; + TextView textView5 = getBinding().f1881c; m.checkNotNullExpressionValue(textView5, "binding.editMemberBanButton"); textView5.setVisibility(0); - getBinding().f1879c.setOnClickListener(new WidgetServerSettingsEditMember$configureUI$3(this, nickOrUsername, model)); + getBinding().f1881c.setOnClickListener(new WidgetServerSettingsEditMember$configureUI$3(this, nickOrUsername, model)); } else { - TextView textView6 = getBinding().f1879c; + TextView textView6 = getBinding().f1881c; m.checkNotNullExpressionValue(textView6, "binding.editMemberBanButton"); textView6.setVisibility(8); - getBinding().f1879c.setOnClickListener(null); + getBinding().f1881c.setOnClickListener(null); } if (model.getCanTransferOwnership()) { TextView textView7 = getBinding().i; @@ -416,7 +416,7 @@ public final class WidgetServerSettingsEditMember extends AppFragment { private final void onNicknameChangeSuccessful(String str) { AppFragment.hideKeyboard$default(this, null, 1, null); - o.j(this, str.length() > 0 ? c.a.l.b.j(this, 2131891331, new Object[]{str}, null, 4) : c.a.l.b.j(this, 2131891332, new Object[0], null, 4), 0, 4); + o.j(this, str.length() > 0 ? c.a.l.b.j(this, 2131891364, new Object[]{str}, null, 4) : c.a.l.b.j(this, 2131891365, new Object[0], null, 4), 0, 4); } private final void setupNickname(Model model) { diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java index 7f402427ab..59b637da1c 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter.java @@ -190,7 +190,7 @@ public final class WidgetServerSettingsEditMemberRolesAdapter extends MGRecycler if (roleItem.isManageable()) { this.binding.b.e(new WidgetServerSettingsEditMemberRolesAdapter$RoleListItem$onConfigure$1(this, roleItem)); } else if (roleItem.isRoleManaged()) { - this.binding.b.b(2131890900); + this.binding.b.b(2131890930); } else { CheckedSetting.d(this.binding.b, null, 1); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java index f04ecaacc5..c8161445b3 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$binding$2.java @@ -22,137 +22,137 @@ public final /* synthetic */ class WidgetServerSettingsEditRole$binding$2 extend public final WidgetEditRoleBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362995; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362995); + int i = 2131362997; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362997); if (textInputLayout != null) { - i = 2131362996; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362996); + i = 2131362998; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131362998); if (floatingActionButton != null) { - i = 2131364456; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364456); + i = 2131364459; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364459); if (checkedSetting != null) { - i = 2131364457; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364457); + i = 2131364460; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364460); if (checkedSetting2 != null) { - i = 2131364458; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364458); + i = 2131364461; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364461); if (checkedSetting3 != null) { - i = 2131364459; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364459); + i = 2131364462; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364462); if (checkedSetting4 != null) { - i = 2131364460; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364460); + i = 2131364463; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364463); if (checkedSetting5 != null) { - i = 2131364461; - View findViewById = view.findViewById(2131364461); + i = 2131364464; + View findViewById = view.findViewById(2131364464); if (findViewById != null) { - i = 2131364462; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364462); + i = 2131364465; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364465); if (relativeLayout != null) { - i = 2131364463; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364463); + i = 2131364466; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364466); if (checkedSetting6 != null) { - i = 2131364464; - View findViewById2 = view.findViewById(2131364464); + i = 2131364467; + View findViewById2 = view.findViewById(2131364467); if (findViewById2 != null) { - i = 2131364465; - View findViewById3 = view.findViewById(2131364465); + i = 2131364468; + View findViewById3 = view.findViewById(2131364468); if (findViewById3 != null) { - i = 2131364466; - CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364466); + i = 2131364469; + CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364469); if (checkedSetting7 != null) { - i = 2131364467; - CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364467); + i = 2131364470; + CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364470); if (checkedSetting8 != null) { - i = 2131364468; - CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364468); + i = 2131364471; + CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364471); if (checkedSetting9 != null) { - i = 2131364469; - CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364469); + i = 2131364472; + CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364472); if (checkedSetting10 != null) { - i = 2131364470; - CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364470); + i = 2131364473; + CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364473); if (checkedSetting11 != null) { - i = 2131364471; - CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364471); + i = 2131364474; + CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364474); if (checkedSetting12 != null) { - i = 2131364472; - CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364472); + i = 2131364475; + CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364475); if (checkedSetting13 != null) { - i = 2131364473; - CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364473); + i = 2131364476; + CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364476); if (checkedSetting14 != null) { - i = 2131364474; - CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364474); + i = 2131364477; + CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364477); if (checkedSetting15 != null) { - i = 2131364475; - CheckedSetting checkedSetting16 = (CheckedSetting) view.findViewById(2131364475); + i = 2131364478; + CheckedSetting checkedSetting16 = (CheckedSetting) view.findViewById(2131364478); if (checkedSetting16 != null) { - i = 2131364476; - CheckedSetting checkedSetting17 = (CheckedSetting) view.findViewById(2131364476); + i = 2131364479; + CheckedSetting checkedSetting17 = (CheckedSetting) view.findViewById(2131364479); if (checkedSetting17 != null) { - i = 2131364477; - CheckedSetting checkedSetting18 = (CheckedSetting) view.findViewById(2131364477); + i = 2131364480; + CheckedSetting checkedSetting18 = (CheckedSetting) view.findViewById(2131364480); if (checkedSetting18 != null) { - i = 2131364478; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364478); + i = 2131364481; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364481); if (nestedScrollView != null) { - i = 2131364479; - CheckedSetting checkedSetting19 = (CheckedSetting) view.findViewById(2131364479); + i = 2131364482; + CheckedSetting checkedSetting19 = (CheckedSetting) view.findViewById(2131364482); if (checkedSetting19 != null) { - i = 2131364480; - CheckedSetting checkedSetting20 = (CheckedSetting) view.findViewById(2131364480); + i = 2131364483; + CheckedSetting checkedSetting20 = (CheckedSetting) view.findViewById(2131364483); if (checkedSetting20 != null) { - i = 2131364481; - CheckedSetting checkedSetting21 = (CheckedSetting) view.findViewById(2131364481); + i = 2131364484; + CheckedSetting checkedSetting21 = (CheckedSetting) view.findViewById(2131364484); if (checkedSetting21 != null) { - i = 2131364482; - CheckedSetting checkedSetting22 = (CheckedSetting) view.findViewById(2131364482); + i = 2131364485; + CheckedSetting checkedSetting22 = (CheckedSetting) view.findViewById(2131364485); if (checkedSetting22 != null) { - i = 2131364483; - CheckedSetting checkedSetting23 = (CheckedSetting) view.findViewById(2131364483); + i = 2131364486; + CheckedSetting checkedSetting23 = (CheckedSetting) view.findViewById(2131364486); if (checkedSetting23 != null) { - i = 2131364484; - CheckedSetting checkedSetting24 = (CheckedSetting) view.findViewById(2131364484); + i = 2131364487; + CheckedSetting checkedSetting24 = (CheckedSetting) view.findViewById(2131364487); if (checkedSetting24 != null) { - i = 2131364485; - CheckedSetting checkedSetting25 = (CheckedSetting) view.findViewById(2131364485); + i = 2131364488; + CheckedSetting checkedSetting25 = (CheckedSetting) view.findViewById(2131364488); if (checkedSetting25 != null) { - i = 2131364486; - CheckedSetting checkedSetting26 = (CheckedSetting) view.findViewById(2131364486); + i = 2131364489; + CheckedSetting checkedSetting26 = (CheckedSetting) view.findViewById(2131364489); if (checkedSetting26 != null) { - i = 2131364487; - CheckedSetting checkedSetting27 = (CheckedSetting) view.findViewById(2131364487); + i = 2131364490; + CheckedSetting checkedSetting27 = (CheckedSetting) view.findViewById(2131364490); if (checkedSetting27 != null) { - i = 2131364488; - CheckedSetting checkedSetting28 = (CheckedSetting) view.findViewById(2131364488); + i = 2131364491; + CheckedSetting checkedSetting28 = (CheckedSetting) view.findViewById(2131364491); if (checkedSetting28 != null) { - i = 2131364489; - CheckedSetting checkedSetting29 = (CheckedSetting) view.findViewById(2131364489); + i = 2131364492; + CheckedSetting checkedSetting29 = (CheckedSetting) view.findViewById(2131364492); if (checkedSetting29 != null) { - i = 2131364490; - CheckedSetting checkedSetting30 = (CheckedSetting) view.findViewById(2131364490); + i = 2131364493; + CheckedSetting checkedSetting30 = (CheckedSetting) view.findViewById(2131364493); if (checkedSetting30 != null) { - i = 2131364491; - CheckedSetting checkedSetting31 = (CheckedSetting) view.findViewById(2131364491); + i = 2131364494; + CheckedSetting checkedSetting31 = (CheckedSetting) view.findViewById(2131364494); if (checkedSetting31 != null) { - i = 2131364492; - CheckedSetting checkedSetting32 = (CheckedSetting) view.findViewById(2131364492); + i = 2131364495; + CheckedSetting checkedSetting32 = (CheckedSetting) view.findViewById(2131364495); if (checkedSetting32 != null) { - i = 2131364493; - CheckedSetting checkedSetting33 = (CheckedSetting) view.findViewById(2131364493); + i = 2131364496; + CheckedSetting checkedSetting33 = (CheckedSetting) view.findViewById(2131364496); if (checkedSetting33 != null) { - i = 2131364494; - CheckedSetting checkedSetting34 = (CheckedSetting) view.findViewById(2131364494); + i = 2131364497; + CheckedSetting checkedSetting34 = (CheckedSetting) view.findViewById(2131364497); if (checkedSetting34 != null) { - i = 2131364495; - CheckedSetting checkedSetting35 = (CheckedSetting) view.findViewById(2131364495); + i = 2131364498; + CheckedSetting checkedSetting35 = (CheckedSetting) view.findViewById(2131364498); if (checkedSetting35 != null) { - i = 2131365010; - View findViewById4 = view.findViewById(2131365010); + i = 2131365014; + View findViewById4 = view.findViewById(2131365014); if (findViewById4 != null) { - i = 2131365011; - TextView textView = (TextView) view.findViewById(2131365011); + i = 2131365015; + TextView textView = (TextView) view.findViewById(2131365015); if (textView != null) { return new WidgetEditRoleBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, findViewById, relativeLayout, checkedSetting6, findViewById2, findViewById3, checkedSetting7, checkedSetting8, checkedSetting9, checkedSetting10, checkedSetting11, checkedSetting12, checkedSetting13, checkedSetting14, checkedSetting15, checkedSetting16, checkedSetting17, checkedSetting18, nestedScrollView, checkedSetting19, checkedSetting20, checkedSetting21, checkedSetting22, checkedSetting23, checkedSetting24, checkedSetting25, checkedSetting26, checkedSetting27, checkedSetting28, checkedSetting29, checkedSetting30, checkedSetting31, checkedSetting32, checkedSetting33, checkedSetting34, checkedSetting35, findViewById4, textView); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java index 57f9a4d380..370ba5de70 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$configureUI$1.java @@ -51,6 +51,6 @@ public final class WidgetServerSettingsEditRole$configureUI$1 implements View.On AppFragment.hideKeyboard$default(this.this$0, null, 1, null); return; } - o.i(this.this$0, 2131888716, 0, 4); + o.i(this.this$0, 2131888726, 0, 4); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java index 6c7a7cb69b..65a0035107 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2.java @@ -19,7 +19,7 @@ public final class WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2 i public final void onClick(View view) { WidgetServerSettingsEditRole.access$getBinding$p(this.this$0).b.clearFocus(); RestAPIParams.Role createWithRole = RestAPIParams.Role.Companion.createWithRole(this.$data.getRole()); - CheckedSetting checkedSetting = WidgetServerSettingsEditRole.access$getBinding$p(this.this$0).f1765y; + CheckedSetting checkedSetting = WidgetServerSettingsEditRole.access$getBinding$p(this.this$0).f1767y; m.checkNotNullExpressionValue(checkedSetting, "binding.roleSettingsMentionableCheckedsetting"); createWithRole.setMentionable(Boolean.valueOf(!checkedSetting.isChecked())); WidgetServerSettingsEditRole.access$patchRole(this.this$0, this.$data.getGuildId(), createWithRole); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java index c249563919..296af69102 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole$setupMenu$1.java @@ -39,7 +39,7 @@ public final class WidgetServerSettingsEditRole$setupMenu$1 implements A public final void call(MenuItem menuItem, Context context) { m.checkNotNullParameter(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363884) { + if (menuItem.getItemId() == 2131363886) { ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().deleteRole(this.$data.getGuildId(), this.$data.getRole().getId()), false, 1, null), this.this$0, null, 2, null).k(q.j(new AnonymousClass1(this), this.this$0.getContext(), null, 4)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java index 0b74b1263f..f3aef48f20 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java @@ -55,7 +55,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment { private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private static final String INTENT_EXTRA_ROLE_ID = "INTENT_EXTRA_ROLE_ID"; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditRole$binding$2.INSTANCE, null, 2, null); - private final StatefulViews state = new StatefulViews(2131362995); + private final StatefulViews state = new StatefulViews(2131362997); /* compiled from: WidgetServerSettingsEditRole.kt */ public static final class Companion { @@ -306,7 +306,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment { } public WidgetServerSettingsEditRole() { - super(2131558990); + super(2131558991); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEditRole widgetServerSettingsEditRole, Model model) { @@ -344,8 +344,8 @@ public final class WidgetServerSettingsEditRole extends AppFragment { setupHoistAndMentionSettings(model); setupPermissionsSettings(model); setupColorSetting(model); - this.state.configureSaveActionView(getBinding().f1762c); - getBinding().f1762c.setOnClickListener(new WidgetServerSettingsEditRole$configureUI$1(this, model)); + this.state.configureSaveActionView(getBinding().f1764c); + getBinding().f1764c.setOnClickListener(new WidgetServerSettingsEditRole$configureUI$1(this, model)); } private final void enableSetting(CheckedSetting checkedSetting, Model model, long j) { @@ -386,13 +386,13 @@ public final class WidgetServerSettingsEditRole extends AppFragment { if (manageStatus != null) { int ordinal = manageStatus.ordinal(); if (ordinal == 0) { - str = getString(2131890125); + str = getString(2131890138); } else if (ordinal == 1) { - str = getString(2131890127); + str = getString(2131890140); } else if (ordinal == 2) { - str = getString(2131890128); + str = getString(2131890141); } else if (ordinal == 3) { - str = getString(2131893971); + str = getString(2131894010); } m.checkNotNullExpressionValue(str, "when (data.manageStatus)…s)\n else -> \"\"\n }"); return str; @@ -401,7 +401,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment { m.checkNotNullExpressionValue(str, "when (data.manageStatus)…s)\n else -> \"\"\n }"); return str; } - String string = getString(2131888630); + String string = getString(2131888640); m.checkNotNullExpressionValue(string, "getString(R.string.form_…el_disabled_for_everyone)"); return string; } @@ -417,19 +417,19 @@ public final class WidgetServerSettingsEditRole extends AppFragment { kVar.f1461s = ColorCompat.getThemedColor(getContext(), 2130968904); kVar.i = false; kVar.g = getColorsToDisplay(roleColor$default); - kVar.a = 2131892626; + kVar.a = 2131892668; kVar.r = ColorCompat.getThemedColor(getContext(), 2130968932); FontUtils fontUtils = FontUtils.INSTANCE; kVar.f1462x = fontUtils.getThemedFontResId(getContext(), 2130969320); kVar.o = ColorCompat.getThemedColor(getContext(), 2130968892); - kVar.f1460c = 2131887415; - kVar.v = ColorCompat.getColor(getContext(), 2131100427); - kVar.b = 2131887416; + kVar.f1460c = 2131887417; + kVar.v = ColorCompat.getColor(getContext(), 2131100428); + kVar.b = 2131887418; kVar.p = ColorCompat.getThemedColor(getContext(), 2130968994); - kVar.d = 2131893090; + kVar.d = 2131893132; kVar.l = true; - kVar.e = 2131892599; - kVar.w = ColorCompat.getColor(getContext(), 2131100427); + kVar.e = 2131892641; + kVar.w = ColorCompat.getColor(getContext(), 2131100428); kVar.f1463y = fontUtils.getThemedFontResId(getContext(), 2130969326); kVar.q = ColorCompat.getThemedColor(getContext(), 2130968900); kVar.t = ColorCompat.getThemedColor(getContext(), 2130968988); @@ -464,7 +464,7 @@ public final class WidgetServerSettingsEditRole extends AppFragment { ColorCompat.setStatusBarColor(this, i, isColorDark$default); WidgetServerSettingsEditRole$setupActionBar$1 widgetServerSettingsEditRole$setupActionBar$1 = WidgetServerSettingsEditRole$setupActionBar$1.INSTANCE; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - String string = getString(2131888718); + String string = getString(2131888728); m.checkNotNullExpressionValue(string, "getString(R.string.form_label_role_settings)"); setActionBarTitle(widgetServerSettingsEditRole$setupActionBar$1.invoke(string, color)); setActionBarSubtitle(widgetServerSettingsEditRole$setupActionBar$1.invoke(model.getRole().f(), color)); @@ -508,17 +508,17 @@ public final class WidgetServerSettingsEditRole extends AppFragment { CheckedSetting checkedSetting = getBinding().o; m.checkNotNullExpressionValue(checkedSetting, "binding.roleSettingsHoistCheckedsetting"); checkedSetting.setChecked(model.getRole().c()); - CheckedSetting checkedSetting2 = getBinding().f1765y; + CheckedSetting checkedSetting2 = getBinding().f1767y; m.checkNotNullExpressionValue(checkedSetting2, "binding.roleSettingsMentionableCheckedsetting"); checkedSetting2.setChecked(model.getRole().e()); if (!model.canManage() || model.isEveryoneRole()) { String lockMessage = getLockMessage(model, true); getBinding().o.c(lockMessage); - getBinding().f1765y.c(lockMessage); + getBinding().f1767y.c(lockMessage); return; } getBinding().o.e(new WidgetServerSettingsEditRole$setupHoistAndMentionSettings$1(this, model)); - getBinding().f1765y.e(new WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2(this, model)); + getBinding().f1767y.e(new WidgetServerSettingsEditRole$setupHoistAndMentionSettings$2(this, model)); } private final void setupMenu(Model model) { @@ -533,116 +533,116 @@ public final class WidgetServerSettingsEditRole extends AppFragment { /* JADX WARNING: Removed duplicated region for block: B:71:0x026f */ private final void setupPermissionsSettings(Model model) { long j; - for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g, getBinding().h, getBinding().k, getBinding().n, getBinding().p, getBinding().q, getBinding().f1763s, getBinding().t, getBinding().r, getBinding().u, getBinding().v, getBinding().w, getBinding().f1764x, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().F, getBinding().G, getBinding().d, getBinding().H, getBinding().J, getBinding().N, getBinding().P, getBinding().M, getBinding().K, getBinding().L, getBinding().O, getBinding().f1766z, getBinding().I, getBinding().C})) { + for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().e, getBinding().f, getBinding().g, getBinding().h, getBinding().k, getBinding().n, getBinding().p, getBinding().q, getBinding().f1765s, getBinding().t, getBinding().r, getBinding().u, getBinding().v, getBinding().w, getBinding().f1766x, getBinding().A, getBinding().B, getBinding().D, getBinding().E, getBinding().F, getBinding().G, getBinding().d, getBinding().H, getBinding().J, getBinding().N, getBinding().P, getBinding().M, getBinding().K, getBinding().L, getBinding().O, getBinding().f1768z, getBinding().I, getBinding().C})) { m.checkNotNullExpressionValue(checkedSetting, "setting"); switch (checkedSetting.getId()) { - case 2131364456: + case 2131364459: j = 64; break; - case 2131364457: + case 2131364460: j = 8; break; - case 2131364458: + case 2131364461: j = 32768; break; - case 2131364459: + case 2131364462: j = 4; break; - case 2131364460: + case 2131364463: j = 67108864; break; - case 2131364461: - case 2131364462: case 2131364464: case 2131364465: case 2131364467: - case 2131364477: - case 2131364478: + case 2131364468: + case 2131364470: + case 2131364480: + case 2131364481: default: j = 0; break; - case 2131364463: + case 2131364466: j = 1; break; - case 2131364466: + case 2131364469: j = 16384; break; - case 2131364468: + case 2131364471: j = 2; break; - case 2131364469: + case 2131364472: j = 16; break; - case 2131364470: + case 2131364473: j = 1073741824; break; - case 2131364471: + case 2131364474: j = 8192; break; - case 2131364472: + case 2131364475: j = 134217728; break; - case 2131364473: + case 2131364476: j = 268435456; break; - case 2131364474: + case 2131364477: j = 32; break; - case 2131364475: + case 2131364478: j = 536870912; break; - case 2131364476: + case 2131364479: j = 131072; break; - case 2131364479: + case 2131364482: j = 256; break; - case 2131364480: + case 2131364483: j = 65536; break; - case 2131364481: + case 2131364484: j = 1024; break; - case 2131364482: + case 2131364485: j = 4294967296L; break; - case 2131364483: + case 2131364486: j = 2048; break; - case 2131364484: + case 2131364487: j = 4096; break; - case 2131364485: + case 2131364488: j = 2147483648L; break; - case 2131364486: + case 2131364489: j = 262144; break; - case 2131364487: + case 2131364490: j = 128; break; - case 2131364488: + case 2131364491: j = 524288; break; - case 2131364489: + case 2131364492: j = 1048576; break; - case 2131364490: + case 2131364493: j = 8388608; break; - case 2131364491: + case 2131364494: j = 16777216; break; - case 2131364492: + case 2131364495: j = 4194304; break; - case 2131364493: + case 2131364496: j = 2097152; break; - case 2131364494: + case 2131364497: j = 33554432; break; - case 2131364495: + case 2131364498: j = 512; break; } @@ -657,15 +657,15 @@ public final class WidgetServerSettingsEditRole extends AppFragment { if (model.getOwner() || j != 8 || !model.isSingular(j)) { enableSetting(checkedSetting, model, j); } else { - checkedSetting.b(2131890130); + checkedSetting.b(2131890143); } } } else if (can2 && !(model.isSingular(j) && can)) { enableSetting(checkedSetting, model, j); } else if (!can2) { - checkedSetting.b(2131890126); + checkedSetting.b(2131890139); } else { - checkedSetting.b(2131890130); + checkedSetting.b(2131890143); } checkedSetting.setVisibility(!((j != 524288 && !model.isCommunityServer()) ^ true) ? 0 : 8); } @@ -701,11 +701,11 @@ public final class WidgetServerSettingsEditRole extends AppFragment { setRetainInstance(true); this.state.setupUnsavedChangesConfirmation(this); StatefulViews statefulViews = this.state; - FloatingActionButton floatingActionButton = getBinding().f1762c; + FloatingActionButton floatingActionButton = getBinding().f1764c; TextInputLayout textInputLayout = getBinding().b; m.checkNotNullExpressionValue(textInputLayout, "binding.editRoleName"); statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout); - FloatingActionButton floatingActionButton2 = getBinding().f1762c; + FloatingActionButton floatingActionButton2 = getBinding().f1764c; m.checkNotNullExpressionValue(floatingActionButton2, "binding.editRoleSave"); floatingActionButton2.setVisibility(8); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java index 553d5710f6..56c5fcf2ce 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetServerSettingsEmojis$binding$2 extends public final WidgetServerSettingsEmojisBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365609; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365609); + int i = 2131365615; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365615); if (recyclerView != null) { - i = 2131365613; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365613); + i = 2131365619; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131365619); if (appViewFlipper != null) { return new WidgetServerSettingsEmojisBinding((CoordinatorLayout) view, recyclerView, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java index f7e390adb4..0de2d7b8d2 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojis.java @@ -84,7 +84,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment { public static final class EmojiEmptyViewHolder extends MGRecyclerViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public EmojiEmptyViewHolder(Adapter adapter) { - super(2131559156, adapter); + super(2131559157, adapter); m.checkNotNullParameter(adapter, "adapter"); } @@ -99,14 +99,14 @@ public final class WidgetServerSettingsEmojis extends AppFragment { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public EmojiHeaderViewHolder(Adapter adapter) { - super(2131559157, adapter); + super(2131559158, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - int i = 2131365611; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365611); + int i = 2131365617; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365617); if (materialButton != null) { - i = 2131365612; - TextView textView = (TextView) view.findViewById(2131365612); + i = 2131365618; + TextView textView = (TextView) view.findViewById(2131365618); if (textView != null) { WidgetServerSettingsEmojisHeaderBinding widgetServerSettingsEmojisHeaderBinding = new WidgetServerSettingsEmojisHeaderBinding((LinearLayout) view, materialButton, textView); m.checkNotNullExpressionValue(widgetServerSettingsEmojisHeaderBinding, "WidgetServerSettingsEmoj…derBinding.bind(itemView)"); @@ -123,9 +123,9 @@ public final class WidgetServerSettingsEmojis extends AppFragment { public void onConfigure(int i, Item item) { m.checkNotNullParameter(item, "data"); - TextView textView = this.binding.f1882c; + TextView textView = this.binding.f1884c; m.checkNotNullExpressionValue(textView, "binding.widgetServerSett…gsEmojisUploadDescription"); - textView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131889668, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4)); + textView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131889678, new Object[]{String.valueOf(((Item.EmojiHeader) item).getEmojiMax()), String.valueOf(256)}, null, 4)); this.binding.b.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder$onConfigure$1(this)); } } @@ -136,24 +136,24 @@ public final class WidgetServerSettingsEmojis extends AppFragment { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public EmojiItemViewHolder(Adapter adapter) { - super(2131559158, adapter); + super(2131559159, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - int i = 2131364625; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364625); + int i = 2131364628; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364628); if (simpleDraweeView != null) { LinearLayout linearLayout = (LinearLayout) view; - i = 2131364629; - TextView textView = (TextView) view.findViewById(2131364629); + i = 2131364632; + TextView textView = (TextView) view.findViewById(2131364632); if (textView != null) { - i = 2131364631; - ImageView imageView = (ImageView) view.findViewById(2131364631); + i = 2131364634; + ImageView imageView = (ImageView) view.findViewById(2131364634); if (imageView != null) { - i = 2131364632; - TextView textView2 = (TextView) view.findViewById(2131364632); + i = 2131364635; + TextView textView2 = (TextView) view.findViewById(2131364635); if (textView2 != null) { - i = 2131364633; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364633); + i = 2131364636; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) view.findViewById(2131364636); if (simpleDraweeView2 != null) { WidgetServerSettingsEmojisItemBinding widgetServerSettingsEmojisItemBinding = new WidgetServerSettingsEmojisItemBinding(linearLayout, simpleDraweeView, linearLayout, textView, imageView, textView2, simpleDraweeView2); m.checkNotNullExpressionValue(widgetServerSettingsEmojisItemBinding, "WidgetServerSettingsEmoj…temBinding.bind(itemView)"); @@ -194,7 +194,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment { SimpleDraweeView simpleDraweeView4 = this.binding.b; m.checkNotNullExpressionValue(simpleDraweeView4, "binding.serverSettingsEmojisAvatar"); simpleDraweeView4.setImageAlpha(emojiItem.getEmoji().getAvailable() ? 255 : 100); - this.binding.f1883c.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1(this, item)); + this.binding.f1885c.setOnClickListener(new WidgetServerSettingsEmojis$Adapter$EmojiItemViewHolder$onConfigure$1(this, item)); } } @@ -204,17 +204,17 @@ public final class WidgetServerSettingsEmojis extends AppFragment { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public EmojiSectionViewHolder(Adapter adapter) { - super(2131559159, adapter); + super(2131559160, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131365610); + TextView textView = (TextView) view.findViewById(2131365616); if (textView != null) { WidgetServerSettingsEmojisSectionBinding widgetServerSettingsEmojisSectionBinding = new WidgetServerSettingsEmojisSectionBinding((LinearLayout) view, textView); m.checkNotNullExpressionValue(widgetServerSettingsEmojisSectionBinding, "WidgetServerSettingsEmoj…ionBinding.bind(itemView)"); this.binding = widgetServerSettingsEmojisSectionBinding; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365610))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365616))); } public void onConfigure(int i, Item item) { @@ -228,10 +228,10 @@ public final class WidgetServerSettingsEmojis extends AppFragment { m.checkNotNullExpressionValue(context, "itemView.context"); Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "itemView.context.resources"); - CharSequence g = b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131888306, new Object[]{StringResourceUtilsKt.getQuantityString(resources, a.T(this.itemView, "itemView", "itemView.context"), 2131755074, emojiMax, Integer.valueOf(emojiMax))}, null, 4); + CharSequence g = b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131888316, new Object[]{StringResourceUtilsKt.getQuantityString(resources, a.T(this.itemView, "itemView", "itemView.context"), 2131755075, emojiMax, Integer.valueOf(emojiMax))}, null, 4); TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.widgetServerSettingsEmojisSection"); - textView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131888305, new Object[]{b.g(a.T(this.itemView, "itemView", "itemView.context"), emojiSection.getTitleId(), new Object[0], null, 4), g}, null, 4)); + textView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131888315, new Object[]{b.g(a.T(this.itemView, "itemView", "itemView.context"), emojiSection.getTitleId(), new Object[0], null, 4), g}, null, 4)); } } @@ -616,7 +616,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment { arrayList4.add(new Item.EmojiItem(modelEmojiGuild2)); } List reversed2 = u.reversed(arrayList4); - Item.EmojiSection emojiSection = new Item.EmojiSection(guildEmojiMaxCount, reversed.size(), 2131888258); + Item.EmojiSection emojiSection = new Item.EmojiSection(guildEmojiMaxCount, reversed.size(), 2131888268); Item.EmojiSection emojiSection2 = new Item.EmojiSection(guildEmojiMaxCount, reversed2.size(), 2131886354); ArrayList arrayList5 = new ArrayList(d0.t.m.listOf(emojiHeader)); if (!reversed.isEmpty()) { @@ -812,7 +812,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment { } public WidgetServerSettingsEmojis() { - super(2131559154); + super(2131559155); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEmojis widgetServerSettingsEmojis, Model model) { @@ -828,7 +828,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment { } private final void configureToolbar(String str) { - setActionBarTitle(2131888258); + setActionBarTitle(2131888268); setActionBarSubtitle(str); } @@ -850,7 +850,7 @@ public final class WidgetServerSettingsEmojis extends AppFragment { z2 = true; } if (!z2) { - AppViewFlipper appViewFlipper = getBinding().f1880c; + AppViewFlipper appViewFlipper = getBinding().f1882c; m.checkNotNullExpressionValue(appViewFlipper, "binding.widgetServerSettingsEmojisViewFlipper"); appViewFlipper.setDisplayedChild(1); this.uploadEmojiAction = new WidgetServerSettingsEmojis$configureUI$1(this, model); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java index a8a46b9ac3..8bbef3b381 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetServerSettingsEmojisEdit$binding$2 exte public final WidgetServerSettingsEmojisEditBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364627; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364627); + int i = 2131364630; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364630); if (textInputLayout != null) { - i = 2131364628; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364628); + i = 2131364631; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364631); if (floatingActionButton != null) { return new WidgetServerSettingsEmojisEditBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java index 09eac80cbe..e9705061e4 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$configureMenu$1.java @@ -14,7 +14,7 @@ public final class WidgetServerSettingsEmojisEdit$configureMenu$1 implem public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363902) { + if (menuItem.getItemId() == 2131363904) { WidgetServerSettingsEmojisEdit.access$deleteEmoji(this.this$0); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java index 146ebac84f..c0faac4e35 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.java @@ -36,7 +36,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment { private long emojiId = -1; private String emojiName = ""; private long guildId = -1; - private final StatefulViews state = new StatefulViews(2131364627); + private final StatefulViews state = new StatefulViews(2131364630); /* compiled from: WidgetServerSettingsEmojisEdit.kt */ public static final class Companion { @@ -57,7 +57,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment { } public WidgetServerSettingsEmojisEdit() { - super(2131559155); + super(2131559156); } public static final /* synthetic */ void access$deleteEmoji(WidgetServerSettingsEmojisEdit widgetServerSettingsEmojisEdit) { @@ -93,7 +93,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment { } private final void configureToolbar(String str) { - setActionBarTitle(2131888258); + setActionBarTitle(2131888268); setActionBarSubtitle(str); } @@ -132,7 +132,7 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment { TextInputLayout textInputLayout3 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout3, "binding.serverSettingsEmojisEditAlias"); ViewExtensions.setText(textInputLayout2, (CharSequence) statefulViews2.get(textInputLayout3.getId(), str)); - o.j(this, getString(2131892931), 0, 4); + o.j(this, getString(2131892973), 0, 4); } private final String sanitizeEmojiName(String str) { @@ -163,12 +163,12 @@ public final class WidgetServerSettingsEmojisEdit extends AppFragment { ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), this.emojiName)); this.state.setupUnsavedChangesConfirmation(this); StatefulViews statefulViews2 = this.state; - FloatingActionButton floatingActionButton = getBinding().f1881c; + FloatingActionButton floatingActionButton = getBinding().f1883c; TextInputLayout textInputLayout3 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout3, "binding.serverSettingsEmojisEditAlias"); statefulViews2.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout3); - this.state.configureSaveActionView(getBinding().f1881c); - getBinding().f1881c.setOnClickListener(new WidgetServerSettingsEmojisEdit$onViewBound$1(this)); + this.state.configureSaveActionView(getBinding().f1883c); + getBinding().f1883c.setOnClickListener(new WidgetServerSettingsEmojisEdit$onViewBound$1(this)); configureToolbar(this.emojiName); configureMenu(); if (!isRecreated()) { diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java index 051a2954eb..5e378042d0 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$binding$2.java @@ -17,17 +17,17 @@ public final /* synthetic */ class WidgetServerSettingsInstantInvitesActions$bin public final WidgetServerSettingsInstantInviteActionsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363603; - TextView textView = (TextView) view.findViewById(2131363603); + int i = 2131363605; + TextView textView = (TextView) view.findViewById(2131363605); if (textView != null) { - i = 2131363604; - TextView textView2 = (TextView) view.findViewById(2131363604); + i = 2131363606; + TextView textView2 = (TextView) view.findViewById(2131363606); if (textView2 != null) { - i = 2131363605; - TextView textView3 = (TextView) view.findViewById(2131363605); + i = 2131363607; + TextView textView3 = (TextView) view.findViewById(2131363607); if (textView3 != null) { - i = 2131363606; - TextView textView4 = (TextView) view.findViewById(2131363606); + i = 2131363608; + TextView textView4 = (TextView) view.findViewById(2131363608); if (textView4 != null) { return new WidgetServerSettingsInstantInviteActionsBinding((NestedScrollView) view, textView, textView2, textView3, textView4); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java index 8023b8bfa4..4827104dce 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.java @@ -19,7 +19,7 @@ public final class WidgetServerSettingsInstantInvitesActions$onResume$3 implemen public final void onClick(View view) { Context T = a.T(view, "it", "it.context"); String str = this.$inviteUrl; - IntentUtils.performChooserSendIntent(T, str, b.j(this.this$0, 2131893194, new Object[]{str}, null, 4)); + IntentUtils.performChooserSendIntent(T, str, b.j(this.this$0, 2131893236, new Object[]{str}, null, 4)); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java index ed7b941457..436d8085a3 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions.java @@ -8,6 +8,7 @@ import c.d.b.a.a; import com.discord.app.AppBottomSheet; import com.discord.databinding.WidgetServerSettingsInstantInviteActionsBinding; import com.discord.models.domain.ModelInvite; +import com.discord.models.invite.InviteUtils; import com.discord.stores.StoreStream; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; @@ -65,7 +66,7 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559162; + return 2131559163; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -77,7 +78,7 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh dismiss(); return; } - String H = a.H(new Object[]{"https://discord.gg", string}, 2, "%1$s/%2$s", "java.lang.String.format(format, *args)"); + String createLinkFromCode = InviteUtils.INSTANCE.createLinkFromCode(string); if (string.length() == 0) { z2 = true; } @@ -90,8 +91,8 @@ public final class WidgetServerSettingsInstantInvitesActions extends AppBottomSh m.checkNotNullExpressionValue(textView2, "binding.inviteActionsTitle"); textView2.setText(string); } - getBinding().f1884c.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$1(this, string)); - getBinding().b.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$2(this, H)); - getBinding().d.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$3(this, H)); + getBinding().f1886c.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$1(this, string)); + getBinding().b.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$2(this, createLinkFromCode)); + getBinding().d.setOnClickListener(new WidgetServerSettingsInstantInvitesActions$onResume$3(this, createLinkFromCode)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java index 5aefa1f3f2..a902b8873d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations$binding$2.java @@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsIntegrations$binding$2 ex public final WidgetServerSettingsIntegrationsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363592; - TextView textView = (TextView) view.findViewById(2131363592); + int i = 2131363594; + TextView textView = (TextView) view.findViewById(2131363594); if (textView != null) { - i = 2131363593; - TextView textView2 = (TextView) view.findViewById(2131363593); + i = 2131363595; + TextView textView2 = (TextView) view.findViewById(2131363595); if (textView2 != null) { - i = 2131363594; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363594); + i = 2131363596; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363596); if (recyclerView != null) { - i = 2131363596; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363596); + i = 2131363598; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363598); if (appViewFlipper != null) { return new WidgetServerSettingsIntegrationsBinding((CoordinatorLayout) view, textView, textView2, recyclerView, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java index 2749ba9336..d30df335ec 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrations.java @@ -294,7 +294,7 @@ public final class WidgetServerSettingsIntegrations extends AppFragment { } public WidgetServerSettingsIntegrations() { - super(2131559166); + super(2131559167); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsIntegrations widgetServerSettingsIntegrations, Model model) { @@ -303,9 +303,9 @@ public final class WidgetServerSettingsIntegrations extends AppFragment { private final void configureUI(Model model) { if (model != null) { - setActionBarTitle(2131890363); + setActionBarTitle(2131890393); setActionBarSubtitle(model.getGuildName()); - AppViewFlipper appViewFlipper = getBinding().f1888c; + AppViewFlipper appViewFlipper = getBinding().f1890c; m.checkNotNullExpressionValue(appViewFlipper, "binding.integrationsViewFlipper"); appViewFlipper.setDisplayedChild(model.getIntegrations().isEmpty() ? 1 : 0); Adapter adapter = this.adapter; diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java index da30c06106..595a715a9d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.java @@ -25,35 +25,35 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetServerSettingsIntegrationsListItem(WidgetServerSettingsIntegrations.Adapter adapter) { - super(2131559165, adapter); + super(2131559166, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - int i = 2131363583; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363583); + int i = 2131363585; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363585); if (relativeLayout != null) { - i = 2131363584; - View findViewById = view.findViewById(2131363584); + i = 2131363586; + View findViewById = view.findViewById(2131363586); if (findViewById != null) { - i = 2131363585; - ImageView imageView = (ImageView) view.findViewById(2131363585); + i = 2131363587; + ImageView imageView = (ImageView) view.findViewById(2131363587); if (imageView != null) { - i = 2131363586; - TextView textView = (TextView) view.findViewById(2131363586); + i = 2131363588; + TextView textView = (TextView) view.findViewById(2131363588); if (textView != null) { - i = 2131363587; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363587); + i = 2131363589; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363589); if (linearLayout != null) { - i = 2131363588; - TextView textView2 = (TextView) view.findViewById(2131363588); + i = 2131363590; + TextView textView2 = (TextView) view.findViewById(2131363590); if (textView2 != null) { - i = 2131363589; - ImageView imageView2 = (ImageView) view.findViewById(2131363589); + i = 2131363591; + ImageView imageView2 = (ImageView) view.findViewById(2131363591); if (imageView2 != null) { - i = 2131363590; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363590); + i = 2131363592; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363592); if (checkedSetting != null) { - i = 2131363591; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131363591); + i = 2131363593; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131363593); if (progressBar != null) { WidgetServerSettingsIntegrationListItemBinding widgetServerSettingsIntegrationListItemBinding = new WidgetServerSettingsIntegrationListItemBinding((FrameLayout) view, relativeLayout, findViewById, imageView, textView, linearLayout, textView2, imageView2, checkedSetting, progressBar); m.checkNotNullExpressionValue(widgetServerSettingsIntegrationListItemBinding, "WidgetServerSettingsInte…temBinding.bind(itemView)"); @@ -88,18 +88,18 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi } private final void showDisableSyncDialog(long j, long j2, boolean z2, Context context) { - View inflate = LayoutInflater.from(context).inflate(2131559151, (ViewGroup) null, false); - int i = 2131364613; - TextView textView = (TextView) inflate.findViewById(2131364613); + View inflate = LayoutInflater.from(context).inflate(2131559152, (ViewGroup) null, false); + int i = 2131364616; + TextView textView = (TextView) inflate.findViewById(2131364616); if (textView != null) { - i = 2131364614; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364614); + i = 2131364617; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364617); if (materialButton != null) { - i = 2131364615; - MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364615); + i = 2131364618; + MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364618); if (materialButton2 != null) { - i = 2131364616; - TextView textView2 = (TextView) inflate.findViewById(2131364616); + i = 2131364619; + TextView textView2 = (TextView) inflate.findViewById(2131364619); if (textView2 != null) { LinearLayout linearLayout = (LinearLayout) inflate; m.checkNotNullExpressionValue(new d5(linearLayout, textView, materialButton, materialButton2, textView2), "WidgetServerSettingsConf…om(context), null, false)"); @@ -107,7 +107,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi m.checkNotNullExpressionValue(create, "AlertDialog.Builder(cont…ew(binding.root).create()"); materialButton.setOnClickListener(new WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$1(create)); materialButton2.setOnClickListener(new WidgetServerSettingsIntegrationsListItem$showDisableSyncDialog$2(j, j2, create, context)); - textView.setText(z2 ? 2131888118 : 2131888119); + textView.setText(z2 ? 2131888128 : 2131888129); create.show(); return; } @@ -125,7 +125,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi ProgressBar progressBar = this.binding.i; m.checkNotNullExpressionValue(progressBar, "binding.integrationSyncingProgressBar"); progressBar.setVisibility(z2 ? 0 : 8); - View view = this.binding.f1887c; + View view = this.binding.f1889c; m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay"); if (!z2) { i = 8; @@ -156,7 +156,7 @@ public final class WidgetServerSettingsIntegrationsListItem extends MGRecyclerVi User user = integrationItem.getIntegration().getUser(); textView2.setText(user != null ? user.r() : null); this.binding.d.setImageResource(areEqual ? 2131230879 : 2131230880); - View view = this.binding.f1887c; + View view = this.binding.f1889c; m.checkNotNullExpressionValue(view, "binding.integrationHeaderDisabledOverlay"); int i2 = 0; if (!(isSyncing || !isEnabled)) { diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java index c06640bee3..cbb79691cc 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$binding$2.java @@ -18,35 +18,35 @@ public final /* synthetic */ class WidgetServerSettingsModeration$binding$2 exte public final WidgetServerSettingsModerationBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364645; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364645); + int i = 2131364648; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364648); if (checkedSetting != null) { - i = 2131364646; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364646); + i = 2131364649; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364649); if (checkedSetting2 != null) { - i = 2131364647; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364647); + i = 2131364650; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364650); if (checkedSetting3 != null) { - i = 2131364648; - TextView textView = (TextView) view.findViewById(2131364648); + i = 2131364651; + TextView textView = (TextView) view.findViewById(2131364651); if (textView != null) { - i = 2131364649; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364649); + i = 2131364652; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364652); if (checkedSetting4 != null) { - i = 2131364650; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364650); + i = 2131364653; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364653); if (checkedSetting5 != null) { - i = 2131364651; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364651); + i = 2131364654; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364654); if (checkedSetting6 != null) { - i = 2131364652; - CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364652); + i = 2131364655; + CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364655); if (checkedSetting7 != null) { - i = 2131364653; - CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364653); + i = 2131364656; + CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364656); if (checkedSetting8 != null) { - i = 2131364654; - TextView textView2 = (TextView) view.findViewById(2131364654); + i = 2131364657; + TextView textView2 = (TextView) view.findViewById(2131364657); if (textView2 != null) { return new WidgetServerSettingsModerationBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, textView, checkedSetting4, checkedSetting5, checkedSetting6, checkedSetting7, checkedSetting8, textView2); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java index a55fa406e4..bbab6cedef 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration$updateGuild$1.java @@ -25,6 +25,6 @@ public final class WidgetServerSettingsModeration$updateGuild$1 extends o implem public final void invoke(Guild guild) { m.checkNotNullParameter(guild, "it"); - c.a.d.o.i(this.this$0, 2131893144, 0, 4); + c.a.d.o.i(this.this$0, 2131893186, 0, 4); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java index 92c251c8bc..57ed6891a0 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsModeration.java @@ -137,7 +137,7 @@ public final class WidgetServerSettingsModeration extends AppFragment { } public WidgetServerSettingsModeration() { - super(2131559169); + super(2131559170); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsModeration widgetServerSettingsModeration, Model model) { @@ -157,7 +157,7 @@ public final class WidgetServerSettingsModeration extends AppFragment { if (!model.getGuild().getFeatures().contains(GuildFeature.COMMUNITY) || guildExplicitContentFilter.compareTo(GuildExplicitContentFilter.ALL) >= 0) { checkedSetting.e(new WidgetServerSettingsModeration$configureExplicitContentRadio$1(this, model, guildExplicitContentFilter)); } else { - checkedSetting.b(2131893915); + checkedSetting.b(2131893954); } if (this.radioManagerExplicit != null && model.getGuild().getExplicitContentFilter() == guildExplicitContentFilter && (radioManager = this.radioManagerExplicit) != null) { radioManager.a(checkedSetting); @@ -189,7 +189,7 @@ public final class WidgetServerSettingsModeration extends AppFragment { if (!model.getGuild().getFeatures().contains(GuildFeature.COMMUNITY) || guildVerificationLevel != GuildVerificationLevel.NONE) { checkedSetting.e(new WidgetServerSettingsModeration$configureVerificationLevelRadio$1(this, model, guildVerificationLevel)); } else { - checkedSetting.b(2131893915); + checkedSetting.b(2131893954); } if (this.radioManagerVerification != null && model.getGuild().getVerificationLevel() == guildVerificationLevel && (radioManager = this.radioManagerVerification) != null) { radioManager.a(checkedSetting); @@ -203,7 +203,7 @@ public final class WidgetServerSettingsModeration extends AppFragment { private final List getExplicitContentViews() { CheckedSetting checkedSetting = getBinding().b; m.checkNotNullExpressionValue(checkedSetting, "binding.serverSettingsModerationExplicit1"); - CheckedSetting checkedSetting2 = getBinding().f1891c; + CheckedSetting checkedSetting2 = getBinding().f1893c; m.checkNotNullExpressionValue(checkedSetting2, "binding.serverSettingsModerationExplicit2"); CheckedSetting checkedSetting3 = getBinding().d; m.checkNotNullExpressionValue(checkedSetting3, "binding.serverSettingsModerationExplicit3"); @@ -237,17 +237,17 @@ public final class WidgetServerSettingsModeration extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131891206); + setActionBarTitle(2131891239); TextView textView = getBinding().k; m.checkNotNullExpressionValue(textView, "binding.serverSettingsModerationVerificationHelp"); - b.n(textView, 2131888591, new Object[0], null, 4); + b.n(textView, 2131888601, new Object[0], null, 4); TextView textView2 = getBinding().e; m.checkNotNullExpressionValue(textView2, "binding.serverSettingsModerationExplicitHelp"); - b.n(textView2, 2131888570, new Object[0], null, 4); + b.n(textView2, 2131888580, new Object[0], null, 4); this.radioManagerVerification = new RadioManager(getVerificationViews()); this.radioManagerExplicit = new RadioManager(getExplicitContentViews()); - CheckedSetting.i(getVerificationViews().get(2), b.j(this, 2131894393, new Object[]{"5"}, null, 4), false, 2); - CheckedSetting.i(getVerificationViews().get(3), b.j(this, 2131894389, new Object[]{"10"}, null, 4), false, 2); + CheckedSetting.i(getVerificationViews().get(2), b.j(this, 2131894440, new Object[]{"5"}, null, 4), false, 2); + CheckedSetting.i(getVerificationViews().get(3), b.j(this, 2131894436, new Object[]{"10"}, null, 4), false, 2); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java index d6059d1ddc..ab8c926de4 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$AfkBottomSheet$binding$2.java @@ -17,23 +17,23 @@ public final /* synthetic */ class WidgetServerSettingsOverview$AfkBottomSheet$b public final WidgetServerSettingsOverviewAfkTimeoutBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363340; - TextView textView = (TextView) view.findViewById(2131363340); + int i = 2131363342; + TextView textView = (TextView) view.findViewById(2131363342); if (textView != null) { - i = 2131364662; - TextView textView2 = (TextView) view.findViewById(2131364662); + i = 2131364665; + TextView textView2 = (TextView) view.findViewById(2131364665); if (textView2 != null) { - i = 2131364663; - TextView textView3 = (TextView) view.findViewById(2131364663); + i = 2131364666; + TextView textView3 = (TextView) view.findViewById(2131364666); if (textView3 != null) { - i = 2131364664; - TextView textView4 = (TextView) view.findViewById(2131364664); + i = 2131364667; + TextView textView4 = (TextView) view.findViewById(2131364667); if (textView4 != null) { - i = 2131364665; - TextView textView5 = (TextView) view.findViewById(2131364665); + i = 2131364668; + TextView textView5 = (TextView) view.findViewById(2131364668); if (textView5 != null) { - i = 2131364666; - TextView textView6 = (TextView) view.findViewById(2131364666); + i = 2131364669; + TextView textView6 = (TextView) view.findViewById(2131364669); if (textView6 != null) { return new WidgetServerSettingsOverviewAfkTimeoutBinding((NestedScrollView) view, textView, textView2, textView3, textView4, textView5, textView6); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java index 8583a61bba..fe0ba09d73 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$binding$2.java @@ -51,115 +51,115 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend LinearLayout linearLayout2 = (LinearLayout) findViewById.findViewById(2131361929); if (linearLayout2 != null) { e5 e5Var = new e5((LinearLayout) findViewById, textView, linearLayout, textView2, linearLayout2); - i = 2131363503; - View findViewById2 = view.findViewById(2131363503); + i = 2131363505; + View findViewById2 = view.findViewById(2131363505); if (findViewById2 != null) { - int i3 = 2131363526; - TextView textView3 = (TextView) findViewById2.findViewById(2131363526); + int i3 = 2131363528; + TextView textView3 = (TextView) findViewById2.findViewById(2131363528); if (textView3 != null) { - i3 = 2131364124; - TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131364124); + i3 = 2131364126; + TextInputLayout textInputLayout = (TextInputLayout) findViewById2.findViewById(2131364126); if (textInputLayout != null) { - i3 = 2131364667; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById2.findViewById(2131364667); + i3 = 2131364670; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById2.findViewById(2131364670); if (simpleDraweeView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) findViewById2; - i3 = 2131364669; - TextView textView4 = (TextView) findViewById2.findViewById(2131364669); + i3 = 2131364672; + TextView textView4 = (TextView) findViewById2.findViewById(2131364672); if (textView4 != null) { - i3 = 2131364670; - TextView textView5 = (TextView) findViewById2.findViewById(2131364670); + i3 = 2131364673; + TextView textView5 = (TextView) findViewById2.findViewById(2131364673); if (textView5 != null) { v2 v2Var = new v2(constraintLayout, textView3, textInputLayout, simpleDraweeView, constraintLayout, textView4, textView5); - i = 2131364042; - View findViewById3 = view.findViewById(2131364042); + i = 2131364044; + View findViewById3 = view.findViewById(2131364044); if (findViewById3 != null) { - int i4 = 2131364671; - CheckedSetting checkedSetting = (CheckedSetting) findViewById3.findViewById(2131364671); + int i4 = 2131364674; + CheckedSetting checkedSetting = (CheckedSetting) findViewById3.findViewById(2131364674); if (checkedSetting != null) { - i4 = 2131364672; - CheckedSetting checkedSetting2 = (CheckedSetting) findViewById3.findViewById(2131364672); + i4 = 2131364675; + CheckedSetting checkedSetting2 = (CheckedSetting) findViewById3.findViewById(2131364675); if (checkedSetting2 != null) { w2 w2Var = new w2((LinearLayout) findViewById3, checkedSetting, checkedSetting2); - View findViewById4 = view.findViewById(2131364397); + View findViewById4 = view.findViewById(2131364400); if (findViewById4 != null) { - int i5 = 2131364125; - TextView textView6 = (TextView) findViewById4.findViewById(2131364125); + int i5 = 2131364127; + TextView textView6 = (TextView) findViewById4.findViewById(2131364127); if (textView6 != null) { - i5 = 2131364126; - ImageView imageView = (ImageView) findViewById4.findViewById(2131364126); + i5 = 2131364128; + ImageView imageView = (ImageView) findViewById4.findViewById(2131364128); if (imageView != null) { LinearLayout linearLayout3 = (LinearLayout) findViewById4; x2 x2Var = new x2(linearLayout3, textView6, imageView, linearLayout3); - View findViewById5 = view.findViewById(2131364398); + View findViewById5 = view.findViewById(2131364401); if (findViewById5 != null) { - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById5.findViewById(2131363443); + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) findViewById5.findViewById(2131363445); if (linkifiedTextView != null) { LinearLayout linearLayout4 = (LinearLayout) findViewById5; y2 y2Var = new y2(linearLayout4, linkifiedTextView, linearLayout4); - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364507); + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364510); if (floatingActionButton != null) { - ScrollView scrollView = (ScrollView) view.findViewById(2131364675); + ScrollView scrollView = (ScrollView) view.findViewById(2131364678); if (scrollView != null) { - View findViewById6 = view.findViewById(2131365157); + View findViewById6 = view.findViewById(2131365161); if (findViewById6 != null) { - int i6 = 2131365158; - TextView textView7 = (TextView) findViewById6.findViewById(2131365158); + int i6 = 2131365162; + TextView textView7 = (TextView) findViewById6.findViewById(2131365162); if (textView7 != null) { - i6 = 2131365159; - CheckedSetting checkedSetting3 = (CheckedSetting) findViewById6.findViewById(2131365159); + i6 = 2131365163; + CheckedSetting checkedSetting3 = (CheckedSetting) findViewById6.findViewById(2131365163); if (checkedSetting3 != null) { - i6 = 2131365160; - CheckedSetting checkedSetting4 = (CheckedSetting) findViewById6.findViewById(2131365160); + i6 = 2131365164; + CheckedSetting checkedSetting4 = (CheckedSetting) findViewById6.findViewById(2131365164); if (checkedSetting4 != null) { LinearLayout linearLayout5 = (LinearLayout) findViewById6; z2 z2Var = new z2(linearLayout5, textView7, checkedSetting3, checkedSetting4, linearLayout5); - View findViewById7 = view.findViewById(2131365340); + View findViewById7 = view.findViewById(2131365345); if (findViewById7 != null) { - int i7 = 2131364676; - FrameLayout frameLayout = (FrameLayout) findViewById7.findViewById(2131364676); + int i7 = 2131364679; + FrameLayout frameLayout = (FrameLayout) findViewById7.findViewById(2131364679); if (frameLayout != null) { - i7 = 2131364677; - TextView textView8 = (TextView) findViewById7.findViewById(2131364677); + i7 = 2131364680; + TextView textView8 = (TextView) findViewById7.findViewById(2131364680); if (textView8 != null) { - i7 = 2131365342; - SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById7.findViewById(2131365342); + i7 = 2131365347; + SimpleDraweeView simpleDraweeView2 = (SimpleDraweeView) findViewById7.findViewById(2131365347); if (simpleDraweeView2 != null) { - i7 = 2131365343; - FloatingActionButton floatingActionButton2 = (FloatingActionButton) findViewById7.findViewById(2131365343); + i7 = 2131365348; + FloatingActionButton floatingActionButton2 = (FloatingActionButton) findViewById7.findViewById(2131365348); if (floatingActionButton2 != null) { - i7 = 2131365344; - LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById7.findViewById(2131365344); + i7 = 2131365349; + LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) findViewById7.findViewById(2131365349); if (linkifiedTextView2 != null) { - i7 = 2131365345; - TextView textView9 = (TextView) findViewById7.findViewById(2131365345); + i7 = 2131365350; + TextView textView9 = (TextView) findViewById7.findViewById(2131365350); if (textView9 != null) { - i7 = 2131365346; - TextView textView10 = (TextView) findViewById7.findViewById(2131365346); + i7 = 2131365351; + TextView textView10 = (TextView) findViewById7.findViewById(2131365351); if (textView10 != null) { a3 a3Var = new a3((LinearLayout) findViewById7, frameLayout, textView8, simpleDraweeView2, floatingActionButton2, linkifiedTextView2, textView9, textView10); - View findViewById8 = view.findViewById(2131365341); + View findViewById8 = view.findViewById(2131365346); if (findViewById8 != null) { - int i8 = 2131364678; - FrameLayout frameLayout2 = (FrameLayout) findViewById8.findViewById(2131364678); + int i8 = 2131364681; + FrameLayout frameLayout2 = (FrameLayout) findViewById8.findViewById(2131364681); if (frameLayout2 != null) { - i8 = 2131364679; - FloatingActionButton floatingActionButton3 = (FloatingActionButton) findViewById8.findViewById(2131364679); + i8 = 2131364682; + FloatingActionButton floatingActionButton3 = (FloatingActionButton) findViewById8.findViewById(2131364682); if (floatingActionButton3 != null) { - i8 = 2131364680; - TextView textView11 = (TextView) findViewById8.findViewById(2131364680); + i8 = 2131364683; + TextView textView11 = (TextView) findViewById8.findViewById(2131364683); if (textView11 != null) { - i8 = 2131365351; - SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById8.findViewById(2131365351); + i8 = 2131365356; + SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) findViewById8.findViewById(2131365356); if (simpleDraweeView3 != null) { - i8 = 2131365352; - LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById8.findViewById(2131365352); + i8 = 2131365357; + LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) findViewById8.findViewById(2131365357); if (linkifiedTextView3 != null) { - i8 = 2131365353; - TextView textView12 = (TextView) findViewById8.findViewById(2131365353); + i8 = 2131365358; + TextView textView12 = (TextView) findViewById8.findViewById(2131365358); if (textView12 != null) { - i8 = 2131365354; - TextView textView13 = (TextView) findViewById8.findViewById(2131365354); + i8 = 2131365359; + TextView textView13 = (TextView) findViewById8.findViewById(2131365359); if (textView13 != null) { return new WidgetServerSettingsOverviewBinding((CoordinatorLayout) view, e5Var, v2Var, w2Var, x2Var, y2Var, floatingActionButton, scrollView, z2Var, a3Var, new b3((LinearLayout) findViewById8, frameLayout2, floatingActionButton3, textView11, simpleDraweeView3, linkifiedTextView3, textView12, textView13)); } @@ -171,7 +171,7 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend } throw new NullPointerException("Missing required view with ID: ".concat(findViewById8.getResources().getResourceName(i8))); } - i = 2131365341; + i = 2131365346; } } } @@ -181,30 +181,30 @@ public final /* synthetic */ class WidgetServerSettingsOverview$binding$2 extend } throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i7))); } - i = 2131365340; + i = 2131365345; } } } throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i6))); } - i = 2131365157; + i = 2131365161; } else { - i = 2131364675; + i = 2131364678; } } else { - i = 2131364507; + i = 2131364510; } } else { - throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(2131363443))); + throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(2131363445))); } } else { - i = 2131364398; + i = 2131364401; } } } throw new NullPointerException("Missing required view with ID: ".concat(findViewById4.getResources().getResourceName(i5))); } - i = 2131364397; + i = 2131364400; } } throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i4))); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java index a25d28ab84..0fe78c747d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.java @@ -15,6 +15,6 @@ public final class WidgetServerSettingsOverview$configureUI$2 implements View.On @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetChannelSelector.Companion.launchForVoice(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_AFK_CHANNEL", true, 2131891335); + WidgetChannelSelector.Companion.launchForVoice(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_AFK_CHANNEL", true, 2131891368); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java index e9de4ec5c0..bbdd1ad532 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.java @@ -15,6 +15,6 @@ public final class WidgetServerSettingsOverview$configureUI$4 implements View.On @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetChannelSelector.Companion.launchForText(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_SYSTEM_CHANNEL", true, 2131891388); + WidgetChannelSelector.Companion.launchForText(this.this$0, this.$this_configureUI.getGuild().getId(), "REQUEST_KEY_SYSTEM_CHANNEL", true, 2131891421); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java index f3f217ce51..5402ce6e7c 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$7.java @@ -107,11 +107,11 @@ public final class WidgetServerSettingsOverview$configureUI$7 implements View.On Long valueOf2 = channel2 != null ? Long.valueOf(channel2.g()) : null; Integer num2 = (Integer) WidgetServerSettingsOverview.access$getState$p(this.this$0).get(90001, Integer.valueOf(this.$this_configureUI.getGuild().getDefaultMessageNotifications())); StatefulViews access$getState$p6 = WidgetServerSettingsOverview.access$getState$p(this.this$0); - SimpleDraweeView simpleDraweeView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1893c.d; + SimpleDraweeView simpleDraweeView = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1895c.d; m.checkNotNullExpressionValue(simpleDraweeView, "binding.header.serverSettingsOverviewIcon"); String str = (String) access$getState$p6.get(simpleDraweeView.getId(), IconUtils.getForGuild$default(this.$this_configureUI.getGuild(), null, false, null, 14, null)); StatefulViews access$getState$p7 = WidgetServerSettingsOverview.access$getState$p(this.this$0); - TextInputLayout textInputLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1893c.f167c; + TextInputLayout textInputLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).f1895c.f167c; m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName"); String str2 = (String) access$getState$p7.get(textInputLayout.getId(), this.$this_configureUI.getGuild().getName()); StatefulViews access$getState$p8 = WidgetServerSettingsOverview.access$getState$p(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java index 5d1c6a44f2..802394000f 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$onViewBound$2.java @@ -27,7 +27,7 @@ public final class WidgetServerSettingsOverview$onViewBound$2 extends o implemen public final void invoke(long j, String str) { m.checkNotNullParameter(str, ""); Channel channel = StoreStream.Companion.getChannels().getChannel(j); - WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131365158, channel); + WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131365162, channel); WidgetServerSettingsOverview.access$getState$p(this.this$0).configureSaveActionView(WidgetServerSettingsOverview.access$getBinding$p(this.this$0).g); WidgetServerSettingsOverview.access$configureSystemChannel(this.this$0, channel); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java index 2f374bd8e6..6ebec01d35 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$lambda$1.java @@ -30,8 +30,8 @@ public final class WidgetServerSettingsOverview$showRegionDialog$$inlined$apply$ public final void invoke(WidgetServerRegionSelectDialog.VoiceRegion voiceRegion) { m.checkNotNullParameter(voiceRegion, "voiceRegion"); int voiceRegionIconResourceId = IconUtils.INSTANCE.getVoiceRegionIconResourceId(voiceRegion.getId()); - WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364125, voiceRegion.getName()); - WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364126, Integer.valueOf(voiceRegionIconResourceId)); + WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364127, voiceRegion.getName()); + WidgetServerSettingsOverview.access$getState$p(this.this$0).put(2131364128, Integer.valueOf(voiceRegionIconResourceId)); StatefulViews access$getState$p = WidgetServerSettingsOverview.access$getState$p(this.this$0); LinearLayout linearLayout = WidgetServerSettingsOverview.access$getBinding$p(this.this$0).e.d; m.checkNotNullExpressionValue(linearLayout, "binding.region.overviewRegionWrap"); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java index 787d1f6831..2158d6745d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsOverview.java @@ -80,7 +80,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsOverview$binding$2.INSTANCE, null, 2, null); private boolean hasOpenedAvatarPicker; private Action1 imageSelectedResult; - private final StatefulViews state = new StatefulViews(2131364667, 2131364124, 2131364125, 2131364126, 2131364127, 2131361926, 2131361928, 2131361929, 2131365158, 2131365351, 2131365342, 2131365160, 2131365159, 90001); + private final StatefulViews state = new StatefulViews(2131364670, 2131364126, 2131364127, 2131364128, 2131364129, 2131361926, 2131361928, 2131361929, 2131365162, 2131365356, 2131365347, 2131365164, 2131365163, 90001); /* compiled from: WidgetServerSettingsOverview.kt */ public static final class AfkBottomSheet extends AppBottomSheet { @@ -98,7 +98,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { private final List getTimeouts() { TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.serverSettingsOverviewAfkTimeout01"); - TextView textView2 = getBinding().f1892c; + TextView textView2 = getBinding().f1894c; m.checkNotNullExpressionValue(textView2, "binding.serverSettingsOverviewAfkTimeout05"); TextView textView3 = getBinding().d; m.checkNotNullExpressionValue(textView3, "binding.serverSettingsOverviewAfkTimeout15"); @@ -111,7 +111,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559171; + return 2131559172; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -202,25 +202,25 @@ public final class WidgetServerSettingsOverview extends AppFragment { if (i == 60) { Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources, context, 2131755067, 1, 1); + return StringResourceUtilsKt.getQuantityString(resources, context, 2131755068, 1, 1); } else if (i == 300) { Resources resources2 = context.getResources(); m.checkNotNullExpressionValue(resources2, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755067, 5, 5); + return StringResourceUtilsKt.getQuantityString(resources2, context, 2131755068, 5, 5); } else if (i == 900) { Resources resources3 = context.getResources(); m.checkNotNullExpressionValue(resources3, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755067, 15, 15); + return StringResourceUtilsKt.getQuantityString(resources3, context, 2131755068, 15, 15); } else if (i == 1800) { Resources resources4 = context.getResources(); m.checkNotNullExpressionValue(resources4, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755067, 30, 30); + return StringResourceUtilsKt.getQuantityString(resources4, context, 2131755068, 30, 30); } else if (i != 3600) { return ""; } else { Resources resources5 = context.getResources(); m.checkNotNullExpressionValue(resources5, "context.resources"); - return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755064, 1, 1); + return StringResourceUtilsKt.getQuantityString(resources5, context, 2131755065, 1, 1); } } } @@ -405,7 +405,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { } public WidgetServerSettingsOverview() { - super(2131559170); + super(2131559171); } public static final /* synthetic */ void access$configureAfkChannel(WidgetServerSettingsOverview widgetServerSettingsOverview, Channel channel) { @@ -467,7 +467,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { private final void configureAfkChannel(Channel channel) { TextView textView = getBinding().b.b; m.checkNotNullExpressionValue(textView, "binding.afk.afkChannel"); - configureChannel(textView, channel, 2131891335, 2131231493); + configureChannel(textView, channel, 2131891368, 2131231493); } private final void configureBannerImage(String str, String str2, boolean z2) { @@ -507,11 +507,11 @@ public final class WidgetServerSettingsOverview extends AppFragment { textView.setVisibility(8); TextView textView2 = getBinding().j.h; m.checkNotNullExpressionValue(textView2, "binding.uploadBanner.uploadBannerUnlock"); - b.n(textView2, 2131889778, new Object[]{"2"}, null, 4); + b.n(textView2, 2131889789, new Object[]{"2"}, null, 4); TextView textView3 = getBinding().j.h; m.checkNotNullExpressionValue(textView3, "binding.uploadBanner.uploadBannerUnlock"); - DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231812, 0, 0, 13, (Object) null); - getBinding().j.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100427)); + DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231815, 0, 0, 13, (Object) null); + getBinding().j.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100428)); TextView textView4 = getBinding().j.h; m.checkNotNullExpressionValue(textView4, "binding.uploadBanner.uploadBannerUnlock"); String banner = guild.getBanner(); @@ -531,7 +531,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { } TextView textView5 = getBinding().j.g; m.checkNotNullExpressionValue(textView5, "binding.uploadBanner.uploadBannerNitroTier"); - b.m(textView5, 2131889779, new Object[]{"2", "tierStatus"}, new WidgetServerSettingsOverview$configureBannerSection$1(guild)); + b.m(textView5, 2131889790, new Object[]{"2", "tierStatus"}, new WidgetServerSettingsOverview$configureBannerSection$1(guild)); TextView textView6 = getBinding().j.g; m.checkNotNullExpressionValue(textView6, "binding.uploadBanner.uploadBannerNitroTier"); textView6.setVisibility(0); @@ -541,13 +541,13 @@ public final class WidgetServerSettingsOverview extends AppFragment { int premiumSubscriptionCount = 15 - guild.getPremiumSubscriptionCount(); Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755159, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755160, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)); TextView textView7 = getBinding().j.h; m.checkNotNullExpressionValue(textView7, "binding.uploadBanner.uploadBannerUnlock"); - ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889777, new Object[]{quantityString}, null, 4)); + ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889788, new Object[]{quantityString}, null, 4)); TextView textView8 = getBinding().j.h; m.checkNotNullExpressionValue(textView8, "binding.uploadBanner.uploadBannerUnlock"); - DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231811, 0, 0, 13, (Object) null); + DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231814, 0, 0, 13, (Object) null); getBinding().j.h.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130969877)); getBinding().j.d.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130969890)); getBinding().j.g.setOnClickListener(new WidgetServerSettingsOverview$configureBannerSection$2(guild)); @@ -574,36 +574,36 @@ public final class WidgetServerSettingsOverview extends AppFragment { } if (z2) { StatefulViews statefulViews = this.state; - SimpleDraweeView simpleDraweeView = getBinding().f1893c.d; + SimpleDraweeView simpleDraweeView = getBinding().f1895c.d; m.checkNotNullExpressionValue(simpleDraweeView, "binding.header.serverSettingsOverviewIcon"); statefulViews.put(simpleDraweeView.getId(), str3 != null ? str3 : ""); } else { StatefulViews statefulViews2 = this.state; - SimpleDraweeView simpleDraweeView2 = getBinding().f1893c.d; + SimpleDraweeView simpleDraweeView2 = getBinding().f1895c.d; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.header.serverSettingsOverviewIcon"); str3 = (String) statefulViews2.get(simpleDraweeView2.getId(), str2); } - getBinding().f1893c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2)); - SimpleDraweeView simpleDraweeView3 = getBinding().f1893c.d; + getBinding().f1895c.d.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$1(this, str, str2)); + SimpleDraweeView simpleDraweeView3 = getBinding().f1895c.d; m.checkNotNullExpressionValue(simpleDraweeView3, "binding.header.serverSettingsOverviewIcon"); IconUtils.setIcon$default(simpleDraweeView3, str3, 2131165286, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); if (str3 != null && !t.isBlank(str3)) { z3 = false; } - TextView textView = getBinding().f1893c.b; + TextView textView = getBinding().f1895c.b; m.checkNotNullExpressionValue(textView, "binding.header.iconLabel"); textView.setVisibility(z3 ? 0 : 8); - TextView textView2 = getBinding().f1893c.e; + TextView textView2 = getBinding().f1895c.e; m.checkNotNullExpressionValue(textView2, "binding.header.serverSettingsOverviewIconRemove"); textView2.setVisibility(z3 ^ true ? 0 : 8); - getBinding().f1893c.e.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$2(this, str, str2)); - TextView textView3 = getBinding().f1893c.f; + getBinding().f1895c.e.setOnClickListener(new WidgetServerSettingsOverview$configureIcon$2(this, str, str2)); + TextView textView3 = getBinding().f1895c.f; m.checkNotNullExpressionValue(textView3, "binding.header.serverSettingsOverviewIconText"); if (!z3) { i = 8; } textView3.setVisibility(i); - TextView textView4 = getBinding().f1893c.f; + TextView textView4 = getBinding().f1895c.f; m.checkNotNullExpressionValue(textView4, "binding.header.serverSettingsOverviewIconText"); textView4.setText(str); this.state.configureSaveActionView(getBinding().g); @@ -622,10 +622,10 @@ public final class WidgetServerSettingsOverview extends AppFragment { CheckedSetting checkedSetting = (CheckedSetting) obj; m.checkNotNullExpressionValue(checkedSetting, "checkedSetting"); checkedSetting.setChecked(i3 == i2); - if (!z2 || checkedSetting.getId() != 2131364671) { + if (!z2 || checkedSetting.getId() != 2131364674) { checkedSetting.h(null, false); } else { - checkedSetting.h(b.j(this, 2131889591, new Object[0], null, 4), false); + checkedSetting.h(b.j(this, 2131889601, new Object[0], null, 4), false); } checkedSetting.setOnCheckedListener(new WidgetServerSettingsOverview$configureRadios$$inlined$forEachIndexed$lambda$1(i3, this, i2, z2, i)); i3 = i4; @@ -670,11 +670,11 @@ public final class WidgetServerSettingsOverview extends AppFragment { getBinding().k.e.setBackgroundResource(2131231016); TextView textView2 = getBinding().k.h; m.checkNotNullExpressionValue(textView2, "binding.uploadSplash.uploadSplashUnlock"); - b.n(textView2, 2131889778, new Object[]{"1"}, null, 4); + b.n(textView2, 2131889789, new Object[]{"1"}, null, 4); TextView textView3 = getBinding().k.h; m.checkNotNullExpressionValue(textView3, "binding.uploadSplash.uploadSplashUnlock"); - DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231812, 0, 0, 13, (Object) null); - getBinding().k.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100427)); + DrawableCompat.setCompoundDrawablesCompat$default(textView3, 0, 2131231815, 0, 0, 13, (Object) null); + getBinding().k.h.setTextColor(ColorCompat.getColor(requireContext(), 2131100428)); TextView textView4 = getBinding().k.h; m.checkNotNullExpressionValue(textView4, "binding.uploadSplash.uploadSplashUnlock"); String splash = guild.getSplash(); @@ -694,7 +694,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { } TextView textView5 = getBinding().k.g; m.checkNotNullExpressionValue(textView5, "binding.uploadSplash.uploadSplashNitroTier"); - b.m(textView5, 2131889779, new Object[]{"1", "tierInfo"}, new WidgetServerSettingsOverview$configureSplashSection$1(guild)); + b.m(textView5, 2131889790, new Object[]{"1", "tierInfo"}, new WidgetServerSettingsOverview$configureSplashSection$1(guild)); TextView textView6 = getBinding().k.g; m.checkNotNullExpressionValue(textView6, "binding.uploadSplash.uploadSplashNitroTier"); textView6.setVisibility(0); @@ -704,13 +704,13 @@ public final class WidgetServerSettingsOverview extends AppFragment { int premiumSubscriptionCount = 2 - guild.getPremiumSubscriptionCount(); Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755159, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755160, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount)); TextView textView7 = getBinding().k.h; m.checkNotNullExpressionValue(textView7, "binding.uploadSplash.uploadSplashUnlock"); - ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889777, new Object[]{quantityString}, null, 4)); + ViewExtensions.setTextAndVisibilityBy(textView7, b.j(this, 2131889788, new Object[]{quantityString}, null, 4)); TextView textView8 = getBinding().k.h; m.checkNotNullExpressionValue(textView8, "binding.uploadSplash.uploadSplashUnlock"); - DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231811, 0, 0, 13, (Object) null); + DrawableCompat.setCompoundDrawablesCompat$default(textView8, 0, 2131231814, 0, 0, 13, (Object) null); getBinding().k.h.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130969877)); getBinding().k.e.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130969890)); getBinding().k.g.setOnClickListener(new WidgetServerSettingsOverview$configureSplashSection$2(guild)); @@ -719,7 +719,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { private final void configureSystemChannel(Channel channel) { TextView textView = getBinding().i.b; m.checkNotNullExpressionValue(textView, "binding.systemChannel.systemChannel"); - configureChannel(textView, channel, 2131891388, 2131231484); + configureChannel(textView, channel, 2131891421, 2131231484); } private final void configureUI(Model model) { @@ -733,10 +733,10 @@ public final class WidgetServerSettingsOverview extends AppFragment { } boolean z2 = false; configureIcon(model.getGuild().getShortName(), IconUtils.getForGuild$default(model.getGuild(), null, true, null, 10, null), null, false); - TextInputLayout textInputLayout = getBinding().f1893c.f167c; + TextInputLayout textInputLayout = getBinding().f1895c.f167c; m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName"); StatefulViews statefulViews = this.state; - TextInputLayout textInputLayout2 = getBinding().f1893c.f167c; + TextInputLayout textInputLayout2 = getBinding().f1895c.f167c; m.checkNotNullExpressionValue(textInputLayout2, "binding.header.overviewName"); ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), model.getGuild().getName())); getBinding().e.d.setOnClickListener(new WidgetServerSettingsOverview$configureUI$1(this, model)); @@ -757,7 +757,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { m.checkNotNullExpressionValue(textView2, "binding.region.overviewRegion"); CharSequence charSequence = (String) statefulViews3.get(textView2.getId(), model.getVoiceRegion()); if (charSequence == null) { - charSequence = b.j(this, 2131893142, new Object[0], null, 4); + charSequence = b.j(this, 2131893184, new Object[0], null, 4); } textView.setText(charSequence); LinearLayout linearLayout4 = getBinding().f.f182c; @@ -768,7 +768,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { linearLayout4.setVisibility(i); LinkifiedTextView linkifiedTextView = getBinding().f.b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.regionHelp.guildRegionHelp"); - b.n(linkifiedTextView, 2131889332, new Object[]{f.a.a(360060570993L, null)}, null, 4); + b.n(linkifiedTextView, 2131889342, new Object[]{f.a.a(360060570993L, null)}, null, 4); int voiceRegionIconResourceId = IconUtils.INSTANCE.getVoiceRegionIconResourceId(model.getGuild().getRegion()); StatefulViews statefulViews4 = this.state; ImageView imageView = getBinding().e.f176c; @@ -844,7 +844,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { AppFragment.hideKeyboard$default(this, null, 1, null); getBinding().h.fullScroll(33); configureUI(model); - o.i(this, 2131893144, 0, 4); + o.i(this, 2131893186, 0, 4); } public static final void create(Context context, long j, boolean z2) { @@ -898,7 +898,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { this.state.setupUnsavedChangesConfirmation(this); StatefulViews statefulViews = this.state; FloatingActionButton floatingActionButton = getBinding().g; - TextInputLayout textInputLayout = getBinding().f1893c.f167c; + TextInputLayout textInputLayout = getBinding().f1895c.f167c; m.checkNotNullExpressionValue(textInputLayout, "binding.header.overviewName"); TextView textView = getBinding().e.b; m.checkNotNullExpressionValue(textView, "binding.region.overviewRegion"); @@ -911,16 +911,16 @@ public final class WidgetServerSettingsOverview extends AppFragment { TextView textView4 = getBinding().i.b; m.checkNotNullExpressionValue(textView4, "binding.systemChannel.systemChannel"); statefulViews2.addOptionalFields(textView3, textView4); - TextView textView5 = getBinding().f1893c.b; + TextView textView5 = getBinding().f1895c.b; m.checkNotNullExpressionValue(textView5, "binding.header.iconLabel"); - b.n(textView5, 2131891174, new Object[]{"128", "128"}, null, 4); + b.n(textView5, 2131891205, new Object[]{"128", "128"}, null, 4); LinkifiedTextView linkifiedTextView = getBinding().k.f; m.checkNotNullExpressionValue(linkifiedTextView, "binding.uploadSplash.uploadSplashLearnMore"); f fVar = f.a; - b.n(linkifiedTextView, 2131889878, new Object[]{fVar.a(360028716472L, null)}, null, 4); + b.n(linkifiedTextView, 2131889889, new Object[]{fVar.a(360028716472L, null)}, null, 4); LinkifiedTextView linkifiedTextView2 = getBinding().j.f; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.uploadBanner.uploadBannerLearnMore"); - b.n(linkifiedTextView2, 2131889552, new Object[]{fVar.a(360028716472L, null)}, null, 4); + b.n(linkifiedTextView2, 2131889562, new Object[]{fVar.a(360028716472L, null)}, null, 4); getBinding().g.hide(); WidgetChannelSelector.Companion companion = WidgetChannelSelector.Companion; companion.registerForResult(this, "REQUEST_KEY_AFK_CHANNEL", true, new WidgetServerSettingsOverview$onViewBound$1(this)); @@ -930,7 +930,7 @@ public final class WidgetServerSettingsOverview extends AppFragment { @Override // com.discord.app.AppFragment public void onViewBoundOrOnResume() { super.onViewBoundOrOnResume(); - setActionBarTitle(2131891718); + setActionBarTitle(2131891755); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(getMostRecentIntent().getLongExtra("INTENT_EXTRA_GUILD_ID", -1)), this, null, 2, null), WidgetServerSettingsOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsOverview$onViewBoundOrOnResume$1(this), 62, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java index 7356ec28c3..115c7d6df7 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$binding$2.java @@ -22,11 +22,11 @@ public final /* synthetic */ class WidgetServerSettingsRolesList$binding$2 exten int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364498; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364498); + i = 2131364501; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364501); if (floatingActionButton != null) { - i = 2131364688; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364688); + i = 2131364691; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364691); if (recyclerView != null) { return new WidgetServerSettingsRolesListBinding((CoordinatorLayout) view, dimmerView, floatingActionButton, recyclerView); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java index 8e83edfca9..fd021c84a8 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList$processRoleDrop$1.java @@ -22,6 +22,6 @@ public final class WidgetServerSettingsRolesList$processRoleDrop$1 extends o imp } public final void invoke(Void r4) { - c.a.d.o.i(this.this$0, 2131892693, 0, 4); + c.a.d.o.i(this.this$0, 2131892735, 0, 4); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java index c796dd9802..6bea3a9acb 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesList.java @@ -217,7 +217,7 @@ public final class WidgetServerSettingsRolesList extends AppFragment { } public WidgetServerSettingsRolesList() { - super(2131559176); + super(2131559177); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsRolesList widgetServerSettingsRolesList, Model model) { @@ -245,19 +245,19 @@ public final class WidgetServerSettingsRolesList extends AppFragment { } return; } - setActionBarTitle(2131892867); + setActionBarTitle(2131892909); setActionBarSubtitle(model.getGuildName()); WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter = this.adapter; if (widgetServerSettingsRolesListAdapter != null) { widgetServerSettingsRolesListAdapter.configure(model.getRoleItems(), new WidgetServerSettingsRolesList$configureUI$1(this, model), new WidgetServerSettingsRolesList$configureUI$2(this, model)); } if (!model.getCanManageRoles() || !model.getElevated()) { - getBinding().f1896c.hide(); - getBinding().f1896c.setOnClickListener(null); + getBinding().f1898c.hide(); + getBinding().f1898c.setOnClickListener(null); return; } - getBinding().f1896c.setOnClickListener(new WidgetServerSettingsRolesList$configureUI$3(this, model)); - getBinding().f1896c.show(); + getBinding().f1898c.setOnClickListener(new WidgetServerSettingsRolesList$configureUI$3(this, model)); + getBinding().f1898c.show(); } private final void createRole(long j, Model model) { diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java index 248b64f827..ca086519f1 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$2.java @@ -23,6 +23,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - c.a.d.o.g(view.getContext(), 2131888630, 0, null, 12); + c.a.d.o.g(view.getContext(), 2131888640, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java index 1fabc3a3ed..27176307cd 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$3.java @@ -23,6 +23,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - c.a.d.o.g(view.getContext(), 2131890125, 0, null, 12); + c.a.d.o.g(view.getContext(), 2131890138, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java index 42afa3f9b5..54d8281b7d 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure$4.java @@ -23,6 +23,6 @@ public final class WidgetServerSettingsRolesListAdapter$RoleListItem$onConfigure public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - c.a.d.o.g(view.getContext(), 2131893971, 0, null, 12); + c.a.d.o.g(view.getContext(), 2131894010, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java index 8960a8dc03..be96fee923 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter.java @@ -281,7 +281,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public RoleListHelpItem(WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter) { - super(2131559161, widgetServerSettingsRolesListAdapter); + super(2131559162, widgetServerSettingsRolesListAdapter); m.checkNotNullParameter(widgetServerSettingsRolesListAdapter, "adapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -301,7 +301,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt super.onConfigure(i, (int) payload); LinkifiedTextView linkifiedTextView = this.binding.b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.serverSettingsHelpItem"); - c.a.l.b.m(linkifiedTextView, 2131890129, new Object[0], new WidgetServerSettingsRolesListAdapter$RoleListHelpItem$onConfigure$1(payload)); + c.a.l.b.m(linkifiedTextView, 2131890142, new Object[0], new WidgetServerSettingsRolesListAdapter$RoleListHelpItem$onConfigure$1(payload)); } @Override // com.discord.utilities.mg_recycler.DragAndDropHelper.DraggableViewHolder @@ -316,23 +316,23 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public RoleListItem(WidgetServerSettingsRolesListAdapter widgetServerSettingsRolesListAdapter) { - super(2131559175, widgetServerSettingsRolesListAdapter); + super(2131559176, widgetServerSettingsRolesListAdapter); m.checkNotNullParameter(widgetServerSettingsRolesListAdapter, "adapter"); View view = this.itemView; - int i = 2131364682; - View findViewById = view.findViewById(2131364682); + int i = 2131364685; + View findViewById = view.findViewById(2131364685); if (findViewById != null) { - i = 2131364683; - View findViewById2 = view.findViewById(2131364683); + i = 2131364686; + View findViewById2 = view.findViewById(2131364686); if (findViewById2 != null) { - i = 2131364684; - View findViewById3 = view.findViewById(2131364684); + i = 2131364687; + View findViewById3 = view.findViewById(2131364687); if (findViewById3 != null) { - i = 2131364685; - ImageView imageView = (ImageView) view.findViewById(2131364685); + i = 2131364688; + ImageView imageView = (ImageView) view.findViewById(2131364688); if (imageView != null) { - i = 2131364686; - TextView textView = (TextView) view.findViewById(2131364686); + i = 2131364689; + TextView textView = (TextView) view.findViewById(2131364689); if (textView != null) { WidgetServerSettingsRoleItemBinding widgetServerSettingsRoleItemBinding = new WidgetServerSettingsRoleItemBinding((RelativeLayout) view, findViewById, findViewById2, findViewById3, imageView, textView); m.checkNotNullExpressionValue(widgetServerSettingsRoleItemBinding, "WidgetServerSettingsRoleItemBinding.bind(itemView)"); @@ -386,7 +386,7 @@ public final class WidgetServerSettingsRolesListAdapter extends DragAndDropAdapt } else { this.binding.a.setOnLongClickListener(null); } - ImageView imageView = this.binding.f1895c; + ImageView imageView = this.binding.f1897c; m.checkNotNullExpressionValue(imageView, "binding.serverSettingsRoleItemLockIndicator"); imageView.setVisibility(roleItem.getLocked() ? 0 : 8); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java index e4486a3e3b..4f3db26b09 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog$binding$2.java @@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsSecurity$ToggleMfaDialog$ public final WidgetServerSettingsSecurityDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364027; - TextView textView = (TextView) view.findViewById(2131364027); + int i = 2131364029; + TextView textView = (TextView) view.findViewById(2131364029); if (textView != null) { - i = 2131364694; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364694); + i = 2131364697; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364697); if (materialButton != null) { - i = 2131364695; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364695); + i = 2131364698; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364698); if (materialButton2 != null) { - i = 2131364697; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364697); + i = 2131364700; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364700); if (textInputLayout != null) { return new WidgetServerSettingsSecurityDialogBinding((LinearLayout) view, textView, materialButton, materialButton2, textInputLayout); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java index dc6668ccb6..199ce34bc3 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity$binding$2.java @@ -18,14 +18,14 @@ public final /* synthetic */ class WidgetServerSettingsSecurity$binding$2 extend public final WidgetServerSettingsSecurityBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363915; - TextView textView = (TextView) view.findViewById(2131363915); + int i = 2131363917; + TextView textView = (TextView) view.findViewById(2131363917); if (textView != null) { - i = 2131364696; - TextView textView2 = (TextView) view.findViewById(2131364696); + i = 2131364699; + TextView textView2 = (TextView) view.findViewById(2131364699); if (textView2 != null) { - i = 2131364698; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364698); + i = 2131364701; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364701); if (materialButton != null) { return new WidgetServerSettingsSecurityBinding((CoordinatorLayout) view, textView, textView2, materialButton); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java index 99181f4074..5e18c748ea 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsSecurity.java @@ -199,7 +199,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment { } public ToggleMfaDialog() { - super(2131559178); + super(2131559179); } public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(ToggleMfaDialog toggleMfaDialog) { @@ -226,15 +226,15 @@ public final class WidgetServerSettingsSecurity extends AppFragment { if (j <= 0) { dismiss(); } - getBinding().f1898c.setText(z2 ? 2131888113 : 2131888314); - MaterialButton materialButton = getBinding().f1898c; + getBinding().f1900c.setText(z2 ? 2131888123 : 2131888324); + MaterialButton materialButton = getBinding().f1900c; m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityDialogConfirm"); WidgetServerSettingsSecurityDialogBinding binding = getBinding(); m.checkNotNullExpressionValue(binding, "binding"); LinearLayout linearLayout = binding.a; m.checkNotNullExpressionValue(linearLayout, "binding.root"); materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(linearLayout.getContext(), z2 ? 2131100324 : 2131100249))); - getBinding().f1898c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j)); + getBinding().f1900c.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$1(this, z2, j)); getBinding().b.setOnClickListener(new WidgetServerSettingsSecurity$ToggleMfaDialog$configure$2(this)); } @@ -253,7 +253,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment { } public WidgetServerSettingsSecurity() { - super(2131559177); + super(2131559178); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsSecurity widgetServerSettingsSecurity, Model model) { @@ -273,16 +273,16 @@ public final class WidgetServerSettingsSecurity extends AppFragment { } return; } - setActionBarTitle(2131893087); + setActionBarTitle(2131893129); setActionBarSubtitle(model.getGuildName()); if (model.isMfaEnabled()) { - getBinding().f1897c.setText(2131889342); - MaterialButton materialButton = getBinding().f1897c; + getBinding().f1899c.setText(2131889352); + MaterialButton materialButton = getBinding().f1899c; m.checkNotNullExpressionValue(materialButton, "binding.serverSettingsSecurityToggleMfaButton"); materialButton.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100324))); } else { - getBinding().f1897c.setText(2131889343); - MaterialButton materialButton2 = getBinding().f1897c; + getBinding().f1899c.setText(2131889353); + MaterialButton materialButton2 = getBinding().f1899c; m.checkNotNullExpressionValue(materialButton2, "binding.serverSettingsSecurityToggleMfaButton"); materialButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100249))); } @@ -290,7 +290,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment { if (findFragmentByTag != null) { ((ToggleMfaDialog) findFragmentByTag).configure(model.getGuildId(), model.isMfaEnabled()); } - getBinding().f1897c.setOnClickListener(new WidgetServerSettingsSecurity$configureUI$1(this, model)); + getBinding().f1899c.setOnClickListener(new WidgetServerSettingsSecurity$configureUI$1(this, model)); } private final WidgetServerSettingsSecurityBinding getBinding() { @@ -312,7 +312,7 @@ public final class WidgetServerSettingsSecurity extends AppFragment { } TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.mfaDescriptionText"); - c.a.l.b.n(textView, 2131889337, new Object[0], null, 4); + c.a.l.b.n(textView, 2131889347, new Object[0], null, 4); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java index 1e903fceb7..2804070b3f 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership$binding$2.java @@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetServerSettingsTransferOwnership$binding public final WidgetGuildTransferOwnershipBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363454; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363454); + int i = 2131363456; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131363456); if (checkedSetting != null) { - i = 2131363455; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363455); + i = 2131363457; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363457); if (materialButton != null) { - i = 2131363456; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363456); + i = 2131363458; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363458); if (materialButton2 != null) { - i = 2131363457; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363457); + i = 2131363459; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363459); if (textInputLayout != null) { - i = 2131363458; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363458); + i = 2131363460; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363460); if (linearLayout != null) { return new WidgetGuildTransferOwnershipBinding((LinearLayout) view, checkedSetting, materialButton, materialButton2, textInputLayout, linearLayout); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java index a16d3297b5..7195f122d1 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java @@ -192,7 +192,7 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog { } public WidgetServerSettingsTransferOwnership() { - super(2131559046); + super(2131559047); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsTransferOwnership widgetServerSettingsTransferOwnership, Model model) { @@ -219,13 +219,13 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog { LinearLayout linearLayout = getBinding().f; m.checkNotNullExpressionValue(linearLayout, "binding.guildTransferOwnershipMfaWrap"); linearLayout.setVisibility(model.isMfaEnabled() ? 0 : 8); - getBinding().f1809c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this)); + getBinding().f1811c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this)); MaterialButton materialButton = getBinding().d; m.checkNotNullExpressionValue(materialButton, "binding.guildTransferOwnershipConfirm"); CheckedSetting checkedSetting = getBinding().b; m.checkNotNullExpressionValue(checkedSetting, "binding.guildTransferOwnershipAcknowledgeCheck"); materialButton.setEnabled(checkedSetting.isChecked()); - getBinding().b.setText(b.j(this, 2131893922, new Object[]{model.getUser().getUsername()}, null, 4)); + getBinding().b.setText(b.j(this, 2131893961, new Object[]{model.getUser().getUsername()}, null, 4)); getBinding().b.e(new WidgetServerSettingsTransferOwnership$configureUI$2(this)); getBinding().d.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$3(this, model)); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java index 3b9c4a7fa4..fa0d60e338 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl$binding$2.java @@ -21,32 +21,32 @@ public final /* synthetic */ class WidgetServerSettingsVanityUrl$binding$2 exten public final WidgetServerSettingsVanityUrlBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364702; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364702); + int i = 2131364705; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364705); if (textInputLayout != null) { - i = 2131364703; - TextView textView = (TextView) view.findViewById(2131364703); + i = 2131364706; + TextView textView = (TextView) view.findViewById(2131364706); if (textView != null) { - i = 2131364704; - TextView textView2 = (TextView) view.findViewById(2131364704); + i = 2131364707; + TextView textView2 = (TextView) view.findViewById(2131364707); if (textView2 != null) { - i = 2131364705; - TextView textView3 = (TextView) view.findViewById(2131364705); + i = 2131364708; + TextView textView3 = (TextView) view.findViewById(2131364708); if (textView3 != null) { - i = 2131364706; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364706); + i = 2131364709; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364709); if (relativeLayout != null) { - i = 2131364707; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131364707); + i = 2131364710; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131364710); if (progressBar != null) { - i = 2131364708; - TextView textView4 = (TextView) view.findViewById(2131364708); + i = 2131364711; + TextView textView4 = (TextView) view.findViewById(2131364711); if (textView4 != null) { - i = 2131364709; - TextView textView5 = (TextView) view.findViewById(2131364709); + i = 2131364712; + TextView textView5 = (TextView) view.findViewById(2131364712); if (textView5 != null) { - i = 2131364710; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364710); + i = 2131364713; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364713); if (floatingActionButton != null) { return new WidgetServerSettingsVanityUrlBinding((CoordinatorLayout) view, textInputLayout, textView, textView2, textView3, relativeLayout, progressBar, textView4, textView5, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java index ccb44f1d5b..498c0a495c 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.java @@ -41,7 +41,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment { private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsVanityUrl$binding$2.INSTANCE, null, 2, null); private final Lazy guildId$delegate = g.lazy(new WidgetServerSettingsVanityUrl$guildId$2(this)); - private final StatefulViews state = new StatefulViews(2131364702); + private final StatefulViews state = new StatefulViews(2131364705); /* compiled from: WidgetServerSettingsVanityUrl.kt */ public static final class Companion { @@ -197,7 +197,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment { } public WidgetServerSettingsVanityUrl() { - super(2131559179); + super(2131559180); } public static final /* synthetic */ void access$configureInviteCode(WidgetServerSettingsVanityUrl widgetServerSettingsVanityUrl, String str, int i) { @@ -247,12 +247,12 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment { if (str != null) { if (str.length() > 0) { String u = a.u("https://discord.gg/", str); - TextView textView = getBinding().f1899c; + TextView textView = getBinding().f1901c; m.checkNotNullExpressionValue(textView, "binding.serverSettingsVanityUrlCurrentUrl"); - c.a.l.b.n(textView, 2131894374, new Object[]{u}, null, 4); + c.a.l.b.n(textView, 2131894421, new Object[]{u}, null, 4); } } - TextView textView2 = getBinding().f1899c; + TextView textView2 = getBinding().f1901c; m.checkNotNullExpressionValue(textView2, "binding.serverSettingsVanityUrlCurrentUrl"); if (str != null) { if (str.length() > 0) { @@ -269,13 +269,13 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment { } textView3.setVisibility(i2); if (str != null) { - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755354, i, Integer.valueOf(i)); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755355, i, Integer.valueOf(i)); TextView textView4 = getBinding().e; m.checkNotNullExpressionValue(textView4, "binding.serverSettingsVanityUrlHeader"); - c.a.l.b.n(textView4, 2131894371, new Object[]{i18nPluralString}, null, 4); + c.a.l.b.n(textView4, 2131894418, new Object[]{i18nPluralString}, null, 4); return; } - getBinding().e.setText(2131894370); + getBinding().e.setText(2131894417); return; } } @@ -312,7 +312,7 @@ public final class WidgetServerSettingsVanityUrl extends AppFragment { return; } showLoadingUI(false); - setActionBarTitle(2131894370); + setActionBarTitle(2131894417); setActionBarSubtitle(model.getGuildName()); configureInviteCode(model.getVanityUrl(), model.getVanityUrlUses()); this.state.configureSaveActionView(getBinding().j); diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java index cdb4242713..e79c765e3d 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.java @@ -199,7 +199,7 @@ public final class WidgetServerSettingsAuditLog$Model$Companion$get$1 implements Acti public final boolean onMenuItemClick(MenuItem menuItem) { m.checkNotNullExpressionValue(menuItem, "it"); switch (menuItem.getItemId()) { - case 2131363857: + case 2131363860: WidgetServerSettingsAuditLogFilterSheet.Companion.show(a.T(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1); break; - case 2131363858: + case 2131363861: WidgetServerSettingsAuditLogFilterSheet.Companion.show(a.T(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0); break; } @@ -62,7 +62,7 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1 implements Acti public final void call(Menu menu) { View actionView; - MenuItem findItem = menu.findItem(2131363885); + MenuItem findItem = menu.findItem(2131363887); if (findItem != null && (actionView = findItem.getActionView()) != null) { actionView.setOnClickListener(new AnonymousClass1(this)); } diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java index e85e89b3a4..a0ffbf8ce3 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.java @@ -161,7 +161,7 @@ public final class WidgetServerSettingsAuditLog extends AppFragment { } public WidgetServerSettingsAuditLog() { - super(2131559136); + super(2131559137); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsAuditLog widgetServerSettingsAuditLog, Model model) { @@ -234,18 +234,18 @@ public final class WidgetServerSettingsAuditLog extends AppFragment { long longExtra = getMostRecentIntent().getLongExtra("GUILD_ID", -1); this.guildId = longExtra; if (longExtra == -1) { - o.g(getContext(), 2131887892, 0, null, 12); + o.g(getContext(), 2131887894, 0, null, 12); AppActivity appActivity = getAppActivity(); if (appActivity != null) { appActivity.finish(); } } - setActionBarTitle(2131889723); + setActionBarTitle(2131889734); setActionBarSubtitle(getMostRecentIntent().getStringExtra("GUILD_NAME")); setActionBarOptionsMenu(2131623953, null, new WidgetServerSettingsAuditLog$onViewBound$1(this)); - getBinding().f1863c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2()); + getBinding().f1865c.addOnScrollListener(new WidgetServerSettingsAuditLog$onViewBound$2()); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1863c; + RecyclerView recyclerView = getBinding().f1865c; m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsAuditLogsRecycler"); this.adapter = (WidgetServerSettingsAuditLogAdapter) companion.configure(new WidgetServerSettingsAuditLogAdapter(recyclerView)); getBinding().d.setOnClickListener(new WidgetServerSettingsAuditLog$onViewBound$3(this)); diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java index 17de371c1d..20672b33d1 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogAdapter.java @@ -99,7 +99,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AuditLogEntryViewHolder(WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter) { - super(2131559139, widgetServerSettingsAuditLogAdapter); + super(2131559140, widgetServerSettingsAuditLogAdapter); m.checkNotNullParameter(widgetServerSettingsAuditLogAdapter, "adapter"); View view = this.itemView; int i = 2131362004; @@ -179,11 +179,11 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter TextView textView3 = this.binding.e; m.checkNotNullExpressionValue(textView3, "binding.auditLogListitemChangeText"); textView3.setVisibility(auditLogEntryItem.isSelected() && auditLogEntryItem.getHasChangesToRender() ? 0 : 8); - ImageView imageView3 = this.binding.f1866c; + ImageView imageView3 = this.binding.f1868c; m.checkNotNullExpressionValue(imageView3, "binding.auditLogListitemArrow"); imageView3.setVisibility(auditLogEntryItem.getHasChangesToRender() ? 0 : 4); if (!auditLogEntryItem.isSelected() || !auditLogEntryItem.getHasChangesToRender()) { - this.binding.f1866c.setImageResource(2131231514); + this.binding.f1868c.setImageResource(2131231514); RelativeLayout relativeLayout = this.binding.i; View view2 = this.itemView; m.checkNotNullExpressionValue(view2, "itemView"); @@ -192,7 +192,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter TextView textView4 = this.binding.e; m.checkNotNullExpressionValue(textView4, "binding.auditLogListitemChangeText"); textView4.setText(auditLogEntryItem.getChangeText()); - this.binding.f1866c.setImageResource(2131231510); + this.binding.f1868c.setImageResource(2131231510); RelativeLayout relativeLayout2 = this.binding.i; View view3 = this.itemView; m.checkNotNullExpressionValue(view3, "itemView"); @@ -226,7 +226,7 @@ public final class WidgetServerSettingsAuditLogAdapter extends MGRecyclerAdapter public static final class AuditLogLoadingViewHolder extends MGRecyclerViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AuditLogLoadingViewHolder(WidgetServerSettingsAuditLogAdapter widgetServerSettingsAuditLogAdapter) { - super(2131559140, widgetServerSettingsAuditLogAdapter); + super(2131559141, widgetServerSettingsAuditLogAdapter); m.checkNotNullParameter(widgetServerSettingsAuditLogAdapter, "adapter"); } } diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java index 733596b602..0ea58d4531 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter.java @@ -77,7 +77,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AuditLogFilterActionViewHolder(WidgetServerSettingsAuditLogFilterAdapter widgetServerSettingsAuditLogFilterAdapter) { - super(2131559137, widgetServerSettingsAuditLogFilterAdapter); + super(2131559138, widgetServerSettingsAuditLogFilterAdapter); m.checkNotNullParameter(widgetServerSettingsAuditLogFilterAdapter, "adapter"); View view = this.itemView; int i = 2131361997; @@ -116,7 +116,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); imageView.setImageResource(auditLogUtils.getTargetTypeImage(view, auditLogActionFilterItem.getActionId())); - this.binding.f1864c.setImageResource(auditLogUtils.getActionTypeImage(auditLogActionFilterItem.getActionId())); + this.binding.f1866c.setImageResource(auditLogUtils.getActionTypeImage(auditLogActionFilterItem.getActionId())); this.binding.b.setText(auditLogActionFilterItem.getText()); CheckedSetting checkedSetting = this.binding.b; m.checkNotNullExpressionValue(checkedSetting, "binding.auditLogFilterCs"); @@ -131,7 +131,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AuditLogFilterUserViewHolder(WidgetServerSettingsAuditLogFilterAdapter widgetServerSettingsAuditLogFilterAdapter) { - super(2131559138, widgetServerSettingsAuditLogFilterAdapter); + super(2131559139, widgetServerSettingsAuditLogFilterAdapter); m.checkNotNullParameter(widgetServerSettingsAuditLogFilterAdapter, "adapter"); View view = this.itemView; int i = 2131361996; @@ -187,7 +187,7 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA ImageView imageView2 = this.binding.d; View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231731); + Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131231734); if (drawable != null) { ImageView imageView3 = this.binding.d; m.checkNotNullExpressionValue(imageView3, "binding.auditLogFilterImage"); @@ -197,11 +197,11 @@ public final class WidgetServerSettingsAuditLogFilterAdapter extends MGRecyclerA } imageView2.setImageDrawable(drawable); } - this.binding.f1865c.setText(auditLogUserFilterItem.getText()); - CheckedSetting checkedSetting = this.binding.f1865c; + this.binding.f1867c.setText(auditLogUserFilterItem.getText()); + CheckedSetting checkedSetting = this.binding.f1867c; m.checkNotNullExpressionValue(checkedSetting, "binding.auditLogFilterCs"); checkedSetting.setChecked(auditLogUserFilterItem.isChecked()); - this.binding.f1865c.setOnCheckedListener(new WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$2(this, auditLogUserFilterItem)); + this.binding.f1867c.setOnCheckedListener(new WidgetServerSettingsAuditLogFilterAdapter$AuditLogFilterUserViewHolder$onConfigure$2(this, auditLogUserFilterItem)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java index 0b03ccc136..19d1427340 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.java @@ -97,7 +97,7 @@ public final class WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2 if (this.$filterType == 0) { m.checkNotNullExpressionValue(str, "filterText"); if (t.isBlank(str)) { - String string = this.$context.getString(2131889674); + String string = this.$context.getString(2131889684); m.checkNotNullExpressionValue(string, "context.getString(R.stri…ettings_filter_all_users)"); sequence = u.asSequence(d0.t.m.listOf(new WidgetServerSettingsAuditLogFilterAdapter.AuditLogUserFilterItem("", 0, string, null, auditLogState.getFilter().getUserFilter() == 0))); } else { diff --git a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java index e8c9bc3427..644cd9d22d 100644 --- a/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java +++ b/app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.java @@ -171,16 +171,16 @@ public final class WidgetServerSettingsAuditLogFilterSheet extends AppFragment { super.onViewCreated(view, bundle); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1669c; + RecyclerView recyclerView = getBinding().f1671c; m.checkNotNullExpressionValue(recyclerView, "binding.auditLogFilterRecycler"); this.adapter = (WidgetServerSettingsAuditLogFilterAdapter) companion.configure(new WidgetServerSettingsAuditLogFilterAdapter(recyclerView)); - setActionBarTitle(2131889723); + setActionBarTitle(2131889734); Integer num = this.filterType; - setActionBarSubtitle((num != null && num.intValue() == 0) ? 2131889675 : 2131889671); + setActionBarSubtitle((num != null && num.intValue() == 0) ? 2131889685 : 2131889681); TextInputLayout textInputLayout = getBinding().b; m.checkNotNullExpressionValue(textInputLayout, "binding.auditLogFilterInput"); Integer num2 = this.filterType; - ViewExtensions.setSingleLineHint(textInputLayout, (num2 != null && num2.intValue() == 0) ? 2131893060 : 2131893006); + ViewExtensions.setSingleLineHint(textInputLayout, (num2 != null && num2.intValue() == 0) ? 2131893102 : 2131893048); TextInputLayout textInputLayout2 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout2, "binding.auditLogFilterInput"); ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetServerSettingsAuditLogFilterSheet$onViewCreated$1(this)); diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java index 29cc00e442..cb8dfc4c0e 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java +++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedHeaderIconView.java @@ -60,7 +60,7 @@ public final class CommunityGetStartedHeaderIconView extends CardView { CharSequence text = obtainStyledAttributes.getText(1); obtainStyledAttributes.recycle(); this.binding.b.setImageDrawable(AppCompatResources.getDrawable(getContext(), resourceId)); - TextView textView = this.binding.f1644c; + TextView textView = this.binding.f1646c; m.checkNotNullExpressionValue(textView, "binding.communityGetStartedHeaderIconText"); textView.setText(text); } diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java index cbc7aa3407..7d61ae22ae 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java +++ b/app/src/main/java/com/discord/widgets/servers/community/CommunityGetStartedInformationView.java @@ -80,7 +80,7 @@ public final class CommunityGetStartedInformationView extends CardView { CharSequence text = obtainStyledAttributes.getText(2); CharSequence text2 = obtainStyledAttributes.getText(0); obtainStyledAttributes.recycle(); - this.binding.f1645c.setImageDrawable(AppCompatResources.getDrawable(getContext(), resourceId)); + this.binding.f1647c.setImageDrawable(AppCompatResources.getDrawable(getContext(), resourceId)); TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.communityListAdapterItemTextName"); textView.setText(text); diff --git a/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java b/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java index ef3e67e3d2..e2130c855e 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java +++ b/app/src/main/java/com/discord/widgets/servers/community/CommunitySelectorView.java @@ -28,17 +28,17 @@ public final class CommunitySelectorView extends LinearLayout { super(context, attributeSet, i); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558795, this); - int i2 = 2131364609; - TextView textView = (TextView) findViewById(2131364609); + int i2 = 2131364612; + TextView textView = (TextView) findViewById(2131364612); if (textView != null) { - i2 = 2131364610; - ImageView imageView = (ImageView) findViewById(2131364610); + i2 = 2131364613; + ImageView imageView = (ImageView) findViewById(2131364613); if (imageView != null) { - i2 = 2131364611; - TextView textView2 = (TextView) findViewById(2131364611); + i2 = 2131364614; + TextView textView2 = (TextView) findViewById(2131364614); if (textView2 != null) { - i2 = 2131364612; - TextView textView3 = (TextView) findViewById(2131364612); + i2 = 2131364615; + TextView textView3 = (TextView) findViewById(2131364615); if (textView3 != null) { ViewServerSettingsCommunitySettingSelectorBinding viewServerSettingsCommunitySettingSelectorBinding = new ViewServerSettingsCommunitySettingSelectorBinding(this, textView, imageView, textView2, textView3); m.checkNotNullExpressionValue(viewServerSettingsCommunitySettingSelectorBinding, "ViewServerSettingsCommun…ater.from(context), this)"); @@ -81,7 +81,7 @@ public final class CommunitySelectorView extends LinearLayout { TextView textView4 = this.binding.d; m.checkNotNullExpressionValue(textView4, "binding.serverSettingsCo…tySettingSelectorSubtitle"); textView4.setVisibility(z2 ? 0 : 8); - ImageView imageView = this.binding.f1658c; + ImageView imageView = this.binding.f1660c; m.checkNotNullExpressionValue(imageView, "binding.serverSettingsCo…ttingSelectorDropdownIcon"); if (!z2) { i = 8; diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java index ff274e1a3a..bfb3841d6a 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetConfirmRemoveCommunityDialog.java @@ -44,7 +44,7 @@ public final class WidgetConfirmRemoveCommunityDialog extends AppDialog { } public WidgetConfirmRemoveCommunityDialog() { - super(2131558976); + super(2131558977); } public static final /* synthetic */ Bundle access$getArgumentsOrDefault$p(WidgetConfirmRemoveCommunityDialog widgetConfirmRemoveCommunityDialog) { @@ -67,7 +67,7 @@ public final class WidgetConfirmRemoveCommunityDialog extends AppDialog { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - getBinding().f1754c.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$1(this)); + getBinding().f1756c.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$1(this)); getBinding().b.setOnClickListener(new WidgetConfirmRemoveCommunityDialog$onViewBound$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java index 4da21fbfdd..24244acbd9 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$1.java @@ -25,7 +25,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$1 implemen public final WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig invoke(WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig communityGuildConfig) { m.checkNotNullParameter(communityGuildConfig, "it"); - CheckedSetting checkedSetting = WidgetServerSettingsCommunityFirstStep.access$getBinding$p(this.this$0.this$0).f1875c; + CheckedSetting checkedSetting = WidgetServerSettingsCommunityFirstStep.access$getBinding$p(this.this$0.this$0).f1877c; m.checkNotNullExpressionValue(checkedSetting, "binding.communitySettingsVerifiedEmailedSwitch"); return WidgetServerSettingsEnableCommunityViewModel.CommunityGuildConfig.copy$default(communityGuildConfig, null, null, null, null, false, false, !checkedSetting.isChecked(), false, null, false, null, null, 4031, null); } @@ -42,7 +42,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$1 implemen if (!this.$viewState.getCommunityGuildConfig().getVerificationLevel() || !this.$guildVerificationLevel) { WidgetServerSettingsCommunityFirstStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this)); } else { - c.a.d.o.d(this.this$0.getContext(), 2131888324, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0)); + c.a.d.o.d(this.this$0.getContext(), 2131888334, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0)); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java index b70d1d1a8a..97d1abafda 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep$configureUI$2.java @@ -42,7 +42,7 @@ public final class WidgetServerSettingsCommunityFirstStep$configureUI$2 implemen if (!this.$viewState.getCommunityGuildConfig().getExplicitContentFilter() || !this.$guildExplicitContentFilter) { WidgetServerSettingsCommunityFirstStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this)); } else { - c.a.d.o.d(this.this$0.getContext(), 2131888324, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0)); + c.a.d.o.d(this.this$0.getContext(), 2131888334, 0, WidgetServerSettingsCommunityFirstStep.access$getToastManager$p(this.this$0)); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java index 9edda09021..537ba2adf6 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityFirstStep.java @@ -50,7 +50,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment { } public WidgetServerSettingsCommunityFirstStep() { - super(2131559148); + super(2131559149); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityFirstStep widgetServerSettingsCommunityFirstStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) { @@ -74,7 +74,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment { } private final void configureUI(WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) { - CheckedSetting checkedSetting = getBinding().f1875c; + CheckedSetting checkedSetting = getBinding().f1877c; m.checkNotNullExpressionValue(checkedSetting, "binding.communitySettingsVerifiedEmailedSwitch"); checkedSetting.setChecked(loaded.getCommunityGuildConfig().getVerificationLevel()); CheckedSetting checkedSetting2 = getBinding().b; @@ -86,7 +86,7 @@ public final class WidgetServerSettingsCommunityFirstStep extends AppFragment { if (guild == null || guild.getExplicitContentFilter().compareTo(GuildExplicitContentFilter.NONE) <= 0) { z2 = false; } - getBinding().f1875c.e(new WidgetServerSettingsCommunityFirstStep$configureUI$1(this, loaded, z3)); + getBinding().f1877c.e(new WidgetServerSettingsCommunityFirstStep$configureUI$1(this, loaded, z3)); getBinding().b.e(new WidgetServerSettingsCommunityFirstStep$configureUI$2(this, loaded, z2)); } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java index 5d4c634ea3..9e1a7b2604 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$binding$2.java @@ -24,17 +24,17 @@ public final /* synthetic */ class WidgetServerSettingsCommunityOverview$binding i = 2131362669; CommunitySelectorView communitySelectorView2 = (CommunitySelectorView) view.findViewById(2131362669); if (communitySelectorView2 != null) { - i = 2131364606; - CommunitySelectorView communitySelectorView3 = (CommunitySelectorView) view.findViewById(2131364606); + i = 2131364609; + CommunitySelectorView communitySelectorView3 = (CommunitySelectorView) view.findViewById(2131364609); if (communitySelectorView3 != null) { - i = 2131364608; - ScrollView scrollView = (ScrollView) view.findViewById(2131364608); + i = 2131364611; + ScrollView scrollView = (ScrollView) view.findViewById(2131364611); if (scrollView != null) { - i = 2131364623; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364623); + i = 2131364626; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131364626); if (loadingButton != null) { - i = 2131364624; - CommunitySelectorView communitySelectorView4 = (CommunitySelectorView) view.findViewById(2131364624); + i = 2131364627; + CommunitySelectorView communitySelectorView4 = (CommunitySelectorView) view.findViewById(2131364627); if (communitySelectorView4 != null) { return new WidgetServerSettingsCommunityOverviewBinding((LinearLayout) view, communitySelectorView, communitySelectorView2, communitySelectorView3, scrollView, loadingButton, communitySelectorView4); } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java index 85124b2614..767b5de16a 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2.java @@ -34,9 +34,9 @@ public final class WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$2 m.checkNotNullExpressionValue(requireActivity, "requireActivity()"); companion.create(requireActivity, this.this$0.getGuildId()); } else if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.SaveSuccess.INSTANCE)) { - c.a.d.o.i(this.this$0, 2131893144, 0, 4); + c.a.d.o.i(this.this$0, 2131893186, 0, 4); } else if (m.areEqual(event, WidgetServerSettingsCommunityOverviewViewModel.Event.Error.INSTANCE)) { - c.a.d.o.i(this.this$0, 2131889839, 0, 4); + c.a.d.o.i(this.this$0, 2131889850, 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java index a782c539af..822ad322bf 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityOverview.java @@ -60,7 +60,7 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment { } public WidgetServerSettingsCommunityOverview() { - super(2131559147); + super(2131559148); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityOverview widgetServerSettingsCommunityOverview, WidgetServerSettingsCommunityOverviewViewModel.ViewState viewState) { @@ -88,10 +88,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment { private final void configureValidUI(WidgetServerSettingsCommunityOverviewViewModel.ViewState.Loaded loaded) { String str; getBinding().e.setIsLoading(false); - String string = loaded.getRulesChannel() == null ? requireContext().getString(2131889838) : AnimatableValueParser.A0(loaded.getRulesChannel(), requireContext(), false, 2); + String string = loaded.getRulesChannel() == null ? requireContext().getString(2131889849) : AnimatableValueParser.A0(loaded.getRulesChannel(), requireContext(), false, 2); m.checkNotNullExpressionValue(string, "when (viewState.rulesCha…t(requireContext())\n }"); if (loaded.getUpdatesChannel() == null) { - str = requireContext().getString(2131889838); + str = requireContext().getString(2131889849); } else { Channel updatesChannel = loaded.getUpdatesChannel(); FragmentActivity requireActivity = requireActivity(); @@ -100,10 +100,10 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment { } m.checkNotNullExpressionValue(str, "when (viewState.updatesC…(requireActivity())\n }"); getBinding().b.setSubtitle(string); - getBinding().f1874c.setSubtitle(str); + getBinding().f1876c.setSubtitle(str); getBinding().d.setSubtitle(WidgetSettingsLanguage.Companion.getAsStringInLocale(loaded.getGuild().getPreferredLocale())); getBinding().b.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$1(this, loaded)); - getBinding().f1874c.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$2(this, loaded)); + getBinding().f1876c.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$2(this, loaded)); getBinding().d.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$3(this)); getBinding().e.setOnClickListener(new WidgetServerSettingsCommunityOverview$configureValidUI$4(this, loaded)); } @@ -138,7 +138,7 @@ public final class WidgetServerSettingsCommunityOverview extends AppFragment { public void onViewBoundOrOnResume() { super.onViewBoundOrOnResume(); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131889553); + setActionBarTitle(2131889563); Observable s2 = getViewModel().observeViewState().s(); m.checkNotNullExpressionValue(s2, "viewModel\n .obser… .distinctUntilChanged()"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(s2, this, null, 2, null), WidgetServerSettingsCommunityOverview.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityOverview$onViewBoundOrOnResume$1(this), 62, (Object) null); diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java index 72f9662461..6bd3caeeec 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunitySecondStep.java @@ -49,7 +49,7 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment { } public WidgetServerSettingsCommunitySecondStep() { - super(2131559149); + super(2131559150); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunitySecondStep widgetServerSettingsCommunitySecondStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) { @@ -61,14 +61,14 @@ public final class WidgetServerSettingsCommunitySecondStep extends AppFragment { } private final void configureUI(WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) { - String string = loaded.getCommunityGuildConfig().getRulesChannel() == null ? requireContext().getString(2131888346) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getRulesChannel(), requireContext(), false, 2); + String string = loaded.getCommunityGuildConfig().getRulesChannel() == null ? requireContext().getString(2131888356) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getRulesChannel(), requireContext(), false, 2); m.checkNotNullExpressionValue(string, "when (viewState.communit…t(requireContext())\n }"); - String string2 = loaded.getCommunityGuildConfig().getUpdatesChannel() == null ? requireContext().getString(2131888346) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getUpdatesChannel(), requireContext(), false, 2); + String string2 = loaded.getCommunityGuildConfig().getUpdatesChannel() == null ? requireContext().getString(2131888356) : AnimatableValueParser.A0(loaded.getCommunityGuildConfig().getUpdatesChannel(), requireContext(), false, 2); m.checkNotNullExpressionValue(string2, "when (viewState.communit…t(requireContext())\n }"); getBinding().b.setSubtitle(string); - getBinding().f1876c.setSubtitle(string2); + getBinding().f1878c.setSubtitle(string2); getBinding().b.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$1(this)); - getBinding().f1876c.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$2(this)); + getBinding().f1878c.setOnClickListener(new WidgetServerSettingsCommunitySecondStep$configureUI$2(this)); } public static final void create(Context context) { diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java index f9a1740cfe..40897b9a79 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$1.java @@ -42,7 +42,7 @@ public final class WidgetServerSettingsCommunityThirdStep$configureUI$1 implemen if (!this.$viewState.getCommunityGuildConfig().getDefaultMessageNotifications() || !this.$guildDefaultMessageNotifications) { WidgetServerSettingsCommunityThirdStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this)); } else { - c.a.d.o.d(this.this$0.getContext(), 2131888324, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0)); + c.a.d.o.d(this.this$0.getContext(), 2131888334, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0)); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java index 32ee99c242..3ed6c2958f 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep$configureUI$2.java @@ -42,7 +42,7 @@ public final class WidgetServerSettingsCommunityThirdStep$configureUI$2 implemen if (!this.$viewState.getCommunityGuildConfig().getEveryonePermissions() || !this.$guildEveryonePermissions) { WidgetServerSettingsCommunityThirdStep.access$getViewModel$p(this.this$0).modifyGuildConfig(new AnonymousClass1(this)); } else { - c.a.d.o.d(this.this$0.getContext(), 2131888324, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0)); + c.a.d.o.d(this.this$0.getContext(), 2131888334, 0, WidgetServerSettingsCommunityThirdStep.access$getToastManager$p(this.this$0)); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java index c86d17e10a..acc2e64608 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsCommunityThirdStep.java @@ -53,7 +53,7 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment { } public WidgetServerSettingsCommunityThirdStep() { - super(2131559150); + super(2131559151); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsCommunityThirdStep widgetServerSettingsCommunityThirdStep, WidgetServerSettingsEnableCommunityViewModel.ViewState.Loaded loaded) { @@ -152,12 +152,12 @@ public final class WidgetServerSettingsCommunityThirdStep extends AppFragment { ObservableExtensionsKt.appSubscribe$default(G, WidgetServerSettingsCommunityThirdStep.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$1(this), 62, (Object) null); CheckedSetting checkedSetting = getBinding().e; Context context = getContext(); - checkedSetting.setText(context != null ? b.a(context, 2131888319, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2(this)) : null); + checkedSetting.setText(context != null ? b.a(context, 2131888329, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$2(this)) : null); CheckedSetting checkedSetting2 = getBinding().d; Context context2 = getContext(); - checkedSetting2.setText(context2 != null ? b.a(context2, 2131888322, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3(this)) : null); - LinkifiedTextView linkifiedTextView = getBinding().f1877c; + checkedSetting2.setText(context2 != null ? b.a(context2, 2131888332, new Object[0], new WidgetServerSettingsCommunityThirdStep$onViewBoundOrOnResume$3(this)) : null); + LinkifiedTextView linkifiedTextView = getBinding().f1879c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.communitySettingGuidelines"); - b.n(linkifiedTextView, 2131887481, new Object[]{f.a.a(360035969312L, null)}, null, 4); + b.n(linkifiedTextView, 2131887483, new Object[]{f.a.a(360035969312L, null)}, null, 4); } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java index fd58e273fc..44d38b5577 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunity.java @@ -18,7 +18,7 @@ public final class WidgetServerSettingsEnableCommunity extends AppFragment { private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetServerSettingsEnableCommunityViewModel.class), new WidgetServerSettingsEnableCommunity$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetServerSettingsEnableCommunity$viewModel$2.INSTANCE)); public WidgetServerSettingsEnableCommunity() { - super(2131559160); + super(2131559161); } public static final /* synthetic */ WidgetServerSettingsEnableCommunityViewModel access$getViewModel$p(WidgetServerSettingsEnableCommunity widgetServerSettingsEnableCommunity) { diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java index 2b67659748..a968a1f23b 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResume$3.java @@ -34,7 +34,7 @@ public final class WidgetServerSettingsEnableCommunitySteps$onViewBoundOrOnResum m.checkNotNullExpressionValue(requireActivity, "requireActivity()"); companion.create(requireActivity, this.this$0.getGuildId()); } else if (m.areEqual(event, WidgetServerSettingsEnableCommunityViewModel.Event.Error.INSTANCE)) { - c.a.d.o.i(this.this$0, 2131889839, 0, 4); + c.a.d.o.i(this.this$0, 2131889850, 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java index 9e1de66fe7..478aaa9864 100644 --- a/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java +++ b/app/src/main/java/com/discord/widgets/servers/community/WidgetServerSettingsEnableCommunitySteps.java @@ -52,7 +52,7 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment } public WidgetServerSettingsEnableCommunitySteps() { - super(2131558994); + super(2131558995); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsEnableCommunitySteps widgetServerSettingsEnableCommunitySteps, WidgetServerSettingsEnableCommunityViewModel.ViewState viewState) { @@ -93,7 +93,7 @@ public final class WidgetServerSettingsEnableCommunitySteps extends AppFragment public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - getBinding().b.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetServerSettingsEnableCommunity.class, 0, 0, 0, null, null, null, false, false, false, 126), new StepsView.b.a(WidgetServerSettingsCommunityFirstStep.class, 0, 0, 0, null, null, null, false, false, false, 254), new StepsView.b.a(WidgetServerSettingsCommunitySecondStep.class, 0, 0, 0, null, null, null, false, false, false, 254), new StepsView.b.a(WidgetServerSettingsCommunityThirdStep.class, 0, 0, 2131888315, null, null, new WidgetServerSettingsEnableCommunitySteps$onViewBound$steps$1(this), false, false, false, 182)})), new WidgetServerSettingsEnableCommunitySteps$onViewBound$1(this), new WidgetServerSettingsEnableCommunitySteps$onViewBound$2(this)); + getBinding().b.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetServerSettingsEnableCommunity.class, 0, 0, 0, null, null, null, false, false, false, 126), new StepsView.b.a(WidgetServerSettingsCommunityFirstStep.class, 0, 0, 0, null, null, null, false, false, false, 254), new StepsView.b.a(WidgetServerSettingsCommunitySecondStep.class, 0, 0, 0, null, null, null, false, false, false, 254), new StepsView.b.a(WidgetServerSettingsCommunityThirdStep.class, 0, 0, 2131888325, null, null, new WidgetServerSettingsEnableCommunitySteps$onViewBound$steps$1(this), false, false, false, 182)})), new WidgetServerSettingsEnableCommunitySteps$onViewBound$1(this), new WidgetServerSettingsEnableCommunitySteps$onViewBound$2(this)); AppFragment.setOnBackPressed$default(this, new WidgetServerSettingsEnableCommunitySteps$onViewBound$3(this), 0, 2, null); } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java index f23e0a14ab..678f9f0488 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$binding$2.java @@ -19,23 +19,23 @@ public final /* synthetic */ class MemberVerificationPendingDialog$binding$2 ext public final WidgetMemberVerificationPendingDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363832; - ImageView imageView = (ImageView) view.findViewById(2131363832); + int i = 2131363835; + ImageView imageView = (ImageView) view.findViewById(2131363835); if (imageView != null) { - i = 2131363833; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363833); + i = 2131363836; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363836); if (materialButton != null) { - i = 2131363844; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363844); + i = 2131363847; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363847); if (materialButton2 != null) { - i = 2131363846; - TextView textView = (TextView) view.findViewById(2131363846); + i = 2131363849; + TextView textView = (TextView) view.findViewById(2131363849); if (textView != null) { - i = 2131364187; - TextView textView2 = (TextView) view.findViewById(2131364187); + i = 2131364189; + TextView textView2 = (TextView) view.findViewById(2131364189); if (textView2 != null) { - i = 2131364188; - TextView textView3 = (TextView) view.findViewById(2131364188); + i = 2131364190; + TextView textView3 = (TextView) view.findViewById(2131364190); if (textView3 != null) { return new WidgetMemberVerificationPendingDialogBinding((RelativeLayout) view, imageView, materialButton, materialButton2, textView, textView2, textView3); } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java index dc4311c9a3..335d4f1668 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog$onViewBoundOrOnResume$2.java @@ -26,7 +26,7 @@ public final class MemberVerificationPendingDialog$onViewBoundOrOnResume$2 exten public final void invoke(MemberVerificationPendingViewModel.Event event) { m.checkNotNullParameter(event, "event"); if (!(event instanceof MemberVerificationPendingViewModel.Event.Success) && (event instanceof MemberVerificationPendingViewModel.Event.Error)) { - c.a.d.o.i(this.this$0, 2131889839, 0, 4); + c.a.d.o.i(this.this$0, 2131889850, 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java index 6c8a66a464..96935b4a6b 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java @@ -84,7 +84,7 @@ public final class MemberVerificationPendingDialog extends AppDialog { } public MemberVerificationPendingDialog() { - super(2131559084); + super(2131559085); MemberVerificationPendingDialog$viewModel$2 memberVerificationPendingDialog$viewModel$2 = new MemberVerificationPendingDialog$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(MemberVerificationPendingViewModel.class), new MemberVerificationPendingDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(memberVerificationPendingDialog$viewModel$2)); @@ -110,7 +110,7 @@ public final class MemberVerificationPendingDialog extends AppDialog { } textView.setVisibility(i); int themedColor = loaded.getDialogState().ordinal() != 3 ? ColorCompat.getThemedColor(getContext(), 2130969007) : ColorCompat.getColor(getContext(), 2131100324); - MaterialButton materialButton = getBinding().f1828c; + MaterialButton materialButton = getBinding().f1830c; m.checkNotNullExpressionValue(materialButton, "binding.memberVerificationPrimaryBtn"); materialButton.setBackgroundTintList(ColorStateList.valueOf(themedColor)); int ordinal = loaded.getDialogState().ordinal(); @@ -118,64 +118,64 @@ public final class MemberVerificationPendingDialog extends AppDialog { getBinding().b.setImageResource(2131231529); TextView textView2 = getBinding().g; m.checkNotNullExpressionValue(textView2, "binding.pendingDialogTitle"); - textView2.setText(getString(2131891105)); + textView2.setText(getString(2131891136)); TextView textView3 = getBinding().f; m.checkNotNullExpressionValue(textView3, "binding.pendingDialogDesc"); - textView3.setText(getString(2131891104)); - MaterialButton materialButton2 = getBinding().f1828c; + textView3.setText(getString(2131891135)); + MaterialButton materialButton2 = getBinding().f1830c; m.checkNotNullExpressionValue(materialButton2, "binding.memberVerificationPrimaryBtn"); - materialButton2.setText(getString(2131891103)); + materialButton2.setText(getString(2131891134)); MaterialButton materialButton3 = getBinding().d; m.checkNotNullExpressionValue(materialButton3, "binding.memberVerificationSecondaryBtn"); - materialButton3.setText(getString(2131887177)); - getBinding().f1828c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this)); + materialButton3.setText(getString(2131887178)); + getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$9(this)); } else if (ordinal == 1) { - getBinding().b.setImageResource(2131231730); + getBinding().b.setImageResource(2131231733); TextView textView4 = getBinding().g; m.checkNotNullExpressionValue(textView4, "binding.pendingDialogTitle"); - textView4.setText(getString(2131891069)); + textView4.setText(getString(2131891100)); TextView textView5 = getBinding().f; m.checkNotNullExpressionValue(textView5, "binding.pendingDialogDesc"); - textView5.setText(getString(2131891065)); - MaterialButton materialButton4 = getBinding().f1828c; + textView5.setText(getString(2131891096)); + MaterialButton materialButton4 = getBinding().f1830c; m.checkNotNullExpressionValue(materialButton4, "binding.memberVerificationPrimaryBtn"); - materialButton4.setText(getString(2131891064)); + materialButton4.setText(getString(2131891095)); MaterialButton materialButton5 = getBinding().d; m.checkNotNullExpressionValue(materialButton5, "binding.memberVerificationSecondaryBtn"); - materialButton5.setText(getString(2131891063)); - getBinding().f1828c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this)); + materialButton5.setText(getString(2131891094)); + getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$2(this)); getBinding().e.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$3(this)); } else if (ordinal == 2) { TextView textView6 = getBinding().g; m.checkNotNullExpressionValue(textView6, "binding.pendingDialogTitle"); - textView6.setText(getString(2131891059)); + textView6.setText(getString(2131891090)); TextView textView7 = getBinding().f; m.checkNotNullExpressionValue(textView7, "binding.pendingDialogDesc"); - textView7.setText(getString(2131891061)); - MaterialButton materialButton6 = getBinding().f1828c; + textView7.setText(getString(2131891092)); + MaterialButton materialButton6 = getBinding().f1830c; m.checkNotNullExpressionValue(materialButton6, "binding.memberVerificationPrimaryBtn"); - materialButton6.setText(getString(2131891063)); + materialButton6.setText(getString(2131891094)); MaterialButton materialButton7 = getBinding().d; m.checkNotNullExpressionValue(materialButton7, "binding.memberVerificationSecondaryBtn"); - materialButton7.setText(getString(2131891066)); - getBinding().f1828c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this)); + materialButton7.setText(getString(2131891097)); + getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$5(this)); } else if (ordinal == 3) { TextView textView8 = getBinding().g; m.checkNotNullExpressionValue(textView8, "binding.pendingDialogTitle"); - textView8.setText(getString(2131891062)); + textView8.setText(getString(2131891093)); TextView textView9 = getBinding().f; m.checkNotNullExpressionValue(textView9, "binding.pendingDialogDesc"); - textView9.setText(getString(2131891061)); - MaterialButton materialButton8 = getBinding().f1828c; + textView9.setText(getString(2131891092)); + MaterialButton materialButton8 = getBinding().f1830c; m.checkNotNullExpressionValue(materialButton8, "binding.memberVerificationPrimaryBtn"); - materialButton8.setText(getString(2131891067)); + materialButton8.setText(getString(2131891098)); MaterialButton materialButton9 = getBinding().d; m.checkNotNullExpressionValue(materialButton9, "binding.memberVerificationSecondaryBtn"); - materialButton9.setText(getString(2131891066)); - getBinding().f1828c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this)); + materialButton9.setText(getString(2131891097)); + getBinding().f1830c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$7(this)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java index 99fcb40a8d..9865cfed45 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java @@ -59,7 +59,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ApproveTermsItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559079, memberVerificationRulesAdapter); + super(2131559080, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -90,7 +90,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559080, memberVerificationRulesAdapter); + super(2131559081, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -115,7 +115,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public MultipleChoiceItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559081, memberVerificationRulesAdapter); + super(2131559082, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -134,7 +134,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl for (String str : list) { int indexOf = list.indexOf(str); if (indexOf >= radioGroup.getChildCount()) { - View inflate = LayoutInflater.from(context).inflate(2131559082, (ViewGroup) radioGroup, false); + View inflate = LayoutInflater.from(context).inflate(2131559083, (ViewGroup) radioGroup, false); Objects.requireNonNull(inflate, "rootView"); radioButton = (RadioButton) inflate; m.checkNotNullExpressionValue(new w4(radioButton), "WidgetMemberVerification… false\n )"); @@ -207,10 +207,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ParagraphItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559083, memberVerificationRulesAdapter); + super(2131559084, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363831); + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363834); if (textInputEditText != null) { WidgetMemberVerificationParagraphItemBinding widgetMemberVerificationParagraphItemBinding = new WidgetMemberVerificationParagraphItemBinding((TextInputLayout) view, textInputEditText); m.checkNotNullExpressionValue(widgetMemberVerificationParagraphItemBinding, "WidgetMemberVerification…temBinding.bind(itemView)"); @@ -219,7 +219,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl TextWatcherKt.addBindedTextWatcher(textInputEditText, memberVerificationRulesAdapter.getFragment(), new AnonymousClass1(this, memberVerificationRulesAdapter)); return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363831))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363834))); } public static final /* synthetic */ int access$getFieldIndex$p(ParagraphItemHolder paragraphItemHolder) { @@ -248,7 +248,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public TermHeaderItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559080, memberVerificationRulesAdapter); + super(2131559081, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; Objects.requireNonNull(view, "rootView"); @@ -265,7 +265,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl m.checkNotNullExpressionValue(textView, "binding.memberVerificationRulesHeader"); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); - textView.setText(view.getResources().getString(2131891038)); + textView.setText(view.getResources().getString(2131891069)); } } @@ -275,20 +275,20 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public TermItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559085, memberVerificationRulesAdapter); + super(2131559086, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; - int i = 2131363834; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363834); + int i = 2131363837; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363837); if (linearLayout != null) { - i = 2131363835; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363835); + i = 2131363838; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131363838); if (simpleDraweeSpanTextView != null) { - i = 2131363836; - View findViewById = view.findViewById(2131363836); + i = 2131363839; + View findViewById = view.findViewById(2131363839); if (findViewById != null) { - i = 2131363837; - TextView textView = (TextView) view.findViewById(2131363837); + i = 2131363840; + TextView textView = (TextView) view.findViewById(2131363840); if (textView != null) { RoundedRelativeLayout roundedRelativeLayout = (RoundedRelativeLayout) view; WidgetMemberVerificationRuleItemBinding widgetMemberVerificationRuleItemBinding = new WidgetMemberVerificationRuleItemBinding(roundedRelativeLayout, linearLayout, simpleDraweeSpanTextView, findViewById, textView, roundedRelativeLayout); @@ -319,9 +319,9 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl m.checkNotNullExpressionValue(context, "itemView.context"); String format = StringUtilsKt.format(index, context); int i2 = 0; - textView.setText(b.h(resources, 2131891080, new Object[]{format}, null, 4)); + textView.setText(b.h(resources, 2131891111, new Object[]{format}, null, 4)); this.binding.b.setDraweeSpanStringBuilder(AstRenderer.render(memberVerificationItemTerm.getAst(), new MessageRenderContext(a.T(this.itemView, "itemView", "itemView.context"), 0, memberVerificationItemTerm.getAllowAnimatedEmojis(), null, memberVerificationItemTerm.getChannelNames(), memberVerificationItemTerm.getRoles(), 0, null, null, 0, 0, null, null, null, 16328, null))); - View view3 = this.binding.f1829c; + View view3 = this.binding.f1831c; m.checkNotNullExpressionValue(view3, "binding.memberVerificationRuleDivider"); if (!(!memberVerificationItemTerm.isLastItem())) { i2 = 8; @@ -373,10 +373,10 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public TextInputItemHolder(MemberVerificationRulesAdapter memberVerificationRulesAdapter) { - super(2131559087, memberVerificationRulesAdapter); + super(2131559088, memberVerificationRulesAdapter); m.checkNotNullParameter(memberVerificationRulesAdapter, "adapter"); View view = this.itemView; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363848); + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363851); if (textInputEditText != null) { WidgetMemberVerificationTextInputItemBinding widgetMemberVerificationTextInputItemBinding = new WidgetMemberVerificationTextInputItemBinding((TextInputLayout) view, textInputEditText); m.checkNotNullExpressionValue(widgetMemberVerificationTextInputItemBinding, "WidgetMemberVerification…temBinding.bind(itemView)"); @@ -385,7 +385,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl TextWatcherKt.addBindedTextWatcher(textInputEditText, memberVerificationRulesAdapter.getFragment(), new AnonymousClass1(this, memberVerificationRulesAdapter)); return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363848))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363851))); } public static final /* synthetic */ int access$getFieldIndex$p(TextInputItemHolder textInputItemHolder) { diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java index f2f45a88aa..c127184937 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog$binding$2.java @@ -19,14 +19,14 @@ public final /* synthetic */ class MemberVerificationSuccessDialog$binding$2 ext public final WidgetMemberVerificationSuccessBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363826; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363826); + int i = 2131363829; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363829); if (materialButton != null) { - i = 2131363829; - TextView textView = (TextView) view.findViewById(2131363829); + i = 2131363832; + TextView textView = (TextView) view.findViewById(2131363832); if (textView != null) { - i = 2131363845; - CardView cardView = (CardView) view.findViewById(2131363845); + i = 2131363848; + CardView cardView = (CardView) view.findViewById(2131363848); if (cardView != null) { return new WidgetMemberVerificationSuccessBinding((RelativeLayout) view, materialButton, textView, cardView); } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java index e873b6906e..626211b53f 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java @@ -39,7 +39,7 @@ public final class MemberVerificationSuccessDialog extends AppDialog { } public MemberVerificationSuccessDialog() { - super(2131559086); + super(2131559087); } private final WidgetMemberVerificationSuccessBinding getBinding() { @@ -51,9 +51,9 @@ public final class MemberVerificationSuccessDialog extends AppDialog { m.checkNotNullParameter(view, "view"); super.onViewBound(view); String string = getArgumentsOrDefault().getString("INTENT_EXTRA_GUILD_NAME"); - TextView textView = getBinding().f1830c; + TextView textView = getBinding().f1832c; m.checkNotNullExpressionValue(textView, "binding.memberVerificationGuildName"); - textView.setText(b.j(this, 2131890872, new Object[]{string}, null, 4)); + textView.setText(b.j(this, 2131890902, new Object[]{string}, null, 4)); getBinding().b.setOnClickListener(new MemberVerificationSuccessDialog$onViewBound$1(this)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java index 8cf59e3eaa..c7c19b2b04 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationView.java @@ -31,17 +31,17 @@ public final class MemberVerificationView extends CardView { super(context, attributeSet, i); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558761, this); - int i2 = 2131363849; - TextView textView = (TextView) findViewById(2131363849); + int i2 = 2131363852; + TextView textView = (TextView) findViewById(2131363852); if (textView != null) { - i2 = 2131363850; - MaterialButton materialButton = (MaterialButton) findViewById(2131363850); + i2 = 2131363853; + MaterialButton materialButton = (MaterialButton) findViewById(2131363853); if (materialButton != null) { - i2 = 2131363851; - ImageView imageView = (ImageView) findViewById(2131363851); + i2 = 2131363854; + ImageView imageView = (ImageView) findViewById(2131363854); if (imageView != null) { - i2 = 2131363852; - TextView textView2 = (TextView) findViewById(2131363852); + i2 = 2131363855; + TextView textView2 = (TextView) findViewById(2131363855); if (textView2 != null) { ViewMemberVerificationBinding viewMemberVerificationBinding = new ViewMemberVerificationBinding(this, textView, materialButton, imageView, textView2); m.checkNotNullExpressionValue(viewMemberVerificationBinding, "ViewMemberVerificationBi…ater.from(context), this)"); @@ -71,12 +71,12 @@ public final class MemberVerificationView extends CardView { public final void configure(@DrawableRes int i, @StringRes int i2, boolean z2, Function0 function0) { this.binding.d.setImageResource(i); this.binding.e.setText(i2); - this.binding.f1653c.setOnClickListener(new MemberVerificationView$configure$1(function0)); + this.binding.f1655c.setOnClickListener(new MemberVerificationView$configure$1(function0)); TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.memberVerificationVerifiedCheck"); int i3 = 0; textView.setVisibility(z2 ? 0 : 8); - MaterialButton materialButton = this.binding.f1653c; + MaterialButton materialButton = this.binding.f1655c; m.checkNotNullExpressionValue(materialButton, "binding.memberVerificationVerifyButton"); if (!(!z2)) { i3 = 8; diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java index eaecf0eee7..1e5bc799d4 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$binding$2.java @@ -33,23 +33,23 @@ public final /* synthetic */ class WidgetMemberVerification$binding$2 extends k i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131363825; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363825); + i = 2131363828; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363828); if (simpleDraweeView != null) { - i = 2131363827; - MemberVerificationView memberVerificationView = (MemberVerificationView) view.findViewById(2131363827); + i = 2131363830; + MemberVerificationView memberVerificationView = (MemberVerificationView) view.findViewById(2131363830); if (memberVerificationView != null) { - i = 2131363828; - MemberVerificationAvatarView memberVerificationAvatarView = (MemberVerificationAvatarView) view.findViewById(2131363828); + i = 2131363831; + MemberVerificationAvatarView memberVerificationAvatarView = (MemberVerificationAvatarView) view.findViewById(2131363831); if (memberVerificationAvatarView != null) { - i = 2131363840; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363840); + i = 2131363843; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363843); if (loadingButton != null) { - i = 2131363842; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363842); + i = 2131363845; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363845); if (recyclerView != null) { - i = 2131363843; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363843); + i = 2131363846; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131363846); if (nestedScrollView != null) { return new WidgetMemberVerificationBinding((CoordinatorLayout) view, customAppBarLayout, collapsingToolbarLayout, dimmerView, simpleDraweeView, memberVerificationView, memberVerificationAvatarView, loadingButton, recyclerView, nestedScrollView); } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java index f4d0afb1f7..877c8f9bd1 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification$onViewBoundOrOnResume$2.java @@ -38,7 +38,7 @@ public final class WidgetMemberVerification$onViewBoundOrOnResume$2 extends o im MemberVerificationPendingDialog.Companion.enqueue(success.getGuildId().longValue(), success.getGuildName()); } } else if (event instanceof WidgetMemberVerificationViewModel.Event.Error) { - c.a.d.o.i(this.this$0, 2131889839, 0, 4); + c.a.d.o.i(this.this$0, 2131889850, 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java index 4f645c7b55..64fef7f0c7 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java @@ -100,7 +100,7 @@ public final class WidgetMemberVerification extends AppFragment { } public WidgetMemberVerification() { - super(2131559078); + super(2131559079); WidgetMemberVerification$viewModel$2 widgetMemberVerification$viewModel$2 = new WidgetMemberVerification$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetMemberVerificationViewModel.class), new WidgetMemberVerification$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetMemberVerification$viewModel$2)); @@ -137,7 +137,7 @@ public final class WidgetMemberVerification extends AppFragment { RecyclerView recyclerView = getBinding().g; m.checkNotNullExpressionValue(recyclerView, "binding.memberVerificationRulesRecycler"); recyclerView.setVisibility(loaded.isRulesListVisible() ? 0 : 8); - SimpleDraweeView simpleDraweeView = getBinding().f1827c; + SimpleDraweeView simpleDraweeView = getBinding().f1829c; IconUtils iconUtils = IconUtils.INSTANCE; Guild guild = loaded.getGuild(); Resources resources = getResources(); @@ -181,7 +181,7 @@ public final class WidgetMemberVerification extends AppFragment { private final void configureUI(WidgetMemberVerificationViewModel.ViewState viewState) { if (viewState instanceof WidgetMemberVerificationViewModel.ViewState.Invalid) { - o.i(this, 2131888048, 0, 4); + o.i(this, 2131888049, 0, 4); requireActivity().finish(); } else if (viewState instanceof WidgetMemberVerificationViewModel.ViewState.Loaded) { configureLoadedUI((WidgetMemberVerificationViewModel.ViewState.Loaded) viewState); @@ -207,9 +207,9 @@ public final class WidgetMemberVerification extends AppFragment { if (verificationType != null) { int ordinal = verificationType.ordinal(); if (ordinal == 0) { - getBinding().d.configure(2131231826, 2131891033, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$2(this)); + getBinding().d.configure(2131231829, 2131891064, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$2(this)); } else if (ordinal == 1) { - getBinding().d.configure(2131231567, 2131891028, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$1(this)); + getBinding().d.configure(2131231570, 2131891059, !loaded.getNeedsAdditionalVerification(), new WidgetMemberVerification$configureVerificationBanner$1(this)); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java index e01ae104dd..6c04407c1a 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.java @@ -16,9 +16,12 @@ import com.discord.utilities.guilds.GuildUtilsKt; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; import com.discord.utilities.premium.PremiumUtils; import com.discord.utilities.resources.StringResourceUtilsKt; +import com.discord.widgets.chat.input.sticker.StickerPickerFeatureFlag; import com.discord.widgets.servers.premiumguild.PremiumGuildSubscriptionPerkViewAdapter; import d0.t.n; import d0.z.d.m; +import f0.f0.c; +import java.util.ArrayList; import java.util.List; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: PremiumGuildSubscriptionPerkView.kt */ @@ -63,14 +66,14 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout { private final void initialize() { MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = this.binding.f1655c; + RecyclerView recyclerView = this.binding.f1657c; m.checkNotNullExpressionValue(recyclerView, "binding.perksLevelContentsRecycler"); this.adapter = (PremiumGuildSubscriptionPerkViewAdapter) companion.configure(new PremiumGuildSubscriptionPerkViewAdapter(recyclerView)); - this.binding.f1655c.addOnItemTouchListener(new PremiumGuildSubscriptionPerkView$initialize$1()); + this.binding.f1657c.addOnItemTouchListener(new PremiumGuildSubscriptionPerkView$initialize$1()); } public final void configure(int i, int i2) { - List list; + List list; PremiumGuildSubscriptionPerkView$configure$1 premiumGuildSubscriptionPerkView$configure$1 = PremiumGuildSubscriptionPerkView$configure$1.INSTANCE; boolean z2 = i2 >= i; if (z2) { @@ -81,19 +84,19 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout { int i3 = i != 1 ? i != 2 ? i != 3 ? 0 : 30 : 15 : 2; TextView textView = this.binding.f; m.checkNotNullExpressionValue(textView, "binding.perksLevelHeaderText"); - b.n(textView, i != 1 ? i != 2 ? i != 3 ? 0 : 2131889721 : 2131889720 : 2131889719, new Object[0], null, 4); - int i4 = i != 1 ? i != 2 ? i != 3 ? 0 : z2 ? 2131231816 : 2131231817 : z2 ? 2131231814 : 2131231815 : z2 ? 2131231812 : 2131231813; + b.n(textView, i != 1 ? i != 2 ? i != 3 ? 0 : 2131889732 : 2131889731 : 2131889730, new Object[0], null, 4); + int i4 = i != 1 ? i != 2 ? i != 3 ? 0 : z2 ? 2131231819 : 2131231820 : z2 ? 2131231817 : 2131231818 : z2 ? 2131231815 : 2131231816; TextView textView2 = this.binding.f; m.checkNotNullExpressionValue(textView2, "binding.perksLevelHeaderText"); DrawableCompat.setCompoundDrawablesCompat$default(textView2, i4, 0, 0, 0, 14, (Object) null); - this.binding.f.setTextColor(z2 ? ColorCompat.getColor(getContext(), 2131100427) : ColorCompat.getThemedColor(getContext(), 2130969877)); + this.binding.f.setTextColor(z2 ? ColorCompat.getColor(getContext(), 2131100428) : ColorCompat.getThemedColor(getContext(), 2130969877)); TextView textView3 = this.binding.e; m.checkNotNullExpressionValue(textView3, "binding.perksLevelHeaderBoosts"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); - textView3.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755164, i3, Integer.valueOf(i3))); + textView3.setText(StringResourceUtilsKt.getQuantityString(resources, context, 2131755165, i3, Integer.valueOf(i3))); TextView textView4 = this.binding.e; m.checkNotNullExpressionValue(textView4, "binding.perksLevelHeaderBoosts"); int i5 = 8; @@ -106,24 +109,29 @@ public final class PremiumGuildSubscriptionPerkView extends RelativeLayout { cardView.setVisibility(i5); TextView textView5 = this.binding.b; m.checkNotNullExpressionValue(textView5, "binding.perksLevelContentsHeader"); - b.n(textView5, i != 1 ? 2131889717 : 2131889715, new Object[0], null, 4); + b.n(textView5, i != 1 ? 2131889728 : 2131889726, new Object[0], null, 4); if (i == 1) { - list = n.listOf((Object[]) new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[]{new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231928, z2), b.i(this, 2131889713, new Object[]{50, Integer.valueOf(PremiumUtils.INSTANCE.getGuildEmojiMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231679, z2), b.i(this, 2131889712, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231779, z2), b.i(this, 2131889706, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231704, z2), b.i(this, 2131889707, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231668, z2), b.i(this, 2131889708, new Object[0], null, 4))}); - } else if (i == 2) { - int invoke = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231928, z2); + int invoke = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231931, z2); PremiumUtils premiumUtils = PremiumUtils.INSTANCE; - list = n.listOf((Object[]) new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[]{new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke, b.i(this, 2131889713, new Object[]{50, Integer.valueOf(premiumUtils.getGuildEmojiMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231679, z2), b.i(this, 2131889712, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232005, z2), b.i(this, 2131889714, new Object[]{b.i(this, 2131888499, new Object[]{Integer.valueOf(premiumUtils.getGuildMaxFileSizeMB(2))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231704, z2), b.i(this, 2131889709, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231668, z2), b.i(this, 2131889710, new Object[0], null, 4))}); - } else if (i != 3) { - list = n.emptyList(); - } else { - int invoke2 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231928, z2); + list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke, b.i(this, 2131889723, new Object[]{50, Integer.valueOf(premiumUtils.getGuildEmojiMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889724, new Object[]{15, Integer.valueOf(premiumUtils.getGuildStickerMaxCount(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231682, z2), b.i(this, 2131889722, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(1, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231782, z2), b.i(this, 2131889716, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231707, z2), b.i(this, 2131889717, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231671, z2), b.i(this, 2131889718, new Object[0], null, 4))); + } else if (i == 2) { + int invoke2 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231931, z2); PremiumUtils premiumUtils2 = PremiumUtils.INSTANCE; - list = n.listOf((Object[]) new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem[]{new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke2, b.i(this, 2131889713, new Object[]{100, Integer.valueOf(premiumUtils2.getGuildEmojiMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231679, z2), b.i(this, 2131889712, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232005, z2), b.i(this, 2131889714, new Object[]{b.i(this, 2131888499, new Object[]{Integer.valueOf(premiumUtils2.getGuildMaxFileSizeMB(3))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231954, z2), b.i(this, 2131889711, new Object[0], null, 4))}); + list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke2, b.i(this, 2131889723, new Object[]{50, Integer.valueOf(premiumUtils2.getGuildEmojiMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889724, new Object[]{15, Integer.valueOf(premiumUtils2.getGuildStickerMaxCount(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231682, z2), b.i(this, 2131889722, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(2, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232008, z2), b.i(this, 2131889725, new Object[]{b.i(this, 2131888509, new Object[]{Integer.valueOf(premiumUtils2.getGuildMaxFileSizeMB(2))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231707, z2), b.i(this, 2131889719, new Object[0], null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231671, z2), b.i(this, 2131889720, new Object[0], null, 4))); + } else if (i != 3) { + list = new ArrayList(); + } else { + int invoke3 = premiumGuildSubscriptionPerkView$configure$1.invoke(2131231931, z2); + PremiumUtils premiumUtils3 = PremiumUtils.INSTANCE; + list = n.mutableListOf(new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(invoke3, b.i(this, 2131889723, new Object[]{100, Integer.valueOf(premiumUtils3.getGuildEmojiMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231965, z2), b.i(this, 2131889724, new Object[]{30, Integer.valueOf(premiumUtils3.getGuildStickerMaxCount(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231682, z2), b.i(this, 2131889722, new Object[]{Integer.valueOf(GuildUtilsKt.getMaxVoiceBitrateKbps(3, false))}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131232008, z2), b.i(this, 2131889725, new Object[]{b.i(this, 2131888509, new Object[]{Integer.valueOf(premiumUtils3.getGuildMaxFileSizeMB(3))}, null, 4)}, null, 4)), new PremiumGuildSubscriptionPerkViewAdapter.PremiumGuildSubscriptionPerkViewListItem(premiumGuildSubscriptionPerkView$configure$1.invoke(2131231957, z2), b.i(this, 2131889721, new Object[0], null, 4))); + } + if (!StickerPickerFeatureFlag.Companion.getINSTANCE().isEnabled() && list.size() >= 2) { + list.remove(1); } PremiumGuildSubscriptionPerkViewAdapter premiumGuildSubscriptionPerkViewAdapter = this.adapter; if (premiumGuildSubscriptionPerkViewAdapter == null) { m.throwUninitializedPropertyAccessException("adapter"); } - premiumGuildSubscriptionPerkViewAdapter.configure(list); + premiumGuildSubscriptionPerkViewAdapter.configure(c.z(list)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java index 8049e972b2..70e7a3412c 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/PremiumGuildViewModel.java @@ -753,15 +753,15 @@ public final class PremiumGuildViewModel extends AppViewModel { ModelSubscription modelSubscription = (ModelSubscription) u.firstOrNull((List) loaded.getSubscriptions()); if (modelSubscription == null || modelSubscription.isGoogleSubscription()) { if ((modelSubscription != null ? modelSubscription.getRenewalMutations() : null) != null) { - this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892087, 2131892085)); + this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892125, 2131892123)); return; } if ((modelSubscription != null ? modelSubscription.getStatus() : null) == ModelSubscription.Status.CANCELED) { - this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892087, 2131892084)); + this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892125, 2131892122)); return; } if ((modelSubscription != null ? modelSubscription.getStatus() : null) == ModelSubscription.Status.ACCOUNT_HOLD) { - this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892083, 2131892082)); + this.eventSubject.j.onNext(new Event.ShowBlockedPlanSwitchAlertDialog(2131892121, 2131892120)); return; } List purchases = loaded.getPurchases(); diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java index 870b18e43e..0da82809a8 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$binding$2.java @@ -59,8 +59,8 @@ public final /* synthetic */ class WidgetPremiumGuildSubscription$binding$2 exte i = 2131362137; SimplePager simplePager = (SimplePager) view.findViewById(2131362137); if (simplePager != null) { - i = 2131364350; - View findViewById = view.findViewById(2131364350); + i = 2131364353; + View findViewById = view.findViewById(2131364353); if (findViewById != null) { int i2 = 2131362111; ProgressBar progressBar = (ProgressBar) findViewById.findViewById(2131362111); diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java index 54bbcafc2b..cf40de4820 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$onViewBound$2.java @@ -11,7 +11,7 @@ public final class WidgetPremiumGuildSubscription$onViewBound$2 implemen public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363894) { + if (menuItem.getItemId() == 2131363896) { WidgetSettingsPremiumGuildSubscription.Companion companion = WidgetSettingsPremiumGuildSubscription.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java index 1b90852e48..191c009f8a 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.java @@ -154,7 +154,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { } public WidgetPremiumGuildSubscription() { - super(2131559131); + super(2131559132); WidgetPremiumGuildSubscription$viewModel$2 widgetPremiumGuildSubscription$viewModel$2 = new WidgetPremiumGuildSubscription$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildViewModel.class), new WidgetPremiumGuildSubscription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscription$viewModel$2)); @@ -225,7 +225,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { ProgressBar progressBar2 = getBinding().l.b; m.checkNotNullExpressionValue(progressBar2, "binding.progress.boostBarProgressBar"); boolean z2 = false; - progressBar2.setContentDescription(getString(i != 0 ? i != 1 ? i != 2 ? i != 3 ? 0 : 2131892118 : 2131892117 : 2131892116 : 2131891971)); + progressBar2.setContentDescription(getString(i != 0 ? i != 1 ? i != 2 ? i != 3 ? 0 : 2131892156 : 2131892155 : 2131892154 : 2131892009)); ImageView imageView = getBinding().l.f123c; m.checkNotNullExpressionValue(imageView, "binding.progress.boostBarTier0Iv"); imageView.setEnabled(i2 > 0); @@ -244,7 +244,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { } private final void configureToolbar(String str) { - setActionBarTitle(2131891988); + setActionBarTitle(2131892026); setActionBarSubtitle(str); } @@ -276,7 +276,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { m.checkNotNullExpressionValue(textView, "binding.boostStatusNumBoosts"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - textView.setText(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755243, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); + textView.setText(StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755244, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); } } @@ -339,7 +339,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, getString(2131892087), b.j(this, 2131892086, new Object[]{f.a.a(360055386693L, null)}, null, 4), getString(2131892058), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, getString(2131892125), b.j(this, 2131892124, new Object[]{f.a.a(360055386693L, null)}, null, 4), getString(2131892096), null, null, null, null, null, null, null, null, 0, null, 16368, null); } else if (event instanceof PremiumGuildViewModel.Event.UnacknowledgedPurchase) { o.i(this, 2131886888, 0, 4); GooglePlayBillingManager.INSTANCE.queryPurchases(); @@ -351,7 +351,7 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { String string = getString(showBlockedPlanSwitchAlertDialog.getHeaderStringRes()); String string2 = getString(showBlockedPlanSwitchAlertDialog.getBodyStringRes()); m.checkNotNullExpressionValue(string2, "getString(event.bodyStringRes)"); - WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager2, string, string2, getString(2131886914), getString(2131887177), g0.mapOf(d0.o.to(2131364030, new WidgetPremiumGuildSubscription$handleEvent$1(this))), null, null, null, null, null, null, 0, null, 16320, null); + WidgetNoticeDialog.Companion.show$default(companion2, parentFragmentManager2, string, string2, getString(2131886914), getString(2131887178), g0.mapOf(d0.o.to(2131364032, new WidgetPremiumGuildSubscription$handleEvent$1(this))), null, null, null, null, null, null, 0, null, 16320, null); } } @@ -371,13 +371,13 @@ public final class WidgetPremiumGuildSubscription extends AppFragment { simplePager.setAdapter(perksPagerAdapter); getBinding().k.addOnPageChangeListener(new WidgetPremiumGuildSubscription$onViewBound$1(this)); AppFragment.setActionBarOptionsMenu$default(this, 2131623957, WidgetPremiumGuildSubscription$onViewBound$2.INSTANCE, null, 4, null); - LinkifiedTextView linkifiedTextView = getBinding().f1859c; + LinkifiedTextView linkifiedTextView = getBinding().f1861c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.boostStatusLearnMore"); - b.m(linkifiedTextView, 2131891980, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE); - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755245, 2, 2); + b.m(linkifiedTextView, 2131892018, new Object[]{"learnMode"}, WidgetPremiumGuildSubscription$onViewBound$3.INSTANCE); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755246, 2, 2); LinkifiedTextView linkifiedTextView2 = getBinding().g; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.boostStatusProtip"); - b.m(linkifiedTextView2, 2131891994, new Object[]{i18nPluralString}, new WidgetPremiumGuildSubscription$onViewBound$4(this)); + b.m(linkifiedTextView2, 2131892032, new Object[]{i18nPluralString}, new WidgetPremiumGuildSubscription$onViewBound$4(this)); ImageView imageView = getBinding().l.f123c; m.checkNotNullExpressionValue(imageView, "binding.progress.boostBarTier0Iv"); ImageView imageView2 = getBinding().l.d; diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java index ddaa87e77e..9fac3426c8 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.java @@ -76,7 +76,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen } public WidgetPremiumGuildSubscriptionConfirmation() { - super(2131559130); + super(2131559131); WidgetPremiumGuildSubscriptionConfirmation$viewModel$2 widgetPremiumGuildSubscriptionConfirmation$viewModel$2 = new WidgetPremiumGuildSubscriptionConfirmation$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildSubscriptionInProgressViewModel.class), new WidgetPremiumGuildSubscriptionConfirmation$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscriptionConfirmation$viewModel$2)); @@ -105,7 +105,7 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen } private final void configureToolbar(String str) { - setActionBarTitle(2131891988); + setActionBarTitle(2131892026); setActionBarSubtitle(str); } @@ -186,11 +186,11 @@ public final class WidgetPremiumGuildSubscriptionConfirmation extends AppFragmen getBinding().e.setOnClickListener(new WidgetPremiumGuildSubscriptionConfirmation$onViewBound$1(this)); MaterialButton materialButton = getBinding().e; m.checkNotNullExpressionValue(materialButton, "binding.boostConfirmationSelect"); - materialButton.setText(b.j(this, 2131892004, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755251, 1, 1)}, null, 4)); - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755252, 7, 7); - CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755253, 1, 1); - TextView textView = getBinding().f1858c; + materialButton.setText(b.j(this, 2131892042, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755252, 1, 1)}, null, 4)); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755253, 7, 7); + CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755254, 1, 1); + TextView textView = getBinding().f1860c; m.checkNotNullExpressionValue(textView, "binding.boostConfirmationCooldownWarning"); - textView.setText(b.j(this, 2131892006, new Object[]{i18nPluralString2, i18nPluralString}, null, 4)); + textView.setText(b.j(this, 2131892044, new Object[]{i18nPluralString2, i18nPluralString}, null, 4)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java index a0c61eba4c..bef1c0088a 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer$binding$2.java @@ -23,26 +23,26 @@ public final /* synthetic */ class WidgetPremiumGuildSubscriptionTransfer$bindin int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364268; - TextView textView = (TextView) view.findViewById(2131364268); + i = 2131364270; + TextView textView = (TextView) view.findViewById(2131364270); if (textView != null) { - i = 2131364269; - TextView textView2 = (TextView) view.findViewById(2131364269); + i = 2131364271; + TextView textView2 = (TextView) view.findViewById(2131364271); if (textView2 != null) { - i = 2131364270; - PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131364270); + i = 2131364272; + PremiumGuildConfirmationView premiumGuildConfirmationView = (PremiumGuildConfirmationView) view.findViewById(2131364272); if (premiumGuildConfirmationView != null) { - i = 2131364271; - TextView textView3 = (TextView) view.findViewById(2131364271); + i = 2131364273; + TextView textView3 = (TextView) view.findViewById(2131364273); if (textView3 != null) { - i = 2131364272; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364272); + i = 2131364274; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364274); if (materialButton != null) { - i = 2131364273; - PremiumGuildConfirmationView premiumGuildConfirmationView2 = (PremiumGuildConfirmationView) view.findViewById(2131364273); + i = 2131364275; + PremiumGuildConfirmationView premiumGuildConfirmationView2 = (PremiumGuildConfirmationView) view.findViewById(2131364275); if (premiumGuildConfirmationView2 != null) { - i = 2131364274; - TextView textView4 = (TextView) view.findViewById(2131364274); + i = 2131364276; + TextView textView4 = (TextView) view.findViewById(2131364276); if (textView4 != null) { return new WidgetPremiumGuildTransferBinding((CoordinatorLayout) view, dimmerView, textView, textView2, premiumGuildConfirmationView, textView3, materialButton, premiumGuildConfirmationView2, textView4); } diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java index c039d8a767..e1746eeb05 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java @@ -75,7 +75,7 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment { } public WidgetPremiumGuildSubscriptionTransfer() { - super(2131559108); + super(2131559109); WidgetPremiumGuildSubscriptionTransfer$viewModel$2 widgetPremiumGuildSubscriptionTransfer$viewModel$2 = new WidgetPremiumGuildSubscriptionTransfer$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(PremiumGuildTransferInProgressViewModel.class), new WidgetPremiumGuildSubscriptionTransfer$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPremiumGuildSubscriptionTransfer$viewModel$2)); @@ -143,19 +143,19 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - TextView textView = getBinding().f1845c; + TextView textView = getBinding().f1847c; m.checkNotNullExpressionValue(textView, "binding.premiumGuildTransferConfirmationBlurb"); - textView.setText(b.j(this, 2131892007, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755255, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755254, 1, 1)}, null, 4)); + textView.setText(b.j(this, 2131892045, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755256, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755255, 1, 1)}, null, 4)); TextView textView2 = getBinding().f; m.checkNotNullExpressionValue(textView2, "binding.premiumGuildTransferPreviousGuildHeader"); - textView2.setText(b.j(this, 2131892008, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755256, 1, 1)}, null, 4)); + textView2.setText(b.j(this, 2131892046, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755257, 1, 1)}, null, 4)); TextView textView3 = getBinding().i; m.checkNotNullExpressionValue(textView3, "binding.premiumGuildTransferTargetGuildHeader"); - textView3.setText(b.j(this, 2131892010, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755257, 1, 1)}, null, 4)); + textView3.setText(b.j(this, 2131892048, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755258, 1, 1)}, null, 4)); getBinding().g.setOnClickListener(new WidgetPremiumGuildSubscriptionTransfer$onViewBound$1(this)); MaterialButton materialButton = getBinding().g; m.checkNotNullExpressionValue(materialButton, "binding.premiumGuildTransferSelect"); - materialButton.setText(b.j(this, 2131892016, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755259, 1, 1)}, null, 4)); + materialButton.setText(b.j(this, 2131892054, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755260, 1, 1)}, null, 4)); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java index 001d55b507..19ee2fffc4 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites$binding$2.java @@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetServerSettingsInstantInvites$binding$2 public final WidgetServerSettingsInstantInvitesBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364013; - TextView textView = (TextView) view.findViewById(2131364013); + int i = 2131364015; + TextView textView = (TextView) view.findViewById(2131364015); if (textView != null) { - i = 2131364014; - TextView textView2 = (TextView) view.findViewById(2131364014); + i = 2131364016; + TextView textView2 = (TextView) view.findViewById(2131364016); if (textView2 != null) { - i = 2131364637; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364637); + i = 2131364640; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364640); if (recyclerView != null) { - i = 2131364638; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364638); + i = 2131364641; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364641); if (appViewFlipper != null) { return new WidgetServerSettingsInstantInvitesBinding((CoordinatorLayout) view, textView, textView2, recyclerView, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java index 1f27e7cf3c..a88fff94b3 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvites.java @@ -346,7 +346,7 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment { } public WidgetServerSettingsInstantInvites() { - super(2131559164); + super(2131559165); } public static final /* synthetic */ void access$configureUI(WidgetServerSettingsInstantInvites widgetServerSettingsInstantInvites, Model model) { @@ -367,15 +367,15 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment { return; } if (model.getInviteItems() == null) { - AppViewFlipper appViewFlipper = getBinding().f1886c; + AppViewFlipper appViewFlipper = getBinding().f1888c; m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsInstantInvitesViewFlipper"); appViewFlipper.setDisplayedChild(0); } else if (model.getInviteItems().isEmpty()) { - AppViewFlipper appViewFlipper2 = getBinding().f1886c; + AppViewFlipper appViewFlipper2 = getBinding().f1888c; m.checkNotNullExpressionValue(appViewFlipper2, "binding.serverSettingsInstantInvitesViewFlipper"); appViewFlipper2.setDisplayedChild(2); } else { - AppViewFlipper appViewFlipper3 = getBinding().f1886c; + AppViewFlipper appViewFlipper3 = getBinding().f1888c; m.checkNotNullExpressionValue(appViewFlipper3, "binding.serverSettingsInstantInvitesViewFlipper"); appViewFlipper3.setDisplayedChild(1); Adapter adapter = this.adapter; @@ -383,7 +383,7 @@ public final class WidgetServerSettingsInstantInvites extends AppFragment { adapter.configure(model.getInviteItems(), new WidgetServerSettingsInstantInvites$configureUI$1(this), WidgetServerSettingsInstantInvites$configureUI$2.INSTANCE); } } - setActionBarTitle(2131890356); + setActionBarTitle(2131890386); setActionBarSubtitle(model.getGuild().getName()); } diff --git a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java index c7f0157671..aa139339ab 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem.java @@ -29,47 +29,47 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetServerSettingsInstantInvitesListItem(WidgetServerSettingsInstantInvites.Adapter adapter) { - super(2131559163, adapter); + super(2131559164, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - int i = 2131363612; - TextView textView = (TextView) view.findViewById(2131363612); + int i = 2131363615; + TextView textView = (TextView) view.findViewById(2131363615); if (textView != null) { - i = 2131363613; - TextView textView2 = (TextView) view.findViewById(2131363613); + i = 2131363616; + TextView textView2 = (TextView) view.findViewById(2131363616); if (textView2 != null) { - i = 2131363614; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363614); + i = 2131363617; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363617); if (linearLayout != null) { - i = 2131363615; - View findViewById = view.findViewById(2131363615); + i = 2131363618; + View findViewById = view.findViewById(2131363618); if (findViewById != null) { - i = 2131363616; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363616); + i = 2131363619; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363619); if (linearLayout2 != null) { - i = 2131363617; - TextView textView3 = (TextView) view.findViewById(2131363617); + i = 2131363620; + TextView textView3 = (TextView) view.findViewById(2131363620); if (textView3 != null) { - i = 2131363619; - TextView textView4 = (TextView) view.findViewById(2131363619); + i = 2131363622; + TextView textView4 = (TextView) view.findViewById(2131363622); if (textView4 != null) { - i = 2131363620; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363620); + i = 2131363623; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363623); if (simpleDraweeView != null) { - i = 2131363627; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363627); + i = 2131363630; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363630); if (linearLayout3 != null) { - i = 2131363631; - ImageView imageView = (ImageView) view.findViewById(2131363631); + i = 2131363634; + ImageView imageView = (ImageView) view.findViewById(2131363634); if (imageView != null) { - i = 2131363634; - TextView textView5 = (TextView) view.findViewById(2131363634); + i = 2131363637; + TextView textView5 = (TextView) view.findViewById(2131363637); if (textView5 != null) { - i = 2131363635; - TextView textView6 = (TextView) view.findViewById(2131363635); + i = 2131363638; + TextView textView6 = (TextView) view.findViewById(2131363638); if (textView6 != null) { - i = 2131363636; - TextView textView7 = (TextView) view.findViewById(2131363636); + i = 2131363639; + TextView textView7 = (TextView) view.findViewById(2131363639); if (textView7 != null) { WidgetServerSettingsInstantInviteListItemBinding widgetServerSettingsInstantInviteListItemBinding = new WidgetServerSettingsInstantInviteListItemBinding((CardView) view, textView, textView2, linearLayout, findViewById, linearLayout2, textView3, textView4, simpleDraweeView, linearLayout3, imageView, textView5, textView6, textView7); m.checkNotNullExpressionValue(widgetServerSettingsInstantInviteListItemBinding, "WidgetServerSettingsInst…temBinding.bind(itemView)"); @@ -137,7 +137,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler private final void setupExpirationTime(ModelInvite modelInvite) { if (modelInvite.getMaxAge() == 0) { - this.binding.e.setText(2131890967); + this.binding.e.setText(2131890998); TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.inviteExpirationTime"); textView.setTextColor(ColorCompat.getColor(textView, 2131099906)); @@ -163,7 +163,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler super.onConfigure(i, (int) inviteItem); User inviter = inviteItem.getInvite().getInviter(); this.binding.d.setOnClickListener(new WidgetServerSettingsInstantInvitesListItem$onConfigure$1(this, inviteItem)); - TextView textView = this.binding.f1885c; + TextView textView = this.binding.f1887c; m.checkNotNullExpressionValue(textView, "binding.inviteCode"); textView.setText(inviteItem.getInvite().getCode()); TextView textView2 = this.binding.h; @@ -183,7 +183,7 @@ public final class WidgetServerSettingsInstantInvitesListItem extends MGRecycler if (inviter == null || (str = inviter.r()) == null) { CardView cardView = this.binding.a; m.checkNotNullExpressionValue(cardView, "binding.root"); - str = cardView.getContext().getString(2131890337); + str = cardView.getContext().getString(2131890367); } textView5.setText(str); if (inviter != null) { diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java index 94c776aea9..6aa78d5125 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$binding$2.java @@ -22,23 +22,23 @@ public final /* synthetic */ class WidgetServerSettingsMembers$binding$2 extends public final WidgetServerSettingsMembersBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364017; - TextView textView = (TextView) view.findViewById(2131364017); + int i = 2131364019; + TextView textView = (TextView) view.findViewById(2131364019); if (textView != null) { - i = 2131364639; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364639); + i = 2131364642; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364642); if (linearLayout != null) { - i = 2131364640; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364640); + i = 2131364643; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364643); if (textInputLayout != null) { - i = 2131364642; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364642); + i = 2131364645; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364645); if (recyclerView != null) { - i = 2131364643; - Spinner spinner = (Spinner) view.findViewById(2131364643); + i = 2131364646; + Spinner spinner = (Spinner) view.findViewById(2131364646); if (spinner != null) { - i = 2131364644; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364644); + i = 2131364647; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364647); if (appViewFlipper != null) { return new WidgetServerSettingsMembersBinding((CoordinatorLayout) view, textView, linearLayout, textInputLayout, recyclerView, spinner, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java index 9a397ecb62..c639b3a8ba 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$1.java @@ -18,7 +18,7 @@ public final class WidgetServerSettingsMembers$configureUI$1 implements public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363903) { + if (menuItem.getItemId() == 2131363905) { WidgetPruneUsers.Companion companion = WidgetPruneUsers.Companion; long id2 = this.$model.getGuild().getId(); FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java index 9516812350..7b965b8fcd 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers$configureUI$2.java @@ -47,12 +47,12 @@ public final class WidgetServerSettingsMembers$configureUI$2 extends o implement m.checkNotNullExpressionValue(context, "binding.root.context"); companion.launch(id2, j, context); } else if (RoleUtils.rankEquals(this.$model.getMyHighestRole(), highestRole)) { - c.a.d.o.i(this.this$0, 2131887188, 0, 4); + c.a.d.o.i(this.this$0, 2131887189, 0, 4); } else { - c.a.d.o.i(this.this$0, 2131887186, 0, 4); + c.a.d.o.i(this.this$0, 2131887187, 0, 4); } } else { - c.a.d.o.i(this.this$0, 2131887187, 0, 4); + c.a.d.o.i(this.this$0, 2131887188, 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java index 475078e241..c9c95b7129 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembers.java @@ -158,7 +158,7 @@ public final class WidgetServerSettingsMembers extends AppFragment { } public WidgetServerSettingsMembers() { - super(2131559168); + super(2131559169); BehaviorSubject m0 = BehaviorSubject.m0(""); m.checkNotNullExpressionValue(m0, "BehaviorSubject.create(\"\")"); this.nameFilterPublisher = m0; @@ -202,7 +202,7 @@ public final class WidgetServerSettingsMembers extends AppFragment { return; } AppFragment.setActionBarOptionsMenu$default(this, widgetServerSettingsMembersModel.getCanKick() ? 2131623961 : 2131623951, new WidgetServerSettingsMembers$configureUI$1(this, widgetServerSettingsMembersModel), null, 4, null); - setActionBarTitle(2131890979); + setActionBarTitle(2131891010); setActionBarSubtitle(widgetServerSettingsMembersModel.getGuild().getName()); AppViewFlipper appViewFlipper = getBinding().e; m.checkNotNullExpressionValue(appViewFlipper, "binding.serverSettingsMembersViewFlipper"); @@ -249,7 +249,7 @@ public final class WidgetServerSettingsMembers extends AppFragment { super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1890c; + RecyclerView recyclerView = getBinding().f1892c; m.checkNotNullExpressionValue(recyclerView, "binding.serverSettingsMembersRecycler"); this.adapter = (WidgetServerSettingsMembersAdapter) companion.configure(new WidgetServerSettingsMembersAdapter(recyclerView)); if (!isRecreated()) { diff --git a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java index fd4524ab2c..23138203e0 100644 --- a/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/settings/members/WidgetServerSettingsMembersAdapter.java @@ -30,24 +30,24 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public MemberListItem(WidgetServerSettingsMembersAdapter widgetServerSettingsMembersAdapter) { - super(2131559167, widgetServerSettingsMembersAdapter); + super(2131559168, widgetServerSettingsMembersAdapter); m.checkNotNullParameter(widgetServerSettingsMembersAdapter, "adapter"); View view = this.itemView; - int i = 2131363818; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363818); + int i = 2131363821; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363821); if (simpleDraweeView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131363820; - ImageView imageView = (ImageView) view.findViewById(2131363820); + i = 2131363823; + ImageView imageView = (ImageView) view.findViewById(2131363823); if (imageView != null) { - i = 2131363821; - UsernameView usernameView = (UsernameView) view.findViewById(2131363821); + i = 2131363824; + UsernameView usernameView = (UsernameView) view.findViewById(2131363824); if (usernameView != null) { - i = 2131363822; - ImageView imageView2 = (ImageView) view.findViewById(2131363822); + i = 2131363825; + ImageView imageView2 = (ImageView) view.findViewById(2131363825); if (imageView2 != null) { - i = 2131363823; - RolesListView rolesListView = (RolesListView) view.findViewById(2131363823); + i = 2131363826; + RolesListView rolesListView = (RolesListView) view.findViewById(2131363826); if (rolesListView != null) { WidgetServerSettingsMemberListItemBinding widgetServerSettingsMemberListItemBinding = new WidgetServerSettingsMemberListItemBinding(constraintLayout, simpleDraweeView, constraintLayout, imageView, usernameView, imageView2, rolesListView); m.checkNotNullExpressionValue(widgetServerSettingsMemberListItemBinding, "WidgetServerSettingsMemb…temBinding.bind(itemView)"); @@ -69,7 +69,7 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS m.checkNotNullParameter(memberItem, "data"); super.onConfigure(i, (int) memberItem); UsernameView.c(this.binding.e, memberItem.getUserDisplayName(), null, false, null, null, 30); - this.binding.e.a(memberItem.getUser().isBot(), 2131887049, UserUtils.INSTANCE.isVerifiedBot(memberItem.getUser())); + this.binding.e.a(memberItem.getUser().isBot(), 2131887050, UserUtils.INSTANCE.isVerifiedBot(memberItem.getUser())); RolesListView rolesListView = this.binding.g; List roles = memberItem.getRoles(); RolesListView rolesListView2 = this.binding.g; @@ -88,7 +88,7 @@ public final class WidgetServerSettingsMembersAdapter extends MGRecyclerAdapterS i2 = 8; } imageView2.setVisibility(i2); - this.binding.f1889c.setOnClickListener(new WidgetServerSettingsMembersAdapter$MemberListItem$onConfigure$1(this, memberItem)); + this.binding.f1891c.setOnClickListener(new WidgetServerSettingsMembersAdapter$MemberListItem$onConfigure$1(this, memberItem)); SimpleDraweeView simpleDraweeView = this.binding.b; m.checkNotNullExpressionValue(simpleDraweeView, "binding.memberListItemAvatar"); IconUtils.setIcon$default(simpleDraweeView, memberItem.getUser(), 2131165296, null, null, memberItem.getGuildMember(), 24, null); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java index 7e5a3f2e62..1b4a43c5b4 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet$binding$2.java @@ -22,50 +22,50 @@ public final /* synthetic */ class WidgetMuteSettingsSheet$binding$2 extends k i int i = 2131362279; TextView textView = (TextView) view.findViewById(2131362279); if (textView != null) { - i = 2131363984; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363984); + i = 2131363986; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363986); if (linearLayout != null) { - i = 2131364038; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364038); + i = 2131364040; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364040); if (linearLayout2 != null) { - i = 2131364039; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364039); + i = 2131364041; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364041); if (frameLayout != null) { - i = 2131364040; - TextView textView2 = (TextView) view.findViewById(2131364040); + i = 2131364042; + TextView textView2 = (TextView) view.findViewById(2131364042); if (textView2 != null) { - i = 2131364041; - TextView textView3 = (TextView) view.findViewById(2131364041); + i = 2131364043; + TextView textView3 = (TextView) view.findViewById(2131364043); if (textView3 != null) { - i = 2131364099; - TextView textView4 = (TextView) view.findViewById(2131364099); + i = 2131364101; + TextView textView4 = (TextView) view.findViewById(2131364101); if (textView4 != null) { - i = 2131364100; - TextView textView5 = (TextView) view.findViewById(2131364100); + i = 2131364102; + TextView textView5 = (TextView) view.findViewById(2131364102); if (textView5 != null) { - i = 2131364101; - TextView textView6 = (TextView) view.findViewById(2131364101); + i = 2131364103; + TextView textView6 = (TextView) view.findViewById(2131364103); if (textView6 != null) { - i = 2131364102; - TextView textView7 = (TextView) view.findViewById(2131364102); + i = 2131364104; + TextView textView7 = (TextView) view.findViewById(2131364104); if (textView7 != null) { - i = 2131364105; - TextView textView8 = (TextView) view.findViewById(2131364105); + i = 2131364107; + TextView textView8 = (TextView) view.findViewById(2131364107); if (textView8 != null) { - i = 2131365129; - TextView textView9 = (TextView) view.findViewById(2131365129); + i = 2131365133; + TextView textView9 = (TextView) view.findViewById(2131365133); if (textView9 != null) { - i = 2131365281; - TextView textView10 = (TextView) view.findViewById(2131365281); + i = 2131365286; + TextView textView10 = (TextView) view.findViewById(2131365286); if (textView10 != null) { - i = 2131365334; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365334); + i = 2131365339; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365339); if (linearLayout3 != null) { - i = 2131365335; - TextView textView11 = (TextView) view.findViewById(2131365335); + i = 2131365340; + TextView textView11 = (TextView) view.findViewById(2131365340); if (textView11 != null) { - i = 2131365336; - TextView textView12 = (TextView) view.findViewById(2131365336); + i = 2131365341; + TextView textView12 = (TextView) view.findViewById(2131365341); if (textView12 != null) { return new WidgetMuteSettingsSheetBinding((NestedScrollView) view, textView, linearLayout, linearLayout2, frameLayout, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, linearLayout3, textView11, textView12); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java index 990a19af18..2ff22c6957 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java @@ -134,7 +134,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { TextView textView = getBinding().g; m.checkNotNullExpressionValue(textView, "binding.notificationSettingsOverridesLabel"); int notificationOverride = loaded.getNotificationOverride(); - textView.setText(notificationOverride == ModelNotificationSettings.FREQUENCY_ALL ? b.j(this, 2131888599, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_MENTIONS ? b.j(this, 2131888699, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_NOTHING ? b.j(this, 2131888693, new Object[0], null, 4) : ""); + textView.setText(notificationOverride == ModelNotificationSettings.FREQUENCY_ALL ? b.j(this, 2131888609, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_MENTIONS ? b.j(this, 2131888709, new Object[0], null, 4) : notificationOverride == ModelNotificationSettings.FREQUENCY_NOTHING ? b.j(this, 2131888703, new Object[0], null, 4) : ""); int ordinal = loaded.getSettingsType().ordinal(); if (ordinal != 0) { boolean z2 = true; @@ -152,7 +152,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { textView3.setVisibility(0); TextView textView4 = getBinding().b; m.checkNotNullExpressionValue(textView4, "binding.channelMutedDetails"); - textView4.setText(loaded.isChannelMuted() ? b.j(this, 2131888551, new Object[0], null, 4) : b.d(this, 2131888663, new Object[0], new WidgetMuteSettingsSheet$configureNotificationSettings$1(this))); + textView4.setText(loaded.isChannelMuted() ? b.j(this, 2131888561, new Object[0], null, 4) : b.d(this, 2131888673, new Object[0], new WidgetMuteSettingsSheet$configureNotificationSettings$1(this))); } else { TextView textView5 = getBinding().f; m.checkNotNullExpressionValue(textView5, "binding.notificationSettingsLabel"); @@ -182,22 +182,22 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { if (loaded.isChannelMuted()) { TextView textView = getBinding().q; m.checkNotNullExpressionValue(textView, "binding.unmuteButtonLabel"); - b.m(textView, 2131894026, new Object[]{loaded.getSubtitle()}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1); + b.m(textView, 2131894065, new Object[]{loaded.getSubtitle()}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1); TextView textView2 = getBinding().p; m.checkNotNullExpressionValue(textView2, "binding.unmuteButtonDetailsLabel"); int ordinal = loaded.getSettingsType().ordinal(); if (ordinal == 1 || ordinal == 2) { String muteEndTime = loaded.getMuteEndTime(); - charSequence = muteEndTime == null ? b.d(this, 2131888665, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888666, new Object[]{parseMuteEndtime(muteEndTime)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1); + charSequence = muteEndTime == null ? b.d(this, 2131888675, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888676, new Object[]{parseMuteEndtime(muteEndTime)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1); } else { String muteEndTime2 = loaded.getMuteEndTime(); - charSequence = muteEndTime2 == null ? b.d(this, 2131888660, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888661, new Object[]{parseMuteEndtime(muteEndTime2)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1); + charSequence = muteEndTime2 == null ? b.d(this, 2131888670, new Object[0], widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1) : b.d(this, 2131888671, new Object[]{parseMuteEndtime(muteEndTime2)}, widgetMuteSettingsSheet$configureUnmuteButton$boldRenderContext$1); } textView2.setText(charSequence); LinearLayout linearLayout = getBinding().o; m.checkNotNullExpressionValue(linearLayout, "binding.unmuteButton"); linearLayout.setVisibility(0); - LinearLayout linearLayout2 = getBinding().f1832c; + LinearLayout linearLayout2 = getBinding().f1834c; m.checkNotNullExpressionValue(linearLayout2, "binding.muteSettingsSheetMuteOptions"); linearLayout2.setVisibility(8); return; @@ -205,7 +205,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { LinearLayout linearLayout3 = getBinding().o; m.checkNotNullExpressionValue(linearLayout3, "binding.unmuteButton"); linearLayout3.setVisibility(8); - LinearLayout linearLayout4 = getBinding().f1832c; + LinearLayout linearLayout4 = getBinding().f1834c; m.checkNotNullExpressionValue(linearLayout4, "binding.muteSettingsSheetMuteOptions"); linearLayout4.setVisibility(0); } @@ -245,7 +245,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { MuteSettingsSheetViewModel.ViewState.Loaded loaded = (MuteSettingsSheetViewModel.ViewState.Loaded) viewState; int ordinal = loaded.getSettingsType().ordinal(); CharSequence charSequence = null; - Integer num = ordinal != 0 ? (ordinal == 1 || ordinal == 2) ? 2131891277 : ordinal != 3 ? ordinal != 4 ? null : 2131891274 : 2131891275 : 2131891276; + Integer num = ordinal != 0 ? (ordinal == 1 || ordinal == 2) ? 2131891310 : ordinal != 3 ? ordinal != 4 ? null : 2131891307 : 2131891308 : 2131891309; TextView textView = getBinding().n; m.checkNotNullExpressionValue(textView, "binding.title"); if (num != null) { @@ -258,7 +258,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { configureUnmuteButton(loaded); configureNotificationSettings(loaded); } else if (viewState instanceof MuteSettingsSheetViewModel.ViewState.Failure) { - o.i(this, 2131888048, 0, 4); + o.i(this, 2131888049, 0, 4); dismiss(); } } @@ -274,7 +274,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559090; + return 2131559091; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java index 82c31b8106..ee7d469ee6 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$binding$2.java @@ -62,62 +62,62 @@ public final /* synthetic */ class WidgetSettings$binding$2 extends k implements i = 2131362856; TextView textView13 = (TextView) view.findViewById(2131362856); if (textView13 != null) { - i = 2131363730; - TextView textView14 = (TextView) view.findViewById(2131363730); + i = 2131363733; + TextView textView14 = (TextView) view.findViewById(2131363733); if (textView14 != null) { - i = 2131364006; - TextView textView15 = (TextView) view.findViewById(2131364006); + i = 2131364008; + TextView textView15 = (TextView) view.findViewById(2131364008); if (textView15 != null) { - i = 2131364007; - TextView textView16 = (TextView) view.findViewById(2131364007); + i = 2131364009; + TextView textView16 = (TextView) view.findViewById(2131364009); if (textView16 != null) { - i = 2131364008; - TextView textView17 = (TextView) view.findViewById(2131364008); + i = 2131364010; + TextView textView17 = (TextView) view.findViewById(2131364010); if (textView17 != null) { - i = 2131364009; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364009); + i = 2131364011; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364011); if (linearLayout != null) { - i = 2131364042; - TextView textView18 = (TextView) view.findViewById(2131364042); + i = 2131364044; + TextView textView18 = (TextView) view.findViewById(2131364044); if (textView18 != null) { - i = 2131364333; - TextView textView19 = (TextView) view.findViewById(2131364333); + i = 2131364336; + TextView textView19 = (TextView) view.findViewById(2131364336); if (textView19 != null) { - i = 2131364382; - TextView textView20 = (TextView) view.findViewById(2131364382); + i = 2131364385; + TextView textView20 = (TextView) view.findViewById(2131364385); if (textView20 != null) { - i = 2131364721; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364721); + i = 2131364724; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364724); if (linearLayout2 != null) { - i = 2131364803; - TextView textView21 = (TextView) view.findViewById(2131364803); + i = 2131364806; + TextView textView21 = (TextView) view.findViewById(2131364806); if (textView21 != null) { - i = 2131364850; - TextView textView22 = (TextView) view.findViewById(2131364850); + i = 2131364853; + TextView textView22 = (TextView) view.findViewById(2131364853); if (textView22 != null) { - i = 2131364859; - TextView textView23 = (TextView) view.findViewById(2131364859); + i = 2131364862; + TextView textView23 = (TextView) view.findViewById(2131364862); if (textView23 != null) { - i = 2131364881; - StatusView statusView = (StatusView) view.findViewById(2131364881); + i = 2131364884; + StatusView statusView = (StatusView) view.findViewById(2131364884); if (statusView != null) { - i = 2131365147; - TextView textView24 = (TextView) view.findViewById(2131365147); + i = 2131365151; + TextView textView24 = (TextView) view.findViewById(2131365151); if (textView24 != null) { - i = 2131365211; - TextView textView25 = (TextView) view.findViewById(2131365211); + i = 2131365215; + TextView textView25 = (TextView) view.findViewById(2131365215); if (textView25 != null) { - i = 2131365347; - TextView textView26 = (TextView) view.findViewById(2131365347); + i = 2131365352; + TextView textView26 = (TextView) view.findViewById(2131365352); if (textView26 != null) { - i = 2131365413; - TextView textView27 = (TextView) view.findViewById(2131365413); + i = 2131365418; + TextView textView27 = (TextView) view.findViewById(2131365418); if (textView27 != null) { - i = 2131365415; - UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365415); + i = 2131365420; + UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365420); if (userProfileHeaderView != null) { - i = 2131365515; - TextView textView28 = (TextView) view.findViewById(2131365515); + i = 2131365521; + TextView textView28 = (TextView) view.findViewById(2131365521); if (textView28 != null) { return new WidgetSettingsBinding((CoordinatorLayout) view, textView, textView2, textView3, textView4, textView5, textView6, textView7, textView8, textView9, textView10, textView11, textView12, findViewById, textView13, textView14, textView15, textView16, textView17, linearLayout, textView18, textView19, textView20, linearLayout2, textView21, textView22, textView23, statusView, textView24, textView25, textView26, textView27, userProfileHeaderView, textView28); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java index 36eeac6d62..7142256ca3 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java @@ -16,12 +16,12 @@ public final class WidgetSettings$configureToolbar$1 implements Action2< public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case 2131363904: + case 2131363906: WidgetDebugging.Companion companion = WidgetDebugging.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launch(context); return; - case 2131363905: + case 2131363907: WidgetSettings widgetSettings = this.this$0; m.checkNotNullExpressionValue(context, "context"); WidgetSettings.access$showLogoutDialog(widgetSettings, context); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java index bde72dacd3..cae9a94956 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings$onViewBound$$inlined$with$lambda$4.java @@ -54,10 +54,10 @@ public final class WidgetSettings$onViewBound$$inlined$with$lambda$4 implements m.checkNotNullExpressionValue(textView2, "uploadDebugLogs"); if (z2) { widgetSettings = this.this$0.this$0; - i = 2131894093; + i = 2131894132; } else { widgetSettings = this.this$0.this$0; - i = 2131894583; + i = 2131894630; } textView2.setText(widgetSettings.getString(i)); } @@ -85,7 +85,7 @@ public final class WidgetSettings$onViewBound$$inlined$with$lambda$4 implements } public final void invoke(Void r4) { - c.a.d.o.i(this.this$0.this$0, 2131894091, 0, 4); + c.a.d.o.i(this.this$0.this$0, 2131894130, 0, 4); AnonymousClass1.invoke$default(this.$updateUploadDebugLogsUI$1, false, 1, null); } } 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 9fdcf42b81..2d90d041e4 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -171,7 +171,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi } public WidgetSettings() { - super(2131559180); + super(2131559181); WidgetSettings$viewModelUserProfileHeader$2 widgetSettings$viewModelUserProfileHeader$2 = WidgetSettings$viewModelUserProfileHeader$2.INSTANCE; h0 h0Var = new h0(this); this.viewModelUserProfileHeader$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(UserProfileHeaderViewModel.class), new WidgetSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettings$viewModelUserProfileHeader$2)); @@ -187,7 +187,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi private final void configureToolbar() { bindToolbar(); - setActionBarTitle(2131894217); + setActionBarTitle(2131894256); setActionBarTitleLayoutMinimumTappableArea(); AppFragment.setActionBarOptionsMenu$default(this, 2131623962, new WidgetSettings$configureToolbar$1(this), null, 4, null); } @@ -216,15 +216,15 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi i = 8; } linearLayout.setVisibility(i); - TextView textView3 = binding.f1917y; + TextView textView3 = binding.f1919y; m.checkNotNullExpressionValue(textView3, "settingsNitro"); - textView3.setText(getString(hasSubscription ? 2131886914 : 2131892214)); + textView3.setText(getString(hasSubscription ? 2131886914 : 2131892252)); TextView textView4 = binding.q; m.checkNotNullExpressionValue(textView4, "nitroBoosting"); - textView4.setText(getString(hasSubscription ? 2131891992 : 2131892208)); + textView4.setText(getString(hasSubscription ? 2131892030 : 2131892246)); Presence presence = model.getPresence(); binding.A.setPresence(presence); - TextView textView5 = binding.f1918z; + TextView textView5 = binding.f1920z; m.checkNotNullExpressionValue(textView5, "settingsPresenceText"); textView5.setText(getString(PresenceUtils.INSTANCE.getStatusStringResForPresence(presence))); } @@ -240,7 +240,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi private final void showLogoutDialog(Context context) { FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131890857).setMessage(2131894261).setDialogAttrTheme(2130969788).setPositiveButton(2131890857, WidgetSettings$showLogoutDialog$1.INSTANCE), 2131887177, (Function1) null, 2, (Object) null).show(parentFragmentManager); + WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131890887).setMessage(2131894302).setDialogAttrTheme(2130969788).setPositiveButton(2131890887, WidgetSettings$showLogoutDialog$1.INSTANCE), 2131887178, (Function1) null, 2, (Object) null).show(parentFragmentManager); } @Override // com.discord.widgets.tabs.OnTabSelectedListener @@ -262,7 +262,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi widgetTabsHost.registerTabSelectionListener(NavigationTab.SETTINGS, this); } WidgetSettingsBinding binding = getBinding(); - binding.f1916x.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$1(this)); + binding.f1918x.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$1(this)); UserProfileHeaderView userProfileHeaderView = binding.F; Badge.Companion companion = Badge.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); @@ -271,12 +271,12 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(2131886360); - textView.setText(string + " - 80.11 - Stable (80011)"); + textView.setText(string + " - 81.14 - Stable (81014)"); binding.w.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this)); binding.t.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.r.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); - binding.f1914c.setOnClickListener(WidgetSettings$onViewBound$1$7.INSTANCE); + binding.f1916c.setOnClickListener(WidgetSettings$onViewBound$1$7.INSTANCE); binding.i.setOnClickListener(WidgetSettings$onViewBound$1$8.INSTANCE); binding.v.setOnClickListener(WidgetSettings$onViewBound$1$9.INSTANCE); binding.l.setOnClickListener(WidgetSettings$onViewBound$1$10.INSTANCE); @@ -292,7 +292,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi binding.D.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$4(binding, this)); binding.d.setOnClickListener(WidgetSettings$onViewBound$1$21.INSTANCE); binding.k.setOnClickListener(WidgetSettings$onViewBound$1$22.INSTANCE); - for (TextView textView2 : n.listOf((Object[]) new TextView[]{binding.E, binding.f1915s, binding.g, binding.o, binding.f})) { + for (TextView textView2 : n.listOf((Object[]) new TextView[]{binding.E, binding.f1917s, binding.g, binding.o, binding.f})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView2, "header"); accessibilityUtils.setViewIsHeading(textView2); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$Model$Companion$get$1.java index d57e15463b..de832264ae 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$Model$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAccessibility$Model$Companion$get$1.java @@ -1,14 +1,13 @@ package com.discord.widgets.settings; -import com.discord.models.experiments.domain.Experiment; import com.discord.widgets.settings.WidgetSettingsAccessibility; import d0.z.d.m; -import rx.functions.Func5; +import rx.functions.Func4; /* compiled from: WidgetSettingsAccessibility.kt */ -public final class WidgetSettingsAccessibility$Model$Companion$get$1 implements Func5 { +public final class WidgetSettingsAccessibility$Model$Companion$get$1 implements Func4 { public static final WidgetSettingsAccessibility$Model$Companion$get$1 INSTANCE = new WidgetSettingsAccessibility$Model$Companion$get$1(); - public final WidgetSettingsAccessibility.Model call(Boolean bool, Boolean bool2, Boolean bool3, Integer num, Experiment experiment) { + public final WidgetSettingsAccessibility.Model call(Boolean bool, Boolean bool2, Boolean bool3, Integer num) { m.checkNotNullExpressionValue(bool, "reducedMotionEnabled"); boolean booleanValue = bool.booleanValue(); m.checkNotNullExpressionValue(bool2, "allowAnimatedEmoji"); @@ -16,6 +15,6 @@ public final class WidgetSettingsAccessibility$Model$Companion$get$1 get() { StoreStream.Companion companion = StoreStream.Companion; - Observable g = Observable.g(companion.getAccessibility().observeReducedMotionEnabled(), companion.getUserSettings().observeIsAnimatedEmojisEnabled(false), companion.getUserSettings().observeIsAutoPlayGifsEnabled(false), companion.getUserSettings().observeStickerAnimationSettings(false), companion.getExperiments().observeUserExperiment("2020-09_dsti_user_settings", true), WidgetSettingsAccessibility$Model$Companion$get$1.INSTANCE); - m.checkNotNullExpressionValue(g, "Observable.combineLatest…= 1\n )\n }"); - return g; + Observable h = Observable.h(companion.getAccessibility().observeReducedMotionEnabled(), companion.getUserSettings().observeIsAnimatedEmojisEnabled(false), companion.getUserSettings().observeIsAutoPlayGifsEnabled(false), companion.getUserSettings().observeStickerAnimationSettings(false), WidgetSettingsAccessibility$Model$Companion$get$1.INSTANCE); + m.checkNotNullExpressionValue(h, "Observable.combineLatest…ngs\n )\n }"); + return h; } } - public Model(boolean z2, boolean z3, boolean z4, int i, boolean z5) { + public Model(boolean z2, boolean z3, boolean z4, int i) { this.reducedMotionEnabled = z2; this.allowAnimatedEmoji = z3; this.autoPlayGifs = z4; this.currentStickerAnimationSettings = i; - this.showStickers = z5; } - public static /* synthetic */ Model copy$default(Model model, boolean z2, boolean z3, boolean z4, int i, boolean z5, int i2, Object obj) { + public static /* synthetic */ Model copy$default(Model model, boolean z2, boolean z3, boolean z4, int i, int i2, Object obj) { if ((i2 & 1) != 0) { z2 = model.reducedMotionEnabled; } @@ -94,10 +91,7 @@ public final class WidgetSettingsAccessibility extends AppFragment { if ((i2 & 8) != 0) { i = model.currentStickerAnimationSettings; } - if ((i2 & 16) != 0) { - z5 = model.showStickers; - } - return model.copy(z2, z3, z4, i, z5); + return model.copy(z2, z3, z4, i); } public final boolean component1() { @@ -116,12 +110,8 @@ public final class WidgetSettingsAccessibility extends AppFragment { return this.currentStickerAnimationSettings; } - public final boolean component5() { - return this.showStickers; - } - - public final Model copy(boolean z2, boolean z3, boolean z4, int i, boolean z5) { - return new Model(z2, z3, z4, i, z5); + public final Model copy(boolean z2, boolean z3, boolean z4, int i) { + return new Model(z2, z3, z4, i); } public boolean equals(Object obj) { @@ -132,7 +122,7 @@ public final class WidgetSettingsAccessibility extends AppFragment { return false; } Model model = (Model) obj; - return this.reducedMotionEnabled == model.reducedMotionEnabled && this.allowAnimatedEmoji == model.allowAnimatedEmoji && this.autoPlayGifs == model.autoPlayGifs && this.currentStickerAnimationSettings == model.currentStickerAnimationSettings && this.showStickers == model.showStickers; + return this.reducedMotionEnabled == model.reducedMotionEnabled && this.allowAnimatedEmoji == model.allowAnimatedEmoji && this.autoPlayGifs == model.autoPlayGifs && this.currentStickerAnimationSettings == model.currentStickerAnimationSettings; } public final boolean getAllowAnimatedEmoji() { @@ -151,10 +141,6 @@ public final class WidgetSettingsAccessibility extends AppFragment { return this.reducedMotionEnabled; } - public final boolean getShowStickers() { - return this.showStickers; - } - public int hashCode() { boolean z2 = this.reducedMotionEnabled; int i = 1; @@ -174,18 +160,10 @@ public final class WidgetSettingsAccessibility extends AppFragment { int i8 = z3 ? 1 : 0; int i9 = (i5 + i6) * 31; boolean z4 = this.autoPlayGifs; - if (z4) { - z4 = true; + if (!z4) { + i = z4 ? 1 : 0; } - int i10 = z4 ? 1 : 0; - int i11 = z4 ? 1 : 0; - int i12 = z4 ? 1 : 0; - int i13 = (((i9 + i10) * 31) + this.currentStickerAnimationSettings) * 31; - boolean z5 = this.showStickers; - if (!z5) { - i = z5 ? 1 : 0; - } - return i13 + i; + return ((i9 + i) * 31) + this.currentStickerAnimationSettings; } public String toString() { @@ -196,14 +174,12 @@ public final class WidgetSettingsAccessibility extends AppFragment { L.append(", autoPlayGifs="); L.append(this.autoPlayGifs); L.append(", currentStickerAnimationSettings="); - L.append(this.currentStickerAnimationSettings); - L.append(", showStickers="); - return a.G(L, this.showStickers, ")"); + return a.z(L, this.currentStickerAnimationSettings, ")"); } } public WidgetSettingsAccessibility() { - super(2131559181); + super(2131559182); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccessibility widgetSettingsAccessibility, Model model) { @@ -226,58 +202,55 @@ public final class WidgetSettingsAccessibility extends AppFragment { CheckedSetting checkedSetting = getBinding().g; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsAccessibilityReducedMotionSwitch"); checkedSetting.setChecked(model.getReducedMotionEnabled()); - LinearLayout linearLayout = getBinding().h; - m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccessibilityStickersContainer"); - linearLayout.setVisibility(model.getShowStickers() ? 0 : 8); if (model.getReducedMotionEnabled()) { getBinding().b.b(2131886133); CheckedSetting checkedSetting2 = getBinding().b; m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsAccessib…tyAllowAnimateEmojiSwitch"); checkedSetting2.setChecked(false); - for (CheckedSetting checkedSetting3 : n.listOf((Object[]) new CheckedSetting[]{getBinding().j, getBinding().k, getBinding().l})) { - checkedSetting3.b(2131893537); + for (CheckedSetting checkedSetting3 : n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k})) { + checkedSetting3.b(2131893577); } if (model.getCurrentStickerAnimationSettings() != 2) { RadioManager radioManager = this.stickersAnimationRadioManager; if (radioManager != null) { - CheckedSetting checkedSetting4 = getBinding().k; + CheckedSetting checkedSetting4 = getBinding().j; m.checkNotNullExpressionValue(checkedSetting4, "binding.stickersAnimateOnInteraction"); radioManager.a(checkedSetting4); } } else { RadioManager radioManager2 = this.stickersAnimationRadioManager; if (radioManager2 != null) { - CheckedSetting checkedSetting5 = getBinding().l; + CheckedSetting checkedSetting5 = getBinding().k; m.checkNotNullExpressionValue(checkedSetting5, "binding.stickersNeverAnimate"); radioManager2.a(checkedSetting5); } } - CheckedSetting checkedSetting6 = getBinding().f1900c; + CheckedSetting checkedSetting6 = getBinding().f1902c; m.checkNotNullExpressionValue(checkedSetting6, "binding.settingsAccessib…ityAllowAutoplayGifSwitch"); checkedSetting6.setChecked(false); - getBinding().f1900c.b(2131886133); + getBinding().f1902c.b(2131886133); return; } CheckedSetting checkedSetting7 = getBinding().b; m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsAccessib…tyAllowAnimateEmojiSwitch"); checkedSetting7.setChecked(model.getAllowAnimatedEmoji()); int currentStickerAnimationSettings = model.getCurrentStickerAnimationSettings(); - CheckedSetting checkedSetting8 = getBinding().j; + CheckedSetting checkedSetting8 = getBinding().i; m.checkNotNullExpressionValue(checkedSetting8, "binding.stickersAlwaysAnimate"); configureStickerAnimationRadio(currentStickerAnimationSettings, checkedSetting8, 0); int currentStickerAnimationSettings2 = model.getCurrentStickerAnimationSettings(); - CheckedSetting checkedSetting9 = getBinding().k; + CheckedSetting checkedSetting9 = getBinding().j; m.checkNotNullExpressionValue(checkedSetting9, "binding.stickersAnimateOnInteraction"); configureStickerAnimationRadio(currentStickerAnimationSettings2, checkedSetting9, 1); int currentStickerAnimationSettings3 = model.getCurrentStickerAnimationSettings(); - CheckedSetting checkedSetting10 = getBinding().l; + CheckedSetting checkedSetting10 = getBinding().k; m.checkNotNullExpressionValue(checkedSetting10, "binding.stickersNeverAnimate"); configureStickerAnimationRadio(currentStickerAnimationSettings3, checkedSetting10, 2); - CheckedSetting checkedSetting11 = getBinding().f1900c; + CheckedSetting checkedSetting11 = getBinding().f1902c; m.checkNotNullExpressionValue(checkedSetting11, "binding.settingsAccessib…ityAllowAutoplayGifSwitch"); checkedSetting11.setChecked(model.getAutoPlayGifs()); getBinding().b.e(new WidgetSettingsAccessibility$configureUI$1(this)); - getBinding().f1900c.e(new WidgetSettingsAccessibility$configureUI$2(this)); + getBinding().f1902c.e(new WidgetSettingsAccessibility$configureUI$2(this)); } private final WidgetSettingsAccessibilityBinding getBinding() { @@ -289,16 +262,16 @@ public final class WidgetSettingsAccessibility extends AppFragment { super.onViewBoundOrOnResume(); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(Model.Companion.get(), this, null, 2, null), WidgetSettingsAccessibility.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetSettingsAccessibility$onViewBoundOrOnResume$1(this), 62, (Object) null); setActionBarTitle(2131886116); - setActionBarSubtitle(2131894217); + setActionBarSubtitle(2131894256); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); getBinding().g.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$2.INSTANCE); LinkifiedTextView linkifiedTextView = getBinding().e; m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsAccessib…yReducedMotionDescription"); b.n(linkifiedTextView, 2131886131, new Object[]{f.a.a(360040613412L, null)}, null, 4); getBinding().b.setOnCheckedListener(new WidgetSettingsAccessibility$onViewBoundOrOnResume$3(this)); - getBinding().f1900c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE); - this.stickersAnimationRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().j, getBinding().k, getBinding().l})); - for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().f, getBinding().d, getBinding().i})) { + getBinding().f1902c.setOnCheckedListener(WidgetSettingsAccessibility$onViewBoundOrOnResume$4.INSTANCE); + this.stickersAnimationRadioManager = new RadioManager(n.listOf((Object[]) new CheckedSetting[]{getBinding().i, getBinding().j, getBinding().k})); + for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().f, getBinding().d, getBinding().h})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView, "header"); accessibilityUtils.setViewIsHeading(textView); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java index 000a16162d..246b3f5766 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetSettingsActivityStatus$binding$2 extend public final WidgetSettingsActivityStatusBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364935); + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364938); if (checkedSetting != null) { return new WidgetSettingsActivityStatusBinding((CoordinatorLayout) view, checkedSetting); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364935))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364938))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java index 00d8829f4c..a531274490 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsActivityStatus.java @@ -39,7 +39,7 @@ public final class WidgetSettingsActivityStatus extends AppFragment { } public WidgetSettingsActivityStatus() { - super(2131559188); + super(2131559189); } public static final /* synthetic */ void access$configureUI(WidgetSettingsActivityStatus widgetSettingsActivityStatus, boolean z2) { @@ -61,7 +61,7 @@ public final class WidgetSettingsActivityStatus extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); + setActionBarSubtitle(2131894256); setActionBarTitle(2131886233); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java index 5aaa66a86e..faa5a565de 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$binding$2.java @@ -93,60 +93,60 @@ public final /* synthetic */ class WidgetSettingsAppearance$binding$2 extends k i2 = 2131362596; TypingDots typingDots = (TypingDots) findViewById.findViewById(2131362596); if (typingDots != null) { - i2 = 2131365269; - ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById.findViewById(2131365269); + i2 = 2131365273; + ConstraintLayout constraintLayout2 = (ConstraintLayout) findViewById.findViewById(2131365273); if (constraintLayout2 != null) { - i2 = 2131365270; - ImageView imageView3 = (ImageView) findViewById.findViewById(2131365270); + i2 = 2131365274; + ImageView imageView3 = (ImageView) findViewById.findViewById(2131365274); if (imageView3 != null) { - i2 = 2131365271; - TextView textView6 = (TextView) findViewById.findViewById(2131365271); + i2 = 2131365275; + TextView textView6 = (TextView) findViewById.findViewById(2131365275); if (textView6 != null) { - i2 = 2131365323; - Guideline guideline = (Guideline) findViewById.findViewById(2131365323); + i2 = 2131365328; + Guideline guideline = (Guideline) findViewById.findViewById(2131365328); if (guideline != null) { j4 j4Var = new j4((ConstraintLayout) findViewById, findViewById2, findViewById3, linearLayout, findViewById4, linkifiedTextView, simpleDraweeView, frameLayout, simpleDraweeView2, imageView, frameLayout2, textView, imageView2, constraintLayout, textView2, textView3, simpleDraweeSpanTextView, textView4, textView5, appCompatImageView, typingDots, constraintLayout2, imageView3, textView6, guideline); - i = 2131364781; - TextView textView7 = (TextView) view.findViewById(2131364781); + i = 2131364784; + TextView textView7 = (TextView) view.findViewById(2131364784); if (textView7 != null) { - i = 2131364782; - TextView textView8 = (TextView) view.findViewById(2131364782); + i = 2131364785; + TextView textView8 = (TextView) view.findViewById(2131364785); if (textView8 != null) { - i = 2131364783; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364783); + i = 2131364786; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364786); if (linearLayout2 != null) { - i = 2131364784; - TextView textView9 = (TextView) view.findViewById(2131364784); + i = 2131364787; + TextView textView9 = (TextView) view.findViewById(2131364787); if (textView9 != null) { - i = 2131364785; - SeekBar seekBar = (SeekBar) view.findViewById(2131364785); + i = 2131364788; + SeekBar seekBar = (SeekBar) view.findViewById(2131364788); if (seekBar != null) { - i = 2131364786; - TextView textView10 = (TextView) view.findViewById(2131364786); + i = 2131364789; + TextView textView10 = (TextView) view.findViewById(2131364789); if (textView10 != null) { - i = 2131364787; - TextView textView11 = (TextView) view.findViewById(2131364787); + i = 2131364790; + TextView textView11 = (TextView) view.findViewById(2131364790); if (textView11 != null) { - i = 2131364788; - View findViewById5 = view.findViewById(2131364788); + i = 2131364791; + View findViewById5 = view.findViewById(2131364791); if (findViewById5 != null) { - i = 2131364789; - TextView textView12 = (TextView) view.findViewById(2131364789); + i = 2131364792; + TextView textView12 = (TextView) view.findViewById(2131364792); if (textView12 != null) { - i = 2131364790; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364790); + i = 2131364793; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364793); if (checkedSetting != null) { - i = 2131364791; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364791); + i = 2131364794; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364794); if (checkedSetting2 != null) { - i = 2131364792; - TextView textView13 = (TextView) view.findViewById(2131364792); + i = 2131364795; + TextView textView13 = (TextView) view.findViewById(2131364795); if (textView13 != null) { - i = 2131364793; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364793); + i = 2131364796; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364796); if (checkedSetting3 != null) { - i = 2131364794; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364794); + i = 2131364797; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364797); if (checkedSetting4 != null) { return new WidgetSettingsAppearanceBinding((CoordinatorLayout) view, j4Var, textView7, textView8, linearLayout2, textView9, seekBar, textView10, textView11, findViewById5, textView12, checkedSetting, checkedSetting2, textView13, checkedSetting3, checkedSetting4); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.java index bfa4fadb65..3f022a81dc 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$1.java @@ -48,7 +48,7 @@ public final class WidgetSettingsAppearance$configureUI$1 implements View.OnClic if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(5000, this) == coroutine_suspended) { + if (a.n(5000, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -73,7 +73,7 @@ public final class WidgetSettingsAppearance$configureUI$1 implements View.OnClic m.checkNotNullExpressionValue(view, "it"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(view); if (coroutineScope != null) { - a.F(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + a.G(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); } } else if (andIncrement == 5) { WidgetSettingsAppearance.access$showHolyLight(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java index 82b7bd345f..b85b002ec8 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.java @@ -52,7 +52,7 @@ public final class WidgetSettingsAppearance$configureUI$2 implements View.OnClic if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(5000, this) == coroutine_suspended) { + if (a.n(5000, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -79,13 +79,13 @@ public final class WidgetSettingsAppearance$configureUI$2 implements View.OnClic m.checkNotNullExpressionValue(view, "it"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(view); if (coroutineScope != null) { - a.F(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + a.G(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); } } else if (3 <= andIncrement && 8 > andIncrement) { m.checkNotNullExpressionValue(view, "it"); - o.h(view.getContext(), b.j(this.this$0, 2131893799, new Object[]{String.valueOf(8 - andIncrement)}, null, 4), 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0), 4); + o.h(view.getContext(), b.j(this.this$0, 2131893839, new Object[]{String.valueOf(8 - andIncrement)}, null, 4), 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0), 4); } else if (andIncrement == 8) { - o.d(this.this$0.getContext(), 2131893800, 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0)); + o.d(this.this$0.getContext(), 2131893840, 0, WidgetSettingsAppearance.access$getToastManager$p(this.this$0)); WidgetSettingsAppearance.access$getPureEvilEasterEggSubject$p(this.this$0).onNext(Boolean.TRUE); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java index ba9bc97692..bda3b9e714 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance$updateTheme$1.java @@ -37,9 +37,9 @@ public final class WidgetSettingsAppearance$updateTheme$1 extends o implements F public final void invoke(ModelUserSettings modelUserSettings) { m.checkNotNullParameter(modelUserSettings, "it"); if (m.areEqual(this.this$0.$theme, "pureEvil")) { - c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893802, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893842, 0, null, 12); } else { - c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893804, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.getActivity(), 2131893844, 0, null, 12); } } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java index 0e9f5e10e3..67a2fe4b07 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAppearance.java @@ -206,7 +206,7 @@ public final class WidgetSettingsAppearance extends AppFragment { } public WidgetSettingsAppearance() { - super(2131559189); + super(2131559190); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAppearance widgetSettingsAppearance, Model model) { @@ -297,7 +297,7 @@ public final class WidgetSettingsAppearance extends AppFragment { getBinding().f.setOnSeekBarChangeListener(new WidgetSettingsAppearance$configureUI$4(this)); getBinding().e.setOnClickListener(WidgetSettingsAppearance$configureUI$5.INSTANCE); setupMessage(model); - for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().h, getBinding().f1911c})) { + for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().h, getBinding().f1913c})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView, "header"); accessibilityUtils.setViewIsHeading(textView); @@ -341,11 +341,11 @@ public final class WidgetSettingsAppearance extends AppFragment { textView3.setText(TimeUtils.toReadableTimeString$default(requireContext(), ClockFactory.get().currentTimeMillis(), null, 4, null)); LinkifiedTextView linkifiedTextView = getBinding().b.b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.chatItem.chatListAdapterItemText"); - linkifiedTextView.setText(getString(2131894246)); + linkifiedTextView.setText(getString(2131894285)); } private final void showHolyLight() { - o.d(getContext(), 2131893797, 0, this.toastManager); + o.d(getContext(), 2131893837, 0, this.toastManager); tryEnableTorchMode(true); View view = getBinding().g; m.checkNotNullExpressionValue(view, "binding.settingsAppearanceHolyLight"); @@ -388,7 +388,7 @@ public final class WidgetSettingsAppearance extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); setActionBarTitle(2131886370); - setActionBarSubtitle(2131894217); + setActionBarSubtitle(2131894256); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); SeekBar seekBar = getBinding().f; m.checkNotNullExpressionValue(seekBar, "binding.settingsAppearanceFontScalingSeekbar"); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java index d1be162b81..ba6eb8626e 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps$adapter$1.java @@ -54,28 +54,28 @@ public final class WidgetSettingsAuthorizedApps$adapter$1 extends o implements F public final WidgetSettingsAuthorizedApps.AuthorizedAppViewHolder invoke(LayoutInflater layoutInflater, ViewGroup viewGroup) { m.checkNotNullParameter(layoutInflater, "layoutInflater"); m.checkNotNullParameter(viewGroup, "parent"); - View inflate = layoutInflater.inflate(2131559191, viewGroup, false); - int i = 2131364063; - AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131364063); + View inflate = layoutInflater.inflate(2131559192, viewGroup, false); + int i = 2131364065; + AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131364065); if (appCompatImageView != null) { - i = 2131364064; - TextView textView = (TextView) inflate.findViewById(2131364064); + i = 2131364066; + TextView textView = (TextView) inflate.findViewById(2131364066); if (textView != null) { - i = 2131364065; - TextView textView2 = (TextView) inflate.findViewById(2131364065); + i = 2131364067; + TextView textView2 = (TextView) inflate.findViewById(2131364067); if (textView2 != null) { - i = 2131364066; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364066); + i = 2131364068; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131364068); if (simpleDraweeView != null) { MaterialCardView materialCardView = (MaterialCardView) inflate; - i = 2131364068; - TextView textView3 = (TextView) inflate.findViewById(2131364068); + i = 2131364070; + TextView textView3 = (TextView) inflate.findViewById(2131364070); if (textView3 != null) { - i = 2131364069; - TextView textView4 = (TextView) inflate.findViewById(2131364069); + i = 2131364071; + TextView textView4 = (TextView) inflate.findViewById(2131364071); if (textView4 != null) { - i = 2131364070; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364070); + i = 2131364072; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131364072); if (recyclerView != null) { WidgetSettingsAuthorizedAppsListItemBinding widgetSettingsAuthorizedAppsListItemBinding = new WidgetSettingsAuthorizedAppsListItemBinding(materialCardView, appCompatImageView, textView, textView2, simpleDraweeView, materialCardView, textView3, textView4, recyclerView); m.checkNotNullExpressionValue(widgetSettingsAuthorizedAppsListItemBinding, "WidgetSettingsAuthorized…tInflater, parent, false)"); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java index 8972526c13..f71e24c727 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.java @@ -66,7 +66,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment { RecyclerView recyclerView = widgetSettingsAuthorizedAppsListItemBinding.i; m.checkNotNullExpressionValue(recyclerView, "binding.oauthApplicationPermissionsRv"); recyclerView.setAdapter(simpleRecyclerAdapter); - for (TextView textView : n.listOf((Object[]) new TextView[]{widgetSettingsAuthorizedAppsListItemBinding.g, widgetSettingsAuthorizedAppsListItemBinding.f1912c, widgetSettingsAuthorizedAppsListItemBinding.h})) { + for (TextView textView : n.listOf((Object[]) new TextView[]{widgetSettingsAuthorizedAppsListItemBinding.g, widgetSettingsAuthorizedAppsListItemBinding.f1914c, widgetSettingsAuthorizedAppsListItemBinding.h})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView, "header"); accessibilityUtils.setViewIsHeading(textView); @@ -91,7 +91,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment { MaterialCardView materialCardView = this.binding.f; m.checkNotNullExpressionValue(materialCardView, "binding.oauthApplicationListItem"); materialCardView.setContentDescription(application.g()); - TextView textView2 = this.binding.f1912c; + TextView textView2 = this.binding.f1914c; m.checkNotNullExpressionValue(textView2, "binding.oauthApplicationDescriptionLabelTv"); String c2 = application.c(); int i = 0; @@ -123,7 +123,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment { } public WidgetSettingsAuthorizedApps() { - super(2131559190); + super(2131559191); } public static final /* synthetic */ SimpleRecyclerAdapter access$getAdapter$p(WidgetSettingsAuthorizedApps widgetSettingsAuthorizedApps) { @@ -144,7 +144,7 @@ public final class WidgetSettingsAuthorizedApps extends AppFragment { @MainThread public final void deauthorizeApp(long j) { - WidgetNoticeDialog.Builder positiveButton = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888043).setMessage(2131888057), 2131887177, (Function1) null, 2, (Object) null).setPositiveButton(2131888042, new WidgetSettingsAuthorizedApps$deauthorizeApp$1(this, j)); + WidgetNoticeDialog.Builder positiveButton = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888044).setMessage(2131888058), 2131887178, (Function1) null, 2, (Object) null).setPositiveButton(2131888043, new WidgetSettingsAuthorizedApps$deauthorizeApp$1(this, j)); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); positiveButton.show(parentFragmentManager); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java index 8cfba0b12e..69fc2560cc 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior$binding$2.java @@ -18,20 +18,20 @@ public final /* synthetic */ class WidgetSettingsBehavior$binding$2 extends k im public final WidgetSettingsBehaviorBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364798; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364798); + int i = 2131364801; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364801); if (checkedSetting != null) { - i = 2131364799; - TextView textView = (TextView) view.findViewById(2131364799); + i = 2131364802; + TextView textView = (TextView) view.findViewById(2131364802); if (textView != null) { - i = 2131364800; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364800); + i = 2131364803; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364803); if (checkedSetting2 != null) { - i = 2131364801; - TextView textView2 = (TextView) view.findViewById(2131364801); + i = 2131364804; + TextView textView2 = (TextView) view.findViewById(2131364804); if (textView2 != null) { - i = 2131364802; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364802); + i = 2131364805; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364805); if (checkedSetting3 != null) { return new WidgetSettingsBehaviorBinding((CoordinatorLayout) view, checkedSetting, textView, checkedSetting2, textView2, checkedSetting3); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java index 15b67f985f..3acce83f2a 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsBehavior.java @@ -42,7 +42,7 @@ public final class WidgetSettingsBehavior extends AppFragment { } public WidgetSettingsBehavior() { - super(2131559192); + super(2131559193); } private final WidgetSettingsBehaviorBinding getBinding() { @@ -57,8 +57,8 @@ public final class WidgetSettingsBehavior extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131888667); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131888677); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); StoreUserSettings userSettings = StoreStream.Companion.getUserSettings(); CheckedSetting checkedSetting = getBinding().f; @@ -68,16 +68,16 @@ public final class WidgetSettingsBehavior extends AppFragment { checkedSetting2.setChecked(userSettings.getIsDeveloperMode()); Context context = checkedSetting2.getContext(); m.checkNotNullExpressionValue(context, "context"); - b.g(context, 2131888102, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4); + b.g(context, 2131888107, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4); Context context2 = checkedSetting2.getContext(); m.checkNotNullExpressionValue(context2, "context"); - checkedSetting2.h(b.g(context2, 2131888102, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4), false); + checkedSetting2.h(b.g(context2, 2131888107, new Object[]{"https://discord.com/developers/docs/intro"}, null, 4), false); checkedSetting2.setSubtextOnClickListener(new WidgetSettingsBehavior$onViewBound$2$1(checkedSetting2)); checkedSetting2.setOnCheckedListener(new WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$2(this, userSettings)); CheckedSetting checkedSetting3 = getBinding().b; checkedSetting3.setChecked(userSettings.getIsChromeCustomTabsEnabled()); checkedSetting3.setOnCheckedListener(new WidgetSettingsBehavior$onViewBound$$inlined$apply$lambda$3(userSettings)); - for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().e, getBinding().f1913c})) { + for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().e, getBinding().f1915c})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView, "header"); accessibilityUtils.setViewIsHeading(textView); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java index 8042414d4e..40923f7a65 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$binding$2.java @@ -20,23 +20,23 @@ public final /* synthetic */ class WidgetSettingsLanguage$binding$2 extends k im public final WidgetSettingsLanguageBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364841; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364841); + int i = 2131364844; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364844); if (relativeLayout != null) { - i = 2131364842; - ImageView imageView = (ImageView) view.findViewById(2131364842); + i = 2131364845; + ImageView imageView = (ImageView) view.findViewById(2131364845); if (imageView != null) { - i = 2131364843; - TextView textView = (TextView) view.findViewById(2131364843); + i = 2131364846; + TextView textView = (TextView) view.findViewById(2131364846); if (textView != null) { - i = 2131364844; - TextView textView2 = (TextView) view.findViewById(2131364844); + i = 2131364847; + TextView textView2 = (TextView) view.findViewById(2131364847); if (textView2 != null) { - i = 2131364848; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364848); + i = 2131364851; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364851); if (checkedSetting != null) { - i = 2131364849; - TextView textView3 = (TextView) view.findViewById(2131364849); + i = 2131364852; + TextView textView3 = (TextView) view.findViewById(2131364852); if (textView3 != null) { return new WidgetSettingsLanguageBinding((CoordinatorLayout) view, relativeLayout, imageView, textView, textView2, checkedSetting, textView3); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java index c27f82df1b..5540068576 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage$onViewBound$1.java @@ -43,7 +43,7 @@ public final class WidgetSettingsLanguage$onViewBound$1 extends o implements Fun public final void invoke(ModelUserSettings modelUserSettings) { m.checkNotNullParameter(modelUserSettings, "it"); - c.a.d.o.g(this.this$0.this$0.this$0.requireContext(), 2131890742, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.this$0.requireContext(), 2131890772, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java index 9481a4dfcb..ea4485a6ba 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguage.java @@ -111,144 +111,144 @@ public final class WidgetSettingsLanguage extends AppFragment { @DrawableRes public final int getLocaleFlagResId(String str) { if (str == null) { - return 2131232067; + return 2131232070; } switch (str.hashCode()) { case 3141: - return str.equals("bg") ? 2131232061 : 2131232067; + return str.equals("bg") ? 2131232064 : 2131232070; case 3184: - return str.equals("cs") ? 2131232062 : 2131232067; + return str.equals("cs") ? 2131232065 : 2131232070; case 3197: - return str.equals("da") ? 2131232063 : 2131232067; + return str.equals("da") ? 2131232066 : 2131232070; case 3201: - return str.equals("de") ? 2131232064 : 2131232067; + return str.equals("de") ? 2131232067 : 2131232070; case 3239: - return str.equals("el") ? 2131232065 : 2131232067; + return str.equals("el") ? 2131232068 : 2131232070; case 3267: - return str.equals("fi") ? 2131232070 : 2131232067; + return str.equals("fi") ? 2131232073 : 2131232070; case 3276: - return str.equals("fr") ? 2131232071 : 2131232067; + return str.equals("fr") ? 2131232074 : 2131232070; case 3329: - return str.equals("hi") ? 2131232073 : 2131232067; + return str.equals("hi") ? 2131232076 : 2131232070; case 3338: - return str.equals("hr") ? 2131232075 : 2131232067; + return str.equals("hr") ? 2131232078 : 2131232070; case 3341: - return str.equals("hu") ? 2131232076 : 2131232067; + return str.equals("hu") ? 2131232079 : 2131232070; case 3371: - return str.equals("it") ? 2131232077 : 2131232067; + return str.equals("it") ? 2131232080 : 2131232070; case 3383: - return str.equals("ja") ? 2131232078 : 2131232067; + return str.equals("ja") ? 2131232081 : 2131232070; case 3428: - return str.equals("ko") ? 2131232079 : 2131232067; + return str.equals("ko") ? 2131232082 : 2131232070; case 3464: - return str.equals("lt") ? 2131232080 : 2131232067; + return str.equals("lt") ? 2131232083 : 2131232070; case 3518: - return str.equals("nl") ? 2131232081 : 2131232067; + return str.equals("nl") ? 2131232084 : 2131232070; case 3521: - return str.equals("no") ? 2131232082 : 2131232067; + return str.equals("no") ? 2131232085 : 2131232070; case 3580: - return str.equals("pl") ? 2131232083 : 2131232067; + return str.equals("pl") ? 2131232086 : 2131232070; case 3645: - return str.equals("ro") ? 2131232085 : 2131232067; + return str.equals("ro") ? 2131232088 : 2131232070; case 3651: - return str.equals("ru") ? 2131232086 : 2131232067; + return str.equals("ru") ? 2131232089 : 2131232070; case 3700: - return str.equals("th") ? 2131232089 : 2131232067; + return str.equals("th") ? 2131232092 : 2131232070; case 3710: - return str.equals("tr") ? 2131232090 : 2131232067; + return str.equals("tr") ? 2131232093 : 2131232070; case 3734: - return str.equals("uk") ? 2131232091 : 2131232067; + return str.equals("uk") ? 2131232094 : 2131232070; case 3763: - return str.equals("vi") ? 2131232093 : 2131232067; + return str.equals("vi") ? 2131232096 : 2131232070; case 96598143: - return str.equals("en-GB") ? 2131232066 : 2131232067; + return str.equals("en-GB") ? 2131232069 : 2131232070; case 96598594: str.equals("en-US"); - return 2131232067; + return 2131232070; case 96747053: - return str.equals("es-ES") ? 2131232068 : 2131232067; + return str.equals("es-ES") ? 2131232071 : 2131232070; case 106935481: - return str.equals("pt-BR") ? 2131232084 : 2131232067; + return str.equals("pt-BR") ? 2131232087 : 2131232070; case 109766140: - return str.equals("sv-SE") ? 2131232088 : 2131232067; + return str.equals("sv-SE") ? 2131232091 : 2131232070; case 115813226: - return str.equals("zh-CN") ? 2131232094 : 2131232067; + return str.equals("zh-CN") ? 2131232097 : 2131232070; case 115813762: - return str.equals("zh-TW") ? 2131232095 : 2131232067; + return str.equals("zh-TW") ? 2131232098 : 2131232070; default: - return 2131232067; + return 2131232070; } } @StringRes public final int getLocaleResId(String str) { if (str == null) { - return 2131888313; + return 2131888323; } switch (str.hashCode()) { case 3141: - return str.equals("bg") ? 2131886843 : 2131888313; + return str.equals("bg") ? 2131886843 : 2131888323; case 3184: - return str.equals("cs") ? 2131887986 : 2131888313; + return str.equals("cs") ? 2131887987 : 2131888323; case 3197: - return str.equals("da") ? 2131888008 : 2131888313; + return str.equals("da") ? 2131888009 : 2131888323; case 3201: - return str.equals("de") ? 2131888039 : 2131888313; + return str.equals("de") ? 2131888040 : 2131888323; case 3239: - return str.equals("el") ? 2131888206 : 2131888313; + return str.equals("el") ? 2131888216 : 2131888323; case 3267: - return str.equals("fi") ? 2131888494 : 2131888313; + return str.equals("fi") ? 2131888504 : 2131888323; case 3276: - return str.equals("fr") ? 2131888776 : 2131888313; + return str.equals("fr") ? 2131888786 : 2131888323; case 3329: - return str.equals("hi") ? 2131890131 : 2131888313; + return str.equals("hi") ? 2131890144 : 2131888323; case 3338: - return str.equals("hr") ? 2131890145 : 2131888313; + return str.equals("hr") ? 2131890158 : 2131888323; case 3341: - return str.equals("hu") ? 2131890146 : 2131888313; + return str.equals("hu") ? 2131890159 : 2131888323; case 3371: - return str.equals("it") ? 2131890609 : 2131888313; + return str.equals("it") ? 2131890639 : 2131888323; case 3383: - return str.equals("ja") ? 2131890611 : 2131888313; + return str.equals("ja") ? 2131890641 : 2131888323; case 3428: - return str.equals("ko") ? 2131890736 : 2131888313; + return str.equals("ko") ? 2131890766 : 2131888323; case 3464: - return str.equals("lt") ? 2131890860 : 2131888313; + return str.equals("lt") ? 2131890890 : 2131888323; case 3518: - return str.equals("nl") ? 2131891333 : 2131888313; + return str.equals("nl") ? 2131891366 : 2131888323; case 3521: - return str.equals("no") ? 2131891334 : 2131888313; + return str.equals("no") ? 2131891367 : 2131888323; case 3580: - return str.equals("pl") ? 2131891864 : 2131888313; + return str.equals("pl") ? 2131891901 : 2131888323; case 3645: - return str.equals("ro") ? 2131892619 : 2131888313; + return str.equals("ro") ? 2131892661 : 2131888323; case 3651: - return str.equals("ru") ? 2131892886 : 2131888313; + return str.equals("ru") ? 2131892928 : 2131888323; case 3700: - return str.equals("th") ? 2131893794 : 2131888313; + return str.equals("th") ? 2131893834 : 2131888323; case 3710: - return str.equals("tr") ? 2131893919 : 2131888313; + return str.equals("tr") ? 2131893958 : 2131888323; case 3734: - return str.equals("uk") ? 2131893999 : 2131888313; + return str.equals("uk") ? 2131894038 : 2131888323; case 3763: - return str.equals("vi") ? 2131894424 : 2131888313; + return str.equals("vi") ? 2131894471 : 2131888323; case 96598143: - return str.equals("en-GB") ? 2131888312 : 2131888313; + return str.equals("en-GB") ? 2131888322 : 2131888323; case 96598594: str.equals("en-US"); - return 2131888313; + return 2131888323; case 96747053: - return str.equals("es-ES") ? 2131888378 : 2131888313; + return str.equals("es-ES") ? 2131888388 : 2131888323; case 106935481: - return str.equals("pt-BR") ? 2131892399 : 2131888313; + return str.equals("pt-BR") ? 2131892440 : 2131888323; case 109766140: - return str.equals("sv-SE") ? 2131893655 : 2131888313; + return str.equals("sv-SE") ? 2131893695 : 2131888323; case 115813226: - return str.equals("zh-CN") ? 2131894615 : 2131888313; + return str.equals("zh-CN") ? 2131894662 : 2131888323; case 115813762: - return str.equals("zh-TW") ? 2131894616 : 2131888313; + return str.equals("zh-TW") ? 2131894663 : 2131888323; default: - return 2131888313; + return 2131888323; } } @@ -259,7 +259,7 @@ public final class WidgetSettingsLanguage extends AppFragment { } public WidgetSettingsLanguage() { - super(2131559208); + super(2131559209); } public static final /* synthetic */ void access$configureUI(WidgetSettingsLanguage widgetSettingsLanguage, String str) { @@ -271,7 +271,7 @@ public final class WidgetSettingsLanguage extends AppFragment { m.checkNotNullExpressionValue(textView, "binding.settingsLanguageCurrentText"); Companion companion = Companion; textView.setText(getString(companion.getLocaleResId(str))); - getBinding().f1929c.setImageResource(companion.getLocaleFlagResId(str)); + getBinding().f1931c.setImageResource(companion.getLocaleFlagResId(str)); } private final WidgetSettingsLanguageBinding getBinding() { @@ -282,8 +282,8 @@ public final class WidgetSettingsLanguage extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131890739); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131890769); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); WidgetSettingsLanguageSelect.Companion.registerForResult(this, new WidgetSettingsLanguage$onViewBound$1(this)); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java index 5936a81777..52daec22ae 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetSettingsLanguageSelect$binding$2 extend public final WidgetSettingsLanguageSelectBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364847); + MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131364850); if (maxHeightRecyclerView != null) { return new WidgetSettingsLanguageSelectBinding((NestedScrollView) view, maxHeightRecyclerView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364847))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364850))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java index b81feddc60..2d7a52c29c 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsLanguageSelect.java @@ -56,17 +56,17 @@ public final class WidgetSettingsLanguageSelect extends AppDialog { super(i, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - int i2 = 2131363204; - ImageView imageView = (ImageView) view.findViewById(2131363204); + int i2 = 2131363206; + ImageView imageView = (ImageView) view.findViewById(2131363206); if (imageView != null) { - i2 = 2131363205; - Barrier barrier = (Barrier) view.findViewById(2131363205); + i2 = 2131363207; + Barrier barrier = (Barrier) view.findViewById(2131363207); if (barrier != null) { - i2 = 2131364845; - TextView textView = (TextView) view.findViewById(2131364845); + i2 = 2131364848; + TextView textView = (TextView) view.findViewById(2131364848); if (textView != null) { - i2 = 2131364846; - TextView textView2 = (TextView) view.findViewById(2131364846); + i2 = 2131364849; + TextView textView2 = (TextView) view.findViewById(2131364849); if (textView2 != null) { WidgetSettingsLanguageSelectItemBinding widgetSettingsLanguageSelectItemBinding = new WidgetSettingsLanguageSelectItemBinding((ConstraintLayout) view, imageView, barrier, textView, textView2); m.checkNotNullExpressionValue(widgetSettingsLanguageSelectItemBinding, "WidgetSettingsLanguageSe…temBinding.bind(itemView)"); @@ -87,7 +87,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog { m.checkNotNullParameter(item, "data"); super.onConfigure(i, (int) item); this.binding.a.setOnClickListener(new WidgetSettingsLanguageSelect$Adapter$AdapterItemLocale$onConfigure$1(this, item)); - TextView textView = this.binding.f1930c; + TextView textView = this.binding.f1932c; m.checkNotNullExpressionValue(textView, "binding.settingsLanguageSelectItemName"); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); @@ -116,7 +116,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog { @Override // androidx.recyclerview.widget.RecyclerView.Adapter public AdapterItemLocale onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - return new AdapterItemLocale(2131559210, this); + return new AdapterItemLocale(2131559211, this); } } @@ -225,7 +225,7 @@ public final class WidgetSettingsLanguageSelect extends AppDialog { } public WidgetSettingsLanguageSelect() { - super(2131559209); + super(2131559210); } public static final /* synthetic */ void access$onLocaleSelected(WidgetSettingsLanguageSelect widgetSettingsLanguageSelect, String str) { diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java index 0d3c7af548..8eb79f23e9 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia$binding$2.java @@ -29,35 +29,35 @@ public final /* synthetic */ class WidgetSettingsMedia$binding$2 extends k imple i = 2131362671; LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131362671); if (linkifiedTextView != null) { - i = 2131364882; - TextView textView = (TextView) view.findViewById(2131364882); + i = 2131364885; + TextView textView = (TextView) view.findViewById(2131364885); if (textView != null) { - i = 2131364883; - TextView textView2 = (TextView) view.findViewById(2131364883); + i = 2131364886; + TextView textView2 = (TextView) view.findViewById(2131364886); if (textView2 != null) { - i = 2131364884; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364884); + i = 2131364887; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364887); if (checkedSetting3 != null) { - i = 2131364885; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364885); + i = 2131364888; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364888); if (checkedSetting4 != null) { - i = 2131364886; - TextView textView3 = (TextView) view.findViewById(2131364886); + i = 2131364889; + TextView textView3 = (TextView) view.findViewById(2131364889); if (textView3 != null) { - i = 2131364887; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364887); + i = 2131364890; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364890); if (linearLayout != null) { - i = 2131364888; - TextView textView4 = (TextView) view.findViewById(2131364888); + i = 2131364891; + TextView textView4 = (TextView) view.findViewById(2131364891); if (textView4 != null) { - i = 2131364889; - TextView textView5 = (TextView) view.findViewById(2131364889); + i = 2131364892; + TextView textView5 = (TextView) view.findViewById(2131364892); if (textView5 != null) { - i = 2131364890; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364890); + i = 2131364893; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364893); if (checkedSetting5 != null) { - i = 2131365116; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365116); + i = 2131365120; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131365120); if (checkedSetting6 != null) { return new WidgetSettingsMediaBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, linkifiedTextView, textView, textView2, checkedSetting3, checkedSetting4, textView3, linearLayout, textView4, textView5, checkedSetting5, checkedSetting6); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java index d60ff0555d..3ae3fa8df5 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsMedia.java @@ -49,7 +49,7 @@ public final class WidgetSettingsMedia extends AppFragment { } public WidgetSettingsMedia() { - super(2131559211); + super(2131559212); } public static final /* synthetic */ WidgetSettingsMediaBinding access$getBinding$p(WidgetSettingsMedia widgetSettingsMedia) { @@ -80,8 +80,8 @@ public final class WidgetSettingsMedia extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131893786); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131893826); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); StoreStream.Companion companion = StoreStream.Companion; this.userSettings = companion.getUserSettings(); @@ -93,10 +93,10 @@ public final class WidgetSettingsMedia extends AppFragment { m.throwUninitializedPropertyAccessException("userSettings"); } checkedSetting.setChecked(storeUserSettings.getIsAttachmentMediaInline()); - CheckedSetting.i(getBinding().b, b.j(this, 2131890314, new Object[]{"10"}, null, 4), false, 2); + CheckedSetting.i(getBinding().b, b.j(this, 2131890344, new Object[]{"10"}, null, 4), false, 2); getBinding().b.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$1(this)); - getBinding().f1931c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this)); - CheckedSetting checkedSetting2 = getBinding().f1931c; + getBinding().f1933c.setOnCheckedListener(new WidgetSettingsMedia$onViewBound$2(this)); + CheckedSetting checkedSetting2 = getBinding().f1933c; m.checkNotNullExpressionValue(checkedSetting2, "binding.compressionToggle"); StoreUserSettings storeUserSettings2 = this.userSettings; if (storeUserSettings2 == null) { @@ -105,7 +105,7 @@ public final class WidgetSettingsMedia extends AppFragment { checkedSetting2.setChecked(storeUserSettings2.getIsAutoImageCompressionEnabled()); LinkifiedTextView linkifiedTextView = getBinding().d; m.checkNotNullExpressionValue(linkifiedTextView, "binding.compressionToggleSubtext"); - b.m(linkifiedTextView, 2131890289, new Object[]{"getNitro"}, new WidgetSettingsMedia$onViewBound$3(this)); + b.m(linkifiedTextView, 2131890319, new Object[]{"getNitro"}, new WidgetSettingsMedia$onViewBound$3(this)); CheckedSetting checkedSetting3 = getBinding().g; m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsTextImagesEmbedsToggle"); StoreUserSettings storeUserSettings3 = this.userSettings; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java index c94eca0ca6..cecc256256 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$binding$2.java @@ -18,23 +18,23 @@ public final /* synthetic */ class WidgetSettingsNotifications$binding$2 extends public final WidgetSettingsNotificationsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364840; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364840); + int i = 2131364843; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364843); if (checkedSetting != null) { - i = 2131364854; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364854); + i = 2131364857; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364857); if (checkedSetting2 != null) { - i = 2131364855; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364855); + i = 2131364858; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364858); if (checkedSetting3 != null) { - i = 2131364856; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364856); + i = 2131364859; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364859); if (checkedSetting4 != null) { - i = 2131364857; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364857); + i = 2131364860; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364860); if (checkedSetting5 != null) { - i = 2131364858; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364858); + i = 2131364861; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364861); if (linearLayout != null) { return new WidgetSettingsNotificationsBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, checkedSetting5, linearLayout); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java index 59b2218971..74ab2b8dc8 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.java @@ -36,7 +36,7 @@ public final class WidgetSettingsNotifications$onViewBoundOrOnResume$1 extends o CheckedSetting checkedSetting2 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).b; m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsInappNotifsSwitch"); checkedSetting2.setChecked(settingsV2.isEnabledInApp()); - CheckedSetting checkedSetting3 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f1933c; + CheckedSetting checkedSetting3 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f1935c; m.checkNotNullExpressionValue(checkedSetting3, "binding.settingsNotificationsBlink"); checkedSetting3.setChecked(settingsV2.isDisableBlink()); CheckedSetting checkedSetting4 = WidgetSettingsNotifications.access$getBinding$p(this.this$0).f; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java index f06b473fd4..2e71b8e9d5 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotifications.java @@ -40,7 +40,7 @@ public final class WidgetSettingsNotifications extends AppFragment { } public WidgetSettingsNotifications() { - super(2131559213); + super(2131559214); } public static final /* synthetic */ WidgetSettingsNotificationsBinding access$getBinding$p(WidgetSettingsNotifications widgetSettingsNotifications) { @@ -59,13 +59,13 @@ public final class WidgetSettingsNotifications extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131891504); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131891537); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); StoreNotifications storeNotifications = this.notificationStore; getBinding().d.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$1(storeNotifications)); getBinding().b.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$2(storeNotifications)); - getBinding().f1933c.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$3(storeNotifications)); + getBinding().f1935c.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$3(storeNotifications)); getBinding().f.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$4(storeNotifications)); getBinding().e.setOnCheckedListener(new WidgetSettingsNotifications$onViewBound$1$5(storeNotifications)); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java index dde77c7f67..9316c0d4a0 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs$binding$2.java @@ -19,17 +19,17 @@ public final /* synthetic */ class WidgetSettingsNotificationsOs$binding$2 exten public final WidgetSettingsNotificationOsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364840; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364840); + int i = 2131364843; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364843); if (checkedSetting != null) { - i = 2131364851; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364851); + i = 2131364854; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364854); if (relativeLayout != null) { - i = 2131364852; - TextView textView = (TextView) view.findViewById(2131364852); + i = 2131364855; + TextView textView = (TextView) view.findViewById(2131364855); if (textView != null) { - i = 2131364853; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364853); + i = 2131364856; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364856); if (checkedSetting2 != null) { return new WidgetSettingsNotificationOsBinding((LinearLayout) view, checkedSetting, relativeLayout, textView, checkedSetting2); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java index 657b222034..c87d247203 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsNotificationsOs.java @@ -58,7 +58,7 @@ public final class WidgetSettingsNotificationsOs extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559212; + return 2131559213; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -73,6 +73,6 @@ public final class WidgetSettingsNotificationsOs extends AppBottomSheet { super.onViewCreated(view, bundle); getBinding().d.setOnCheckedListener(WidgetSettingsNotificationsOs$onViewCreated$1.INSTANCE); getBinding().b.setOnCheckedListener(WidgetSettingsNotificationsOs$onViewCreated$2.INSTANCE); - getBinding().f1932c.setOnClickListener(new WidgetSettingsNotificationsOs$onViewCreated$3(this)); + getBinding().f1934c.setOnClickListener(new WidgetSettingsNotificationsOs$onViewCreated$3(this)); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java index 5a15bc6264..a7b8099e51 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$binding$2.java @@ -39,65 +39,65 @@ public final /* synthetic */ class WidgetSettingsPrivacy$binding$2 extends k imp i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364427; - TextView textView2 = (TextView) view.findViewById(2131364427); + i = 2131364430; + TextView textView2 = (TextView) view.findViewById(2131364430); if (textView2 != null) { - i = 2131364860; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364860); + i = 2131364863; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364863); if (checkedSetting5 != null) { - i = 2131364861; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364861); + i = 2131364864; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364864); if (linearLayout != null) { - i = 2131364862; - TextView textView3 = (TextView) view.findViewById(2131364862); + i = 2131364865; + TextView textView3 = (TextView) view.findViewById(2131364865); if (textView3 != null) { - i = 2131364863; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364863); + i = 2131364866; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364866); if (linearLayout2 != null) { - i = 2131364864; - TextView textView4 = (TextView) view.findViewById(2131364864); + i = 2131364867; + TextView textView4 = (TextView) view.findViewById(2131364867); if (textView4 != null) { - i = 2131364865; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364865); + i = 2131364868; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364868); if (checkedSetting6 != null) { - i = 2131364868; - TextView textView5 = (TextView) view.findViewById(2131364868); + i = 2131364871; + TextView textView5 = (TextView) view.findViewById(2131364871); if (textView5 != null) { - i = 2131364869; - CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364869); + i = 2131364872; + CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364872); if (checkedSetting7 != null) { - i = 2131364870; - CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364870); + i = 2131364873; + CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364873); if (checkedSetting8 != null) { - i = 2131364871; - CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364871); + i = 2131364874; + CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364874); if (checkedSetting9 != null) { - i = 2131364872; - CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364872); + i = 2131364875; + CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364875); if (checkedSetting10 != null) { - i = 2131364873; - CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364873); + i = 2131364876; + CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364876); if (checkedSetting11 != null) { - i = 2131364874; - CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364874); + i = 2131364877; + CheckedSetting checkedSetting12 = (CheckedSetting) view.findViewById(2131364877); if (checkedSetting12 != null) { - i = 2131364875; - TextView textView6 = (TextView) view.findViewById(2131364875); + i = 2131364878; + TextView textView6 = (TextView) view.findViewById(2131364878); if (textView6 != null) { - i = 2131364876; - CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364876); + i = 2131364879; + CheckedSetting checkedSetting13 = (CheckedSetting) view.findViewById(2131364879); if (checkedSetting13 != null) { - i = 2131364877; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364877); + i = 2131364880; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364880); if (materialButton != null) { - i = 2131364878; - TextView textView7 = (TextView) view.findViewById(2131364878); + i = 2131364881; + TextView textView7 = (TextView) view.findViewById(2131364881); if (textView7 != null) { - i = 2131364879; - CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364879); + i = 2131364882; + CheckedSetting checkedSetting14 = (CheckedSetting) view.findViewById(2131364882); if (checkedSetting14 != null) { - i = 2131364880; - CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364880); + i = 2131364883; + CheckedSetting checkedSetting15 = (CheckedSetting) view.findViewById(2131364883); if (checkedSetting15 != null) { return new WidgetSettingsPrivacyBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, textView, checkedSetting3, checkedSetting4, dimmerView, textView2, checkedSetting5, linearLayout, textView3, linearLayout2, textView4, checkedSetting6, textView5, checkedSetting7, checkedSetting8, checkedSetting9, checkedSetting10, checkedSetting11, checkedSetting12, textView6, checkedSetting13, materialButton, textView7, checkedSetting14, checkedSetting15); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java index 8edcbd8a5d..d9f7283fea 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$2.java @@ -22,7 +22,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$2 implement @Override // android.view.View.OnClickListener public final void onClick(View view) { - CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1936c; + CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1938c; m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncSettingEnabled"); boolean z2 = !checkedSetting.isChecked(); if (this.$model.getContactSyncConnection() != null) { diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java index f0135291f9..3b3ab6c587 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$3.java @@ -21,7 +21,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$3 implement m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncSettingEmail"); boolean isChecked = checkedSetting2.isChecked(); AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE; - CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1936c; + CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1938c; m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEnabled"); boolean isChecked2 = checkedSetting3.isChecked(); CheckedSetting checkedSetting4 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).b; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java index 2bde4d0ba7..517ce322e8 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureContactSyncOptions$4.java @@ -21,7 +21,7 @@ public final class WidgetSettingsPrivacy$configureContactSyncOptions$4 implement m.checkNotNullExpressionValue(checkedSetting2, "binding.contactSyncSettingPhone"); boolean isChecked = checkedSetting2.isChecked(); AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE; - CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1936c; + CheckedSetting checkedSetting3 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1938c; m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEnabled"); boolean isChecked2 = checkedSetting3.isChecked(); CheckedSetting checkedSetting4 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).e; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java index f127af02c3..939bcc0691 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1.java @@ -35,10 +35,10 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1 implement @Override // android.view.View.OnClickListener public final void onClick(View view) { this.$dialog.dismiss(); - CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1940z; + CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1942z; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics"); checkedSetting.setChecked(true); - CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1940z; + CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1942z; m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics"); checkedSetting2.setEnabled(true); } @@ -63,7 +63,7 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1 implement Boolean bool = r4.$consented; m.checkNotNullExpressionValue(bool, "consented"); boolean booleanValue = bool.booleanValue(); - CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1940z; + CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0.this$0.this$0).f1942z; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics"); WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "usage_statistics", checkedSetting); } @@ -90,11 +90,11 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1 implement m.checkNotNullParameter(textView2, "dialogBody"); m.checkNotNullParameter(textView3, "dialogCancel"); m.checkNotNullParameter(textView4, "dialogConfirm"); - textView.setText(2131894112); - textView2.setText(2131894109); - textView3.setText(2131894110); + textView.setText(2131894151); + textView2.setText(2131894148); + textView3.setText(2131894149); textView3.setOnClickListener(new AnonymousClass1(this, alertDialog)); - textView4.setText(2131894111); + textView4.setText(2131894150); textView4.setOnClickListener(new AnonymousClass2(this, alertDialog)); } } @@ -105,14 +105,14 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$1 implement } public final void call(Boolean bool) { - CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1940z; + CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1942z; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics"); checkedSetting.setEnabled(false); m.checkNotNullExpressionValue(bool, "consented"); if (bool.booleanValue()) { WidgetSettingsPrivacy widgetSettingsPrivacy = this.this$0; boolean booleanValue = bool.booleanValue(); - CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1940z; + CheckedSetting checkedSetting2 = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1942z; m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyStatistics"); WidgetSettingsPrivacy.access$toggleConsent(widgetSettingsPrivacy, booleanValue, "usage_statistics", checkedSetting2); return; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java index 8b28968105..b7f3e3a3f9 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2.java @@ -90,11 +90,11 @@ public final class WidgetSettingsPrivacy$configurePrivacyControls$2 implement m.checkNotNullParameter(textView2, "dialogBody"); m.checkNotNullParameter(textView3, "dialogCancel"); m.checkNotNullParameter(textView4, "dialogConfirm"); - textView.setText(2131891829); - textView2.setText(2131891826); - textView3.setText(2131891827); + textView.setText(2131891866); + textView2.setText(2131891863); + textView3.setText(2131891864); textView3.setOnClickListener(new AnonymousClass1(this, alertDialog)); - textView4.setText(2131891828); + textView4.setText(2131891865); textView4.setOnClickListener(new AnonymousClass2(this, alertDialog)); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java index 8bb598db16..099b5d8a38 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.java @@ -24,7 +24,7 @@ public final class WidgetSettingsPrivacy$configureRequestDataButton$1 implements if (context != null) { m.checkNotNullExpressionValue(context, "context ?: return@setOnClickListener"); if (!this.$isMeVerified || (harvestState = this.$harvestState) == null) { - o.i(this.this$0, 2131888033, 0, 4); + o.i(this.this$0, 2131888034, 0, 4); } else { WidgetSettingsPrivacy.access$onRequestDataClick(this.this$0, context, harvestState); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java index 4a0021d735..962e98aa05 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$friendSourceRadios$2.java @@ -19,6 +19,6 @@ public final class WidgetSettingsPrivacy$friendSourceRadios$2 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final List mo1invoke() { - return n.listOf((Object[]) new CheckedSetting[]{WidgetSettingsPrivacy.access$getBinding$p(this.this$0).r, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1937s, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).t}); + return n.listOf((Object[]) new CheckedSetting[]{WidgetSettingsPrivacy.access$getBinding$p(this.this$0).r, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1939s, WidgetSettingsPrivacy.access$getBinding$p(this.this$0).t}); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java index 38561111ed..802fa442e7 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.java @@ -31,7 +31,7 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$1 extends o implemen public final void invoke(Harvest harvest) { m.checkNotNullParameter(harvest, "requestedHarvest"); - WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888032).setMessage(2131888031), 2131891633, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888033).setMessage(2131888032), 2131891666, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); positiveButton$default.show(parentFragmentManager); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java index c5870f5fdd..e2fb727d28 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.java @@ -38,12 +38,12 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$2 extends o implemen /* JADX WARN: Multi-variable type inference failed */ /* JADX WARNING: Unknown variable types count: 1 */ public final void invoke(String str) { - WidgetNoticeDialog.Builder title = new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888024); + WidgetNoticeDialog.Builder title = new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888025); String str2 = str; if (str == null) { - str2 = b.g(this.$context, 2131888023, new Object[0], null, 4); + str2 = b.g(this.$context, 2131888024, new Object[0], null, 4); } - WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(title.setMessage(str2), 2131891633, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(title.setMessage(str2), 2131891666, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); positiveButton$default.show(parentFragmentManager); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java index 7df0703d0d..7e775b777a 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.java @@ -51,7 +51,7 @@ public final class WidgetSettingsPrivacy$onRequestDataClick$4 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888022).setMessage(2131888027).setPositiveButton(2131891633, new AnonymousClass1(this)), 2131887177, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder negativeButton$default = WidgetNoticeDialog.Builder.setNegativeButton$default(new WidgetNoticeDialog.Builder(this.$context).setTitle(2131888023).setMessage(2131888028).setPositiveButton(2131891666, new AnonymousClass1(this)), 2131887178, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); negativeButton$default.show(parentFragmentManager); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java index a6b51ab852..7195c3b550 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy$onViewBoundOrOnResume$2.java @@ -24,7 +24,7 @@ public final class WidgetSettingsPrivacy$onViewBoundOrOnResume$2 extends o imple } public final void invoke(boolean z2) { - CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1939y; + CheckedSetting checkedSetting = WidgetSettingsPrivacy.access$getBinding$p(this.this$0).f1941y; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyScreenreaderDetection"); checkedSetting.setChecked(z2); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java index d5b453bb6a..2a8b50dc85 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsPrivacy.java @@ -453,7 +453,7 @@ public final class WidgetSettingsPrivacy extends AppFragment { } public WidgetSettingsPrivacy() { - super(2131559215); + super(2131559216); } public static final /* synthetic */ void access$configureRequestDataButton(WidgetSettingsPrivacy widgetSettingsPrivacy, boolean z2, RestAPI.HarvestState harvestState) { @@ -516,11 +516,11 @@ public final class WidgetSettingsPrivacy extends AppFragment { if (model.getShowContactSync()) { TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.contactSyncSettingInfo"); - b.m(textView, 2131887564, new Object[0], new WidgetSettingsPrivacy$configureContactSyncOptions$1(this)); + b.m(textView, 2131887566, new Object[0], new WidgetSettingsPrivacy$configureContactSyncOptions$1(this)); TextView textView2 = getBinding().d; m.checkNotNullExpressionValue(textView2, "binding.contactSyncSettingInfo"); textView2.setMovementMethod(LinkMovementMethod.getInstance()); - CheckedSetting checkedSetting = getBinding().f1936c; + CheckedSetting checkedSetting = getBinding().f1938c; m.checkNotNullExpressionValue(checkedSetting, "binding.contactSyncSettingEnabled"); ModelConnectedAccount contactSyncConnection = model.getContactSyncConnection(); checkedSetting.setChecked(contactSyncConnection != null && contactSyncConnection.isFriendSync()); @@ -530,7 +530,7 @@ public final class WidgetSettingsPrivacy extends AppFragment { CheckedSetting checkedSetting3 = getBinding().b; m.checkNotNullExpressionValue(checkedSetting3, "binding.contactSyncSettingEmail"); checkedSetting3.setChecked((model.getUserDiscoveryFlags() & 4) == 4); - getBinding().f1936c.e(new WidgetSettingsPrivacy$configureContactSyncOptions$2(this, model)); + getBinding().f1938c.e(new WidgetSettingsPrivacy$configureContactSyncOptions$2(this, model)); getBinding().e.e(new WidgetSettingsPrivacy$configureContactSyncOptions$3(this)); getBinding().b.e(new WidgetSettingsPrivacy$configureContactSyncOptions$4(this)); CheckedSetting checkedSetting4 = getBinding().f; @@ -593,10 +593,10 @@ public final class WidgetSettingsPrivacy extends AppFragment { LinearLayout linearLayout = getBinding().k; m.checkNotNullExpressionValue(linearLayout, "binding.settingsPrivacyControls"); linearLayout.setVisibility(0); - CheckedSetting checkedSetting = getBinding().f1940z; + CheckedSetting checkedSetting = getBinding().f1942z; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsPrivacyStatistics"); checkedSetting.setChecked(model.getConsents().getUsageStatistics().getConsented()); - getBinding().f1940z.setOnCheckedListener(new WidgetSettingsPrivacy$configurePrivacyControls$1(this, context)); + getBinding().f1942z.setOnCheckedListener(new WidgetSettingsPrivacy$configurePrivacyControls$1(this, context)); CheckedSetting checkedSetting2 = getBinding().v; m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization"); checkedSetting2.setChecked(model.getConsents().getPersonalization().getConsented()); @@ -636,7 +636,7 @@ public final class WidgetSettingsPrivacy extends AppFragment { m.checkNotNullExpressionValue(textView2, "binding.viewDialogConfirmationText"); MaterialButton materialButton = a.b; m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationCancel"); - MaterialButton materialButton2 = a.f1647c; + MaterialButton materialButton2 = a.f1649c; m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationConfirm"); function5.invoke(create, textView, textView2, materialButton, materialButton2); create.show(); @@ -679,12 +679,12 @@ public final class WidgetSettingsPrivacy extends AppFragment { } private final void showDefaultGuildsRestrictedExistingServers(boolean z2) { - View inflate = getLayoutInflater().inflate(2131559216, (ViewGroup) null, false); - int i = 2131364866; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364866); + View inflate = getLayoutInflater().inflate(2131559217, (ViewGroup) null, false); + int i = 2131364869; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131364869); if (materialButton != null) { - i = 2131364867; - MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364867); + i = 2131364870; + MaterialButton materialButton2 = (MaterialButton) inflate.findViewById(2131364870); if (materialButton2 != null) { LinearLayout linearLayout = (LinearLayout) inflate; m.checkNotNullExpressionValue(new f5(linearLayout, materialButton, materialButton2), "WidgetSettingsPrivacyDef…outInflater, null, false)"); @@ -711,7 +711,7 @@ public final class WidgetSettingsPrivacy extends AppFragment { Context context = getContext(); if (context != null) { m.checkNotNullExpressionValue(context, "context ?: return"); - WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131888036).setMessage(b.g(context, 2131888013, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, j, context, 0, 4, null)}, null, 4)), 2131891633, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(context).setTitle(2131888037).setMessage(b.g(context, 2131888014, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, j, context, 0, 4, null)}, null, 4)), 2131891666, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); positiveButton$default.show(parentFragmentManager); @@ -788,25 +788,25 @@ public final class WidgetSettingsPrivacy extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131892336); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131892374); this.radioManagerExplicit = new RadioManager(getExplicitContentRadios()); CheckedSetting checkedSetting = getBinding().v; CheckedSetting checkedSetting2 = getBinding().v; m.checkNotNullExpressionValue(checkedSetting2, "binding.settingsPrivacyPersonalization"); f fVar = f.a; - checkedSetting.h(b.i(checkedSetting2, 2131888020, new Object[]{fVar.a(360004109911L, null)}, null, 4), true); - CheckedSetting checkedSetting3 = getBinding().f1939y; - CheckedSetting checkedSetting4 = getBinding().f1939y; + checkedSetting.h(b.i(checkedSetting2, 2131888021, new Object[]{fVar.a(360004109911L, null)}, null, 4), true); + CheckedSetting checkedSetting3 = getBinding().f1941y; + CheckedSetting checkedSetting4 = getBinding().f1941y; m.checkNotNullExpressionValue(checkedSetting4, "binding.settingsPrivacyScreenreaderDetection"); - checkedSetting3.h(b.i(checkedSetting4, 2131888015, new Object[]{fVar.a(360035966492L, null)}, null, 4), true); - CheckedSetting checkedSetting5 = getBinding().f1939y; + checkedSetting3.h(b.i(checkedSetting4, 2131888016, new Object[]{fVar.a(360035966492L, null)}, null, 4), true); + CheckedSetting checkedSetting5 = getBinding().f1941y; checkedSetting5.setOnCheckedListener(new WidgetSettingsPrivacy$onViewBound$$inlined$apply$lambda$1(checkedSetting5, this)); getBinding().i.setButtonVisibility(false); CheckedSetting checkedSetting6 = getBinding().i; CheckedSetting checkedSetting7 = getBinding().i; m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsPrivacyBasicService"); - checkedSetting6.h(b.c(checkedSetting7, 2131888017, new Object[0], WidgetSettingsPrivacy$onViewBound$2.INSTANCE), true); + checkedSetting6.h(b.c(checkedSetting7, 2131888018, new Object[0], WidgetSettingsPrivacy$onViewBound$2.INSTANCE), true); getBinding().i.e(WidgetSettingsPrivacy$onViewBound$3.INSTANCE); String a = fVar.a(360004027692L, null); TextView textView = getBinding().h; @@ -815,17 +815,17 @@ public final class WidgetSettingsPrivacy extends AppFragment { sb.append('['); TextView textView2 = getBinding().h; m.checkNotNullExpressionValue(textView2, "binding.requestDataLink"); - sb.append(b.i(textView2, 2131891483, new Object[0], null, 4)); + sb.append(b.i(textView2, 2131891516, new Object[0], null, 4)); sb.append("]("); sb.append(a); sb.append(')'); textView.setText(b.k(sb.toString(), new Object[0], null, 2)); getBinding().h.setOnClickListener(new WidgetSettingsPrivacy$onViewBound$4(a)); - CheckedSetting checkedSetting8 = getBinding().f1940z; - CheckedSetting checkedSetting9 = getBinding().f1940z; + CheckedSetting checkedSetting8 = getBinding().f1942z; + CheckedSetting checkedSetting9 = getBinding().f1942z; m.checkNotNullExpressionValue(checkedSetting9, "binding.settingsPrivacyStatistics"); - checkedSetting8.h(b.i(checkedSetting9, 2131888034, new Object[]{fVar.a(360004109911L, null)}, null, 4), true); - for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f1938x, getBinding().n, getBinding().u, getBinding().l})) { + checkedSetting8.h(b.i(checkedSetting9, 2131888035, new Object[]{fVar.a(360004109911L, null)}, null, 4), true); + for (TextView textView3 : n.listOf((Object[]) new TextView[]{getBinding().f1940x, getBinding().n, getBinding().u, getBinding().l})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView3, "header"); accessibilityUtils.setViewIsHeading(textView3); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java index b5d7519035..b2124576e2 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$InputModeSelector$binding$2.java @@ -18,14 +18,14 @@ public final /* synthetic */ class WidgetSettingsVoice$InputModeSelector$binding public final WidgetSettingsVoiceInputModeBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363340; - TextView textView = (TextView) view.findViewById(2131363340); + int i = 2131363342; + TextView textView = (TextView) view.findViewById(2131363342); if (textView != null) { - i = 2131364898; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364898); + i = 2131364901; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364901); if (linearLayout != null) { - i = 2131364899; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364899); + i = 2131364902; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364902); if (linearLayout2 != null) { return new WidgetSettingsVoiceInputModeBinding((NestedScrollView) view, textView, linearLayout, linearLayout2); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java index e33c608817..1572a86d5b 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$binding$2.java @@ -23,104 +23,104 @@ public final /* synthetic */ class WidgetSettingsVoice$binding$2 extends k imple public final WidgetSettingsVoiceBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364893; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364893); + int i = 2131364896; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364896); if (checkedSetting != null) { - i = 2131364894; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364894); + i = 2131364897; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364897); if (checkedSetting2 != null) { - i = 2131364895; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364895); + i = 2131364898; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131364898); if (checkedSetting3 != null) { - i = 2131364896; - CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364896); + i = 2131364899; + CheckedSetting checkedSetting4 = (CheckedSetting) view.findViewById(2131364899); if (checkedSetting4 != null) { - i = 2131364897; - TextView textView = (TextView) view.findViewById(2131364897); + i = 2131364900; + TextView textView = (TextView) view.findViewById(2131364900); if (textView != null) { - i = 2131364900; - TextView textView2 = (TextView) view.findViewById(2131364900); + i = 2131364903; + TextView textView2 = (TextView) view.findViewById(2131364903); if (textView2 != null) { - i = 2131364901; - CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364901); + i = 2131364904; + CheckedSetting checkedSetting5 = (CheckedSetting) view.findViewById(2131364904); if (checkedSetting5 != null) { - i = 2131364902; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364902); + i = 2131364905; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364905); if (relativeLayout != null) { - i = 2131364903; - TextView textView3 = (TextView) view.findViewById(2131364903); + i = 2131364906; + TextView textView3 = (TextView) view.findViewById(2131364906); if (textView3 != null) { - i = 2131364904; - TextView textView4 = (TextView) view.findViewById(2131364904); + i = 2131364907; + TextView textView4 = (TextView) view.findViewById(2131364907); if (textView4 != null) { - i = 2131364905; - CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364905); + i = 2131364908; + CheckedSetting checkedSetting6 = (CheckedSetting) view.findViewById(2131364908); if (checkedSetting6 != null) { - i = 2131364906; - CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364906); + i = 2131364909; + CheckedSetting checkedSetting7 = (CheckedSetting) view.findViewById(2131364909); if (checkedSetting7 != null) { - i = 2131364907; - TextView textView5 = (TextView) view.findViewById(2131364907); + i = 2131364910; + TextView textView5 = (TextView) view.findViewById(2131364910); if (textView5 != null) { - i = 2131364908; - CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364908); + i = 2131364911; + CheckedSetting checkedSetting8 = (CheckedSetting) view.findViewById(2131364911); if (checkedSetting8 != null) { - i = 2131364909; - CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364909); + i = 2131364912; + CheckedSetting checkedSetting9 = (CheckedSetting) view.findViewById(2131364912); if (checkedSetting9 != null) { - i = 2131364910; - CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364910); + i = 2131364913; + CheckedSetting checkedSetting10 = (CheckedSetting) view.findViewById(2131364913); if (checkedSetting10 != null) { - i = 2131364911; - TextView textView6 = (TextView) view.findViewById(2131364911); + i = 2131364914; + TextView textView6 = (TextView) view.findViewById(2131364914); if (textView6 != null) { - i = 2131364912; - TextView textView7 = (TextView) view.findViewById(2131364912); + i = 2131364915; + TextView textView7 = (TextView) view.findViewById(2131364915); if (textView7 != null) { - i = 2131364913; - SeekBar seekBar = (SeekBar) view.findViewById(2131364913); + i = 2131364916; + SeekBar seekBar = (SeekBar) view.findViewById(2131364916); if (seekBar != null) { - i = 2131364914; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364914); + i = 2131364917; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364917); if (linearLayout != null) { - i = 2131364915; - TextView textView8 = (TextView) view.findViewById(2131364915); + i = 2131364918; + TextView textView8 = (TextView) view.findViewById(2131364918); if (textView8 != null) { - i = 2131364916; - CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364916); + i = 2131364919; + CheckedSetting checkedSetting11 = (CheckedSetting) view.findViewById(2131364919); if (checkedSetting11 != null) { - i = 2131364917; - TextView textView9 = (TextView) view.findViewById(2131364917); + i = 2131364920; + TextView textView9 = (TextView) view.findViewById(2131364920); if (textView9 != null) { - i = 2131364918; - View findViewById = view.findViewById(2131364918); + i = 2131364921; + View findViewById = view.findViewById(2131364921); if (findViewById != null) { - i = 2131364919; - TextView textView10 = (TextView) view.findViewById(2131364919); + i = 2131364922; + TextView textView10 = (TextView) view.findViewById(2131364922); if (textView10 != null) { - i = 2131364920; - TextView textView11 = (TextView) view.findViewById(2131364920); + i = 2131364923; + TextView textView11 = (TextView) view.findViewById(2131364923); if (textView11 != null) { - i = 2131364921; - SeekBar seekBar2 = (SeekBar) view.findViewById(2131364921); + i = 2131364924; + SeekBar seekBar2 = (SeekBar) view.findViewById(2131364924); if (seekBar2 != null) { - i = 2131364922; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364922); + i = 2131364925; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364925); if (materialButton != null) { - i = 2131364923; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364923); + i = 2131364926; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364926); if (linearLayout2 != null) { - i = 2131364924; - RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131364924); + i = 2131364927; + RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131364927); if (relativeLayout2 != null) { - i = 2131364925; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364925); + i = 2131364928; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364928); if (linearLayout3 != null) { - i = 2131364926; - TextView textView12 = (TextView) view.findViewById(2131364926); + i = 2131364929; + TextView textView12 = (TextView) view.findViewById(2131364929); if (textView12 != null) { - i = 2131364927; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364927); + i = 2131364930; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364930); if (linkifiedTextView != null) { return new WidgetSettingsVoiceBinding((CoordinatorLayout) view, checkedSetting, checkedSetting2, checkedSetting3, checkedSetting4, textView, textView2, checkedSetting5, relativeLayout, textView3, textView4, checkedSetting6, checkedSetting7, textView5, checkedSetting8, checkedSetting9, checkedSetting10, textView6, textView7, seekBar, linearLayout, textView8, checkedSetting11, textView9, findViewById, textView10, textView11, seekBar2, materialButton, linearLayout2, relativeLayout2, linearLayout3, textView12, linkifiedTextView); } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.java index 7117333f62..4cb7630fd9 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice$onViewBound$3$1.java @@ -43,7 +43,7 @@ public final class WidgetSettingsVoice$onViewBound$3$1 extends k implements Func if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(1000, this) == coroutine_suspended) { + if (a.n(1000, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java index 6fc1a6a6d8..eb9d3ad072 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettingsVoice.java @@ -124,7 +124,7 @@ public final class WidgetSettingsVoice extends AppFragment { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559218; + return 2131559219; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -133,7 +133,7 @@ public final class WidgetSettingsVoice extends AppFragment { super.onViewCreated(view, bundle); setBottomSheetCollapsedStateDisabled(); getBinding().b.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$1(this)); - getBinding().f1946c.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$2(this)); + getBinding().f1948c.setOnClickListener(new WidgetSettingsVoice$InputModeSelector$onViewCreated$2(this)); } } @@ -224,7 +224,7 @@ public final class WidgetSettingsVoice extends AppFragment { } public WidgetSettingsVoice() { - super(2131559217); + super(2131559218); } public static final /* synthetic */ void access$configureUI(WidgetSettingsVoice widgetSettingsVoice, Model model) { @@ -265,17 +265,17 @@ public final class WidgetSettingsVoice extends AppFragment { private final void configureUI(Model model) { CheckedSetting checkedSetting; - SeekBar seekBar = getBinding().f1942s; + SeekBar seekBar = getBinding().f1944s; m.checkNotNullExpressionValue(seekBar, "binding.settingsVoiceOutputVolume"); seekBar.setProgress(d0.a0.a.roundToInt(PerceptualVolumeUtils.amplitudeToPerceptual$default(PerceptualVolumeUtils.INSTANCE, model.getVoiceConfig().getOutputVolume(), 0.0f, 2, null))); getBinding().i.setOnClickListener(new WidgetSettingsVoice$configureUI$1(this)); int i = 0; - getBinding().j.setText(model.getModePTT() ? 2131890318 : model.getModeVAD() ? 2131890321 : 0); + getBinding().j.setText(model.getModePTT() ? 2131890348 : model.getModeVAD() ? 2131890351 : 0); String D = a.D(new StringBuilder(), f.a.a(360045138471L, null), "?utm_source=discord&utm_medium=blog&utm_campaign=2020-06_help-voice-video&utm_content=--t%3Apm"); LinkifiedTextView linkifiedTextView = getBinding().D; m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsVoiceVideoTroubleshootingGuide"); boolean z2 = true; - b.n(linkifiedTextView, 2131888593, new Object[]{D}, null, 4); + b.n(linkifiedTextView, 2131888603, new Object[]{D}, null, 4); RadioManager radioManager = this.openSLESConfigRadioManager; if (radioManager == null) { m.throwUninitializedPropertyAccessException("openSLESConfigRadioManager"); @@ -311,7 +311,7 @@ public final class WidgetSettingsVoice extends AppFragment { getBinding().k.setOnCheckedListener(WidgetSettingsVoice$configureUI$4.INSTANCE); TextView textView = getBinding().g; m.checkNotNullExpressionValue(textView, "binding.settingsVoiceKrispInfo"); - b.n(textView, 2131890753, new Object[]{f.a.a(360040843952L, null)}, null, 4); + b.n(textView, 2131890783, new Object[]{f.a.a(360040843952L, null)}, null, 4); TextView textView2 = getBinding().g; m.checkNotNullExpressionValue(textView2, "binding.settingsVoiceKrispInfo"); textView2.setMovementMethod(LinkMovementMethod.getInstance()); @@ -319,8 +319,8 @@ public final class WidgetSettingsVoice extends AppFragment { m.checkNotNullExpressionValue(checkedSetting5, "binding.settingsVoiceNoiseSuppressionToggle"); checkedSetting5.setChecked(model.getVoiceConfig().getNoiseProcessing() == StoreMediaSettings.NoiseProcessing.Suppression); if (model.getVoiceConfig().getNoiseProcessing() == noiseProcessing2) { - getBinding().l.b(2131894265); - CheckedSetting.i(getBinding().l, b.j(this, 2131894265, new Object[0], null, 4), false, 2); + getBinding().l.b(2131894307); + CheckedSetting.i(getBinding().l, b.j(this, 2131894307, new Object[0], null, 4), false, 2); } else { getBinding().l.e(WidgetSettingsVoice$configureUI$5.INSTANCE); CheckedSetting.i(getBinding().l, null, false, 2); @@ -332,10 +332,10 @@ public final class WidgetSettingsVoice extends AppFragment { } checkedSetting6.setChecked(z2); getBinding().h.setOnCheckedListener(WidgetSettingsVoice$configureUI$6.INSTANCE); - CheckedSetting checkedSetting7 = getBinding().f1941c; + CheckedSetting checkedSetting7 = getBinding().f1943c; m.checkNotNullExpressionValue(checkedSetting7, "binding.settingsVoiceEchoCancellationToggle"); checkedSetting7.setChecked(model.getVoiceConfig().getEchoCancellation()); - getBinding().f1941c.setOnCheckedListener(WidgetSettingsVoice$configureUI$7.INSTANCE); + getBinding().f1943c.setOnCheckedListener(WidgetSettingsVoice$configureUI$7.INSTANCE); CheckedSetting checkedSetting8 = getBinding().b; m.checkNotNullExpressionValue(checkedSetting8, "binding.settingsVoiceAutoVadToggle"); checkedSetting8.setChecked(model.getVoiceConfig().getAutomaticVad()); @@ -358,25 +358,25 @@ public final class WidgetSettingsVoice extends AppFragment { m.checkNotNullExpressionValue(relativeLayout, "binding.settingsVoiceSensitivityWrap"); int i = 8; relativeLayout.setVisibility(model.getModeVAD() ? 0 : 8); - TextView textView = getBinding().f1943x; + TextView textView = getBinding().f1945x; m.checkNotNullExpressionValue(textView, "binding.settingsVoiceSensitivityLabel"); textView.setVisibility(model.getVoiceConfig().getAutomaticVad() ? 0 : 8); boolean z2 = !m.areEqual(model.getLocalVoiceStatus(), LOCAL_VOICE_STATUS_ENGINE_UNINITIALIZED); LinearLayout linearLayout = getBinding().A; m.checkNotNullExpressionValue(linearLayout, "binding.settingsVoiceSensitivityTestingContainer"); linearLayout.setVisibility(z2 ? 0 : 8); - MaterialButton materialButton = getBinding().f1945z; + MaterialButton materialButton = getBinding().f1947z; m.checkNotNullExpressionValue(materialButton, "binding.settingsVoiceSensitivityTestButton"); if (!z2) { i = 0; } materialButton.setVisibility(i); - getBinding().f1945z.setOnClickListener(new WidgetSettingsVoice$configureVoiceSensitivity$1(this)); + getBinding().f1947z.setOnClickListener(new WidgetSettingsVoice$configureVoiceSensitivity$1(this)); if (model.getVoiceConfig().getAutomaticVad()) { View view = getBinding().w; m.checkNotNullExpressionValue(view, "binding.settingsVoiceSensitivityAutomatic"); view.setVisibility(0); - SeekBar seekBar = getBinding().f1944y; + SeekBar seekBar = getBinding().f1946y; m.checkNotNullExpressionValue(seekBar, "binding.settingsVoiceSensitivityManual"); seekBar.setVisibility(4); int i2 = model.getLocalVoiceStatus().b ? 2131231258 : 2131231257; @@ -388,13 +388,13 @@ public final class WidgetSettingsVoice extends AppFragment { View view3 = getBinding().w; m.checkNotNullExpressionValue(view3, "binding.settingsVoiceSensitivityAutomatic"); view3.setVisibility(4); - SeekBar seekBar2 = getBinding().f1944y; + SeekBar seekBar2 = getBinding().f1946y; m.checkNotNullExpressionValue(seekBar2, "binding.settingsVoiceSensitivityManual"); seekBar2.setVisibility(0); - SeekBar seekBar3 = getBinding().f1944y; + SeekBar seekBar3 = getBinding().f1946y; m.checkNotNullExpressionValue(seekBar3, "binding.settingsVoiceSensitivityManual"); seekBar3.setSecondaryProgress(((int) model.getLocalVoiceStatus().a) + 100); - SeekBar seekBar4 = getBinding().f1944y; + SeekBar seekBar4 = getBinding().f1946y; m.checkNotNullExpressionValue(seekBar4, "binding.settingsVoiceSensitivityManual"); seekBar4.setProgress(((int) model.getVoiceConfig().getSensitivity()) + 100); } @@ -417,7 +417,7 @@ public final class WidgetSettingsVoice extends AppFragment { if (openSLESConfig != null) { StoreStream.Companion.getMediaEngine().setOpenSLESConfig(openSLESConfig); } - o.i(this, 2131894321, 0, 4); + o.i(this, 2131894366, 0, 4); } private final void onOverlayToggled(Context context) { @@ -458,7 +458,7 @@ public final class WidgetSettingsVoice extends AppFragment { super.onViewBound(view); TextView textView = getBinding().q; m.checkNotNullExpressionValue(textView, "binding.settingsVoiceOpenslesHelp"); - b.n(textView, 2131888603, new Object[0], null, 4); + b.n(textView, 2131888613, new Object[0], null, 4); CheckedSetting checkedSetting = getBinding().n; m.checkNotNullExpressionValue(checkedSetting, "binding.settingsVoiceOpenslesDefault"); CheckedSetting checkedSetting2 = getBinding().p; @@ -493,7 +493,7 @@ public final class WidgetSettingsVoice extends AppFragment { m.checkNotNullExpressionValue(findViewById, "target"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(findViewById); if (coroutineScope != null) { - c.q.a.k.a.F(coroutineScope, null, null, new WidgetSettingsVoice$onViewBound$3$1(findViewById, null), 3, null); + c.q.a.k.a.G(coroutineScope, null, null, new WidgetSettingsVoice$onViewBound$3$1(findViewById, null), 3, null); } if (m.areEqual(findViewById, getBinding().u)) { CheckedSetting checkedSetting5 = getBinding().u; @@ -508,8 +508,8 @@ public final class WidgetSettingsVoice extends AppFragment { @Override // com.discord.app.AppFragment public void onViewBoundOrOnResume() { super.onViewBoundOrOnResume(); - getBinding().f1942s.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$1()); - getBinding().f1944y.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$2()); + getBinding().f1944s.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$1()); + getBinding().f1946y.setOnSeekBarChangeListener(new WidgetSettingsVoice$onViewBoundOrOnResume$2()); Model.Companion companion = Model.Companion; BehaviorSubject behaviorSubject = this.requestListenForSensitivitySubject; m.checkNotNullExpressionValue(behaviorSubject, "requestListenForSensitivitySubject"); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java index 1de46cf29d..838a616a85 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$binding$2.java @@ -20,26 +20,26 @@ public final /* synthetic */ class WidgetDisableDeleteAccountDialog$binding$2 ex public final WidgetDisableDeleteAccountDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362901; - TextView textView = (TextView) view.findViewById(2131362901); + int i = 2131362903; + TextView textView = (TextView) view.findViewById(2131362903); if (textView != null) { - i = 2131362902; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131362902); + i = 2131362904; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131362904); if (materialButton != null) { - i = 2131362903; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362903); + i = 2131362905; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362905); if (textInputLayout != null) { - i = 2131362904; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362904); + i = 2131362906; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362906); if (loadingButton != null) { - i = 2131362905; - TextView textView2 = (TextView) view.findViewById(2131362905); + i = 2131362907; + TextView textView2 = (TextView) view.findViewById(2131362907); if (textView2 != null) { - i = 2131362906; - TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362906); + i = 2131362908; + TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362908); if (textInputLayout2 != null) { - i = 2131364028; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364028); + i = 2131364030; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030); if (linearLayout != null) { return new WidgetDisableDeleteAccountDialogBinding((LinearLayout) view, textView, materialButton, textInputLayout, loadingButton, textView2, textInputLayout2, linearLayout); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java index 50a92ae460..f8b1ed3cb3 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog.java @@ -62,8 +62,8 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog { /* compiled from: WidgetDisableDeleteAccountDialog.kt */ public enum Mode { - DISABLE(2131888114, 2131888115, 2131888113), - DELETE(2131888052, 2131888053, 2131888051); + DISABLE(2131888124, 2131888125, 2131888123), + DELETE(2131888053, 2131888054, 2131888052); private final int bodyStringId; private final int confirmStringId; @@ -101,7 +101,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog { } public WidgetDisableDeleteAccountDialog() { - super(2131558984); + super(2131558985); } public static final /* synthetic */ void access$configureUI(WidgetDisableDeleteAccountDialog widgetDisableDeleteAccountDialog, MeUser meUser) { @@ -184,7 +184,7 @@ public final class WidgetDisableDeleteAccountDialog extends AppDialog { m.checkNotNullExpressionValue(textView2, "binding.disableDeleteBody"); textView2.setText(getString(mode.getBodyStringId())); getBinding().e.setText(getString(mode.getConfirmStringId())); - getBinding().f1759c.setOnClickListener(new WidgetDisableDeleteAccountDialog$onViewBound$1(this)); + getBinding().f1761c.setOnClickListener(new WidgetDisableDeleteAccountDialog$onViewBound$1(this)); TextInputLayout textInputLayout = getBinding().d; m.checkNotNullExpressionValue(textInputLayout, "binding.disableDeleteCodeWrap"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetDisableDeleteAccountDialog$onViewBound$2(this)); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java index 077136b13b..2799a0eb19 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog$binding$2.java @@ -20,23 +20,23 @@ public final /* synthetic */ class WidgetEnableSMSBackupDialog$binding$2 extends public final WidgetEnableSmsBackupDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363047; - TextView textView = (TextView) view.findViewById(2131363047); + int i = 2131363049; + TextView textView = (TextView) view.findViewById(2131363049); if (textView != null) { - i = 2131363048; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363048); + i = 2131363050; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363050); if (materialButton != null) { - i = 2131363049; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363049); + i = 2131363051; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131363051); if (loadingButton != null) { - i = 2131363050; - TextView textView2 = (TextView) view.findViewById(2131363050); + i = 2131363052; + TextView textView2 = (TextView) view.findViewById(2131363052); if (textView2 != null) { - i = 2131363051; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363051); + i = 2131363053; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363053); if (textInputLayout != null) { - i = 2131364028; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364028); + i = 2131364030; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364030); if (linearLayout != null) { return new WidgetEnableSmsBackupDialogBinding((LinearLayout) view, textView, materialButton, loadingButton, textView2, textInputLayout, linearLayout); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java index d1738564a8..15d2332586 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.java @@ -52,7 +52,7 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog { } public WidgetEnableSMSBackupDialog() { - super(2131558996); + super(2131558997); setCancelable(false); } @@ -95,21 +95,21 @@ public final class WidgetEnableSMSBackupDialog extends AppDialog { if (valueOf.booleanValue()) { TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.enableSmsBackupHeader"); - textView.setText(getString(2131891165)); + textView.setText(getString(2131891196)); TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.enableSmsBackupBody"); - textView2.setText(getString(2131891160)); - getBinding().d.setText(getString(2131888314)); + textView2.setText(getString(2131891191)); + getBinding().d.setText(getString(2131888324)); } else { TextView textView3 = getBinding().e; m.checkNotNullExpressionValue(textView3, "binding.enableSmsBackupHeader"); - textView3.setText(getString(2131891171)); + textView3.setText(getString(2131891202)); TextView textView4 = getBinding().b; m.checkNotNullExpressionValue(textView4, "binding.enableSmsBackupBody"); - textView4.setText(getString(2131891162)); - getBinding().d.setText(getString(2131888113)); + textView4.setText(getString(2131891193)); + getBinding().d.setText(getString(2131888123)); } - getBinding().f1770c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this)); + getBinding().f1772c.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$1(this)); getBinding().d.setIsLoading(false); getBinding().d.setOnClickListener(new WidgetEnableSMSBackupDialog$onResume$2(this, valueOf)); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java index e695eff7b5..d8fbe5d7af 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$binding$2.java @@ -32,137 +32,137 @@ public final /* synthetic */ class WidgetSettingsAccount$binding$2 extends k imp int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364737; - TextView textView = (TextView) view.findViewById(2131364737); + i = 2131364740; + TextView textView = (TextView) view.findViewById(2131364740); if (textView != null) { - i = 2131364738; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364738); + i = 2131364741; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364741); if (simpleDraweeView != null) { - i = 2131364739; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364739); + i = 2131364742; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364742); if (frameLayout != null) { - i = 2131364740; - ImageView imageView = (ImageView) view.findViewById(2131364740); + i = 2131364743; + ImageView imageView = (ImageView) view.findViewById(2131364743); if (imageView != null) { - i = 2131364741; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364741); + i = 2131364744; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364744); if (linearLayout != null) { - i = 2131364742; - TextView textView2 = (TextView) view.findViewById(2131364742); + i = 2131364745; + TextView textView2 = (TextView) view.findViewById(2131364745); if (textView2 != null) { - i = 2131364743; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364743); + i = 2131364746; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364746); if (linearLayout2 != null) { - i = 2131364744; - TextView textView3 = (TextView) view.findViewById(2131364744); + i = 2131364747; + TextView textView3 = (TextView) view.findViewById(2131364747); if (textView3 != null) { - i = 2131364745; - TextView textView4 = (TextView) view.findViewById(2131364745); + i = 2131364748; + TextView textView4 = (TextView) view.findViewById(2131364748); if (textView4 != null) { - i = 2131364746; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364746); + i = 2131364749; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364749); if (linearLayout3 != null) { - i = 2131364747; - TextView textView5 = (TextView) view.findViewById(2131364747); + i = 2131364750; + TextView textView5 = (TextView) view.findViewById(2131364750); if (textView5 != null) { - i = 2131364748; - TextView textView6 = (TextView) view.findViewById(2131364748); + i = 2131364751; + TextView textView6 = (TextView) view.findViewById(2131364751); if (textView6 != null) { - i = 2131364749; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364749); + i = 2131364752; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364752); if (linearLayout4 != null) { - i = 2131364750; - LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131364750); + i = 2131364753; + LinearLayout linearLayout5 = (LinearLayout) view.findViewById(2131364753); if (linearLayout5 != null) { - i = 2131364751; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364751); + i = 2131364754; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364754); if (materialButton != null) { - i = 2131364752; - LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131364752); + i = 2131364755; + LinearLayout linearLayout6 = (LinearLayout) view.findViewById(2131364755); if (linearLayout6 != null) { - i = 2131364753; - TextView textView7 = (TextView) view.findViewById(2131364753); + i = 2131364756; + TextView textView7 = (TextView) view.findViewById(2131364756); if (textView7 != null) { - i = 2131364754; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364754); + i = 2131364757; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364757); if (appViewFlipper != null) { - i = 2131364755; - LottieAnimationView lottieAnimationView = (LottieAnimationView) view.findViewById(2131364755); + i = 2131364758; + LottieAnimationView lottieAnimationView = (LottieAnimationView) view.findViewById(2131364758); if (lottieAnimationView != null) { - i = 2131364756; - TextView textView8 = (TextView) view.findViewById(2131364756); + i = 2131364759; + TextView textView8 = (TextView) view.findViewById(2131364759); if (textView8 != null) { - i = 2131364758; - LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131364758); + i = 2131364761; + LinearLayout linearLayout7 = (LinearLayout) view.findViewById(2131364761); if (linearLayout7 != null) { - i = 2131364759; - TextView textView9 = (TextView) view.findViewById(2131364759); + i = 2131364762; + TextView textView9 = (TextView) view.findViewById(2131364762); if (textView9 != null) { - i = 2131364760; - TextView textView10 = (TextView) view.findViewById(2131364760); + i = 2131364763; + TextView textView10 = (TextView) view.findViewById(2131364763); if (textView10 != null) { - i = 2131364761; - LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131364761); + i = 2131364764; + LinearLayout linearLayout8 = (LinearLayout) view.findViewById(2131364764); if (linearLayout8 != null) { - i = 2131364762; - TextView textView11 = (TextView) view.findViewById(2131364762); + i = 2131364765; + TextView textView11 = (TextView) view.findViewById(2131364765); if (textView11 != null) { - i = 2131364763; - TextView textView12 = (TextView) view.findViewById(2131364763); + i = 2131364766; + TextView textView12 = (TextView) view.findViewById(2131364766); if (textView12 != null) { - i = 2131364764; - TextView textView13 = (TextView) view.findViewById(2131364764); + i = 2131364767; + TextView textView13 = (TextView) view.findViewById(2131364767); if (textView13 != null) { - i = 2131364765; - TextView textView14 = (TextView) view.findViewById(2131364765); + i = 2131364768; + TextView textView14 = (TextView) view.findViewById(2131364768); if (textView14 != null) { - i = 2131364766; - LinearLayout linearLayout9 = (LinearLayout) view.findViewById(2131364766); + i = 2131364769; + LinearLayout linearLayout9 = (LinearLayout) view.findViewById(2131364769); if (linearLayout9 != null) { - i = 2131364767; - TextView textView15 = (TextView) view.findViewById(2131364767); + i = 2131364770; + TextView textView15 = (TextView) view.findViewById(2131364770); if (textView15 != null) { - i = 2131364768; - TextView textView16 = (TextView) view.findViewById(2131364768); + i = 2131364771; + TextView textView16 = (TextView) view.findViewById(2131364771); if (textView16 != null) { - i = 2131364769; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364769); + i = 2131364772; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772); if (floatingActionButton != null) { - i = 2131364770; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364770); + i = 2131364773; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364773); if (nestedScrollView != null) { - i = 2131364771; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364771); + i = 2131364774; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364774); if (checkedSetting != null) { - i = 2131364772; - TextView textView17 = (TextView) view.findViewById(2131364772); + i = 2131364775; + TextView textView17 = (TextView) view.findViewById(2131364775); if (textView17 != null) { - i = 2131364773; - TextView textView18 = (TextView) view.findViewById(2131364773); + i = 2131364776; + TextView textView18 = (TextView) view.findViewById(2131364776); if (textView18 != null) { - i = 2131364774; - LinearLayout linearLayout10 = (LinearLayout) view.findViewById(2131364774); + i = 2131364777; + LinearLayout linearLayout10 = (LinearLayout) view.findViewById(2131364777); if (linearLayout10 != null) { - i = 2131364775; - TextView textView19 = (TextView) view.findViewById(2131364775); + i = 2131364778; + TextView textView19 = (TextView) view.findViewById(2131364778); if (textView19 != null) { - i = 2131364776; - TextView textView20 = (TextView) view.findViewById(2131364776); + i = 2131364779; + TextView textView20 = (TextView) view.findViewById(2131364779); if (textView20 != null) { - i = 2131364777; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364777); + i = 2131364780; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131364780); if (relativeLayout != null) { - i = 2131364778; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364778); + i = 2131364781; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364781); if (materialButton2 != null) { - i = 2131364779; - TextView textView21 = (TextView) view.findViewById(2131364779); + i = 2131364782; + TextView textView21 = (TextView) view.findViewById(2131364782); if (textView21 != null) { - i = 2131364780; - TextView textView22 = (TextView) view.findViewById(2131364780); + i = 2131364783; + TextView textView22 = (TextView) view.findViewById(2131364783); if (textView22 != null) { - i = 2131364806; - TextView textView23 = (TextView) view.findViewById(2131364806); + i = 2131364809; + TextView textView23 = (TextView) view.findViewById(2131364809); if (textView23 != null) { return new WidgetSettingsAccountBinding((CoordinatorLayout) view, dimmerView, textView, simpleDraweeView, frameLayout, imageView, linearLayout, textView2, linearLayout2, textView3, textView4, linearLayout3, textView5, textView6, linearLayout4, linearLayout5, materialButton, linearLayout6, textView7, appViewFlipper, lottieAnimationView, textView8, linearLayout7, textView9, textView10, linearLayout8, textView11, textView12, textView13, textView14, linearLayout9, textView15, textView16, floatingActionButton, nestedScrollView, checkedSetting, textView17, textView18, linearLayout10, textView19, textView20, relativeLayout, materialButton2, textView21, textView22, textView23); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java index 0d969adfa1..51833b3471 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$2.java @@ -26,7 +26,7 @@ public final class WidgetSettingsAccount$configureUI$2 implements Action1 accountAvatarSelectedResult; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccount$binding$2.INSTANCE, null, 2, null); private String lastIconUrl; - private final StatefulViews state = new StatefulViews(2131364738); + private final StatefulViews state = new StatefulViews(2131364741); /* compiled from: WidgetSettingsAccount.kt */ public static final class Companion { @@ -246,7 +246,7 @@ public final class WidgetSettingsAccount extends AppFragment { } public WidgetSettingsAccount() { - super(2131559182); + super(2131559183); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccount widgetSettingsAccount, Model model) { @@ -291,10 +291,10 @@ public final class WidgetSettingsAccount extends AppFragment { } else { TextView textView2 = getBinding().J; m.checkNotNullExpressionValue(textView2, "binding.settingsAccountVerificationTitle"); - textView2.setText(getString(2131894421)); + textView2.setText(getString(2131894468)); MaterialButton materialButton2 = getBinding().I; m.checkNotNullExpressionValue(materialButton2, "binding.settingsAccountVerificationButton"); - materialButton2.setText(getString(2131894406)); + materialButton2.setText(getString(2131894453)); } getBinding().I.setOnClickListener(WidgetSettingsAccount$configureAccountVerificationBanner$1.INSTANCE); } @@ -325,7 +325,7 @@ public final class WidgetSettingsAccount extends AppFragment { TextView textView3 = getBinding().K; m.checkNotNullExpressionValue(textView3, "binding.settingsAccountViewBackupCodes"); textView3.setEnabled(!z3); - TextView textView4 = getBinding().f1906z; + TextView textView4 = getBinding().f1908z; m.checkNotNullExpressionValue(textView4, "binding.settingsAccountRemoveTwoFa"); textView4.setEnabled(!z3); LinearLayout linearLayout = getBinding().k; @@ -352,7 +352,7 @@ public final class WidgetSettingsAccount extends AppFragment { m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountNameContainer"); int i = 8; linearLayout.setVisibility(component4 != null ? 0 : 8); - TextView textView3 = getBinding().f1903s; + TextView textView3 = getBinding().f1905s; m.checkNotNullExpressionValue(textView3, "binding.settingsAccountNameText"); if (component4 == null || (str = component4.getUsername()) == null) { str = ""; @@ -370,7 +370,7 @@ public final class WidgetSettingsAccount extends AppFragment { getBinding().f.setOnClickListener(new WidgetSettingsAccount$configureUI$1(this)); this.accountAvatarSelectedResult = new WidgetSettingsAccount$configureUI$2(this, component1); setIcon(component1); - getBinding().f1905y.setOnClickListener(new WidgetSettingsAccount$configureUI$3(this, component1)); + getBinding().f1907y.setOnClickListener(new WidgetSettingsAccount$configureUI$3(this, component1)); getBinding().e.setOnClickListener(new WidgetSettingsAccount$configureUI$4(this)); getBinding().F.setOnClickListener(WidgetSettingsAccount$configureUI$5.INSTANCE); getBinding().r.setOnClickListener(WidgetSettingsAccount$configureUI$6.INSTANCE); @@ -403,7 +403,7 @@ public final class WidgetSettingsAccount extends AppFragment { } getBinding().l.setOnClickListener(WidgetSettingsAccount$configureUI$10.INSTANCE); getBinding().K.setOnClickListener(WidgetSettingsAccount$configureUI$11.INSTANCE); - getBinding().f1906z.setOnClickListener(new WidgetSettingsAccount$configureUI$12(this)); + getBinding().f1908z.setOnClickListener(new WidgetSettingsAccount$configureUI$12(this)); getBinding().L.setOnClickListener(WidgetSettingsAccount$configureUI$13.INSTANCE); getBinding().w.setOnClickListener(new WidgetSettingsAccount$configureUI$14(this, model)); getBinding().v.setOnClickListener(new WidgetSettingsAccount$configureUI$15(this, model)); @@ -427,7 +427,7 @@ public final class WidgetSettingsAccount extends AppFragment { m.checkNotNullExpressionValue(textView12, "binding.settingsAccountSmsPhone"); Context context = textView12.getContext(); m.checkNotNullExpressionValue(context, "binding.settingsAccountSmsPhone.context"); - charSequence = b.g(context, 2131891159, new Object[]{component1.getPhoneNumber()}, null, 4); + charSequence = b.g(context, 2131891190, new Object[]{component1.getPhoneNumber()}, null, 4); } ViewExtensions.setTextAndVisibilityBy(textView11, charSequence); CheckedSetting checkedSetting = getBinding().C; @@ -435,7 +435,7 @@ public final class WidgetSettingsAccount extends AppFragment { checkedSetting.setChecked(userUtils.isMfaSMSEnabled(component1)); CheckedSetting checkedSetting2 = getBinding().C; if (sMSBackupDisabledMessage == null) { - sMSBackupDisabledMessage = getString(2131891160); + sMSBackupDisabledMessage = getString(2131891191); m.checkNotNullExpressionValue(sMSBackupDisabledMessage, "getString(R.string.mfa_sms_auth_sales_pitch)"); } CheckedSetting.i(checkedSetting2, sMSBackupDisabledMessage, false, 2); @@ -446,7 +446,7 @@ public final class WidgetSettingsAccount extends AppFragment { m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion.show(parentFragmentManager, true); } - for (TextView textView13 : n.listOf((Object[]) new TextView[]{getBinding().i, getBinding().f1902c, getBinding().j})) { + for (TextView textView13 : n.listOf((Object[]) new TextView[]{getBinding().i, getBinding().f1904c, getBinding().j})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView13, "header"); accessibilityUtils.setViewIsHeading(textView13); @@ -454,7 +454,7 @@ public final class WidgetSettingsAccount extends AppFragment { } private final void configureUpdatedUser(User user) { - o.i(this, 2131892932, 0, 4); + o.i(this, 2131892974, 0, 4); StatefulViews.clear$default(this.state, false, 1, null); StoreStream.Companion.getAuthentication().setAuthed(user.q()); AppFragment.hideKeyboard$default(this, null, 1, null); @@ -468,10 +468,10 @@ public final class WidgetSettingsAccount extends AppFragment { private final String getSMSBackupDisabledMessage(MeUser meUser) { UserUtils userUtils = UserUtils.INSTANCE; if (userUtils.isPartner(meUser) || userUtils.isStaff(meUser)) { - return getString(2131891164); + return getString(2131891195); } if (meUser.getEmail() == null) { - return getString(2131891163); + return getString(2131891194); } return null; } @@ -500,7 +500,7 @@ public final class WidgetSettingsAccount extends AppFragment { IconUtils.setIcon$default(simpleDraweeView2, str, 2131165288, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); this.lastIconUrl = str; } - TextView textView = getBinding().f1905y; + TextView textView = getBinding().f1907y; m.checkNotNullExpressionValue(textView, "binding.settingsAccountRemoveAvatar"); int i = 0; if (str != null && w.contains$default((CharSequence) str, (CharSequence) "asset://asset/images/default_avatar", false, 2, (Object) null)) { @@ -513,7 +513,7 @@ public final class WidgetSettingsAccount extends AppFragment { } private final void showOwnsGuildModal() { - WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888055).setMessage(2131888056), 2131891633, (Function1) null, 2, (Object) null); + WidgetNoticeDialog.Builder positiveButton$default = WidgetNoticeDialog.Builder.setPositiveButton$default(new WidgetNoticeDialog.Builder(requireContext()).setTitle(2131888056).setMessage(2131888057), 2131891666, (Function1) null, 2, (Object) null); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); positiveButton$default.show(parentFragmentManager); @@ -523,11 +523,11 @@ public final class WidgetSettingsAccount extends AppFragment { WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; AppActivity appActivity = getAppActivity(); if (appActivity != null) { - String string = requireContext().getString(2131893982); + String string = requireContext().getString(2131894021); m.checkNotNullExpressionValue(string, "requireContext().getString(R.string.two_fa_remove)"); - String string2 = requireContext().getString(2131894299); + String string2 = requireContext().getString(2131894343); m.checkNotNullExpressionValue(string2, "requireContext().getStri…ngs_mfa_enable_code_body)"); - String string3 = requireContext().getString(2131893939); + String string3 = requireContext().getString(2131893978); m.checkNotNullExpressionValue(string3, "requireContext().getStri….string.two_fa_auth_code)"); WidgetNoticeDialog.Companion.showInputModal$default(companion, appActivity, string, string2, string3, new WidgetSettingsAccount$showRemove2FAModal$1(this), null, null, 96, null); } @@ -563,18 +563,18 @@ public final class WidgetSettingsAccount extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131894305); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131894349); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); setRetainInstance(true); this.state.setupUnsavedChangesConfirmation(this); this.state.setupTextWatcherWithSaveAction(this, getBinding().A, new View[0]); if (getMostRecentIntent().getBooleanExtra("com.discord.extra.HINT_DATA_MANAGEMENT", false)) { - LinearLayout linearLayout = getBinding().f1904x; + LinearLayout linearLayout = getBinding().f1906x; m.checkNotNullExpressionValue(linearLayout, "binding.settingsAccountPrivateDataWrap"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(linearLayout); if (coroutineScope != null) { - c.q.a.k.a.F(coroutineScope, null, null, new WidgetSettingsAccount$onViewBound$1(this, null), 3, null); + c.q.a.k.a.G(coroutineScope, null, null, new WidgetSettingsAccount$onViewBound$1(this, null), 3, null); } } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java index 91aebfd828..f65c808110 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.java @@ -23,6 +23,6 @@ public final class WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder if (clipboardManager != null) { clipboardManager.setPrimaryClip(newPlainText); } - o.g(view.getContext(), 2131887620, 0, null, 12); + o.g(view.getContext(), 2131887622, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java index 407523266f..28884e0912 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$binding$2.java @@ -23,14 +23,14 @@ public final /* synthetic */ class WidgetSettingsAccountBackupCodes$binding$2 ex int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364795; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364795); + i = 2131364798; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364798); if (materialButton != null) { - i = 2131364796; - TextView textView = (TextView) view.findViewById(2131364796); + i = 2131364799; + TextView textView = (TextView) view.findViewById(2131364799); if (textView != null) { - i = 2131364797; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364797); + i = 2131364800; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364800); if (recyclerView != null) { return new WidgetSettingsAccountBackupCodesBinding((CoordinatorLayout) view, dimmerView, materialButton, textView, recyclerView); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java index e6f7fb22d1..b68d91fc64 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.java @@ -43,7 +43,7 @@ public final class WidgetSettingsAccountBackupCodes$getBackupCodes$1 extends o i } ArrayList arrayList3 = new ArrayList(); if (!arrayList.isEmpty()) { - arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894253, new Object[0], null, 4))); + arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894292, new Object[0], null, 4))); ArrayList arrayList4 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList, 10)); for (BackupCode backupCode : arrayList) { arrayList4.add(new WidgetSettingsAccountBackupCodes.BackupCodeItem(backupCode)); @@ -51,7 +51,7 @@ public final class WidgetSettingsAccountBackupCodes$getBackupCodes$1 extends o i arrayList3.addAll(arrayList4); } if (!arrayList2.isEmpty()) { - arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894334, new Object[0], null, 4))); + arrayList3.add(new WidgetSettingsAccountBackupCodes.BackupCodeItemHeader(b.g(this.this$0.requireContext(), 2131894380, new Object[0], null, 4))); ArrayList arrayList5 = new ArrayList(d0.t.o.collectionSizeOrDefault(arrayList2, 10)); for (BackupCode backupCode2 : arrayList2) { arrayList5.add(new WidgetSettingsAccountBackupCodes.BackupCodeItem(backupCode2)); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java index da730ede4e..2470afbe82 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.java @@ -119,7 +119,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment { @Override // androidx.recyclerview.widget.RecyclerView.Adapter public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - return i != 0 ? i != 1 ? new MGRecyclerViewHolder<>(0, this) : new BackupCodeViewHolder(2131559204, this) : new BackupCodeHeaderViewHolder(2131559205, this); + return i != 0 ? i != 1 ? new MGRecyclerViewHolder<>(0, this) : new BackupCodeViewHolder(2131559205, this) : new BackupCodeHeaderViewHolder(2131559206, this); } } @@ -269,7 +269,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment { } public WidgetSettingsAccountBackupCodes() { - super(2131559183); + super(2131559184); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountBackupCodes widgetSettingsAccountBackupCodes, List list) { @@ -312,7 +312,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment { AppActivity appActivity = getAppActivity(); if (appActivity != null) { getBinding().b.setDimmed(true, true); - WidgetNoticeDialog.Companion.showInputModal(appActivity, b.g(requireContext(), 2131893946, new Object[0], null, 4), b.g(requireContext(), 2131894269, new Object[0], null, 4), b.g(requireContext(), 2131888705, new Object[0], null, 4), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1(this), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2(this), Boolean.FALSE); + WidgetNoticeDialog.Companion.showInputModal(appActivity, b.g(requireContext(), 2131893985, new Object[0], null, 4), b.g(requireContext(), 2131894312, new Object[0], null, 4), b.g(requireContext(), 2131888715, new Object[0], null, 4), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$1(this), new WidgetSettingsAccountBackupCodes$showPasswordModal$$inlined$let$lambda$2(this), Boolean.FALSE); } } @@ -320,12 +320,12 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131893946); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131893985); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.settingsBackupCodesInfo"); - b.n(textView, 2131893945, new Object[0], null, 4); + b.n(textView, 2131893984, new Object[0], null, 4); RecyclerView recyclerView = getBinding().e; m.checkNotNullExpressionValue(recyclerView, "binding.settingsBackupCodesRv"); this.backupCodesAdapter = new Adapter(recyclerView); @@ -335,7 +335,7 @@ public final class WidgetSettingsAccountBackupCodes extends AppFragment { m.checkNotNullExpressionValue(recyclerView2, "binding.settingsBackupCodesRv"); this.backupCodesAdapter = (Adapter) companion.configure(new Adapter(recyclerView2)); } - getBinding().f1901c.setOnClickListener(new WidgetSettingsAccountBackupCodes$onViewBound$2(this)); + getBinding().f1903c.setOnClickListener(new WidgetSettingsAccountBackupCodes$onViewBound$2(this)); showPasswordModal(); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java index ac7fd037a5..2326a4bfe5 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$onViewBound$2.java @@ -26,7 +26,7 @@ public final class WidgetSettingsAccountChangePassword$onViewBound$2 extends o i public final void invoke(Editable editable) { m.checkNotNullParameter(editable, "it"); - TextInputLayout textInputLayout = WidgetSettingsAccountChangePassword.access$getBinding$p(this.this$0).f1907c; + TextInputLayout textInputLayout = WidgetSettingsAccountChangePassword.access$getBinding$p(this.this$0).f1909c; m.checkNotNullExpressionValue(textInputLayout, "binding.changePasswordNewPasswordInput"); textInputLayout.setError(null); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java index 0cf3f42c3a..6a6479bb34 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.java @@ -20,7 +20,7 @@ public final class WidgetSettingsAccountChangePassword$saveNewPassword$1 impl public final void call(User user) { GoogleSmartLockManager googleSmartLockManager; - o.i(this.this$0, 2131892932, 0, 4); + o.i(this.this$0, 2131892974, 0, 4); StoreStream.Companion.getAuthentication().setAuthed(user.q()); Context context = this.this$0.getContext(); if (!(context == null || (googleSmartLockManager = GoogleSmartLockManagerKt.googleSmartLockManager(context)) == null)) { diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java index 9c67daef2b..17d7cb700a 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.java @@ -51,7 +51,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment { } public WidgetSettingsAccountChangePassword() { - super(2131559184); + super(2131559185); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountChangePassword widgetSettingsAccountChangePassword, MeUser meUser) { @@ -89,7 +89,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment { TextInputLayout textInputLayout2 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout2, "binding.changePasswordCurrentPasswordInput"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout2); - TextInputLayout textInputLayout3 = getBinding().f1907c; + TextInputLayout textInputLayout3 = getBinding().f1909c; m.checkNotNullExpressionValue(textInputLayout3, "binding.changePasswordNewPasswordInput"); String textOrEmpty2 = ViewExtensions.getTextOrEmpty(textInputLayout3); if (textOrEmpty.length() == 0) { @@ -98,14 +98,14 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment { m.checkNotNullExpressionValue(textInputLayout4, "binding.changePasswordCurrentPasswordInput"); TextInputLayout textInputLayout5 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout5, "binding.changePasswordCurrentPasswordInput"); - textInputLayout4.setError(textInputLayout5.getContext().getString(2131891744)); + textInputLayout4.setError(textInputLayout5.getContext().getString(2131891781)); } else if (!AuthUtils.INSTANCE.isValidPasswordLength(textOrEmpty2)) { - getBinding().f1907c.requestFocus(); - TextInputLayout textInputLayout6 = getBinding().f1907c; + getBinding().f1909c.requestFocus(); + TextInputLayout textInputLayout6 = getBinding().f1909c; m.checkNotNullExpressionValue(textInputLayout6, "binding.changePasswordNewPasswordInput"); - TextInputLayout textInputLayout7 = getBinding().f1907c; + TextInputLayout textInputLayout7 = getBinding().f1909c; m.checkNotNullExpressionValue(textInputLayout7, "binding.changePasswordNewPasswordInput"); - textInputLayout6.setError(textInputLayout7.getContext().getString(2131891733)); + textInputLayout6.setError(textInputLayout7.getContext().getString(2131891770)); } else { if (meUser.getMfaEnabled()) { if (str == null || str.length() == 0) { @@ -114,7 +114,7 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment { m.checkNotNullExpressionValue(textInputLayout8, "binding.changePasswordTwoFactor"); TextInputLayout textInputLayout9 = getBinding().e; m.checkNotNullExpressionValue(textInputLayout9, "binding.changePasswordTwoFactor"); - textInputLayout8.setError(textInputLayout9.getContext().getString(2131893986)); + textInputLayout8.setError(textInputLayout9.getContext().getString(2131894025)); return; } } @@ -131,19 +131,19 @@ public final class WidgetSettingsAccountChangePassword extends AppFragment { Context context = view.getContext(); m.checkNotNullExpressionValue(context, "view.context"); this.googleSmartLockManager = new GoogleSmartLockManager(context, null, 2, null); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131887248); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131887249); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); this.state.setupUnsavedChangesConfirmation(this); StatefulViews statefulViews = this.state; FloatingActionButton floatingActionButton = getBinding().d; - TextInputLayout textInputLayout = getBinding().f1907c; + TextInputLayout textInputLayout = getBinding().f1909c; m.checkNotNullExpressionValue(textInputLayout, "binding.changePasswordNewPasswordInput"); statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout); TextInputLayout textInputLayout2 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout2, "binding.changePasswordCurrentPasswordInput"); ViewExtensions.addBindedTextWatcher(textInputLayout2, this, new WidgetSettingsAccountChangePassword$onViewBound$1(this)); - TextInputLayout textInputLayout3 = getBinding().f1907c; + TextInputLayout textInputLayout3 = getBinding().f1909c; m.checkNotNullExpressionValue(textInputLayout3, "binding.changePasswordNewPasswordInput"); ViewExtensions.addBindedTextWatcher(textInputLayout3, this, new WidgetSettingsAccountChangePassword$onViewBound$2(this)); TextInputLayout textInputLayout4 = getBinding().e; diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java index ff6c63dfb7..f3e064066b 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit$binding$2.java @@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetSettingsAccountContactsNameEdit$binding public final WidgetSettingsAccountContactsNameEditBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362959; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362959); + int i = 2131362961; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362961); if (textInputLayout != null) { - i = 2131364757; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364757); + i = 2131364760; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364760); if (materialButton != null) { - i = 2131364769; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364769); + i = 2131364772; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772); if (floatingActionButton != null) { return new WidgetSettingsAccountContactsNameEditBinding((CoordinatorLayout) view, textInputLayout, materialButton, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java index ea73cc12a3..518d0f33c5 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountContactsNameEdit.java @@ -50,7 +50,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment { } public WidgetSettingsAccountContactsNameEdit() { - super(2131559185); + super(2131559186); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountContactsNameEdit widgetSettingsAccountContactsNameEdit, List list) { @@ -86,7 +86,7 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment { str = ""; } ViewExtensions.setText(textInputLayout, str); - getBinding().f1908c.setOnClickListener(new WidgetSettingsAccountContactsNameEdit$configureUI$1(this)); + getBinding().f1910c.setOnClickListener(new WidgetSettingsAccountContactsNameEdit$configureUI$1(this)); } private final WidgetSettingsAccountContactsNameEditBinding getBinding() { @@ -113,8 +113,8 @@ public final class WidgetSettingsAccountContactsNameEdit extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131887608); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131887610); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); TextInputLayout textInputLayout = getBinding().b; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountNameWrap"); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java index 468c09e7d0..29adcf3363 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetSettingsAccountEmailEdit$binding$2 exte public final WidgetSettingsAccountEmailEditBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362958; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362958); + int i = 2131362960; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362960); if (textInputLayout != null) { - i = 2131364769; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364769); + i = 2131364772; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772); if (floatingActionButton != null) { return new WidgetSettingsAccountEmailEditBinding((CoordinatorLayout) view, textInputLayout, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java index ec0c706323..7546ff216e 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountEmailEdit.java @@ -34,7 +34,7 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment { public static final Companion Companion = new Companion(null); private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountEmailEdit$binding$2.INSTANCE, null, 2, null); private final ActivityResultLauncher passwordVerifyLauncher = WidgetUserPasswordVerify.Companion.registerForResult(this, new WidgetSettingsAccountEmailEdit$passwordVerifyLauncher$1(this)); - private final StatefulViews state = new StatefulViews(2131362958); + private final StatefulViews state = new StatefulViews(2131362960); private final Lazy validationManager$delegate = g.lazy(new WidgetSettingsAccountEmailEdit$validationManager$2(this)); /* compiled from: WidgetSettingsAccountEmailEdit.kt */ @@ -53,7 +53,7 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment { } public WidgetSettingsAccountEmailEdit() { - super(2131559187); + super(2131559188); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountEmailEdit widgetSettingsAccountEmailEdit, MeUser meUser) { @@ -104,15 +104,15 @@ public final class WidgetSettingsAccountEmailEdit extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131894222); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131894261); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); TextInputLayout textInputLayout = getBinding().b; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountEmailWrap"); ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsAccountEmailEdit$onViewBound$1(this), 1, null); - getBinding().f1910c.setOnClickListener(new WidgetSettingsAccountEmailEdit$onViewBound$2(this)); + getBinding().f1912c.setOnClickListener(new WidgetSettingsAccountEmailEdit$onViewBound$2(this)); StatefulViews statefulViews = this.state; - FloatingActionButton floatingActionButton = getBinding().f1910c; + FloatingActionButton floatingActionButton = getBinding().f1912c; TextInputLayout textInputLayout2 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountEmailWrap"); statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout2); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java index 540c356a4a..44a5a74556 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$binding$2.java @@ -20,20 +20,20 @@ public final /* synthetic */ class WidgetSettingsAccountUsernameEdit$binding$2 e public final WidgetSettingsAccountEditBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131362953; - TextView textView = (TextView) view.findViewById(2131362953); + int i = 2131362955; + TextView textView = (TextView) view.findViewById(2131362955); if (textView != null) { - i = 2131362957; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362957); + i = 2131362959; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362959); if (textInputLayout != null) { - i = 2131362961; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362961); + i = 2131362963; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131362963); if (relativeLayout != null) { - i = 2131362962; - TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362962); + i = 2131362964; + TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131362964); if (textInputLayout2 != null) { - i = 2131364769; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364769); + i = 2131364772; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772); if (floatingActionButton != null) { return new WidgetSettingsAccountEditBinding((CoordinatorLayout) view, textView, textInputLayout, relativeLayout, textInputLayout2, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java index 093403d980..3620da31bd 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$configureUI$1.java @@ -34,7 +34,7 @@ public final class WidgetSettingsAccountUsernameEdit$configureUI$1 implements Vi a.b bVar = a.j; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - a.b.a(bVar, parentFragmentManager, 0, this.this$0.getString(2131892309), null, "User Settings", "Edit Account", null, null, false, false, 968); + a.b.a(bVar, parentFragmentManager, 0, this.this$0.getString(2131892347), null, "User Settings", "Edit Account", null, null, false, false, 968); } } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java index 5ae81a020e..8a23c62e31 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit$validationManager$2.java @@ -22,11 +22,11 @@ public final class WidgetSettingsAccountUsernameEdit$validationManager$2 extends @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final ValidationManager mo1invoke() { - TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f1909c; + TextInputLayout textInputLayout = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).f1911c; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap"); - InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(2131894361)}; + InputValidator[] inputValidatorArr = {BasicTextInputValidator.Companion.createRequiredInputValidator(2131894408)}; TextInputLayout textInputLayout2 = WidgetSettingsAccountUsernameEdit.access$getBinding$p(this.this$0).b; m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountDiscriminatorWrap"); - return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.EditTextInput("discriminator", textInputLayout2, AuthUtils.INSTANCE.createDiscriminatorInputValidator(2131891903, 2131891909))); + return new ValidationManager(new Input.TextInputLayoutInput("username", textInputLayout, inputValidatorArr), new Input.EditTextInput("discriminator", textInputLayout2, AuthUtils.INSTANCE.createDiscriminatorInputValidator(2131891940, 2131891946))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java index 12d80707e3..912ffbd635 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsAccountUsernameEdit.java @@ -39,7 +39,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { public static final Companion Companion = new Companion(null); private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetSettingsAccountUsernameEdit$binding$2.INSTANCE, null, 2, null); private final ActivityResultLauncher passwordVerifyLauncher = WidgetUserPasswordVerify.Companion.registerForResult(this, new WidgetSettingsAccountUsernameEdit$passwordVerifyLauncher$1(this)); - private final StatefulViews state = new StatefulViews(2131362962, 2131362957); + private final StatefulViews state = new StatefulViews(2131362964, 2131362959); private final Lazy validationManager$delegate = g.lazy(new WidgetSettingsAccountUsernameEdit$validationManager$2(this)); /* compiled from: WidgetSettingsAccountUsernameEdit.kt */ @@ -58,7 +58,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { } public WidgetSettingsAccountUsernameEdit() { - super(2131559186); + super(2131559187); } public static final /* synthetic */ void access$configureUI(WidgetSettingsAccountUsernameEdit widgetSettingsAccountUsernameEdit, MeUser meUser) { @@ -78,10 +78,10 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { } private final void configureUI(MeUser meUser) { - TextInputLayout textInputLayout = getBinding().f1909c; + TextInputLayout textInputLayout = getBinding().f1911c; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap"); StatefulViews statefulViews = this.state; - TextInputLayout textInputLayout2 = getBinding().f1909c; + TextInputLayout textInputLayout2 = getBinding().f1911c; m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountUsernameWrap"); ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews.get(textInputLayout2.getId(), meUser.getUsername())); TextInputLayout textInputLayout3 = getBinding().b; @@ -93,11 +93,11 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { String format = String.format("%04d", Arrays.copyOf(new Object[]{Integer.valueOf(meUser.getDiscriminator())}, 1)); m.checkNotNullExpressionValue(format, "java.lang.String.format(format, *args)"); ViewExtensions.setText(textInputLayout3, (CharSequence) statefulViews2.get(id2, format)); - TextInputLayout textInputLayout5 = getBinding().f1909c; + TextInputLayout textInputLayout5 = getBinding().f1911c; m.checkNotNullExpressionValue(textInputLayout5, "binding.editAccountUsernameWrap"); EditText editText = textInputLayout5.getEditText(); Editable text = editText != null ? editText.getText() : null; - TextInputLayout textInputLayout6 = getBinding().f1909c; + TextInputLayout textInputLayout6 = getBinding().f1911c; m.checkNotNullExpressionValue(textInputLayout6, "binding.editAccountUsernameWrap"); Selection.setSelection(text, ViewExtensions.getTextOrEmpty(textInputLayout6).length()); TextInputLayout textInputLayout7 = getBinding().b; @@ -124,7 +124,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { WidgetUserPasswordVerify.Companion companion = WidgetUserPasswordVerify.Companion; Context requireContext = requireContext(); ActivityResultLauncher activityResultLauncher = this.passwordVerifyLauncher; - TextInputLayout textInputLayout = getBinding().f1909c; + TextInputLayout textInputLayout = getBinding().f1911c; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountUsernameWrap"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); TextInputLayout textInputLayout2 = getBinding().b; @@ -137,8 +137,8 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131894227); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131894266); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); TextInputLayout textInputLayout = getBinding().b; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountDiscriminatorWrap"); @@ -149,7 +149,7 @@ public final class WidgetSettingsAccountUsernameEdit extends AppFragment { getBinding().d.setOnClickListener(new WidgetSettingsAccountUsernameEdit$onViewBound$3(this)); StatefulViews statefulViews = this.state; FloatingActionButton floatingActionButton = getBinding().d; - TextInputLayout textInputLayout3 = getBinding().f1909c; + TextInputLayout textInputLayout3 = getBinding().f1911c; m.checkNotNullExpressionValue(textInputLayout3, "binding.editAccountUsernameWrap"); TextInputLayout textInputLayout4 = getBinding().b; m.checkNotNullExpressionValue(textInputLayout4, "binding.editAccountDiscriminatorWrap"); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java index 0c3422f689..e144b86491 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers$binding$2.java @@ -25,8 +25,8 @@ public final /* synthetic */ class WidgetSettingsBlockedUsers$binding$2 extends i = 2131362108; RecyclerView recyclerView = (RecyclerView) view.findViewById(2131362108); if (recyclerView != null) { - i = 2131363252; - ImageView imageView = (ImageView) view.findViewById(2131363252); + i = 2131363254; + ImageView imageView = (ImageView) view.findViewById(2131363254); if (imageView != null) { return new WidgetSettingsBlockedUsersBinding((CoordinatorLayout) view, appViewFlipper, recyclerView, imageView); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java index 64dde96ae3..354ec8f852 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsers.java @@ -53,7 +53,7 @@ public final class WidgetSettingsBlockedUsers extends AppFragment { } public WidgetSettingsBlockedUsers() { - super(2131559193); + super(2131559194); WidgetSettingsBlockedUsers$viewModel$2 widgetSettingsBlockedUsers$viewModel$2 = WidgetSettingsBlockedUsers$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsBlockedUsersViewModel.class), new WidgetSettingsBlockedUsers$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsBlockedUsers$viewModel$2)); @@ -131,9 +131,9 @@ public final class WidgetSettingsBlockedUsers extends AppFragment { public void onViewCreated(View view, Bundle bundle) { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); - setActionBarTitle(2131894255); + setActionBarTitle(2131894296); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - RecyclerView recyclerView = getBinding().f1919c; + RecyclerView recyclerView = getBinding().f1921c; MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; m.checkNotNullExpressionValue(recyclerView, "it"); WidgetSettingsBlockedUsersAdapter widgetSettingsBlockedUsersAdapter = (WidgetSettingsBlockedUsersAdapter) companion.configure(new WidgetSettingsBlockedUsersAdapter(recyclerView)); diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java index 6f2113feb3..6103eab77d 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersAdapter.java @@ -38,8 +38,8 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi i2 = 2131362105; TextView textView = (TextView) view.findViewById(2131362105); if (textView != null) { - i2 = 2131365326; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365326); + i2 = 2131365331; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365331); if (materialButton != null) { WidgetSettingsItemBlockedUserBinding widgetSettingsItemBlockedUserBinding = new WidgetSettingsItemBlockedUserBinding((RelativeLayout) view, relativeLayout, simpleDraweeView, textView, materialButton); m.checkNotNullExpressionValue(widgetSettingsItemBlockedUserBinding, "WidgetSettingsItemBlocke…serBinding.bind(itemView)"); @@ -62,7 +62,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi SimpleDraweeView simpleDraweeView = this.binding.b; m.checkNotNullExpressionValue(simpleDraweeView, "binding.blockedUserItemAvatar"); IconUtils.setIcon$default(simpleDraweeView, item.getUser(), 2131165296, null, null, null, 56, null); - TextView textView = this.binding.f1927c; + TextView textView = this.binding.f1929c; m.checkNotNullExpressionValue(textView, "binding.blockedUserItemName"); textView.setText(item.getUser().getUsername()); this.binding.d.setOnClickListener(new WidgetSettingsBlockedUsersAdapter$BlockedUserViewHolder$onConfigure$2(this, item)); @@ -89,7 +89,7 @@ public final class WidgetSettingsBlockedUsersAdapter extends MGRecyclerAdapterSi public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 0) { - return new BlockedUserViewHolder(2131559206, this); + return new BlockedUserViewHolder(2131559207, this); } throw invalidViewTypeException(i); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java index 9a4952099d..8fd3564232 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$1.java @@ -22,6 +22,6 @@ public final class WidgetSettingsBlockedUsersViewModel$onClickUnblock$1 extends } public final void invoke(Void r2) { - WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131894190); + WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131894229); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java index e4e603012c..c53779082d 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/WidgetSettingsBlockedUsersViewModel$onClickUnblock$2.java @@ -25,6 +25,6 @@ public final class WidgetSettingsBlockedUsersViewModel$onClickUnblock$2 extends public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetSettingsBlockedUsersViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java index 9bf935f230..6fa5f84159 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetEnableMFADownload$binding$2 extends k i public final WidgetSettingsEnableMfaDownloadBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - TextView textView = (TextView) view.findViewById(2131363916); + TextView textView = (TextView) view.findViewById(2131363918); if (textView != null) { return new WidgetSettingsEnableMfaDownloadBinding((LinearLayout) view, textView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363916))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363918))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java index 1dd536ebc2..36aa910021 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.java @@ -18,7 +18,7 @@ public final class WidgetEnableMFADownload extends AppFragment { private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetEnableMFADownload$binding$2.INSTANCE, null, 2, null); public WidgetEnableMFADownload() { - super(2131559198); + super(2131559199); } private final WidgetSettingsEnableMfaDownloadBinding getBinding() { @@ -31,7 +31,7 @@ public final class WidgetEnableMFADownload extends AppFragment { super.onViewBound(view); TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.mfaDownloadBody"); - b.n(textView, 2131893956, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4); + b.n(textView, 2131893995, new Object[]{"https://play.google.com/store/apps/details?id=com.authy.authy", "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"}, null, 4); TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.mfaDownloadBody"); textView2.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java index 1d57032c20..56be27e6fc 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetEnableMFAInput$binding$2 extends k impl public final WidgetSettingsEnableMfaInputBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131365414); + CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131365419); if (codeVerificationView != null) { return new WidgetSettingsEnableMfaInputBinding((LinearLayout) view, codeVerificationView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365414))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365419))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java index 104163bcfd..2506543d08 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAInput.java @@ -24,7 +24,7 @@ public final class WidgetEnableMFAInput extends AppFragment { private final Lazy viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetEnableMFAViewModel.class), new WidgetEnableMFAInput$appActivityViewModels$$inlined$activityViewModels$1(this), new g0(WidgetEnableMFAInput$viewModel$2.INSTANCE)); public WidgetEnableMFAInput() { - super(2131559199); + super(2131559200); } public static final /* synthetic */ WidgetEnableMFAViewModel access$getViewModel$p(WidgetEnableMFAInput widgetEnableMFAInput) { diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java index 95dbe6349c..70d12d4b69 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey$binding$2.java @@ -17,14 +17,14 @@ public final /* synthetic */ class WidgetEnableMFAKey$binding$2 extends k implem public final WidgetSettingsEnableMfaKeyBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363043; - TextView textView = (TextView) view.findViewById(2131363043); + int i = 2131363045; + TextView textView = (TextView) view.findViewById(2131363045); if (textView != null) { - i = 2131363044; - TextView textView2 = (TextView) view.findViewById(2131363044); + i = 2131363046; + TextView textView2 = (TextView) view.findViewById(2131363046); if (textView2 != null) { - i = 2131363045; - TextView textView3 = (TextView) view.findViewById(2131363045); + i = 2131363047; + TextView textView3 = (TextView) view.findViewById(2131363047); if (textView3 != null) { return new WidgetSettingsEnableMfaKeyBinding((LinearLayout) view, textView, textView2, textView3); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java index 23cdfe432c..0f610863bc 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.java @@ -54,7 +54,7 @@ public final class WidgetEnableMFAKey extends AppFragment { } public WidgetEnableMFAKey() { - super(2131559200); + super(2131559201); } public static final /* synthetic */ void access$copyCodeToClipboard(WidgetEnableMFAKey widgetEnableMFAKey, Context context) { @@ -71,7 +71,7 @@ public final class WidgetEnableMFAKey extends AppFragment { if (clipboardManager != null) { clipboardManager.setPrimaryClip(newPlainText); } - o.g(context, 2131887620, 0, null, 12); + o.g(context, 2131887622, 0, null, 12); } private final WidgetSettingsEnableMfaKeyBinding getBinding() { @@ -88,18 +88,18 @@ public final class WidgetEnableMFAKey extends AppFragment { if (activity != null && (packageManager = activity.getPackageManager()) != null) { Companion companion = Companion; if (Companion.access$isPackageInstalled(companion, "com.authy.authy", packageManager)) { - TextView textView = getBinding().f1923c; + TextView textView = getBinding().f1925c; m.checkNotNullExpressionValue(textView, "binding.enableMfaKeyLaunchAuthy"); - textView.setText(b.j(this, 2131890750, new Object[]{b.j(this, 2131893937, new Object[0], null, 4)}, null, 4)); - TextView textView2 = getBinding().f1923c; + textView.setText(b.j(this, 2131890780, new Object[]{b.j(this, 2131893976, new Object[0], null, 4)}, null, 4)); + TextView textView2 = getBinding().f1925c; m.checkNotNullExpressionValue(textView2, "binding.enableMfaKeyLaunchAuthy"); textView2.setVisibility(0); - getBinding().f1923c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager)); + getBinding().f1925c.setOnClickListener(new WidgetEnableMFAKey$showLaunchTexts$1(packageManager)); } if (Companion.access$isPackageInstalled(companion, "com.google.android.apps.authenticator2", packageManager)) { TextView textView3 = getBinding().d; m.checkNotNullExpressionValue(textView3, "binding.enableMfaKeyLaunchGoogleAuth"); - textView3.setText(b.j(this, 2131890750, new Object[]{b.j(this, 2131893938, new Object[0], null, 4)}, null, 4)); + textView3.setText(b.j(this, 2131890780, new Object[]{b.j(this, 2131893977, new Object[0], null, 4)}, null, 4)); TextView textView4 = getBinding().d; m.checkNotNullExpressionValue(textView4, "binding.enableMfaKeyLaunchGoogleAuth"); textView4.setVisibility(0); diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java index 87190692e0..8f100e71a5 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$binding$2.java @@ -21,8 +21,8 @@ public final /* synthetic */ class WidgetEnableMFASteps$binding$2 extends k impl int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131363046; - StepsView stepsView = (StepsView) view.findViewById(2131363046); + i = 2131363048; + StepsView stepsView = (StepsView) view.findViewById(2131363048); if (stepsView != null) { return new WidgetEnableMfaStepsBinding((FrameLayout) view, dimmerView, stepsView); } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java index 00e76823c6..a91527ad3d 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps$onViewBoundOrOnResume$1.java @@ -29,7 +29,7 @@ public final class WidgetEnableMFASteps$onViewBoundOrOnResume$1 extends o implem DimmerView.setDimmed$default(WidgetEnableMFASteps.access$getBinding$p(this.this$0).b, viewState.isLoading(), false, 2, null); Integer screenIndex = viewState.getScreenIndex(); if (screenIndex != null) { - WidgetEnableMFASteps.access$getBinding$p(this.this$0).f1769c.b(screenIndex.intValue()); + WidgetEnableMFASteps.access$getBinding$p(this.this$0).f1771c.b(screenIndex.intValue()); } } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java index 6e42837f0b..3333e9c6ad 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.java @@ -54,7 +54,7 @@ public final class WidgetEnableMFASteps extends AppFragment { } public WidgetEnableMFASteps() { - super(2131558995); + super(2131558996); } public static final /* synthetic */ WidgetEnableMfaStepsBinding access$getBinding$p(WidgetEnableMFASteps widgetEnableMFASteps) { @@ -98,7 +98,7 @@ public final class WidgetEnableMFASteps extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - getBinding().f1769c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, 2131887177, 0, null, null, null, false, false, false, 1018), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, false, false, false, 1022), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, false, false, false, 382), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, false, false, false, 510)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this)); + getBinding().f1771c.a(new StepsView.d(this, n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetEnableMFADownload.class, 0, 2131887178, 0, null, null, null, false, false, false, 1018), new StepsView.b.a(WidgetEnableMFAKey.class, 0, 0, 0, null, null, null, false, false, false, 1022), new StepsView.b.a(WidgetEnableMFAInput.class, 0, 0, 0, null, null, null, false, false, false, 382), new StepsView.b.a(WidgetEnableMFASuccess.class, 0, 0, 0, null, null, null, false, false, false, 510)})), new WidgetEnableMFASteps$onViewBound$1(this), new WidgetEnableMFASteps$onViewBound$2(this)); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java index d259ededd0..15a1e24d78 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetEnableMFASuccess$binding$2 extends k im public final WidgetSettingsEnableMfaSuccessBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363917); + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363919); if (materialButton != null) { return new WidgetSettingsEnableMfaSuccessBinding((LinearLayout) view, materialButton); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363917))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363919))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java index c35cace798..4a070b0b1e 100644 --- a/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java +++ b/app/src/main/java/com/discord/widgets/settings/account/mfa/WidgetEnableMFASuccess.java @@ -15,7 +15,7 @@ public final class WidgetEnableMFASuccess extends AppFragment { private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetEnableMFASuccess$binding$2.INSTANCE, null, 2, null); public WidgetEnableMFASuccess() { - super(2131559201); + super(2131559202); } private final WidgetSettingsEnableMfaSuccessBinding getBinding() { diff --git a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java index bb8eb00196..334a8d4422 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceAdapter.java @@ -178,7 +178,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple { if (ordinal == 0) { i2 = 2131886081; } else if (ordinal == 1) { - i2 = 2131891660; + i2 = 2131891693; } else { throw new NoWhenBranchMatchedException(); } @@ -282,11 +282,11 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple { super(2131558616, paymentSourceAdapter); m.checkNotNullParameter(paymentSourceAdapter, "adapter"); View view = this.itemView; - int i = 2131364164; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364164); + int i = 2131364166; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364166); if (materialButton != null) { - i = 2131364166; - PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364166); + i = 2131364168; + PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364168); if (paymentSourceView != null) { PaymentMethodListItemBinding paymentMethodListItemBinding = new PaymentMethodListItemBinding((RelativeLayout) view, materialButton, paymentSourceView); m.checkNotNullExpressionValue(paymentMethodListItemBinding, "PaymentMethodListItemBinding.bind(itemView)"); @@ -305,7 +305,7 @@ public final class PaymentSourceAdapter extends MGRecyclerAdapterSimple { m.checkNotNullParameter(item, "data"); PaymentSourceItem paymentSourceItem = (PaymentSourceItem) item; ModelPaymentSource paymentSource = paymentSourceItem.getPaymentSource(); - this.binding.f1618c.bind(paymentSource, paymentSourceItem.isPremium()); + this.binding.f1620c.bind(paymentSource, paymentSourceItem.isPremium()); this.binding.b.setOnClickListener(new PaymentSourceAdapter$PaymentSourceItemViewHolder$onConfigure$1(this, paymentSource)); } } diff --git a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java index 7729437fed..2d0b7fa689 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/PaymentSourceView.java @@ -32,23 +32,23 @@ public final class PaymentSourceView extends ConstraintLayout { super(context, attributeSet, i); m.checkNotNullParameter(context, "context"); LayoutInflater.from(context).inflate(2131558617, this); - int i2 = 2131364178; - ImageView imageView = (ImageView) findViewById(2131364178); + int i2 = 2131364180; + ImageView imageView = (ImageView) findViewById(2131364180); if (imageView != null) { - i2 = 2131364179; - CardView cardView = (CardView) findViewById(2131364179); + i2 = 2131364181; + CardView cardView = (CardView) findViewById(2131364181); if (cardView != null) { - i2 = 2131364180; - TextView textView = (TextView) findViewById(2131364180); + i2 = 2131364182; + TextView textView = (TextView) findViewById(2131364182); if (textView != null) { - i2 = 2131364181; - ImageView imageView2 = (ImageView) findViewById(2131364181); + i2 = 2131364183; + ImageView imageView2 = (ImageView) findViewById(2131364183); if (imageView2 != null) { - i2 = 2131364182; - TextView textView2 = (TextView) findViewById(2131364182); + i2 = 2131364184; + TextView textView2 = (TextView) findViewById(2131364184); if (textView2 != null) { - i2 = 2131364183; - TextView textView3 = (TextView) findViewById(2131364183); + i2 = 2131364185; + TextView textView3 = (TextView) findViewById(2131364185); if (textView3 != null) { PaymentSourceViewBinding paymentSourceViewBinding = new PaymentSourceViewBinding(this, imageView, cardView, textView, imageView2, textView2, textView3); m.checkNotNullExpressionValue(paymentSourceViewBinding, "PaymentSourceViewBinding…ater.from(context), this)"); @@ -71,7 +71,7 @@ public final class PaymentSourceView extends ConstraintLayout { private final void bindCard(ModelPaymentSource.ModelPaymentSourceCard modelPaymentSourceCard) { TextView textView = this.binding.f; m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewTitle"); - b.n(textView, 2131891769, new Object[]{modelPaymentSourceCard.getBrand(), modelPaymentSourceCard.getLast4()}, null, 4); + b.n(textView, 2131891806, new Object[]{modelPaymentSourceCard.getBrand(), modelPaymentSourceCard.getLast4()}, null, 4); TimeUtils timeUtils = TimeUtils.INSTANCE; int expiresMonth = modelPaymentSourceCard.getExpiresMonth(); TextView textView2 = this.binding.e; @@ -81,11 +81,11 @@ public final class PaymentSourceView extends ConstraintLayout { String localizedMonthName = timeUtils.getLocalizedMonthName(expiresMonth, context); TextView textView3 = this.binding.e; m.checkNotNullExpressionValue(textView3, "binding.paymentSourceViewSubtext"); - b.n(textView3, 2131891771, new Object[]{localizedMonthName, Integer.valueOf(modelPaymentSourceCard.getExpiresYear())}, null, 4); + b.n(textView3, 2131891808, new Object[]{localizedMonthName, Integer.valueOf(modelPaymentSourceCard.getExpiresYear())}, null, 4); } private final void bindPaypal(ModelPaymentSource.ModelPaymentSourcePaypal modelPaymentSourcePaypal) { - this.binding.f.setText(2131891796); + this.binding.f.setText(2131891833); TextView textView = this.binding.e; m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewSubtext"); textView.setText(modelPaymentSourcePaypal.getEmail()); @@ -94,7 +94,7 @@ public final class PaymentSourceView extends ConstraintLayout { public final void bind(ModelPaymentSource modelPaymentSource, boolean z2) { m.checkNotNullParameter(modelPaymentSource, "paymentSource"); this.binding.b.setImageResource(PremiumUtilsKt.getPaymentSourceIcon(modelPaymentSource)); - TextView textView = this.binding.f1619c; + TextView textView = this.binding.f1621c; m.checkNotNullExpressionValue(textView, "binding.paymentSourceViewInvalid"); int i = 0; textView.setVisibility(modelPaymentSource.getInvalid() ? 0 : 8); diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java index cbf9b828d5..d5b2dd6916 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$binding$2.java @@ -31,38 +31,38 @@ public final /* synthetic */ class WidgetPaymentSourceEditDialog$binding$2 exten i = 2131362888; LoadingButton loadingButton = (LoadingButton) view.findViewById(2131362888); if (loadingButton != null) { - i = 2131364167; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364167); + i = 2131364169; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364169); if (textInputLayout != null) { - i = 2131364168; - TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131364168); + i = 2131364170; + TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131364170); if (textInputLayout2 != null) { - i = 2131364169; - TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131364169); + i = 2131364171; + TextInputLayout textInputLayout3 = (TextInputLayout) view.findViewById(2131364171); if (textInputLayout3 != null) { - i = 2131364170; - TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(2131364170); + i = 2131364172; + TextInputLayout textInputLayout4 = (TextInputLayout) view.findViewById(2131364172); if (textInputLayout4 != null) { - i = 2131364171; - CheckBox checkBox = (CheckBox) view.findViewById(2131364171); + i = 2131364173; + CheckBox checkBox = (CheckBox) view.findViewById(2131364173); if (checkBox != null) { - i = 2131364172; - TextView textView = (TextView) view.findViewById(2131364172); + i = 2131364174; + TextView textView = (TextView) view.findViewById(2131364174); if (textView != null) { - i = 2131364173; - TextView textView2 = (TextView) view.findViewById(2131364173); + i = 2131364175; + TextView textView2 = (TextView) view.findViewById(2131364175); if (textView2 != null) { - i = 2131364174; - TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(2131364174); + i = 2131364176; + TextInputLayout textInputLayout5 = (TextInputLayout) view.findViewById(2131364176); if (textInputLayout5 != null) { - i = 2131364175; - TextInputLayout textInputLayout6 = (TextInputLayout) view.findViewById(2131364175); + i = 2131364177; + TextInputLayout textInputLayout6 = (TextInputLayout) view.findViewById(2131364177); if (textInputLayout6 != null) { - i = 2131364176; - TextInputLayout textInputLayout7 = (TextInputLayout) view.findViewById(2131364176); + i = 2131364178; + TextInputLayout textInputLayout7 = (TextInputLayout) view.findViewById(2131364178); if (textInputLayout7 != null) { - i = 2131364177; - PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364177); + i = 2131364179; + PaymentSourceView paymentSourceView = (PaymentSourceView) view.findViewById(2131364179); if (paymentSourceView != null) { return new WidgetPaymentSourceEditDialogBinding((LinearLayout) view, toolbar, materialButton, loadingButton, textInputLayout, textInputLayout2, textInputLayout3, textInputLayout4, checkBox, textView, textView2, textInputLayout5, textInputLayout6, textInputLayout7, paymentSourceView); } diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java index 868201c2bf..0a4cd530ee 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.java @@ -22,7 +22,7 @@ public final class WidgetPaymentSourceEditDialog$deletePaymentSource$1 extends o } public final void invoke(Void r4) { - c.a.d.o.i(this.this$0, 2131891777, 0, 4); + c.a.d.o.i(this.this$0, 2131891814, 0, 4); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java index ccdda00ec4..d567491b94 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.java @@ -18,6 +18,6 @@ public final class WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2 impleme WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131891775, new Object[0], null, 4), b.j(this.this$0, 2131891776, new Object[0], null, 4), b.j(this.this$0, 2131891633, new Object[0], null, 4), "", null, null, null, null, null, null, null, 0, null, 16352, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this.this$0, 2131891812, new Object[0], null, 4), b.j(this.this$0, 2131891813, new Object[0], null, 4), b.j(this.this$0, 2131891666, new Object[0], null, 4), "", null, null, null, null, null, null, null, 0, null, 16352, null); } } diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java index efdfeee799..939273c691 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.java @@ -22,7 +22,7 @@ public final class WidgetPaymentSourceEditDialog$updatePaymentSource$1 extends o } public final void invoke(Void r4) { - c.a.d.o.i(this.this$0, 2131891780, 0, 4); + c.a.d.o.i(this.this$0, 2131891817, 0, 4); this.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java index cdfb6b652d..a827ec88bb 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java @@ -171,7 +171,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog { } public WidgetPaymentSourceEditDialog() { - super(2131559104); + super(2131559105); WidgetPaymentSourceEditDialog$viewModel$2 widgetPaymentSourceEditDialog$viewModel$2 = WidgetPaymentSourceEditDialog$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsBillingViewModel.class), new WidgetPaymentSourceEditDialog$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPaymentSourceEditDialog$viewModel$2)); @@ -257,7 +257,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog { TextView textView = getBinding().k; m.checkNotNullExpressionValue(textView, "binding.paymentSourceEditHelp"); boolean z2 = false; - textView.setText(component1 instanceof ModelPaymentSource.ModelPaymentSourcePaypal ? b.j(this, 2131891779, new Object[]{"https://www.paypal.com"}, null, 4) : b.j(this, 2131891778, new Object[0], null, 4)); + textView.setText(component1 instanceof ModelPaymentSource.ModelPaymentSourcePaypal ? b.j(this, 2131891816, new Object[]{"https://www.paypal.com"}, null, 4) : b.j(this, 2131891815, new Object[0], null, 4)); StateEntry[] statesFor = getStatesFor(component1); ModelBillingAddress billingAddress = component1.getBillingAddress(); TextInputLayout textInputLayout = getBinding().l; @@ -303,12 +303,12 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog { checkBox.setChecked(component1.getDefault()); getBinding().d.setIsLoading(false); if (component2) { - getBinding().f1842c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this)); - MaterialButton materialButton = getBinding().f1842c; + getBinding().f1844c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this)); + MaterialButton materialButton = getBinding().f1844c; m.checkNotNullExpressionValue(materialButton, "binding.dialogDelete"); materialButton.setAlpha(0.3f); } else { - getBinding().f1842c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1)); + getBinding().f1844c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1)); } getBinding().d.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$4(this, component1)); if (m.areEqual(component1.getBillingAddress().getCountry(), "CA")) { @@ -388,7 +388,7 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog { m.a aVar = c.a.a.m.j; FragmentManager parentFragmentManager = getParentFragmentManager(); d0.z.d.m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - CharSequence j = b.j(this, 2131891781, new Object[0], null, 4); + CharSequence j = b.j(this, 2131891818, new Object[0], null, 4); ArrayList arrayList = new ArrayList(stateEntryArr.length); for (StateEntry stateEntry : stateEntryArr) { arrayList.add(stateEntry.getLabel()); diff --git a/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java b/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java index 40c78bd874..ec1fadc566 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/ConnectionsGuildIntegrationView.java @@ -28,20 +28,20 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558740, (ViewGroup) this, false); addView(inflate); - int i = 2131365595; - TextView textView = (TextView) inflate.findViewById(2131365595); + int i = 2131365601; + TextView textView = (TextView) inflate.findViewById(2131365601); if (textView != null) { - i = 2131365596; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365596); + i = 2131365602; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365602); if (simpleDraweeView != null) { - i = 2131365597; - TextView textView2 = (TextView) inflate.findViewById(2131365597); + i = 2131365603; + TextView textView2 = (TextView) inflate.findViewById(2131365603); if (textView2 != null) { - i = 2131365598; - TextView textView3 = (TextView) inflate.findViewById(2131365598); + i = 2131365604; + TextView textView3 = (TextView) inflate.findViewById(2131365604); if (textView3 != null) { - i = 2131365599; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365599); + i = 2131365605; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365605); if (materialButton != null) { ViewConnectionGuildIntegrationBinding viewConnectionGuildIntegrationBinding = new ViewConnectionGuildIntegrationBinding((CardView) inflate, textView, simpleDraweeView, textView2, textView3, materialButton); m.checkNotNullExpressionValue(viewConnectionGuildIntegrationBinding, "ViewConnectionGuildInteg…rom(context), this, true)"); @@ -66,7 +66,7 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout { m.checkNotNullExpressionValue(textView2, "binding.widgetConnectionIntegrationGuildName"); textView2.setText(guild.getName()); String forGuild$default = IconUtils.getForGuild$default(Long.valueOf(guild.getId()), guild.getIcon(), null, false, Integer.valueOf(IconUtils.getMediaProxySize(getResources().getDimensionPixelSize(2131165296))), 12, null); - SimpleDraweeView simpleDraweeView = this.binding.f1646c; + SimpleDraweeView simpleDraweeView = this.binding.f1648c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.widgetConnectionIntegrationGuildIcon"); IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); } @@ -75,7 +75,7 @@ public final class ConnectionsGuildIntegrationView extends FrameLayout { materialButton.setEnabled(!(joinStatus instanceof WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining)); MaterialButton materialButton2 = this.binding.f; m.checkNotNullExpressionValue(materialButton2, "binding.widgetConnectionIntegrationJoinGuild"); - materialButton2.setText(m.areEqual(joinStatus, WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining.INSTANCE) ? getResources().getString(2131890642) : getResources().getString(2131890612)); + materialButton2.setText(m.areEqual(joinStatus, WidgetSettingsUserConnectionsViewModel.JoinStatus.Joining.INSTANCE) ? getResources().getString(2131890672) : getResources().getString(2131890642)); TextView textView3 = this.binding.d; m.checkNotNullExpressionValue(textView3, "binding.widgetConnectionIntegrationGuildJoinError"); int i = 0; diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java index 73fc5b92f7..2ecc68ebe0 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections$onViewBound$2.java @@ -14,7 +14,7 @@ public final class WidgetSettingsUserConnections$onViewBound$2 implement public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363856 && this.this$0.getContext() != null) { + if (menuItem.getItemId() == 2131363859 && this.this$0.getContext() != null) { WidgetSettingsUserConnectionsAdd.Companion.show(this.this$0); } } diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java index 592e74332d..6ac8109f5a 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java @@ -89,26 +89,26 @@ public final class WidgetSettingsUserConnections extends AppFragment { i2 = 2131362685; TextView textView = (TextView) view.findViewById(2131362685); if (textView != null) { - i2 = 2131362934; - SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131362934); + i2 = 2131362936; + SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131362936); if (switchMaterial != null) { - i2 = 2131362936; - SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131362936); + i2 = 2131362938; + SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131362938); if (switchMaterial2 != null) { - i2 = 2131362937; - View findViewById2 = view.findViewById(2131362937); + i2 = 2131362939; + View findViewById2 = view.findViewById(2131362939); if (findViewById2 != null) { - i2 = 2131363151; - TextView textView2 = (TextView) view.findViewById(2131363151); + i2 = 2131363153; + TextView textView2 = (TextView) view.findViewById(2131363153); if (textView2 != null) { - i2 = 2131363595; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363595); + i2 = 2131363597; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363597); if (linearLayout != null) { - i2 = 2131363727; - TextView textView3 = (TextView) view.findViewById(2131363727); + i2 = 2131363730; + TextView textView3 = (TextView) view.findViewById(2131363730); if (textView3 != null) { - i2 = 2131365155; - SwitchMaterial switchMaterial3 = (SwitchMaterial) view.findViewById(2131365155); + i2 = 2131365159; + SwitchMaterial switchMaterial3 = (SwitchMaterial) view.findViewById(2131365159); if (switchMaterial3 != null) { WidgetSettingsItemConnectedAccountBinding widgetSettingsItemConnectedAccountBinding = new WidgetSettingsItemConnectedAccountBinding((CardView) view, imageView, findViewById, imageView2, textView, switchMaterial, switchMaterial2, findViewById2, textView2, linearLayout, textView3, switchMaterial3); m.checkNotNullExpressionValue(widgetSettingsItemConnectedAccountBinding, "WidgetSettingsItemConnec…untBinding.bind(itemView)"); @@ -162,10 +162,10 @@ public final class WidgetSettingsUserConnections extends AppFragment { String id2 = connection.getId(); m.checkNotNullExpressionValue(id2, "connectedAccount.id"); this.binding.a.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1(from, this, userConnectionItem)); - ImageView imageView = this.binding.f1928c; + ImageView imageView = this.binding.f1930c; Integer platformImage = from.getPlatformImage(); imageView.setImageResource(platformImage != null ? platformImage.intValue() : 0); - ImageView imageView2 = this.binding.f1928c; + ImageView imageView2 = this.binding.f1930c; m.checkNotNullExpressionValue(imageView2, "binding.connectedAccountImg"); imageView2.setContentDescription(from.name()); TextView textView = this.binding.d; @@ -191,7 +191,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { switchMaterial4.setVisibility(from.getCanShowActivity() ? 0 : 8); SwitchMaterial switchMaterial5 = this.binding.e; m.checkNotNullExpressionValue(switchMaterial5, "binding.displayActivitySwitch"); - b.n(switchMaterial5, 2131888155, new Object[]{t.capitalize(from.getProperName())}, null, 4); + b.n(switchMaterial5, 2131888165, new Object[]{t.capitalize(from.getProperName())}, null, 4); SwitchMaterial switchMaterial6 = this.binding.e; m.checkNotNullExpressionValue(switchMaterial6, "binding.displayActivitySwitch"); switchMaterial6.setChecked(connection.isShowActivity()); @@ -202,7 +202,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { textView2.setVisibility(0); TextView textView3 = this.binding.g; m.checkNotNullExpressionValue(textView3, "binding.extraInfo"); - b.n(textView3, 2131893264, new Object[0], null, 4); + b.n(textView3, 2131893306, new Object[0], null, 4); this.binding.g.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$6(this, userConnectionItem)); } else { TextView textView4 = this.binding.g; @@ -214,7 +214,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { LinearLayout linearLayout = this.binding.h; m.checkNotNullExpressionValue(linearLayout, "binding.integrationsRoot"); linearLayout.setVisibility(0); - int indexOfChild = this.binding.h.indexOfChild(this.binding.h.findViewById(2131363727)); + int indexOfChild = this.binding.h.indexOfChild(this.binding.h.findViewById(2131363730)); if (indexOfChild != -1) { LinearLayout linearLayout2 = this.binding.h; int i2 = indexOfChild + 1; @@ -264,7 +264,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { @Override // androidx.recyclerview.widget.RecyclerView.Adapter public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - return new ViewHolder(this, 2131559207, this); + return new ViewHolder(this, 2131559208, this); } } @@ -313,7 +313,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { } public WidgetSettingsUserConnections() { - super(2131559195); + super(2131559196); WidgetSettingsUserConnections$viewModel$2 widgetSettingsUserConnections$viewModel$2 = WidgetSettingsUserConnections$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsUserConnectionsViewModel.class), new WidgetSettingsUserConnections$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsUserConnections$viewModel$2)); @@ -342,21 +342,21 @@ public final class WidgetSettingsUserConnections extends AppFragment { TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.connectionsEmpty"); textView.setVisibility(8); - RecyclerView recyclerView = getBinding().f1921c; + RecyclerView recyclerView = getBinding().f1923c; m.checkNotNullExpressionValue(recyclerView, "binding.connectionsRecycler"); recyclerView.setVisibility(8); } else if (viewState instanceof WidgetSettingsUserConnectionsViewModel.ViewState.Empty) { TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.connectionsEmpty"); textView2.setVisibility(0); - RecyclerView recyclerView2 = getBinding().f1921c; + RecyclerView recyclerView2 = getBinding().f1923c; m.checkNotNullExpressionValue(recyclerView2, "binding.connectionsRecycler"); recyclerView2.setVisibility(8); } else if (viewState instanceof WidgetSettingsUserConnectionsViewModel.ViewState.Loaded) { TextView textView3 = getBinding().b; m.checkNotNullExpressionValue(textView3, "binding.connectionsEmpty"); textView3.setVisibility(8); - RecyclerView recyclerView3 = getBinding().f1921c; + RecyclerView recyclerView3 = getBinding().f1923c; m.checkNotNullExpressionValue(recyclerView3, "binding.connectionsRecycler"); recyclerView3.setVisibility(0); List data = ((WidgetSettingsUserConnectionsViewModel.ViewState.Loaded) viewState).getData(); @@ -369,7 +369,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { adapter2.setData(arrayList); } if (itemCount != 0 && arrayList.size() > itemCount) { - getBinding().f1921c.smoothScrollToPosition(arrayList.size() - 1); + getBinding().f1923c.smoothScrollToPosition(arrayList.size() - 1); } } } @@ -385,7 +385,7 @@ public final class WidgetSettingsUserConnections extends AppFragment { FragmentActivity activity = getActivity(); if (activity != null) { MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; - RecyclerView recyclerView = getBinding().f1921c; + RecyclerView recyclerView = getBinding().f1923c; m.checkNotNullExpressionValue(recyclerView, "binding.connectionsRecycler"); m.checkNotNullExpressionValue(activity, "it"); FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); @@ -393,8 +393,8 @@ public final class WidgetSettingsUserConnections extends AppFragment { this.adapter = (Adapter) companion.configure(new Adapter(recyclerView, supportFragmentManager, new WidgetSettingsUserConnections$onViewBound$$inlined$let$lambda$1(this))); } AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131887542); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131887544); AppFragment.setActionBarOptionsMenu$default(this, 2131623945, new WidgetSettingsUserConnections$onViewBound$2(this), null, 4, null); } diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java index 867a0b68da..e9a6554b5f 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java @@ -85,7 +85,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet { public void onConfigure(int i, PlatformItem platformItem) { m.checkNotNullParameter(platformItem, "data"); super.onConfigure(i, (int) platformItem); - TextView textView = this.binding.f1926c; + TextView textView = this.binding.f1928c; m.checkNotNullExpressionValue(textView, "binding.addConnectedAccountText"); textView.setText(platformItem.getPlatform().getProperName()); ImageView imageView = this.binding.b; @@ -110,7 +110,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet { @Override // androidx.recyclerview.widget.RecyclerView.Adapter public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); - return new ViewHolder(2131559203, this, this.dialogDismissCallback); + return new ViewHolder(2131559204, this, this.dialogDismissCallback); } } @@ -207,7 +207,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559196; + return 2131559197; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java index a9ab9ba796..e027dd980c 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAddXbox.java @@ -46,7 +46,7 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment { } public WidgetSettingsUserConnectionsAddXbox() { - super(2131558977); + super(2131558978); } public static final /* synthetic */ WidgetConnectionsAddXboxBinding access$getBinding$p(WidgetSettingsUserConnectionsAddXbox widgetSettingsUserConnectionsAddXbox) { @@ -70,7 +70,7 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment { } private final void showPinError() { - o.g(getContext(), 2131887525, 0, null, 12); + o.g(getContext(), 2131887527, 0, null, 12); getBinding().b.b(); } @@ -91,10 +91,10 @@ public final class WidgetSettingsUserConnectionsAddXbox extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131887542); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131887544); trackXboxLinkStep(); - getBinding().f1755c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE); + getBinding().f1757c.setOnClickListener(WidgetSettingsUserConnectionsAddXbox$onViewBound$1.INSTANCE); getBinding().b.setOnCodeEntered(new WidgetSettingsUserConnectionsAddXbox$onViewBound$2(this)); } diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1.java index 44c8816823..f37bbb4a02 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel$Companion$observeStores$1.java @@ -1,9 +1,11 @@ package com.discord.widgets.settings.connections; +import c.d.b.a.a; import com.discord.models.domain.ModelConnectedAccount; import com.discord.models.guild.Guild; import com.discord.widgets.settings.connections.WidgetSettingsUserConnectionsViewModel; import d0.z.d.m; +import java.util.ArrayList; import java.util.List; import java.util.Map; 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 final WidgetSettingsUserConnectionsViewModel.StoreState call(List list, Map 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"); - return new WidgetSettingsUserConnectionsViewModel.StoreState(list, map); + return new WidgetSettingsUserConnectionsViewModel.StoreState(S, map); } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java index 5019c828df..4653332d21 100644 --- a/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java +++ b/app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsViewModel.java @@ -91,7 +91,7 @@ public final class WidgetSettingsUserConnectionsViewModel extends AppViewModel observeStores() { StoreStream.Companion companion = StoreStream.Companion; Observable 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; } } diff --git a/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java b/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java index d6e51c06e5..fb42f27e1e 100644 --- a/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/developer/ExperimentOverridesAdapter.java @@ -120,13 +120,13 @@ public final class ExperimentOverridesAdapter extends RecyclerView.Adapter list) { diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java index fa721f4900..dd9943fb0d 100644 --- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$binding$2.java @@ -38,11 +38,11 @@ public final /* synthetic */ class WidgetSettingsDeveloper$binding$2 extends k i i = 2131362862; MaterialButton materialButton4 = (MaterialButton) view.findViewById(2131362862); if (materialButton4 != null) { - i = 2131364824; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364824); + i = 2131364827; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364827); if (checkedSetting != null) { - i = 2131365210; - TextView textView = (TextView) view.findViewById(2131365210); + i = 2131365214; + TextView textView = (TextView) view.findViewById(2131365214); if (textView != null) { return new WidgetSettingsDeveloperBinding((CoordinatorLayout) view, materialButton, materialButton2, materialButton3, recyclerView, recyclerView2, materialButton4, checkedSetting, textView); } diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java index 1ed403d36b..2c2dca0122 100644 --- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java +++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper$setupNoticesSection$1.java @@ -44,7 +44,7 @@ public final class WidgetSettingsDeveloper$setupNoticesSection$1 extends o imple @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final ItemTouchHelper mo1invoke() { - SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this.this$0, 2131100324), ContextCompat.getDrawable(this.this$0.requireContext(), 2131231554), DimenUtils.dpToPixels(8)); + SwipeableItemTouchHelper.SwipeRevealConfiguration swipeRevealConfiguration = new SwipeableItemTouchHelper.SwipeRevealConfiguration(ColorCompat.getColor(this.this$0, 2131100324), ContextCompat.getDrawable(this.this$0.requireContext(), 2131231555), DimenUtils.dpToPixels(8)); return new ItemTouchHelper(new AnonymousClass1(swipeRevealConfiguration, swipeRevealConfiguration, swipeRevealConfiguration)); } } diff --git a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java index 99a97ca822..2cca596237 100644 --- a/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java +++ b/app/src/main/java/com/discord/widgets/settings/developer/WidgetSettingsDeveloper.java @@ -100,7 +100,7 @@ public final class WidgetSettingsDeveloper extends AppFragment { } public WidgetSettingsDeveloper() { - super(2131559197); + super(2131559198); } public static final /* synthetic */ ExperimentOverridesAdapter access$getExperimentOverridesAdapter$p(WidgetSettingsDeveloper widgetSettingsDeveloper) { @@ -125,7 +125,7 @@ public final class WidgetSettingsDeveloper extends AppFragment { private final void setupCrashes() { getBinding().d.setOnClickListener(WidgetSettingsDeveloper$setupCrashes$1.INSTANCE); - getBinding().f1922c.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$2(this)); + getBinding().f1924c.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$2(this)); getBinding().b.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$3(this)); getBinding().g.setOnClickListener(new WidgetSettingsDeveloper$setupCrashes$4(this)); } @@ -169,7 +169,7 @@ public final class WidgetSettingsDeveloper extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); setActionBarDisplayHomeAsUpEnabled(true); - setActionBarTitle(2131888103); + setActionBarTitle(2131888108); setupCrashes(); } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java index 1cc64adf5f..bb24dda6ed 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/ChoosePlanViewModel.java @@ -680,7 +680,7 @@ public final class ChoosePlanViewModel extends AppViewModel { } else if (!(downgrade == null || skuDetails3 == null)) { googlePlaySku = downgrade; } - return n.listOf((Object[]) new WidgetChoosePlanAdapter.Item[]{new WidgetChoosePlanAdapter.Item.Header(2131887009), new WidgetChoosePlanAdapter.Item.Plan(fromSkuName, skuDetails, googlePlaySku, this.oldSkuName, skuDetails2, true), new WidgetChoosePlanAdapter.Item.Divider()}); + return n.listOf((Object[]) new WidgetChoosePlanAdapter.Item[]{new WidgetChoosePlanAdapter.Item.Header(2131887010), new WidgetChoosePlanAdapter.Item.Plan(fromSkuName, skuDetails, googlePlaySku, this.oldSkuName, skuDetails2, true), new WidgetChoosePlanAdapter.Item.Divider()}); } private final WidgetChoosePlanAdapter.Item.Header getHeaderForSkuSection(GooglePlaySku.Section section) { diff --git a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java index e16c4e5848..06c60d8d80 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/SettingsPremiumViewModel.java @@ -838,7 +838,7 @@ public final class SettingsPremiumViewModel extends AppViewModel { private final void onCancelError() { if (getViewState() instanceof ViewState.Loaded) { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.ErrorToast(2131891885)); + publishSubject.j.onNext(new Event.ErrorToast(2131891922)); } } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java index caba97d999..6a378f97a7 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlan.java @@ -121,7 +121,7 @@ public final class WidgetChoosePlan extends AppFragment { } public WidgetChoosePlan() { - super(2131558970); + super(2131558971); WidgetChoosePlan$viewModel$2 widgetChoosePlan$viewModel$2 = new WidgetChoosePlan$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(ChoosePlanViewModel.class), new WidgetChoosePlan$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetChoosePlan$viewModel$2)); @@ -258,9 +258,9 @@ public final class WidgetChoosePlan extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); setUpRecycler(); - LinkifiedTextView linkifiedTextView = getBinding().f1752c; + LinkifiedTextView linkifiedTextView = getBinding().f1754c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.choosePlanEmptyDescription"); - b.n(linkifiedTextView, 2131892155, new Object[]{f.a.a(360055386693L, null)}, null, 4); + b.n(linkifiedTextView, 2131892193, new Object[]{f.a.a(360055386693L, null)}, null, 4); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java index ba0e10ee88..7f10a32624 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetChoosePlanAdapter.java @@ -32,7 +32,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple public static final class DividerViewHolder extends MGRecyclerViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public DividerViewHolder(WidgetChoosePlanAdapter widgetChoosePlanAdapter) { - super(2131558971, widgetChoosePlanAdapter); + super(2131558972, widgetChoosePlanAdapter); m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter"); } } @@ -43,17 +43,17 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public HeaderViewHolder(WidgetChoosePlanAdapter widgetChoosePlanAdapter) { - super(2131558972, widgetChoosePlanAdapter); + super(2131558973, widgetChoosePlanAdapter); m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131364574); + TextView textView = (TextView) view.findViewById(2131364577); if (textView != null) { WidgetChoosePlanAdapterHeaderItemBinding widgetChoosePlanAdapterHeaderItemBinding = new WidgetChoosePlanAdapterHeaderItemBinding((FrameLayout) view, textView); m.checkNotNullExpressionValue(widgetChoosePlanAdapterHeaderItemBinding, "WidgetChoosePlanAdapterH…temBinding.bind(itemView)"); this.binding = widgetChoosePlanAdapterHeaderItemBinding; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364574))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364577))); } public void onConfigure(int i, Item item) { @@ -329,7 +329,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public PlanViewHeader(WidgetChoosePlanAdapter widgetChoosePlanAdapter) { - super(2131558973, widgetChoosePlanAdapter); + super(2131558974, widgetChoosePlanAdapter); m.checkNotNullParameter(widgetChoosePlanAdapter, "adapter"); WidgetChoosePlanAdapterPlanItemBinding a = WidgetChoosePlanAdapterPlanItemBinding.a(this.itemView); m.checkNotNullExpressionValue(a, "WidgetChoosePlanAdapterP…temBinding.bind(itemView)"); @@ -350,7 +350,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple TextView textView2 = this.binding.g; m.checkNotNullExpressionValue(textView2, "binding.planItemPrice"); PremiumUtils premiumUtils = PremiumUtils.INSTANCE; - MaterialCardView materialCardView = this.binding.f1751c; + MaterialCardView materialCardView = this.binding.f1753c; m.checkNotNullExpressionValue(materialCardView, "binding.planItemContainer"); Context context = materialCardView.getContext(); m.checkNotNullExpressionValue(context, "binding.planItemContainer.context"); @@ -372,7 +372,7 @@ public final class WidgetChoosePlanAdapter extends MGRecyclerAdapterSimple TextView textView5 = this.binding.g; m.checkNotNullExpressionValue(textView5, "binding.planItemPrice"); DrawableCompat.setCompoundDrawablesCompat$default(textView5, 0, 0, themedDrawableRes$default, 0, 11, (Object) null); - this.binding.f1751c.setOnClickListener(new WidgetChoosePlanAdapter$PlanViewHeader$onConfigure$1(this, item)); + this.binding.f1753c.setOnClickListener(new WidgetChoosePlanAdapter$PlanViewHeader$onConfigure$1(this, item)); } } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java index 391f942820..1d1d43145e 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet$binding$2.java @@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetOutboundPromoTermsSheet$binding$2 exten public final WidgetOutboundPromoTermsSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364362; - TextView textView = (TextView) view.findViewById(2131364362); + int i = 2131364365; + TextView textView = (TextView) view.findViewById(2131364365); if (textView != null) { - i = 2131364363; - TextView textView2 = (TextView) view.findViewById(2131364363); + i = 2131364366; + TextView textView2 = (TextView) view.findViewById(2131364366); if (textView2 != null) { return new WidgetOutboundPromoTermsSheetBinding((LinearLayout) view, textView, textView2); } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java index 14c5dc6231..86220e85d7 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTermsSheet.java @@ -50,7 +50,7 @@ public final class WidgetOutboundPromoTermsSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559103; + return 2131559104; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -58,7 +58,7 @@ public final class WidgetOutboundPromoTermsSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); getBinding().b.setOnClickListener(new WidgetOutboundPromoTermsSheet$onViewCreated$1(this)); - TextView textView = getBinding().f1841c; + TextView textView = getBinding().f1843c; m.checkNotNullExpressionValue(textView, "binding.promoTermsContent"); textView.setText(getArgumentsOrDefault().getString("ARG_CONTENT", "")); } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java index 134d98bcf6..4d416cbfe0 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$binding$2.java @@ -29,59 +29,59 @@ public final /* synthetic */ class WidgetSettingsGifting$binding$2 extends k imp int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131363303; - GiftSelectView giftSelectView = (GiftSelectView) view.findViewById(2131363303); + i = 2131363305; + GiftSelectView giftSelectView = (GiftSelectView) view.findViewById(2131363305); if (giftSelectView != null) { - i = 2131363304; - GiftSelectView giftSelectView2 = (GiftSelectView) view.findViewById(2131363304); + i = 2131363306; + GiftSelectView giftSelectView2 = (GiftSelectView) view.findViewById(2131363306); if (giftSelectView2 != null) { - i = 2131363305; - GiftSelectView giftSelectView3 = (GiftSelectView) view.findViewById(2131363305); + i = 2131363307; + GiftSelectView giftSelectView3 = (GiftSelectView) view.findViewById(2131363307); if (giftSelectView3 != null) { - i = 2131363306; - GiftSelectView giftSelectView4 = (GiftSelectView) view.findViewById(2131363306); + i = 2131363308; + GiftSelectView giftSelectView4 = (GiftSelectView) view.findViewById(2131363308); if (giftSelectView4 != null) { - i = 2131364315; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364315); + i = 2131364318; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364318); if (linkifiedTextView != null) { - i = 2131364317; - LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131364317); + i = 2131364320; + LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131364320); if (linkifiedTextView2 != null) { - i = 2131364825; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364825); + i = 2131364828; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364828); if (appViewFlipper != null) { - i = 2131364826; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131364826); + i = 2131364829; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131364829); if (progressBar != null) { - i = 2131364827; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364827); + i = 2131364830; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364830); if (textInputLayout != null) { - i = 2131364828; - TextView textView = (TextView) view.findViewById(2131364828); + i = 2131364831; + TextView textView = (TextView) view.findViewById(2131364831); if (textView != null) { - i = 2131364829; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364829); + i = 2131364832; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364832); if (recyclerView != null) { - i = 2131364830; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364830); + i = 2131364833; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364833); if (linearLayout != null) { - i = 2131364831; - TextView textView2 = (TextView) view.findViewById(2131364831); + i = 2131364834; + TextView textView2 = (TextView) view.findViewById(2131364834); if (textView2 != null) { - i = 2131364832; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364832); + i = 2131364835; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364835); if (materialButton != null) { - i = 2131364833; - TextView textView3 = (TextView) view.findViewById(2131364833); + i = 2131364836; + TextView textView3 = (TextView) view.findViewById(2131364836); if (textView3 != null) { - i = 2131364834; - TextView textView4 = (TextView) view.findViewById(2131364834); + i = 2131364837; + TextView textView4 = (TextView) view.findViewById(2131364837); if (textView4 != null) { - i = 2131364835; - TextView textView5 = (TextView) view.findViewById(2131364835); + i = 2131364838; + TextView textView5 = (TextView) view.findViewById(2131364838); if (textView5 != null) { - i = 2131364836; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364836); + i = 2131364839; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364839); if (recyclerView2 != null) { return new WidgetSettingsGiftingBinding((CoordinatorLayout) view, dimmerView, giftSelectView, giftSelectView2, giftSelectView3, giftSelectView4, linkifiedTextView, linkifiedTextView2, appViewFlipper, progressBar, textInputLayout, textView, recyclerView, linearLayout, textView2, materialButton, textView3, textView4, textView5, recyclerView2); } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java index ffb21496ab..35f9f66159 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting$onViewBound$chooseGiftCallback$1.java @@ -60,7 +60,7 @@ public final class WidgetSettingsGifting$onViewBound$chooseGiftCallback$1 extend giftingUtils.buyGift(requireAppActivity, googlePlayInAppSku, location, new AnonymousClass1(this)); } catch (Exception unused) { WidgetSettingsGifting widgetSettingsGifting = this.this$0; - c.a.d.o.j(widgetSettingsGifting, b.j(widgetSettingsGifting, 2131888371, new Object[0], null, 4), 0, 4); + c.a.d.o.j(widgetSettingsGifting, b.j(widgetSettingsGifting, 2131888381, new Object[0], null, 4), 0, 4); } } } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java index c0a5ee92d7..88688ec5c6 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGifting.java @@ -107,7 +107,7 @@ public final class WidgetSettingsGifting extends AppFragment { } public WidgetSettingsGifting() { - super(2131559202); + super(2131559203); WidgetSettingsGifting$viewModel$2 widgetSettingsGifting$viewModel$2 = WidgetSettingsGifting$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetSettingsGiftingViewModel.class), new WidgetSettingsGifting$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsGifting$viewModel$2)); @@ -212,7 +212,7 @@ public final class WidgetSettingsGifting extends AppFragment { TextView textView = getBinding().r; m.checkNotNullExpressionValue(textView, "binding.settingsGiftingYourGiftsHeader"); textView.setVisibility(z3 ? 0 : 8); - RecyclerView recyclerView = getBinding().f1925s; + RecyclerView recyclerView = getBinding().f1927s; m.checkNotNullExpressionValue(recyclerView, "binding.settingsGiftingYourGiftsRecycler"); if (!z3) { i = 8; @@ -237,7 +237,7 @@ public final class WidgetSettingsGifting extends AppFragment { m.throwUninitializedPropertyAccessException("chooseGiftViews"); } for (GiftSelectView giftSelectView : map.keySet()) { - giftSelectView.i.f1751c.setOnClickListener(new c.a.z.m0.a(giftSelectView)); + giftSelectView.i.f1753c.setOnClickListener(new c.a.z.m0.a(giftSelectView)); } } @@ -327,7 +327,7 @@ public final class WidgetSettingsGifting extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - this.chooseGiftViews = d0.t.h0.mapOf(d0.o.to(getBinding().f1924c, GooglePlayInAppSkuKt.getPremiumTier1Month()), d0.o.to(getBinding().d, GooglePlayInAppSkuKt.getPremiumTier1Year()), d0.o.to(getBinding().e, GooglePlayInAppSkuKt.getPremiumTier2Month()), d0.o.to(getBinding().f, GooglePlayInAppSkuKt.getPremiumTier2Year())); + this.chooseGiftViews = d0.t.h0.mapOf(d0.o.to(getBinding().f1926c, GooglePlayInAppSkuKt.getPremiumTier1Month()), d0.o.to(getBinding().d, GooglePlayInAppSkuKt.getPremiumTier1Year()), d0.o.to(getBinding().e, GooglePlayInAppSkuKt.getPremiumTier2Month()), d0.o.to(getBinding().f, GooglePlayInAppSkuKt.getPremiumTier2Year())); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); getBinding().o.setOnClickListener(WidgetSettingsGifting$onViewBound$1.INSTANCE); TextInputLayout textInputLayout = getBinding().k; @@ -335,11 +335,11 @@ public final class WidgetSettingsGifting extends AppFragment { ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetSettingsGifting$onViewBound$2(this), 1, null); getBinding().k.setErrorTextColor(ColorStateList.valueOf(ColorCompat.getColor(requireContext(), 2131100324))); WidgetSettingsGiftingOutboundPromosAdapter widgetSettingsGiftingOutboundPromosAdapter = new WidgetSettingsGiftingOutboundPromosAdapter(new WidgetSettingsGifting$onViewBound$3(getViewModel()), new WidgetSettingsGifting$onViewBound$4(getViewModel())); - RecyclerView recyclerView = getBinding().f1925s; + RecyclerView recyclerView = getBinding().f1927s; m.checkNotNullExpressionValue(recyclerView, "binding.settingsGiftingYourGiftsRecycler"); recyclerView.setAdapter(widgetSettingsGiftingOutboundPromosAdapter); this.promosAdapter = widgetSettingsGiftingOutboundPromosAdapter; - RecyclerView recyclerView2 = getBinding().f1925s; + RecyclerView recyclerView2 = getBinding().f1927s; WidgetSettingsGiftingOutboundPromosAdapter widgetSettingsGiftingOutboundPromosAdapter2 = this.promosAdapter; if (widgetSettingsGiftingOutboundPromosAdapter2 == null) { m.throwUninitializedPropertyAccessException("promosAdapter"); @@ -361,10 +361,10 @@ public final class WidgetSettingsGifting extends AppFragment { this.giftingAdapter = (WidgetSettingsGiftingAdapter) companion.configure(new WidgetSettingsGiftingAdapter(recyclerView3)); LinkifiedTextView linkifiedTextView = getBinding().g; m.checkNotNullExpressionValue(linkifiedTextView, "binding.premiumTier1GiftLearnMore"); - b.m(linkifiedTextView, 2131891925, new Object[0], WidgetSettingsGifting$onViewBound$7.INSTANCE); + b.m(linkifiedTextView, 2131891963, new Object[0], WidgetSettingsGifting$onViewBound$7.INSTANCE); LinkifiedTextView linkifiedTextView2 = getBinding().h; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.premiumTier2GiftLearnMore"); - b.m(linkifiedTextView2, 2131892165, new Object[0], WidgetSettingsGifting$onViewBound$8.INSTANCE); + b.m(linkifiedTextView2, 2131892203, new Object[0], WidgetSettingsGifting$onViewBound$8.INSTANCE); Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("com.discord.intent.extra.EXTRA_LOCATION"); if (!(serializableExtra instanceof Traits.Location)) { serializableExtra = null; @@ -405,7 +405,7 @@ public final class WidgetSettingsGifting extends AppFragment { TextView textView5 = key.i.g; m.checkNotNullExpressionValue(textView5, "binding.planItemPrice"); DrawableCompat.setCompoundDrawablesCompat$default(textView5, 0, 0, themedDrawableRes$default, 0, 11, (Object) null); - key.i.f1751c.setOnClickListener(new c.a.z.m0.a(key)); + key.i.f1753c.setOnClickListener(new c.a.z.m0.a(key)); } } RecyclerView recyclerView4 = getBinding().m; diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java index 759a5b7218..71eb393f71 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter.java @@ -69,27 +69,27 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple< super(2131558748, widgetSettingsGiftingAdapter); m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter"); View view = this.itemView; - int i = 2131363291; - TextView textView = (TextView) view.findViewById(2131363291); + int i = 2131363293; + TextView textView = (TextView) view.findViewById(2131363293); if (textView != null) { - i = 2131363292; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363292); + i = 2131363294; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131363294); if (relativeLayout != null) { FrameLayout frameLayout = (FrameLayout) view; - i = 2131363294; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363294); + i = 2131363296; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363296); if (materialButton != null) { - i = 2131363295; - View findViewById = view.findViewById(2131363295); + i = 2131363297; + View findViewById = view.findViewById(2131363297); if (findViewById != null) { - i = 2131363296; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363296); + i = 2131363298; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363298); if (appViewFlipper != null) { - i = 2131363297; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363297); + i = 2131363299; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363299); if (materialButton2 != null) { - i = 2131363298; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363298); + i = 2131363300; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363300); if (linkifiedTextView != null) { ViewGiftEntitlementListItemBinding viewGiftEntitlementListItemBinding = new ViewGiftEntitlementListItemBinding(frameLayout, textView, relativeLayout, frameLayout, materialButton, findViewById, appViewFlipper, materialButton2, linkifiedTextView); m.checkNotNullExpressionValue(viewGiftEntitlementListItemBinding, "ViewGiftEntitlementListItemBinding.bind(itemView)"); @@ -143,8 +143,8 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple< m.checkNotNullExpressionValue(materialButton, "binding.giftEntitlementCopy"); View view6 = this.itemView; m.checkNotNullExpressionValue(view6, "itemView"); - materialButton.setText(b.i(view6, areEqual ? 2131887619 : 2131887621, new Object[0], null, 4)); - RelativeLayout relativeLayout = this.binding.f1648c; + materialButton.setText(b.i(view6, areEqual ? 2131887621 : 2131887623, new Object[0], null, 4)); + RelativeLayout relativeLayout = this.binding.f1650c; if (areEqual) { m.checkNotNullExpressionValue(context, "context"); i2 = DrawableCompat.getThemedDrawableRes$default(context, 2130969333, 0, 2, (Object) null); @@ -158,7 +158,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple< CharSequence timeString = giftingUtils.getTimeString(giftItem.getGift().getExpiresDiff(ClockFactory.get().currentTimeMillis()), context); LinkifiedTextView linkifiedTextView = this.binding.i; m.checkNotNullExpressionValue(linkifiedTextView, "binding.giftEntitlementRevoke"); - b.m(linkifiedTextView, 2131889071, new Object[]{timeString}, new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4(this, giftItem)); + b.m(linkifiedTextView, 2131889081, new Object[]{timeString}, new WidgetSettingsGiftingAdapter$EntitlementListItem$onConfigure$4(this, giftItem)); TextView textView = this.binding.b; m.checkNotNullExpressionValue(textView, "binding.giftEntitlementCode"); textView.setText(giftingUtils.generateGiftUrl(giftItem.getGift().getCode())); @@ -412,17 +412,17 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple< super(2131558750, widgetSettingsGiftingAdapter); m.checkNotNullParameter(widgetSettingsGiftingAdapter, "adapter"); View view = this.itemView; - int i = 2131363307; - ImageView imageView = (ImageView) view.findViewById(2131363307); + int i = 2131363309; + ImageView imageView = (ImageView) view.findViewById(2131363309); if (imageView != null) { - i = 2131363308; - TextView textView = (TextView) view.findViewById(2131363308); + i = 2131363310; + TextView textView = (TextView) view.findViewById(2131363310); if (textView != null) { - i = 2131363309; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363309); + i = 2131363311; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363311); if (simpleDraweeView != null) { - i = 2131363310; - TextView textView2 = (TextView) view.findViewById(2131363310); + i = 2131363312; + TextView textView2 = (TextView) view.findViewById(2131363312); if (textView2 != null) { ViewGiftSkuListItemBinding viewGiftSkuListItemBinding = new ViewGiftSkuListItemBinding((CardView) view, imageView, textView, simpleDraweeView, textView2); m.checkNotNullExpressionValue(viewGiftSkuListItemBinding, "ViewGiftSkuListItemBinding.bind(itemView)"); @@ -453,7 +453,7 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple< TextView textView2 = this.binding.e; m.checkNotNullExpressionValue(textView2, "binding.giftSkuName"); if (from != null) { - Pair pair = from.getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131889083, 2131755127) : new Pair(2131889084, 2131755128); + Pair pair = from.getInterval() == SubscriptionInterval.MONTHLY ? new Pair(2131889093, 2131755128) : new Pair(2131889094, 2131755129); int intValue = ((Number) pair.component1()).intValue(); int intValue2 = ((Number) pair.component2()).intValue(); View view = this.itemView; @@ -463,9 +463,9 @@ public final class WidgetSettingsGiftingAdapter extends MGRecyclerAdapterSimple< charSequence = giftItem.getSku().getName(); } textView2.setText(charSequence); - TextView textView3 = this.binding.f1650c; + TextView textView3 = this.binding.f1652c; m.checkNotNullExpressionValue(textView3, "binding.giftSkuCopies"); - textView3.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755124, giftItem.getCopies().intValue(), giftItem.getCopies())); + textView3.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755125, giftItem.getCopies().intValue(), giftItem.getCopies())); this.binding.b.setImageResource(giftItem.getExpanded().booleanValue() ? 2131231511 : 2131231515); PremiumUtils premiumUtils = PremiumUtils.INSTANCE; if (premiumUtils.isNitroSku(giftItem.getSku())) { diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java index 628136adf9..79ae464005 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsGiftingOutboundPromosAdapter.java @@ -59,20 +59,20 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte this.onMoreDetailsClick = function1; this.onButtonClick = function12; View view = this.itemView; - int i = 2131363285; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363285); + int i = 2131363287; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363287); if (materialButton != null) { - i = 2131363286; - TextView textView = (TextView) view.findViewById(2131363286); + i = 2131363288; + TextView textView = (TextView) view.findViewById(2131363288); if (textView != null) { - i = 2131363287; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363287); + i = 2131363289; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131363289); if (simpleDraweeView != null) { - i = 2131363288; - TextView textView2 = (TextView) view.findViewById(2131363288); + i = 2131363290; + TextView textView2 = (TextView) view.findViewById(2131363290); if (textView2 != null) { - i = 2131363289; - TextView textView3 = (TextView) view.findViewById(2131363289); + i = 2131363291; + TextView textView3 = (TextView) view.findViewById(2131363291); if (textView3 != null) { ViewGiftOutboundPromoListItemBinding viewGiftOutboundPromoListItemBinding = new ViewGiftOutboundPromoListItemBinding((MaterialCardView) view, materialButton, textView, simpleDraweeView, textView2, textView3); textView2.setOnClickListener(new WidgetSettingsGiftingOutboundPromosAdapter$OutboundPromoViewHolder$$special$$inlined$also$lambda$1(this)); @@ -127,12 +127,12 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte Context context = view.getContext(); m.checkNotNullExpressionValue(context, "itemView.context"); String renderUtcDate = timeUtils.renderUtcDate(f, context, 1); - TextView textView2 = this.binding.f1649c; + TextView textView2 = this.binding.f1651c; m.checkNotNullExpressionValue(textView2, "binding.giftPromoDescription"); textView2.setText("Claim your code before " + renderUtcDate); MaterialButton materialButton = this.binding.b; m.checkNotNullExpressionValue(materialButton, "binding.giftPromoButton"); - materialButton.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131892385, new Object[0], null, 4)); + materialButton.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131892426, new Object[0], null, 4)); } else if (claimStatus instanceof WidgetSettingsGiftingViewModel.ClaimStatus.Claimed) { long f2 = ((WidgetSettingsGiftingViewModel.ClaimStatus.Claimed) outboundPromoItem.getClaimStatus()).getRedeemBy().f(); TimeUtils timeUtils2 = TimeUtils.INSTANCE; @@ -141,7 +141,7 @@ public final class WidgetSettingsGiftingOutboundPromosAdapter extends ListAdapte Context context2 = view2.getContext(); m.checkNotNullExpressionValue(context2, "itemView.context"); String renderUtcDate2 = timeUtils2.renderUtcDate(f2, context2, 1); - TextView textView3 = this.binding.f1649c; + TextView textView3 = this.binding.f1651c; m.checkNotNullExpressionValue(textView3, "binding.giftPromoDescription"); textView3.setText("Redeem your code before " + renderUtcDate2); MaterialButton materialButton2 = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java index 633c214c0a..b7e1a70c64 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$binding$2.java @@ -33,7 +33,7 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp int i; m.checkNotNullParameter(view, "p1"); View findViewById = view.findViewById(2131361860); - int i2 = 2131364284; + int i2 = 2131364287; if (findViewById != null) { AccountCreditView accountCreditView = (AccountCreditView) findViewById.findViewById(2131362819); if (accountCreditView != null) { @@ -42,109 +42,118 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp View findViewById2 = findViewById.findViewById(2131362821); if (findViewById2 != null) { x xVar = new x((CardView) findViewById, accountCreditView, accountCreditView2, findViewById2); - View findViewById3 = view.findViewById(2131364163); + View findViewById3 = view.findViewById(2131364165); if (findViewById3 != null) { int i3 = 2131361896; MaterialButton materialButton = (MaterialButton) findViewById3.findViewById(2131361896); if (materialButton != null) { - i3 = 2131364281; - View findViewById4 = findViewById3.findViewById(2131364281); + i3 = 2131364284; + View findViewById4 = findViewById3.findViewById(2131364284); if (findViewById4 != null) { - i3 = 2131364282; - TextView textView = (TextView) findViewById3.findViewById(2131364282); + i3 = 2131364285; + TextView textView = (TextView) findViewById3.findViewById(2131364285); if (textView != null) { - i3 = 2131364285; - TextView textView2 = (TextView) findViewById3.findViewById(2131364285); + i3 = 2131364288; + TextView textView2 = (TextView) findViewById3.findViewById(2131364288); if (textView2 != null) { LinearLayout linearLayout = (LinearLayout) findViewById3; - i3 = 2131364295; - TextView textView3 = (TextView) findViewById3.findViewById(2131364295); + i3 = 2131364298; + TextView textView3 = (TextView) findViewById3.findViewById(2131364298); if (textView3 != null) { j0 j0Var = new j0(linearLayout, materialButton, findViewById4, textView, textView2, linearLayout, textView3); - View findViewById5 = view.findViewById(2131364275); + View findViewById5 = view.findViewById(2131364277); if (findViewById5 != null) { - int i4 = 2131364276; - TextView textView4 = (TextView) findViewById5.findViewById(2131364276); + int i4 = 2131364278; + TextView textView4 = (TextView) findViewById5.findViewById(2131364278); if (textView4 != null) { - i4 = 2131364277; - TextView textView5 = (TextView) findViewById5.findViewById(2131364277); + i4 = 2131364279; + TextView textView5 = (TextView) findViewById5.findViewById(2131364279); if (textView5 != null) { - TextView textView6 = (TextView) findViewById5.findViewById(2131364278); + i4 = 2131364280; + TextView textView6 = (TextView) findViewById5.findViewById(2131364280); if (textView6 != null) { - o2 o2Var = new o2((LinearLayout) findViewById5, textView4, textView5, textView6); - ActiveSubscriptionView activeSubscriptionView = (ActiveSubscriptionView) view.findViewById(2131364279); - if (activeSubscriptionView != null) { - ActiveSubscriptionView activeSubscriptionView2 = (ActiveSubscriptionView) view.findViewById(2131364280); - if (activeSubscriptionView2 != null) { - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364283); - if (linearLayout2 != null) { - TextView textView7 = (TextView) view.findViewById(2131364284); - if (textView7 != null) { - TextView textView8 = (TextView) view.findViewById(2131364286); + i4 = 2131364281; + TextView textView7 = (TextView) findViewById5.findViewById(2131364281); + if (textView7 != null) { + o2 o2Var = new o2((LinearLayout) findViewById5, textView4, textView5, textView6, textView7); + ActiveSubscriptionView activeSubscriptionView = (ActiveSubscriptionView) view.findViewById(2131364282); + if (activeSubscriptionView != null) { + ActiveSubscriptionView activeSubscriptionView2 = (ActiveSubscriptionView) view.findViewById(2131364283); + if (activeSubscriptionView2 != null) { + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131364286); + if (linearLayout2 != null) { + TextView textView8 = (TextView) view.findViewById(2131364287); if (textView8 != null) { - TextView textView9 = (TextView) view.findViewById(2131364287); + TextView textView9 = (TextView) view.findViewById(2131364289); if (textView9 != null) { - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364298); - if (materialButton2 != null) { - i2 = 2131364299; - ScrollView scrollView = (ScrollView) view.findViewById(2131364299); - if (scrollView != null) { - Button button = (Button) view.findViewById(2131364300); - if (button != null) { - i2 = 2131364301; - CardView cardView = (CardView) view.findViewById(2131364301); - if (cardView != null) { - TextView textView10 = (TextView) view.findViewById(2131364302); - if (textView10 != null) { - i2 = 2131364303; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364303); - if (linearLayout3 != null) { - TextView textView11 = (TextView) view.findViewById(2131364304); - if (textView11 != null) { - i2 = 2131364305; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364305); - if (appViewFlipper != null) { - View findViewById6 = view.findViewById(2131364314); - if (findViewById6 != null) { - int i5 = 2131363809; - TextView textView12 = (TextView) findViewById6.findViewById(2131363809); - if (textView12 != null) { - i5 = 2131363810; - TextView textView13 = (TextView) findViewById6.findViewById(2131363810); + TextView textView10 = (TextView) view.findViewById(2131364290); + if (textView10 != null) { + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364301); + if (materialButton2 != null) { + ScrollView scrollView = (ScrollView) view.findViewById(2131364302); + if (scrollView != null) { + i2 = 2131364303; + Button button = (Button) view.findViewById(2131364303); + if (button != null) { + CardView cardView = (CardView) view.findViewById(2131364304); + if (cardView != null) { + i2 = 2131364305; + TextView textView11 = (TextView) view.findViewById(2131364305); + if (textView11 != null) { + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364306); + if (linearLayout3 != null) { + i2 = 2131364307; + TextView textView12 = (TextView) view.findViewById(2131364307); + if (textView12 != null) { + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364308); + if (appViewFlipper != null) { + i2 = 2131364317; + View findViewById6 = view.findViewById(2131364317); + if (findViewById6 != null) { + int i5 = 2131363812; + TextView textView13 = (TextView) findViewById6.findViewById(2131363812); if (textView13 != null) { - i5 = 2131364289; - ImageView imageView = (ImageView) findViewById6.findViewById(2131364289); - if (imageView != null) { - i5 = 2131364290; - TextView textView14 = (TextView) findViewById6.findViewById(2131364290); - if (textView14 != null) { - i5 = 2131364291; - TextView textView15 = (TextView) findViewById6.findViewById(2131364291); + i5 = 2131363813; + TextView textView14 = (TextView) findViewById6.findViewById(2131363813); + if (textView14 != null) { + i5 = 2131364292; + ImageView imageView = (ImageView) findViewById6.findViewById(2131364292); + if (imageView != null) { + i5 = 2131364293; + TextView textView15 = (TextView) findViewById6.findViewById(2131364293); if (textView15 != null) { - i5 = 2131364292; - ImageView imageView2 = (ImageView) findViewById6.findViewById(2131364292); - if (imageView2 != null) { - i5 = 2131364297; - MaterialButton materialButton3 = (MaterialButton) findViewById6.findViewById(2131364297); - if (materialButton3 != null) { - p2 p2Var = new p2((LinearLayout) findViewById6, textView12, textView13, imageView, textView14, textView15, imageView2, materialButton3); - i2 = 2131364316; - View findViewById7 = view.findViewById(2131364316); - if (findViewById7 != null) { - int i6 = 2131364288; - ImageView imageView3 = (ImageView) findViewById7.findViewById(2131364288); - if (imageView3 != null) { - i6 = 2131364293; - ImageView imageView4 = (ImageView) findViewById7.findViewById(2131364293); - if (imageView4 != null) { - i6 = 2131364296; - MaterialButton materialButton4 = (MaterialButton) findViewById7.findViewById(2131364296); - if (materialButton4 != null) { - return new WidgetSettingsPremiumBinding((CoordinatorLayout) view, xVar, j0Var, o2Var, activeSubscriptionView, activeSubscriptionView2, linearLayout2, textView7, textView8, textView9, materialButton2, scrollView, button, cardView, textView10, linearLayout3, textView11, appViewFlipper, p2Var, new q2((LinearLayout) findViewById7, imageView3, imageView4, materialButton4)); + i5 = 2131364294; + TextView textView16 = (TextView) findViewById6.findViewById(2131364294); + if (textView16 != null) { + i5 = 2131364295; + ImageView imageView2 = (ImageView) findViewById6.findViewById(2131364295); + if (imageView2 != null) { + i5 = 2131364300; + MaterialButton materialButton3 = (MaterialButton) findViewById6.findViewById(2131364300); + if (materialButton3 != null) { + i5 = 2131365283; + TextView textView17 = (TextView) findViewById6.findViewById(2131365283); + if (textView17 != null) { + p2 p2Var = new p2((LinearLayout) findViewById6, textView13, textView14, imageView, textView15, textView16, imageView2, materialButton3, textView17); + i2 = 2131364319; + View findViewById7 = view.findViewById(2131364319); + if (findViewById7 != null) { + int i6 = 2131364291; + ImageView imageView3 = (ImageView) findViewById7.findViewById(2131364291); + if (imageView3 != null) { + i6 = 2131364296; + ImageView imageView4 = (ImageView) findViewById7.findViewById(2131364296); + if (imageView4 != null) { + i6 = 2131364299; + MaterialButton materialButton4 = (MaterialButton) findViewById7.findViewById(2131364299); + if (materialButton4 != null) { + return new WidgetSettingsPremiumBinding((CoordinatorLayout) view, xVar, j0Var, o2Var, activeSubscriptionView, activeSubscriptionView2, linearLayout2, textView8, textView9, textView10, materialButton2, scrollView, button, cardView, textView11, linearLayout3, textView12, appViewFlipper, p2Var, new q2((LinearLayout) findViewById7, imageView3, imageView4, materialButton4)); + } + } } + throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i6))); } } - throw new NullPointerException("Missing required view with ID: ".concat(findViewById7.getResources().getResourceName(i6))); } } } @@ -152,50 +161,49 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp } } } + throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i5))); } - throw new NullPointerException("Missing required view with ID: ".concat(findViewById6.getResources().getResourceName(i5))); + } else { + i2 = 2131364308; } - i2 = 2131364314; } } else { - i2 = 2131364304; + i2 = 2131364306; } } } else { - i2 = 2131364302; + i2 = 2131364304; } } } else { - i2 = 2131364300; + i2 = 2131364302; } + } else { + i2 = 2131364301; } } else { - i2 = 2131364298; + i2 = 2131364290; } } else { - i2 = 2131364287; + i2 = 2131364289; } - } else { - i2 = 2131364286; } + } else { + i2 = 2131364286; } } else { i2 = 2131364283; } } else { - i2 = 2131364280; + i2 = 2131364282; } - } else { - i2 = 2131364279; } - } else { - i4 = 2131364278; } } } throw new NullPointerException("Missing required view with ID: ".concat(findViewById5.getResources().getResourceName(i4))); } - i2 = 2131364275; + i2 = 2131364277; } } } @@ -203,7 +211,7 @@ public final /* synthetic */ class WidgetSettingsPremium$binding$2 extends k imp } throw new NullPointerException("Missing required view with ID: ".concat(findViewById3.getResources().getResourceName(i3))); } - i2 = 2131364163; + i2 = 2131364165; } else { i = 2131362821; } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java index c54969307c..9cfb8b5c9b 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2.java @@ -24,8 +24,8 @@ public final class WidgetSettingsPremium$configureButtons$$inlined$forEach$lambd public final void onClick(View view) { WidgetChoosePlan.Companion companion = WidgetChoosePlan.Companion; Context requireContext = this.this$0.requireContext(); - WidgetChoosePlan.ViewType viewType = m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1935s.f) ? WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_1 : WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_2; + WidgetChoosePlan.ViewType viewType = m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1937s.f) ? WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_1 : WidgetChoosePlan.ViewType.BUY_PREMIUM_TIER_2; ModelSubscription modelSubscription = this.$premiumSubscription$inlined; - WidgetChoosePlan.Companion.launch$default(companion, requireContext, null, viewType, modelSubscription != null ? modelSubscription.getPaymentGatewayPlanId() : null, new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), Traits.Subscription.Companion.withGatewayPlanId(m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1935s.f) ? GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName() : GooglePlaySku.PREMIUM_TIER_2_MONTHLY.getSkuName()), 2, null); + WidgetChoosePlan.Companion.launch$default(companion, requireContext, null, viewType, modelSubscription != null ? modelSubscription.getPaymentGatewayPlanId() : null, new Traits.Location("User Settings", WidgetSettingsPremium.access$getAnalyticsLocationSection$p(this.this$0), "Button CTA", "buy", null, 16, null), Traits.Subscription.Companion.withGatewayPlanId(m.areEqual(this.$button, WidgetSettingsPremium.access$getBinding$p(this.this$0).f1937s.f) ? GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName() : GooglePlaySku.PREMIUM_TIER_2_MONTHLY.getSkuName()), 2, null); } } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java index fa45e868d1..4cdb024f5c 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium$onViewBound$1.java @@ -26,8 +26,8 @@ public final class WidgetSettingsPremium$onViewBound$1 extends o implements Func public final void invoke(RenderContext renderContext) { m.checkNotNullParameter(renderContext, "$receiver"); - renderContext.a.put("maxUploadStandard", b.j(this.this$0, 2131888503, new Object[0], null, 4).toString()); - renderContext.a.put("maxUploadPremiumTier1", b.j(this.this$0, 2131888500, new Object[0], null, 4).toString()); - renderContext.a.put("maxUploadPremiumTier2", b.j(this.this$0, 2131888501, new Object[0], null, 4).toString()); + renderContext.a.put("maxUploadStandard", b.j(this.this$0, 2131888513, new Object[0], null, 4).toString()); + renderContext.a.put("maxUploadPremiumTier1", b.j(this.this$0, 2131888510, new Object[0], null, 4).toString()); + renderContext.a.put("maxUploadPremiumTier2", b.j(this.this$0, 2131888511, new Object[0], null, 4).toString()); } } diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java index 1e68996000..6e7deaf4b2 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetSettingsPremium.java @@ -55,6 +55,7 @@ import com.discord.utilities.view.extensions.ViewExtensions; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; import com.discord.views.ActiveSubscriptionView; +import com.discord.widgets.chat.input.sticker.StickerPickerFeatureFlag; import com.discord.widgets.notice.WidgetNoticeDialog; import com.discord.widgets.settings.premium.SettingsPremiumViewModel; import com.google.android.material.button.MaterialButton; @@ -294,7 +295,7 @@ public final class WidgetSettingsPremium extends AppFragment { } public WidgetSettingsPremium() { - super(2131559214); + super(2131559215); WidgetSettingsPremium$viewModel$2 widgetSettingsPremium$viewModel$2 = WidgetSettingsPremium$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsPremiumViewModel.class), new WidgetSettingsPremium$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsPremium$viewModel$2)); @@ -570,7 +571,7 @@ public final class WidgetSettingsPremium extends AppFragment { } private final void configureButtonText(Map map) { - MaterialButton materialButton = getBinding().f1935s.f; + MaterialButton materialButton = getBinding().f1937s.f; m.checkNotNullExpressionValue(materialButton, "binding.premiumTier1.premiumSettingsPremiumClassic"); SkuDetails skuDetails = null; materialButton.setText(getPriceText(map != null ? (SkuDetails) map.get(GooglePlaySku.PREMIUM_TIER_1_MONTHLY.getSkuName()) : null)); @@ -594,14 +595,14 @@ public final class WidgetSettingsPremium extends AppFragment { private final void configureButtons(ModelSubscription modelSubscription, Map map) { configureButtonText(map); if (modelSubscription == null || !modelSubscription.isAppleSubscription()) { - for (MaterialButton materialButton : n.listOf((Object[]) new MaterialButton[]{getBinding().f1935s.f, getBinding().t.b})) { + for (MaterialButton materialButton : n.listOf((Object[]) new MaterialButton[]{getBinding().f1937s.f, getBinding().t.b})) { m.checkNotNullExpressionValue(materialButton, "button"); materialButton.setEnabled(modelSubscription == null); materialButton.setOnClickListener(new WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$2(materialButton, this, modelSubscription)); } return; } - for (MaterialButton materialButton2 : n.listOf((Object[]) new MaterialButton[]{getBinding().f1935s.f, getBinding().t.b})) { + for (MaterialButton materialButton2 : n.listOf((Object[]) new MaterialButton[]{getBinding().f1937s.f, getBinding().t.b})) { m.checkNotNullExpressionValue(materialButton2, "button"); ViewExtensions.setEnabledAlpha$default(materialButton2, true, 0.0f, 2, null); materialButton2.setOnClickListener(new WidgetSettingsPremium$configureButtons$$inlined$forEach$lambda$1(this)); @@ -614,9 +615,9 @@ public final class WidgetSettingsPremium extends AppFragment { if (planType != null) { int ordinal = planType.ordinal(); if (ordinal == 2) { - charSequence = b.j(this, 2131891943, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_MONTHLY_END_DATE())}, null, 4); + charSequence = b.j(this, 2131891981, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_MONTHLY_END_DATE())}, null, 4); } else if (ordinal == 3) { - charSequence = b.j(this, 2131891953, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_YEARLY_END_DATE())}, null, 4); + charSequence = b.j(this, 2131891991, new Object[]{DateFormat.getMediumDateFormat(requireContext()).format(PremiumUtilsKt.getGRANDFATHERED_YEARLY_END_DATE())}, null, 4); } } TextView textView = getBinding().i; @@ -637,9 +638,9 @@ public final class WidgetSettingsPremium extends AppFragment { } int ordinal = premiumSubscription.getPlanType().getInterval().ordinal(); if (ordinal == 0) { - i = 2131886925; - } else if (ordinal == 1) { i = 2131886926; + } else if (ordinal == 1) { + i = 2131886927; } else { throw new NoWhenBranchMatchedException(); } @@ -652,7 +653,7 @@ public final class WidgetSettingsPremium extends AppFragment { textView2.setVisibility(0); TextView textView3 = getBinding().j; m.checkNotNullExpressionValue(textView3, "binding.premiumSettingsLegalese"); - b.n(textView3, i, new Object[]{b.j(this, 2131893777, new Object[0], null, 4), b.j(this, 2131892338, new Object[0], null, 4), googleSubscriptionRenewalPrice}, null, 4); + b.n(textView3, i, new Object[]{b.j(this, 2131893817, new Object[0], null, 4), b.j(this, 2131892376, new Object[0], null, 4), googleSubscriptionRenewalPrice}, null, 4); TextView textView4 = getBinding().j; m.checkNotNullExpressionValue(textView4, "binding.premiumSettingsLegalese"); textView4.setMovementMethod(LinkMovementMethod.getInstance()); @@ -685,10 +686,10 @@ public final class WidgetSettingsPremium extends AppFragment { obj = TimeUtils.renderUtcDate$default(timeUtils, currentPeriodStart, requireContext, (String) null, (java.text.DateFormat) null, ordinal2 != 2 ? ordinal2 != 4 ? 0 : 30 : 3, 12, (Object) null); } obj = obj2; - LinearLayout linearLayout = getBinding().f1934c.f; + LinearLayout linearLayout = getBinding().f1936c.f; m.checkNotNullExpressionValue(linearLayout, "binding.payment.premiumSettingsPaymentContainer"); linearLayout.setVisibility(premiumSubscription != null ? 0 : 8); - View view = getBinding().f1934c.f108c; + View view = getBinding().f1936c.f108c; m.checkNotNullExpressionValue(view, "binding.payment.premiumSettingsBillingDivider"); view.setVisibility(isAppleSubscription ? 0 : 8); if (premiumSubscription != null) { @@ -698,11 +699,11 @@ public final class WidgetSettingsPremium extends AppFragment { if (isGoogleSubscription && a != null) { obj2 = a; } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM) { - obj2 = b.j(this, 2131892263, new Object[0], null, 4); + obj2 = b.j(this, 2131892301, new Object[0], null, 4); } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_CLASSIC) { - obj2 = b.j(this, 2131892261, new Object[0], null, 4); + obj2 = b.j(this, 2131892299, new Object[0], null, 4); } else if (b == ActiveSubscriptionView.ActiveSubscriptionType.PREMIUM_GUILD) { - obj2 = b.j(this, 2131892102, new Object[0], null, 4); + obj2 = b.j(this, 2131892140, new Object[0], null, 4); } } if (isAppleSubscription) { @@ -718,42 +719,42 @@ public final class WidgetSettingsPremium extends AppFragment { googleSubscriptionRenewalPrice = PremiumUtilsKt.getFormattedPriceUsd(renewalInvoicePreview != null ? renewalInvoicePreview.getTotal() : 0, requireContext()); } objArr[1] = googleSubscriptionRenewalPrice; - charSequence = b.j(this, 2131892209, objArr, null, 4); + charSequence = b.j(this, 2131892247, objArr, null, 4); } else if (ordinal3 == 2) { - charSequence = b.j(this, 2131892206, new Object[]{obj2, obj}, null, 4); + charSequence = b.j(this, 2131892244, new Object[]{obj2, obj}, null, 4); } else if (ordinal3 == 3) { - charSequence = b.j(this, 2131892203, new Object[]{obj}, null, 4); + charSequence = b.j(this, 2131892241, new Object[]{obj}, null, 4); } else if (ordinal3 == 4) { - charSequence = b.j(this, 2131892197, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, premiumSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null)}, null, 4); + charSequence = b.j(this, 2131892235, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, premiumSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null)}, null, 4); } } charSequence = null; } - TextView textView = getBinding().f1934c.d; + TextView textView = getBinding().f1936c.d; m.checkNotNullExpressionValue(textView, "binding.payment.premiumSettingsBillingInformation"); if (charSequence == null) { z2 = false; } textView.setVisibility(z2 ? 0 : 8); if (charSequence != null) { - TextView textView2 = getBinding().f1934c.d; + TextView textView2 = getBinding().f1936c.d; m.checkNotNullExpressionValue(textView2, "binding.payment.premiumSettingsBillingInformation"); textView2.setText(charSequence); } - MaterialButton materialButton = getBinding().f1934c.b; + MaterialButton materialButton = getBinding().f1936c.b; m.checkNotNullExpressionValue(materialButton, "binding.payment.activeSubscriptionsBottomButton"); if (isAppleSubscription) { charSequence2 = b.j(this, 2131886914, new Object[0], null, 4); } ViewExtensions.setTextAndVisibilityBy(materialButton, charSequence2); - getBinding().f1934c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription)); - TextView textView3 = getBinding().f1934c.e; + getBinding().f1936c.b.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$1(isAppleSubscription)); + TextView textView3 = getBinding().f1936c.e; m.checkNotNullExpressionValue(textView3, "binding.payment.premiumSettingsGooglePlayManage"); if (!isGoogleSubscription) { i = 8; } textView3.setVisibility(i); - getBinding().f1934c.e.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$2(isGoogleSubscription, premiumSubscription)); + getBinding().f1936c.e.setOnClickListener(new WidgetSettingsPremium$configurePaymentInfo$2(isGoogleSubscription, premiumSubscription)); } /* JADX WARNING: Code restructure failed: missing block: B:57:0x00df, code lost: @@ -801,7 +802,7 @@ public final class WidgetSettingsPremium extends AppFragment { charSequence3 = skuDetails.a(); m.checkNotNullExpressionValue(charSequence3, "skuDetails.description"); } - charSequence = b.j(this, 2131892174, new Object[]{charSequence3, renderUtcDate$default}, null, 4); + charSequence = b.j(this, 2131892212, new Object[]{charSequence3, renderUtcDate$default}, null, 4); } else if (isAccountHold) { String paymentGatewayPlanId2 = modelSubscription.getPaymentGatewayPlanId(); if (paymentGatewayPlanId2 != null) { @@ -824,7 +825,7 @@ public final class WidgetSettingsPremium extends AppFragment { i3++; } charSequence2 = getPlanString(subscriptionPlanType); - charSequence = b.j(this, 2131892201, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null), charSequence2}, null, 4); + charSequence = b.j(this, 2131892239, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, modelSubscription.getAccountHoldEstimatedExpirationTimestamp(), requireContext(), 0, 4, null), charSequence2}, null, 4); } else { charSequence = ""; } @@ -840,7 +841,7 @@ public final class WidgetSettingsPremium extends AppFragment { if (isAccountHold) { Button button2 = getBinding().m; m.checkNotNullExpressionValue(button2, "binding.premiumSettingsStatusNoticeButton"); - b.n(button2, 2131892200, new Object[0], null, 4); + b.n(button2, 2131892238, new Object[0], null, 4); getBinding().m.setOnClickListener(new WidgetSettingsPremium$configureStatusNotice$1(this, modelSubscription)); } } @@ -876,16 +877,16 @@ public final class WidgetSettingsPremium extends AppFragment { if (subscriptionPlanType != null) { int ordinal = subscriptionPlanType.ordinal(); if (ordinal == 4) { - return b.j(this, 2131892177, new Object[0], null, 4); + return b.j(this, 2131892215, new Object[0], null, 4); } if (ordinal == 5) { - return b.j(this, 2131892181, new Object[0], null, 4); + return b.j(this, 2131892219, new Object[0], null, 4); } if (ordinal == 6) { - return b.j(this, 2131892178, new Object[0], null, 4); + return b.j(this, 2131892216, new Object[0], null, 4); } if (ordinal == 7) { - return b.j(this, 2131892182, new Object[0], null, 4); + return b.j(this, 2131892220, new Object[0], null, 4); } } return ""; @@ -921,7 +922,7 @@ public final class WidgetSettingsPremium extends AppFragment { } private final CharSequence getPriceText(SkuDetails skuDetails) { - return skuDetails != null ? b.j(this, 2131892213, new Object[]{skuDetails.b()}, null, 4) : b.j(this, 2131893576, new Object[0], null, 4); + return skuDetails != null ? b.j(this, 2131892251, new Object[]{skuDetails.b()}, null, 4) : b.j(this, 2131893616, new Object[0], null, 4); } /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x0056: APUT @@ -936,7 +937,7 @@ public final class WidgetSettingsPremium extends AppFragment { SkuDetails skuDetails; SubscriptionPlanType planType; boolean isGoogleSubscription = modelSubscription != null ? modelSubscription.isGoogleSubscription() : false; - int i = (modelSubscription == null || (planType = modelSubscription.getPlanType()) == null) ? false : planType.isMonthlyInterval() ? 2131886947 : 2131886953; + int i = (modelSubscription == null || (planType = modelSubscription.getPlanType()) == null) ? false : planType.isMonthlyInterval() ? 2131886948 : 2131886954; String b = (modelSubscription == null || (skuDetails = (SkuDetails) map.get(modelSubscription.getPaymentGatewayPlanId())) == null) ? null : skuDetails.b(); if (isGoogleSubscription && b != null) { return b.j(this, i, new Object[]{b}, null, 4); @@ -969,7 +970,7 @@ public final class WidgetSettingsPremium extends AppFragment { private final void scrollToSection(Integer num) { int i; if (num != null && num.intValue() == 0) { - p2 p2Var = getBinding().f1935s; + p2 p2Var = getBinding().f1937s; m.checkNotNullExpressionValue(p2Var, "binding.premiumTier1"); LinearLayout linearLayout = p2Var.a; m.checkNotNullExpressionValue(linearLayout, "binding.premiumTier1.root"); @@ -997,7 +998,7 @@ public final class WidgetSettingsPremium extends AppFragment { WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131891897, new Object[0], null, 4), b.j(this, 2131891889, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131891896, new Object[0], null, 4), b.j(this, 2131891300, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364030, new WidgetSettingsPremium$showCancelConfirmationAlert$1(settingsPremiumViewModel))), null, null, null, 2130969788, null, null, 0, null, 15808, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131891934, new Object[0], null, 4), b.j(this, 2131891926, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131891933, new Object[0], null, 4), b.j(this, 2131891333, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364032, new WidgetSettingsPremium$showCancelConfirmationAlert$1(settingsPremiumViewModel))), null, null, null, 2130969788, null, null, 0, null, 15808, null); } private final void showContent(SettingsPremiumViewModel.ViewState.Loaded loaded) { @@ -1050,7 +1051,7 @@ public final class WidgetSettingsPremium extends AppFragment { WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131886914, new Object[0], null, 4), b.j(this, 2131892132, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131892058, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, b.j(this, 2131886914, new Object[0], null, 4), b.j(this, 2131892170, new Object[]{f.a.a(360055386693L, null)}, null, 4), b.j(this, 2131892096, new Object[0], null, 4), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showFailureUI() { @@ -1071,19 +1072,19 @@ public final class WidgetSettingsPremium extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131892269); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131892307); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - TextView textView = getBinding().d.d; + TextView textView = getBinding().d.e; m.checkNotNullExpressionValue(textView, "binding.premiumPerks.premiumPerksUploadText"); - textView.setText(b.c(view, 2131891914, new Object[0], new WidgetSettingsPremium$onViewBound$1(this))); - TextView textView2 = getBinding().f1935s.e; + textView.setText(b.c(view, 2131891952, new Object[0], new WidgetSettingsPremium$onViewBound$1(this))); + TextView textView2 = getBinding().f1937s.e; m.checkNotNullExpressionValue(textView2, "binding.premiumTier1.pre…NitroClassicBoostDiscount"); - ViewExtensions.setTextAndVisibilityBy(textView2, b.j(this, 2131889821, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4)); - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755165, 2, 2); - TextView textView3 = getBinding().f1935s.d; + ViewExtensions.setTextAndVisibilityBy(textView2, b.j(this, 2131889832, new Object[]{NumberFormat.getPercentInstance().format(Float.valueOf(0.3f))}, null, 4)); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755166, 2, 2); + TextView textView3 = getBinding().f1937s.d; m.checkNotNullExpressionValue(textView3, "binding.premiumTier1.pre…ngsNitroClassicBoostCount"); - ViewExtensions.setTextAndVisibilityBy(textView3, b.j(this, 2131889822, new Object[]{i18nPluralString}, null, 4)); + ViewExtensions.setTextAndVisibilityBy(textView3, b.j(this, 2131889833, new Object[]{i18nPluralString}, null, 4)); NumberFormat instance = NumberFormat.getInstance(this.localeManager.getPrimaryLocale(requireContext())); TextView textView4 = getBinding().d.b; m.checkNotNullExpressionValue(textView4, "binding.premiumPerks.premiumPerksMaxGuilds"); @@ -1091,27 +1092,34 @@ public final class WidgetSettingsPremium extends AppFragment { textView4.setVisibility(isIncreasedMaxGuildsEnabled() ? 0 : 8); TextView textView5 = getBinding().d.b; m.checkNotNullExpressionValue(textView5, "binding.premiumPerks.premiumPerksMaxGuilds"); - textView5.setText(b.d(this, 2131891916, new Object[0], new WidgetSettingsPremium$onViewBound$2(instance))); + textView5.setText(b.d(this, 2131891954, new Object[0], new WidgetSettingsPremium$onViewBound$2(instance))); TextView textView6 = getBinding().d.f134c; m.checkNotNullExpressionValue(textView6, "binding.premiumPerks.premiumPerksMaxMessageLength"); textView6.setVisibility(isIncreasedMessageLengthEnabled() ? 0 : 8); TextView textView7 = getBinding().d.f134c; m.checkNotNullExpressionValue(textView7, "binding.premiumPerks.premiumPerksMaxMessageLength"); - textView7.setText(b.d(this, 2131891917, new Object[0], new WidgetSettingsPremium$onViewBound$3(instance))); - TextView textView8 = getBinding().f1935s.b; + textView7.setText(b.d(this, 2131891955, new Object[0], new WidgetSettingsPremium$onViewBound$3(instance))); + TextView textView8 = getBinding().f1937s.b; m.checkNotNullExpressionValue(textView8, "binding.premiumTier1.maxGuilds"); textView8.setVisibility(isIncreasedMaxGuildsEnabled() ? 0 : 8); - TextView textView9 = getBinding().f1935s.f138c; + TextView textView9 = getBinding().f1937s.f138c; m.checkNotNullExpressionValue(textView9, "binding.premiumTier1.maxMessageLength"); - if (isIncreasedMessageLengthEnabled()) { + textView9.setVisibility(isIncreasedMessageLengthEnabled() ? 0 : 8); + TextView textView10 = getBinding().d.d; + m.checkNotNullExpressionValue(textView10, "binding.premiumPerks.premiumPerksStickers"); + StickerPickerFeatureFlag.Companion companion = StickerPickerFeatureFlag.Companion; + textView10.setVisibility(companion.getINSTANCE().isEnabled() ? 0 : 8); + TextView textView11 = getBinding().f1937s.g; + m.checkNotNullExpressionValue(textView11, "binding.premiumTier1.tier1StickersPerk"); + if (companion.getINSTANCE().isEnabled()) { i = 0; } - textView9.setVisibility(i); + textView11.setVisibility(i); configureButtonText$default(this, null, 1, null); - for (TextView textView10 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f1934c.g})) { + for (TextView textView12 : n.listOf((Object[]) new TextView[]{getBinding().q, getBinding().h, getBinding().f1936c.g})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; - m.checkNotNullExpressionValue(textView10, "header"); - accessibilityUtils.setViewIsHeading(textView10); + m.checkNotNullExpressionValue(textView12, "header"); + accessibilityUtils.setViewIsHeading(textView12); } } diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java index 9e2e24779f..c1abeccdba 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildSubscriptionSampleGuildAdapter.java @@ -66,7 +66,7 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG m.checkNotNullParameter(item, "data"); super.onConfigure(i, (int) item); int premiumSubscriptionCount = item.getGuild().getPremiumSubscriptionCount(); - SimpleDraweeView simpleDraweeView = this.binding.f1661c; + SimpleDraweeView simpleDraweeView = this.binding.f1663c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.boostedSampleGuildIcon"); IconUtils.setIcon$default((ImageView) simpleDraweeView, item.getGuild(), 0, (MGImages.ChangeDetector) null, false, 28, (Object) null); TextView textView = this.binding.d; @@ -74,7 +74,7 @@ public final class SettingsPremiumGuildSubscriptionSampleGuildAdapter extends MG textView.setText(item.getGuild().getName()); TextView textView2 = this.binding.b; m.checkNotNullExpressionValue(textView2, "binding.boostedSampleGuildCount"); - textView2.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755260, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); + textView2.setText(StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755261, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); this.binding.e.a(item.getGuild().getPremiumTier(), premiumSubscriptionCount); this.itemView.setOnClickListener(new SettingsPremiumGuildSubscriptionSampleGuildAdapter$GuildListItem$onConfigure$1(this, item)); } diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java index 2bc5d364c4..f13c7d4ab0 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.java @@ -723,7 +723,7 @@ public final class SettingsPremiumGuildViewModel extends AppViewModel } } if (!hashMap.isEmpty()) { - arrayList.add(new WidgetSettingsPremiumGuildSubscriptionAdapter.Item.HeaderItem(2131892029)); + arrayList.add(new WidgetSettingsPremiumGuildSubscriptionAdapter.Item.HeaderItem(2131892067)); } for (Map.Entry entry : hashMap.entrySet()) { Long l2 = (Long) entry.getKey(); diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java index 9101e6dadd..14c1e6031e 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$binding$2.java @@ -27,42 +27,42 @@ public final /* synthetic */ class WidgetSettingsPremiumGuildSubscription$bindin public final WidgetSettingsBoostBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364012; - View findViewById = view.findViewById(2131364012); + int i = 2131364014; + View findViewById = view.findViewById(2131364014); if (findViewById != null) { - int i2 = 2131364809; - ImageView imageView = (ImageView) findViewById.findViewById(2131364809); + int i2 = 2131364812; + ImageView imageView = (ImageView) findViewById.findViewById(2131364812); if (imageView != null) { - i2 = 2131364810; - TextView textView = (TextView) findViewById.findViewById(2131364810); + i2 = 2131364813; + TextView textView = (TextView) findViewById.findViewById(2131364813); if (textView != null) { - i2 = 2131364811; - TextView textView2 = (TextView) findViewById.findViewById(2131364811); + i2 = 2131364814; + TextView textView2 = (TextView) findViewById.findViewById(2131364814); if (textView2 != null) { g3 g3Var = new g3((LinearLayoutCompat) findViewById, imageView, textView, textView2); - i = 2131364807; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364807); + i = 2131364810; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131364810); if (appViewFlipper != null) { - i = 2131364808; - PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131364808); + i = 2131364811; + PremiumSubscriptionMarketingView premiumSubscriptionMarketingView = (PremiumSubscriptionMarketingView) view.findViewById(2131364811); if (premiumSubscriptionMarketingView != null) { - i = 2131364812; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364812); + i = 2131364815; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131364815); if (recyclerView != null) { - i = 2131364813; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364813); + i = 2131364816; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364816); if (materialButton != null) { - i = 2131364814; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364814); + i = 2131364817; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131364817); if (recyclerView2 != null) { - i = 2131364815; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364815); + i = 2131364818; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364818); if (linkifiedTextView != null) { - i = 2131364816; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364816); + i = 2131364819; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364819); if (linearLayout != null) { - i = 2131364817; - PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131364817); + i = 2131364820; + PremiumGuildSubscriptionUpsellView premiumGuildSubscriptionUpsellView = (PremiumGuildSubscriptionUpsellView) view.findViewById(2131364820); if (premiumGuildSubscriptionUpsellView != null) { return new WidgetSettingsBoostBinding((CoordinatorLayout) view, g3Var, appViewFlipper, premiumSubscriptionMarketingView, recyclerView, materialButton, recyclerView2, linkifiedTextView, linearLayout, premiumGuildSubscriptionUpsellView); } diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.java index d13bbbdede..851e7bb2db 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription$showContent$1.java @@ -1,8 +1,9 @@ package com.discord.widgets.settings.premiumguild; import com.discord.models.domain.ModelPremiumGuildSubscriptionSlot; +import com.discord.stores.StoreStream; import com.discord.widgets.guilds.WidgetGuildSelector; -import d0.t.m0; +import d0.t.o0; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; @@ -28,6 +29,6 @@ public final class WidgetSettingsPremiumGuildSubscription$showContent$1 extends public final void invoke(ModelPremiumGuildSubscriptionSlot modelPremiumGuildSubscriptionSlot, long j) { m.checkNotNullParameter(modelPremiumGuildSubscriptionSlot, "slot"); 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); } } diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java index 006ce3e23d..bcbc3a25ca 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.java @@ -69,7 +69,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment { } public WidgetSettingsPremiumGuildSubscription() { - super(2131559194); + super(2131559195); WidgetSettingsPremiumGuildSubscription$viewModel$2 widgetSettingsPremiumGuildSubscription$viewModel$2 = WidgetSettingsPremiumGuildSubscription$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(SettingsPremiumGuildViewModel.class), new WidgetSettingsPremiumGuildSubscription$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetSettingsPremiumGuildSubscription$viewModel$2)); @@ -132,7 +132,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment { } private final void showContent(SettingsPremiumGuildViewModel.ViewState.Loaded loaded) { - AppViewFlipper appViewFlipper = getBinding().f1920c; + AppViewFlipper appViewFlipper = getBinding().f1922c; m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper"); appViewFlipper.setDisplayedChild(2); boolean z2 = !loaded.getPremiumGuildSubscriptionItems().isEmpty(); @@ -201,13 +201,13 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment { } private final void showFailureUI() { - AppViewFlipper appViewFlipper = getBinding().f1920c; + AppViewFlipper appViewFlipper = getBinding().f1922c; m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper"); appViewFlipper.setDisplayedChild(1); } private final void showLoadingUI() { - AppViewFlipper appViewFlipper = getBinding().f1920c; + AppViewFlipper appViewFlipper = getBinding().f1922c; m.checkNotNullExpressionValue(appViewFlipper, "binding.settingsBoostFlipper"); appViewFlipper.setDisplayedChild(0); } @@ -217,8 +217,8 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131892102); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131892140); MGRecyclerAdapter.Companion companion = MGRecyclerAdapter.Companion; RecyclerView recyclerView = getBinding().e; m.checkNotNullExpressionValue(recyclerView, "binding.settingsBoostRecycler"); @@ -229,7 +229,7 @@ public final class WidgetSettingsPremiumGuildSubscription extends AppFragment { String a = f.a.a(360028038352L, null); LinkifiedTextView linkifiedTextView = getBinding().h; m.checkNotNullExpressionValue(linkifiedTextView, "binding.settingsBoostSubtext"); - c.a.l.b.n(linkifiedTextView, 2131892101, new Object[]{a}, null, 4); + c.a.l.b.n(linkifiedTextView, 2131892139, new Object[]{a}, null, 4); getBinding().h.setOnClickListener(new WidgetSettingsPremiumGuildSubscription$onViewBound$1(a)); getBinding().f.setOnClickListener(new WidgetSettingsPremiumGuildSubscription$onViewBound$2(this)); getBinding().e.setHasFixedSize(false); diff --git a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java index 066bf33d73..d11e25ab71 100644 --- a/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java +++ b/app/src/main/java/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter.java @@ -100,14 +100,14 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc Context context = view.getContext(); if (guildItem.getGuild().getBanner() != null) { this.binding.b.setImageURI(IconUtils.getBannerForGuild$default(IconUtils.INSTANCE, guildItem.getGuild(), null, 2, null)); - View view2 = this.binding.f1660c; + View view2 = this.binding.f1662c; m.checkNotNullExpressionValue(view2, "binding.boostedGuildGradient"); view2.setVisibility(0); } else { SimpleDraweeView simpleDraweeView = this.binding.b; m.checkNotNullExpressionValue(context, "context"); simpleDraweeView.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130968718, 0, 2, (Object) null)); - View view3 = this.binding.f1660c; + View view3 = this.binding.f1662c; m.checkNotNullExpressionValue(view3, "binding.boostedGuildGradient"); view3.setVisibility(8); } @@ -118,10 +118,10 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc m.checkNotNullExpressionValue(textView, "binding.boostedSampleGuildName"); textView.setText(guildItem.getGuild().getName()); m.checkNotNullExpressionValue(context, "context"); - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755268, guildItem.getSubscriptionCount(), Integer.valueOf(guildItem.getSubscriptionCount())); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(context, 2131755269, guildItem.getSubscriptionCount(), Integer.valueOf(guildItem.getSubscriptionCount())); TextView textView2 = this.binding.e; m.checkNotNullExpressionValue(textView2, "binding.boostedSampleGuildCount"); - textView2.setText(b.g(context, 2131892057, new Object[]{i18nPluralString}, null, 4)); + textView2.setText(b.g(context, 2131892095, new Object[]{i18nPluralString}, null, 4)); this.binding.d.a(guildItem.getGuild().getPremiumTier(), guildItem.getGuild().getPremiumSubscriptionCount()); return; } @@ -453,9 +453,9 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc private final void showPremiumGuildSubPopup(View view, boolean z2, boolean z3, boolean z4, Item.PremiumGuildSubscriptionItem premiumGuildSubscriptionItem) { PopupMenu popupMenu = new PopupMenu(new ContextThemeWrapper(view.getContext(), 2131951664), view); popupMenu.getMenuInflater().inflate(2131623964, popupMenu.getMenu()); - MenuItem findItem = popupMenu.getMenu().findItem(2131363907); - MenuItem findItem2 = popupMenu.getMenu().findItem(2131363906); - MenuItem findItem3 = popupMenu.getMenu().findItem(2131363908); + MenuItem findItem = popupMenu.getMenu().findItem(2131363909); + MenuItem findItem2 = popupMenu.getMenu().findItem(2131363908); + MenuItem findItem3 = popupMenu.getMenu().findItem(2131363910); boolean canceled = premiumGuildSubscriptionItem.getSubscriptionSlot().getCanceled(); m.checkNotNullExpressionValue(findItem, "transfer"); boolean z5 = true; @@ -498,7 +498,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc ModelPremiumGuildSubscription premiumGuildSubscription2 = premiumGuildSubscriptionItem.getSubscriptionSlot().getPremiumGuildSubscription(); long id2 = ((premiumGuildSubscription2 != null ? premiumGuildSubscription2.getId() : 0) >>> 22) + 1420070400000L; boolean canceled = premiumGuildSubscriptionItem.getSubscriptionSlot().getCanceled(); - ImageView imageView = this.binding.f1659c; + ImageView imageView = this.binding.f1661c; m.checkNotNullExpressionValue(imageView, "binding.boostedBoostCancelled"); imageView.setVisibility(canceled ? 0 : 8); TextView textView = this.binding.e; @@ -516,7 +516,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc z3 = z6; z2 = z5; i2 = 0; - str2 = t.replace$default(b.g(context, 2131892088, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, subscriptionEndsAt, context, (String) null, (java.text.DateFormat) null, 0, 28, (Object) null)}, null, 4).toString(), "*", "", false, 4, (Object) null); + str2 = t.replace$default(b.g(context, 2131892126, new Object[]{TimeUtils.renderUtcDate$default(TimeUtils.INSTANCE, subscriptionEndsAt, context, (String) null, (java.text.DateFormat) null, 0, 28, (Object) null)}, null, 4).toString(), "*", "", false, 4, (Object) null); } if (z3) { long max = Math.max(premiumGuildSubscriptionItem.getSubscriptionSlot().getCooldownExpiresAtTimestamp() - currentTimeMillis, 0L); @@ -530,7 +530,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc z4 = true; objArr[1] = String.valueOf(j3); objArr[2] = String.valueOf((j2 - (3600000 * j3)) / 60000); - charSequence = b.g(context, 2131891955, objArr, null, 4); + charSequence = b.g(context, 2131891993, objArr, null, 4); } else { str3 = str; z4 = true; @@ -555,7 +555,7 @@ public final class WidgetSettingsPremiumGuildSubscriptionAdapter extends MGRecyc } TextView textView6 = this.binding.b; m.checkNotNullExpressionValue(textView6, "binding.boostedBoostAction"); - textView6.setText((z2 || z3) ? "" : context.getString(2131892093)); + textView6.setText((z2 || z3) ? "" : context.getString(2131892131)); if (z3 && ((canceled || !WidgetSettingsPremiumGuildSubscriptionAdapter.access$getCanCancelBoosts$p((WidgetSettingsPremiumGuildSubscriptionAdapter) this.adapter)) && (!canceled || !WidgetSettingsPremiumGuildSubscriptionAdapter.access$getCanUncancelBoosts$p((WidgetSettingsPremiumGuildSubscriptionAdapter) this.adapter)))) { z4 = false; } diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java index a07db6cadb..178581a467 100644 --- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java +++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$binding$2.java @@ -28,41 +28,41 @@ public final /* synthetic */ class WidgetIncomingShare$binding$2 extends k imple int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131363145; - ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363145); + i = 2131363147; + ViewEmbedGameInvite viewEmbedGameInvite = (ViewEmbedGameInvite) view.findViewById(2131363147); if (viewEmbedGameInvite != null) { - i = 2131363146; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363146); + i = 2131363148; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363148); if (textInputLayout != null) { - i = 2131363147; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363147); + i = 2131363149; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363149); if (recyclerView != null) { - i = 2131363148; - CardView cardView = (CardView) view.findViewById(2131363148); + i = 2131363150; + CardView cardView = (CardView) view.findViewById(2131363150); if (cardView != null) { - i = 2131363149; - TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363149); + i = 2131363151; + TextInputLayout textInputLayout2 = (TextInputLayout) view.findViewById(2131363151); if (textInputLayout2 != null) { - i = 2131363150; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363150); + i = 2131363152; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363152); if (recyclerView2 != null) { - i = 2131363564; - ImageView imageView = (ImageView) view.findViewById(2131363564); + i = 2131363566; + ImageView imageView = (ImageView) view.findViewById(2131363566); if (imageView != null) { - i = 2131363565; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363565); + i = 2131363567; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363567); if (appViewFlipper != null) { - i = 2131364525; - NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364525); + i = 2131364528; + NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(2131364528); if (nestedScrollView != null) { - i = 2131364534; - AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364534); + i = 2131364537; + AppViewFlipper appViewFlipper2 = (AppViewFlipper) view.findViewById(2131364537); if (appViewFlipper2 != null) { - i = 2131365578; - ViewGlobalSearchItem viewGlobalSearchItem = (ViewGlobalSearchItem) view.findViewById(2131365578); + i = 2131365584; + ViewGlobalSearchItem viewGlobalSearchItem = (ViewGlobalSearchItem) view.findViewById(2131365584); if (viewGlobalSearchItem != null) { - i = 2131365579; - ImageView imageView2 = (ImageView) view.findViewById(2131365579); + i = 2131365585; + ImageView imageView2 = (ImageView) view.findViewById(2131365585); if (imageView2 != null) { return new WidgetIncomingShareBinding((CoordinatorLayout) view, dimmerView, viewEmbedGameInvite, textInputLayout, recyclerView, cardView, textInputLayout2, recyclerView2, imageView, appViewFlipper, nestedScrollView, appViewFlipper2, viewGlobalSearchItem, imageView2); } diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java index cbe04fe365..f1d9c7228e 100644 --- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java +++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$configureUi$2.java @@ -17,7 +17,7 @@ public final class WidgetIncomingShare$configureUi$2 implements Action2< public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363900) { + if (menuItem.getItemId() == 2131363902) { WidgetIncomingShare widgetIncomingShare = this.this$0; m.checkNotNullExpressionValue(context, "ctx"); WidgetIncomingShare.access$onSendClicked(widgetIncomingShare, context, this.$this_configureUi.getReceiver(), this.$this_configureUi.getGameInviteModel(), this.$this_configureUi.getContentModel(), this.$this_configureUi.isOnCooldown(), this.$this_configureUi.getMaxFileSizeMB(), this.$this_configureUi.isUserPremium()); diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java index 613771d85b..126b04da46 100644 --- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java +++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3.java @@ -30,6 +30,7 @@ import kotlin.jvm.functions.Function1; public final class WidgetIncomingShare$onSendClicked$3 extends o implements Function1, Unit> { public final /* synthetic */ Context $context; public final /* synthetic */ List $data; + public final /* synthetic */ boolean $hasGif; public final /* synthetic */ boolean $hasImage; public final /* synthetic */ boolean $hasVideo; public final /* synthetic */ WidgetGlobalSearchModel.ItemDataPayload $receiver; @@ -69,12 +70,12 @@ public final class WidgetIncomingShare$onSendClicked$3 extends o implements Func boolean isPremium = userUtils.isPremium(meUser); int size = this.this$0.$data.size(); WidgetIncomingShare$onSendClicked$3 widgetIncomingShare$onSendClicked$3 = this.this$0; - bVar.a(parentFragmentManager, isPremium, max, Float.MAX_VALUE, Float.MAX_VALUE, null, size, widgetIncomingShare$onSendClicked$3.$hasImage, widgetIncomingShare$onSendClicked$3.$hasVideo); + bVar.a(parentFragmentManager, isPremium, max, Float.MAX_VALUE, Float.MAX_VALUE, null, size, widgetIncomingShare$onSendClicked$3.$hasImage, widgetIncomingShare$onSendClicked$3.$hasVideo, widgetIncomingShare$onSendClicked$3.$hasGif); } } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetIncomingShare$onSendClicked$3(WidgetIncomingShare widgetIncomingShare, List list, Context context, WidgetGlobalSearchModel.ItemDataPayload itemDataPayload, boolean z2, boolean z3) { + public WidgetIncomingShare$onSendClicked$3(WidgetIncomingShare widgetIncomingShare, List list, Context context, WidgetGlobalSearchModel.ItemDataPayload itemDataPayload, boolean z2, boolean z3, boolean z4) { super(1); this.this$0 = widgetIncomingShare; this.$data = list; @@ -82,6 +83,7 @@ public final class WidgetIncomingShare$onSendClicked$3 extends o implements Func this.$receiver = itemDataPayload; this.$hasImage = z2; this.$hasVideo = z3; + this.$hasGif = z4; } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.java index 47ee821dde..bdfadc6f16 100644 --- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.java +++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare$onViewBound$4.java @@ -18,7 +18,7 @@ public final class WidgetIncomingShare$onViewBound$4 implements View.OnClickList public final /* synthetic */ WidgetIncomingShare this$0; /* compiled from: WidgetIncomingShare.kt */ - @e(c = "com.discord.widgets.share.WidgetIncomingShare$onViewBound$4$1", f = "WidgetIncomingShare.kt", l = {133}, m = "invokeSuspend") + @e(c = "com.discord.widgets.share.WidgetIncomingShare$onViewBound$4$1", f = "WidgetIncomingShare.kt", l = {134}, m = "invokeSuspend") /* renamed from: com.discord.widgets.share.WidgetIncomingShare$onViewBound$4$1 reason: invalid class name */ public static final class AnonymousClass1 extends k implements Function2, Object> { public int label; @@ -49,7 +49,7 @@ public final class WidgetIncomingShare$onViewBound$4 implements View.OnClickList if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(200, this) == coroutine_suspended) { + if (a.n(200, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { @@ -72,7 +72,7 @@ public final class WidgetIncomingShare$onViewBound$4 implements View.OnClickList m.checkNotNullExpressionValue(textInputLayout, "binding.externalShareSearch"); CoroutineScope coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(textInputLayout); if (coroutineScope != null) { - a.F(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); + a.G(coroutineScope, null, null, new AnonymousClass1(this, null), 3, null); } WidgetIncomingShare.access$getSelectedReceiverPublisher$p(this.this$0).onNext(null); } diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java index 9f2954ca81..294086d9d3 100644 --- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java +++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java @@ -447,7 +447,7 @@ public final class WidgetIncomingShare extends AppFragment { } public WidgetIncomingShare() { - super(2131559068); + super(2131559069); } public static final /* synthetic */ void access$configureUi(WidgetIncomingShare widgetIncomingShare, Model model, Clock clock) { @@ -525,7 +525,7 @@ public final class WidgetIncomingShare extends AppFragment { i = 8; } cardView.setVisibility(i); - getBinding().d.setHint(z2 ? 2131886235 : 2131894074); + getBinding().d.setHint(z2 ? 2131886235 : 2131894113); } private final void configureUi(Model model, Clock clock) { @@ -596,7 +596,7 @@ public final class WidgetIncomingShare extends AppFragment { } widgetGlobalSearchAdapter.setData(arrayList); widgetGlobalSearchAdapter.setOnSelectedListener(new WidgetIncomingShare$configureUi$$inlined$apply$lambda$2(this, model)); - ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f1820c; + ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f1822c; m.checkNotNullExpressionValue(viewEmbedGameInvite, "binding.externalShareActivityActionPreview"); if (model.getGameInviteModel() == null) { z2 = false; @@ -607,7 +607,7 @@ public final class WidgetIncomingShare extends AppFragment { viewEmbedGameInvite.setVisibility(i); ViewEmbedGameInvite.Model gameInviteModel = model.getGameInviteModel(); if (gameInviteModel != null) { - getBinding().f1820c.bind(gameInviteModel, clock); + getBinding().f1822c.bind(gameInviteModel, clock); } } @@ -661,9 +661,10 @@ public final class WidgetIncomingShare extends AppFragment { List list; boolean z4; boolean z5; + boolean z6; int i2; if (z2) { - c.a.d.o.g(context, 2131887331, 0, null, 12); + c.a.d.o.g(context, 2131887333, 0, null, 12); return; } if (itemDataPayload instanceof WidgetGlobalSearchModel.ItemChannel) { @@ -701,8 +702,8 @@ public final class WidgetIncomingShare extends AppFragment { Float maxOrNull = u.m92maxOrNull((Iterable) arrayList); float floatValue = maxOrNull != null ? maxOrNull.floatValue() : 0.0f; float sumOfFloat = u.sumOfFloat(arrayList); - boolean z6 = list instanceof Collection; - if (!z6 || !list.isEmpty()) { + boolean z7 = list instanceof Collection; + if (!z7 || !list.isEmpty()) { Iterator it = list.iterator(); while (true) { if (it.hasNext()) { @@ -716,12 +717,11 @@ public final class WidgetIncomingShare extends AppFragment { } } z4 = false; - if (!z6 || !list.isEmpty()) { + if (!z7 || !list.isEmpty()) { Iterator it2 = list.iterator(); while (true) { if (it2.hasNext()) { if (AttachmentUtilsKt.isVideo((Attachment) it2.next(), context.getContentResolver())) { - i2 = i; z5 = true; break; } @@ -730,13 +730,28 @@ public final class WidgetIncomingShare extends AppFragment { } } } - i2 = i; z5 = false; + if (!z7 || !list.isEmpty()) { + Iterator it3 = list.iterator(); + while (true) { + if (it3.hasNext()) { + if (AttachmentUtilsKt.isGif((Attachment) it3.next(), context.getContentResolver())) { + i2 = i; + z6 = true; + break; + } + } else { + break; + } + } + } + i2 = i; + z6 = false; if (sumOfFloat > ((float) i2)) { b.C0005b bVar = b.j; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - bVar.a(parentFragmentManager, z3, i, floatValue, sumOfFloat, null, list.size(), z4, z5); + bVar.a(parentFragmentManager, z3, i, floatValue, sumOfFloat, null, list.size(), z4, z5, z6); return; } StoreStream.Companion companion2 = StoreStream.Companion; @@ -749,7 +764,7 @@ public final class WidgetIncomingShare extends AppFragment { if (widgetGlobalSearchAdapter == null) { m.throwUninitializedPropertyAccessException("resultsAdapter"); } - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui(A, this, widgetGlobalSearchAdapter), getBinding().b, 0), WidgetIncomingShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetIncomingShare$onSendClicked$3(this, list, context, itemDataPayload, z4, z5), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer(ObservableExtensionsKt.ui(A, this, widgetGlobalSearchAdapter), getBinding().b, 0), WidgetIncomingShare.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetIncomingShare$onSendClicked$3(this, list, context, itemDataPayload, z4, z5, z6), 62, (Object) null); } private final void onSendCompleted() { diff --git a/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java new file mode 100644 index 0000000000..c3c8b0c45e --- /dev/null +++ b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$1.java @@ -0,0 +1,46 @@ +package com.discord.widgets.stage; + +import com.discord.api.stageinstance.StageInstance; +import com.discord.utilities.permissions.PermissionUtils; +import d0.t.n; +import d0.z.d.m; +import d0.z.d.o; +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import kotlin.jvm.functions.Function1; +/* compiled from: GuildIdsWithVisibleStageInstanceModel.kt */ +public final class GuildIdsWithVisibleStageInstanceModel$compute$1 extends o implements Function1>, Boolean> { + public final /* synthetic */ Map $permissionsByChannel; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public GuildIdsWithVisibleStageInstanceModel$compute$1(Map map) { + super(1); + this.$permissionsByChannel = map; + } + + /* 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 */ Boolean invoke(Map.Entry> entry) { + return Boolean.valueOf(invoke((Map.Entry>) entry)); + } + + public final boolean invoke(Map.Entry> entry) { + int i; + m.checkNotNullParameter(entry, ""); + entry.getKey().longValue(); + Set keySet = ((Map) entry.getValue()).keySet(); + if (!(keySet instanceof Collection) || !keySet.isEmpty()) { + i = 0; + for (Number number : keySet) { + if (PermissionUtils.can(1024, (Long) this.$permissionsByChannel.get(Long.valueOf(number.longValue()))) && (i = i + 1) < 0) { + n.throwCountOverflow(); + } + } + } else { + i = 0; + } + return i > 0; + } +} diff --git a/app/src/main/java/com/discord/stores/StoreStageInstances$getGuildIdsWithStageInstances$2.java b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$2.java similarity index 63% rename from app/src/main/java/com/discord/stores/StoreStageInstances$getGuildIdsWithStageInstances$2.java rename to app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$2.java index df2b0df852..812230e7b3 100644 --- a/app/src/main/java/com/discord/stores/StoreStageInstances$getGuildIdsWithStageInstances$2.java +++ b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$compute$2.java @@ -1,15 +1,15 @@ -package com.discord.stores; +package com.discord.widgets.stage; import com.discord.api.stageinstance.StageInstance; import d0.z.d.m; import d0.z.d.o; import java.util.Map; import kotlin.jvm.functions.Function1; -/* compiled from: StoreStageInstances.kt */ -public final class StoreStageInstances$getGuildIdsWithStageInstances$2 extends o implements Function1>, Long> { - public static final StoreStageInstances$getGuildIdsWithStageInstances$2 INSTANCE = new StoreStageInstances$getGuildIdsWithStageInstances$2(); +/* compiled from: GuildIdsWithVisibleStageInstanceModel.kt */ +public final class GuildIdsWithVisibleStageInstanceModel$compute$2 extends o implements Function1>, Long> { + public static final GuildIdsWithVisibleStageInstanceModel$compute$2 INSTANCE = new GuildIdsWithVisibleStageInstanceModel$compute$2(); - public StoreStageInstances$getGuildIdsWithStageInstances$2() { + public GuildIdsWithVisibleStageInstanceModel$compute$2() { super(1); } diff --git a/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$observe$1.java b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$observe$1.java new file mode 100644 index 0000000000..c14d35103e --- /dev/null +++ b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel$observe$1.java @@ -0,0 +1,26 @@ +package com.discord.widgets.stage; + +import com.discord.stores.StorePermissions; +import com.discord.stores.StoreStageInstances; +import d0.z.d.o; +import java.util.Set; +import kotlin.jvm.functions.Function0; +/* compiled from: GuildIdsWithVisibleStageInstanceModel.kt */ +public final class GuildIdsWithVisibleStageInstanceModel$observe$1 extends o implements Function0> { + public final /* synthetic */ StorePermissions $storePermissions; + public final /* synthetic */ StoreStageInstances $storeStageInstances; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public GuildIdsWithVisibleStageInstanceModel$observe$1(StoreStageInstances storeStageInstances, StorePermissions storePermissions) { + super(0); + this.$storeStageInstances = storeStageInstances; + this.$storePermissions = storePermissions; + } + + /* Return type fixed from 'java.util.Set' to match base method */ + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final Set mo1invoke() { + return GuildIdsWithVisibleStageInstanceModel.INSTANCE.compute(this.$storeStageInstances.getStageInstancesByGuild(), this.$storePermissions.getPermissionsByChannel()); + } +} diff --git a/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel.java b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel.java new file mode 100644 index 0000000000..f92aa33233 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/stage/GuildIdsWithVisibleStageInstanceModel.java @@ -0,0 +1,47 @@ +package com.discord.widgets.stage; + +import com.discord.api.stageinstance.StageInstance; +import com.discord.stores.StorePermissions; +import com.discord.stores.StoreStageInstances; +import com.discord.stores.StoreStream; +import com.discord.stores.updates.ObservationDeck; +import com.discord.stores.updates.ObservationDeckProvider; +import d0.f0.q; +import d0.t.i0; +import d0.z.d.m; +import java.util.Map; +import java.util.Set; +import rx.Observable; +/* compiled from: GuildIdsWithVisibleStageInstanceModel.kt */ +public final class GuildIdsWithVisibleStageInstanceModel { + public static final GuildIdsWithVisibleStageInstanceModel INSTANCE = new GuildIdsWithVisibleStageInstanceModel(); + + private GuildIdsWithVisibleStageInstanceModel() { + } + + public static /* synthetic */ Observable observe$default(GuildIdsWithVisibleStageInstanceModel guildIdsWithVisibleStageInstanceModel, StoreStageInstances storeStageInstances, StorePermissions storePermissions, ObservationDeck observationDeck, int i, Object obj) { + if ((i & 1) != 0) { + storeStageInstances = StoreStream.Companion.getStageInstances(); + } + if ((i & 2) != 0) { + storePermissions = StoreStream.Companion.getPermissions(); + } + if ((i & 4) != 0) { + observationDeck = ObservationDeckProvider.get(); + } + return guildIdsWithVisibleStageInstanceModel.observe(storeStageInstances, storePermissions, observationDeck); + } + + public final Set compute(Map> map, Map map2) { + m.checkNotNullParameter(map, "instancesByGuild"); + m.checkNotNullParameter(map2, "permissionsByChannel"); + return q.toSet(q.map(q.filter(i0.asSequence(map), new GuildIdsWithVisibleStageInstanceModel$compute$1(map2)), GuildIdsWithVisibleStageInstanceModel$compute$2.INSTANCE)); + } + + public final Observable> observe(StoreStageInstances storeStageInstances, StorePermissions storePermissions, ObservationDeck observationDeck) { + m.checkNotNullParameter(storeStageInstances, "storeStageInstances"); + m.checkNotNullParameter(storePermissions, "storePermissions"); + m.checkNotNullParameter(observationDeck, "observationDeck"); + return ObservationDeck.connectRx$default(observationDeck, new ObservationDeck.UpdateSource[]{storeStageInstances, storePermissions}, false, null, null, new GuildIdsWithVisibleStageInstanceModel$observe$1(storeStageInstances, storePermissions), 14, null); + } +} diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java index 7c38b8ab82..d9c58d7402 100644 --- a/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java +++ b/app/src/main/java/com/discord/widgets/stage/StageChannelJoinHelper.java @@ -28,7 +28,7 @@ import kotlin.jvm.functions.Function0; import kotlinx.coroutines.CoroutineScope; import kotlinx.coroutines.Job; import rx.Observable; -import s.a.j; +import s.a.k; /* compiled from: StageChannelJoinHelper.kt */ public final class StageChannelJoinHelper { public static final StageChannelJoinHelper INSTANCE = new StageChannelJoinHelper(); @@ -86,10 +86,10 @@ public final class StageChannelJoinHelper { Job job = lurkJob; Job job2 = null; if (job != null) { - a.j(job, null, 1, null); + a.k(job, null, 1, null); } if (coroutineScope != null) { - job2 = a.F(coroutineScope, null, null, new StageChannelJoinHelper$lurkAndJoinStage$1(context, fragmentManager, j, j2, z2, storeGuilds, storeLurking, storeVoiceChannelSelected, null), 3, null); + job2 = a.G(coroutineScope, null, null, new StageChannelJoinHelper$lurkAndJoinStage$1(context, fragmentManager, j, j2, z2, storeGuilds, storeLurking, storeVoiceChannelSelected, null), 3, null); } lurkJob = job2; } @@ -151,10 +151,10 @@ public final class StageChannelJoinHelper { stageChannelJoinHelper$lurkAndJoinStageAsync$1.J$1 = j2; stageChannelJoinHelper$lurkAndJoinStageAsync$1.Z$0 = z2; stageChannelJoinHelper$lurkAndJoinStageAsync$1.label = 1; - j jVar = new j(b.intercepted(stageChannelJoinHelper$lurkAndJoinStageAsync$1), 1); - jVar.A(); - storeLurking.startLurking(j, d0.w.h.a.b.boxLong(j2), false, new StageChannelJoinHelper$lurkAndJoinStageAsync$2$1(jVar), new StageChannelJoinHelper$lurkAndJoinStageAsync$2$2(jVar)); - Object u = jVar.u(); + k kVar = new k(b.intercepted(stageChannelJoinHelper$lurkAndJoinStageAsync$1), 1); + kVar.A(); + storeLurking.startLurking(j, d0.w.h.a.b.boxLong(j2), false, new StageChannelJoinHelper$lurkAndJoinStageAsync$2$1(kVar), new StageChannelJoinHelper$lurkAndJoinStageAsync$2$2(kVar)); + Object u = kVar.u(); if (u == c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(stageChannelJoinHelper$lurkAndJoinStageAsync$1); } @@ -289,13 +289,13 @@ public final class StageChannelJoinHelper { if (ordinal == 0) { function0.mo1invoke(); } else if (ordinal == 1) { - o.g(context, 2131887272, 0, null, 12); + o.g(context, 2131887273, 0, null, 12); } else if (ordinal == 2) { c.a.a.l.j.a(fragmentManager); } else if (ordinal == 3) { - o.g(context, 2131894000, 0, null, 12); + o.g(context, 2131894039, 0, null, 12); } else if (ordinal == 4) { - o.g(context, 2131889861, 0, null, 12); + o.g(context, 2131889872, 0, null, 12); } } } diff --git a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java index 4a5c0af788..15c6118684 100644 --- a/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java +++ b/app/src/main/java/com/discord/widgets/stage/StageChannelNotifications.java @@ -19,7 +19,7 @@ import d0.z.d.m; import kotlin.Lazy; import kotlin.jvm.internal.DefaultConstructorMarker; import s.a.j0; -import s.a.u0; +import s.a.w0; /* compiled from: StageChannelNotifications.kt */ public final class StageChannelNotifications { public static final Companion Companion = new Companion(null); @@ -109,7 +109,7 @@ public final class StageChannelNotifications { if (d.a && (channel = this.channelsStore.getChannel(j)) != null) { Application application = ApplicationProvider.INSTANCE.get(); VoiceEngineForegroundService.Companion companion = VoiceEngineForegroundService.Companion; - a.F(u0.i, j0.b, null, new StageChannelNotifications$onInvitedToSpeak$1(channel, createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131893402)).addAction(0, application.getString(2131893399), companion.stageInviteAckPendingIntent(application, j, true)).addAction(0, application.getString(2131893401), companion.stageInviteAckPendingIntent(application, j, false)), application, null), 2, null); + a.G(w0.i, j0.b, null, new StageChannelNotifications$onInvitedToSpeak$1(channel, createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131893444)).addAction(0, application.getString(2131893441), companion.stageInviteAckPendingIntent(application, j, true)).addAction(0, application.getString(2131893443), companion.stageInviteAckPendingIntent(application, j, false)), application, null), 2, null); } } @@ -118,7 +118,7 @@ public final class StageChannelNotifications { if (channel != null) { Application application = ApplicationProvider.INSTANCE.get(); Notifications.InvitedToSpeak invitedToSpeak = Notifications.InvitedToSpeak.INSTANCE; - Notification build = createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131888368)).build(); + Notification build = createChannelNotificationBuilder(application, channel).setContentText(application.getString(2131888378)).build(); m.checkNotNullExpressionValue(build, "createChannelNotificatio…le))\n .build()"); invitedToSpeak.notify(application, build); } diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java b/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java index 7b4e5d661a..49bf644f1d 100644 --- a/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java +++ b/app/src/main/java/com/discord/widgets/stage/discovery/IntroductionCardViewHolder.java @@ -13,17 +13,17 @@ public final class IntroductionCardViewHolder extends MGRecyclerViewHolder, Continuation, Object> { public final /* synthetic */ Map $guilds; public final /* synthetic */ Map $presence; @@ -25,18 +24,18 @@ public final class WidgetDiscoveryViewModel$Companion$combineDiscoveryModelState public int label; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1(Map map, Map map2, WidgetDiscoveryViewModel.DiscoveryModelsFetchState discoveryModelsFetchState, WidgetDiscoveryViewModel.DiscoveryModelsFetchState discoveryModelsFetchState2, Continuation continuation) { + public WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1(Map map, WidgetDiscoveryViewModel.DiscoveryModelsFetchState discoveryModelsFetchState, Map map2, WidgetDiscoveryViewModel.DiscoveryModelsFetchState discoveryModelsFetchState2, Continuation continuation) { super(2, continuation); - this.$guilds = map; - this.$presence = map2; + this.$presence = map; this.$presenceFetchState = discoveryModelsFetchState; + this.$guilds = map2; this.$recommendedFetchState = discoveryModelsFetchState2; } @Override // d0.w.h.a.a public final Continuation create(Object obj, Continuation continuation) { m.checkNotNullParameter(continuation, "completion"); - WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1 widgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1 = new WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1(this.$guilds, this.$presence, this.$presenceFetchState, this.$recommendedFetchState, continuation); + WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1 widgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1 = new WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1(this.$presence, this.$presenceFetchState, this.$guilds, this.$recommendedFetchState, continuation); widgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1.L$0 = obj; return widgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1; } @@ -47,51 +46,72 @@ public final class WidgetDiscoveryViewModel$Companion$combineDiscoveryModelState return ((WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1) create(kVar, continuation)).invokeSuspend(Unit.a); } - /* JADX WARNING: Removed duplicated region for block: B:19:0x0076 A[RETURN] */ + /* JADX WARNING: Removed duplicated region for block: B:20:0x0077 A[RETURN] */ + /* JADX WARNING: Removed duplicated region for block: B:23:0x008d A[RETURN] */ @Override // d0.w.h.a.a public final Object invokeSuspend(Object obj) { k kVar; Collection values; + Collection values2; Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); int i = this.label; if (i == 0) { l.throwOnFailure(obj); - k kVar2 = (k) this.L$0; - Collection values2 = this.$guilds.values(); - this.L$0 = kVar2; + kVar = (k) this.L$0; + Collection values3 = this.$presence.values(); + this.L$0 = kVar; this.label = 1; - if (kVar2.yieldAll(values2, this) == coroutine_suspended) { + if (kVar.yieldAll(values3, this) == coroutine_suspended) { return coroutine_suspended; } - kVar = kVar2; } else if (i == 1) { kVar = (k) this.L$0; l.throwOnFailure(obj); } else if (i == 2) { kVar = (k) this.L$0; l.throwOnFailure(obj); + values2 = this.$guilds.values(); + this.L$0 = kVar; + this.label = 3; + if (kVar.yieldAll(values2, this) == coroutine_suspended) { + return coroutine_suspended; + } values = this.$recommendedFetchState.getModels().values(); this.L$0 = null; - this.label = 3; + this.label = 4; + if (kVar.yieldAll(values, this) == coroutine_suspended) { + } + return Unit.a; + } else if (i == 3) { + kVar = (k) this.L$0; + l.throwOnFailure(obj); + values = this.$recommendedFetchState.getModels().values(); + this.L$0 = null; + this.label = 4; if (kVar.yieldAll(values, this) == coroutine_suspended) { return coroutine_suspended; } return Unit.a; - } else if (i == 3) { + } else if (i == 4) { l.throwOnFailure(obj); return Unit.a; } else { throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } - Collection values3 = DiscoveryModelKt.mergeDiscoveryModels(this.$presence, this.$presenceFetchState.getModels()).values(); + Collection values4 = this.$presenceFetchState.getModels().values(); this.L$0 = kVar; this.label = 2; - if (kVar.yieldAll(values3, this) == coroutine_suspended) { + if (kVar.yieldAll(values4, this) == coroutine_suspended) { return coroutine_suspended; } + values2 = this.$guilds.values(); + this.L$0 = kVar; + this.label = 3; + if (kVar.yieldAll(values2, this) == coroutine_suspended) { + } values = this.$recommendedFetchState.getModels().values(); this.L$0 = null; - this.label = 3; + this.label = 4; if (kVar.yieldAll(values, this) == coroutine_suspended) { } return Unit.a; diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2.java deleted file mode 100644 index 65b5934bb2..0000000000 --- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.discord.widgets.stage.discovery; - -import com.discord.widgets.stage.model.DiscoveryModel; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.jvm.functions.Function1; -/* compiled from: WidgetDiscoveryViewModel.kt */ -public final class WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2 extends o implements Function1 { - public static final WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2 INSTANCE = new WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2(); - - public WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2() { - super(1); - } - - public final long invoke(DiscoveryModel discoveryModel) { - m.checkNotNullParameter(discoveryModel, "it"); - return discoveryModel.getChannelId(); - } - - /* 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 */ Long invoke(DiscoveryModel discoveryModel) { - return Long.valueOf(invoke(discoveryModel)); - } -} diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeStoreState$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeStoreState$1.java index b758965441..e3ab5ba08f 100644 --- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeStoreState$1.java +++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$Companion$observeStoreState$1.java @@ -30,7 +30,7 @@ public final class WidgetDiscoveryViewModel$Companion$observeStoreState$1 extend m.checkNotNullParameter(map3, "guildMembers"); m.checkNotNullParameter(connectingState, "connectingState"); m.checkNotNullParameter(navigationTab, "selectedTab"); - return new WidgetDiscoveryViewModel.StoreState.Loaded(compositeDiscoveryModelsFetchState.getRecommendedFetchState().getHasEverRefreshed(), compositeDiscoveryModelsFetchState.isRefreshing(), q.toList(q.map(q.sorted(u.asSequence(list)), new WidgetDiscoveryViewModel$Companion$observeStoreState$1$stageCardItems$1(j2, connectingState, map, j, map2, map3, list2))), j2, navigationTab); + return new WidgetDiscoveryViewModel.StoreState.Loaded(compositeDiscoveryModelsFetchState.getRecommendedFetchState().getHasEverRefreshed(), compositeDiscoveryModelsFetchState.isRefreshing(), q.toList(q.map(u.asSequence(list), new WidgetDiscoveryViewModel$Companion$observeStoreState$1$stageCardItems$1(j2, connectingState, map, j, map2, map3, list2))), j2, navigationTab); } /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java index f1acb69335..310e8745f3 100644 --- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java +++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1.java @@ -19,7 +19,7 @@ import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import rx.Observable; /* compiled from: WidgetDiscoveryViewModel.kt */ -@e(c = "com.discord.widgets.stage.discovery.WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1", f = "WidgetDiscoveryViewModel.kt", l = {341, 347}, m = "invokeSuspend") +@e(c = "com.discord.widgets.stage.discovery.WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1", f = "WidgetDiscoveryViewModel.kt", l = {340, 346}, m = "invokeSuspend") public final class WidgetDiscoveryViewModel$tryConnectToVoice$job$1$connected$1 extends k implements Function2, Object> { public int label; public final /* synthetic */ WidgetDiscoveryViewModel$tryConnectToVoice$job$1 this$0; diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1.java index 7607c92302..2af177d27d 100644 --- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1.java +++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel$tryConnectToVoice$job$1.java @@ -16,7 +16,7 @@ import kotlinx.coroutines.CoroutineScope; import rx.subjects.BehaviorSubject; import s.a.g; /* compiled from: WidgetDiscoveryViewModel.kt */ -@e(c = "com.discord.widgets.stage.discovery.WidgetDiscoveryViewModel$tryConnectToVoice$job$1", f = "WidgetDiscoveryViewModel.kt", l = {337}, m = "invokeSuspend") +@e(c = "com.discord.widgets.stage.discovery.WidgetDiscoveryViewModel$tryConnectToVoice$job$1", f = "WidgetDiscoveryViewModel.kt", l = {336}, m = "invokeSuspend") public final class WidgetDiscoveryViewModel$tryConnectToVoice$job$1 extends k implements Function2, Object> { public final /* synthetic */ long $channelId; public final /* synthetic */ Context $context; diff --git a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java index e76f51f826..ae721ece2a 100644 --- a/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java +++ b/app/src/main/java/com/discord/widgets/stage/discovery/WidgetDiscoveryViewModel.java @@ -33,7 +33,6 @@ import com.discord.widgets.stage.model.DiscoverySpeakerModel; import com.discord.widgets.tabs.NavigationTab; import com.discord.widgets.user.presence.ModelStageRichPresence; import d0.f0.l; -import d0.f0.q; import d0.t.h0; import d0.t.u; import d0.z.d.m; @@ -49,12 +48,14 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.internal.DefaultConstructorMarker; +import kotlin.sequences.Sequence; +import kotlinx.coroutines.CoroutineDispatcher; import kotlinx.coroutines.CoroutineScope; import kotlinx.coroutines.Job; import rx.Observable; import rx.subjects.BehaviorSubject; +import s.a.a.n; import s.a.j0; -import s.a.z; /* compiled from: WidgetDiscoveryViewModel.kt */ public final class WidgetDiscoveryViewModel extends AppViewModel { private static final long CONNECTION_ERROR_TIMEOUT_MS = 10000; @@ -271,7 +272,17 @@ public final class WidgetDiscoveryViewModel extends AppViewModel { } private final List combineDiscoveryModelStates(DiscoveryModelsFetchState discoveryModelsFetchState, DiscoveryModelsFetchState discoveryModelsFetchState2, Map map, Map map2) { - return q.toList(q.distinctBy(l.sequence(new WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1(map2, map, discoveryModelsFetchState2, discoveryModelsFetchState, null)), WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$2.INSTANCE)); + Sequence sequence = l.sequence(new WidgetDiscoveryViewModel$Companion$combineDiscoveryModelStates$1(map, discoveryModelsFetchState2, map2, discoveryModelsFetchState, null)); + LinkedHashMap linkedHashMap = new LinkedHashMap(); + for (DiscoveryModel discoveryModel : sequence) { + DiscoveryModel merge = DiscoveryModel.Companion.merge((DiscoveryModel) linkedHashMap.get(Long.valueOf(discoveryModel.getChannelId())), discoveryModel); + if (merge != null) { + linkedHashMap.put(Long.valueOf(discoveryModel.getChannelId()), merge); + } + } + Collection values = linkedHashMap.values(); + m.checkNotNullExpressionValue(values, "sequence {\n yieldAl… }\n map\n }.values"); + return u.toList(values); } private final Observable> combineDiscoveryModels(Observable observable, Observable observable2, Observable> observable3, Observable> observable4, StoreUserSettings storeUserSettings) { @@ -1158,11 +1169,11 @@ public final class WidgetDiscoveryViewModel extends AppViewModel { } ConnectingState.InProgress inProgress = (ConnectingState.InProgress) o0; if (!(inProgress == null || (job = inProgress.getJob()) == null)) { - c.q.a.k.a.j(job, null, 1, null); + c.q.a.k.a.k(job, null, 1, null); } CoroutineScope viewModelScope = ViewModelKt.getViewModelScope(this); - z zVar = j0.a; - this.connectingStateSubject.onNext(new ConnectingState.InProgress(j, c.q.a.k.a.F(viewModelScope, s.a.a.m.b, null, new WidgetDiscoveryViewModel$tryConnectToVoice$job$1(this, j, context, fragmentManager, null), 2, null))); + CoroutineDispatcher coroutineDispatcher = j0.a; + this.connectingStateSubject.onNext(new ConnectingState.InProgress(j, c.q.a.k.a.G(viewModelScope, n.b, null, new WidgetDiscoveryViewModel$tryConnectToVoice$job$1(this, j, context, fragmentManager, null), 2, null))); } } } diff --git a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java index a765acc8bc..efd6f08c7c 100644 --- a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java +++ b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModel.java @@ -2,11 +2,19 @@ package com.discord.widgets.stage.model; import a0.a.a.b; import com.discord.models.guild.Guild; +import d0.o; +import d0.t.u; import d0.u.a; import d0.z.d.m; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; import java.util.List; +import kotlin.Pair; +import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: DiscoveryModel.kt */ public final class DiscoveryModel implements Comparable { + public static final Companion Companion = new Companion(null); private final int analyticsSource; private final int audienceSize; private final long channelId; @@ -19,6 +27,36 @@ public final class DiscoveryModel implements Comparable { private final Long startTimestamp; private final String topic; + /* compiled from: DiscoveryModel.kt */ + public static final class Companion { + private Companion() { + } + + public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + + public final DiscoveryModel merge(DiscoveryModel discoveryModel, DiscoveryModel discoveryModel2) { + if (discoveryModel == null) { + return discoveryModel2; + } + if (discoveryModel2 == null) { + return discoveryModel; + } + Pair pair = discoveryModel.getSource().getPriority() > discoveryModel2.getSource().getPriority() ? o.to(discoveryModel, discoveryModel2) : o.to(discoveryModel2, discoveryModel); + DiscoveryModel discoveryModel3 = (DiscoveryModel) pair.component1(); + List plus = u.plus((Collection) discoveryModel3.getSpeakers(), (Iterable) ((DiscoveryModel) pair.component2()).getSpeakers()); + HashSet hashSet = new HashSet(); + ArrayList arrayList = new ArrayList(); + for (Object obj : plus) { + if (hashSet.add(Long.valueOf(((DiscoverySpeakerModel) obj).getUserId()))) { + arrayList.add(obj); + } + } + return new DiscoveryModel(discoveryModel3.getTopic(), discoveryModel3.getStartTimestamp(), discoveryModel3.getChannelId(), discoveryModel3.getGuild(), discoveryModel3.getStageInstanceId(), arrayList, Math.max(discoveryModel3.getSpeakerCount(), arrayList.size()), discoveryModel3.getAudienceSize(), discoveryModel3.getSource(), discoveryModel3.getAnalyticsSource(), discoveryModel3.getScore()); + } + } + public DiscoveryModel(String str, Long l, long j, Guild guild, long j2, List list, int i, int i2, DiscoverySource discoverySource, int i3, Double d) { m.checkNotNullParameter(str, "topic"); m.checkNotNullParameter(guild, "guild"); diff --git a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java index d8592e3292..abeaf4c9f4 100644 --- a/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java +++ b/app/src/main/java/com/discord/widgets/stage/model/DiscoveryModelKt.java @@ -5,41 +5,17 @@ import com.discord.api.stageinstance.RecommendedStageInstance; import com.discord.models.guild.Guild; import com.discord.nullserializable.NullSerializable; import d0.d0.f; -import d0.o; import d0.t.g0; +import d0.t.o; import d0.t.o0; -import d0.t.u; import d0.z.d.m; import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; -import kotlin.Pair; /* compiled from: DiscoveryModel.kt */ public final class DiscoveryModelKt { - private static final DiscoveryModel merge(DiscoveryModel discoveryModel, DiscoveryModel discoveryModel2) { - if (discoveryModel == null) { - return discoveryModel2; - } - if (discoveryModel2 == null) { - return discoveryModel; - } - Pair pair = discoveryModel.getSource().getPriority() > discoveryModel2.getSource().getPriority() ? o.to(discoveryModel, discoveryModel2) : o.to(discoveryModel2, discoveryModel); - DiscoveryModel discoveryModel3 = (DiscoveryModel) pair.component1(); - List plus = u.plus((Collection) discoveryModel3.getSpeakers(), (Iterable) ((DiscoveryModel) pair.component2()).getSpeakers()); - HashSet hashSet = new HashSet(); - ArrayList arrayList = new ArrayList(); - for (Object obj : plus) { - if (hashSet.add(Long.valueOf(((DiscoverySpeakerModel) obj).getUserId()))) { - arrayList.add(obj); - } - } - return new DiscoveryModel(discoveryModel3.getTopic(), discoveryModel3.getStartTimestamp(), discoveryModel3.getChannelId(), discoveryModel3.getGuild(), discoveryModel3.getStageInstanceId(), arrayList, Math.max(discoveryModel3.getSpeakerCount(), arrayList.size()), discoveryModel3.getAudienceSize(), discoveryModel3.getSource(), discoveryModel3.getAnalyticsSource(), discoveryModel3.getScore()); - } - public static final Map mergeDiscoveryModels(Map map, Map map2) { m.checkNotNullParameter(map, "a"); m.checkNotNullParameter(map2, "b"); @@ -47,7 +23,7 @@ public final class DiscoveryModelKt { ArrayList arrayList = new ArrayList(); for (Number number : plus) { long longValue = number.longValue(); - DiscoveryModel merge = merge(map.get(Long.valueOf(longValue)), map2.get(Long.valueOf(longValue))); + DiscoveryModel merge = DiscoveryModel.Companion.merge(map.get(Long.valueOf(longValue)), map2.get(Long.valueOf(longValue))); if (merge == null) { merge = null; } @@ -55,7 +31,7 @@ public final class DiscoveryModelKt { arrayList.add(merge); } } - LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(d0.t.o.collectionSizeOrDefault(arrayList, 10)), 16)); + LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList, 10)), 16)); for (Object obj : arrayList) { linkedHashMap.put(Long.valueOf(((DiscoveryModel) obj).getChannelId()), obj); } @@ -66,7 +42,7 @@ public final class DiscoveryModelKt { m.checkNotNullParameter(recommendedStageInstance, "$this$toDiscoveryModel"); m.checkNotNullParameter(discoverySource, "dataSource"); List d = recommendedStageInstance.d(); - ArrayList arrayList = new ArrayList(d0.t.o.collectionSizeOrDefault(d, 10)); + ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(d, 10)); for (GuildMember guildMember : d) { long i = guildMember.j().i(); NullSerializable a = guildMember.j().a(); diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java index a4e2c6bbe2..ddfac6eb32 100644 --- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$binding$2.java @@ -25,44 +25,44 @@ public final /* synthetic */ class WidgetStageSettings$binding$2 extends k imple public final WidgetStageSettingsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364951; - TextView textView = (TextView) view.findViewById(2131364951); + int i = 2131364954; + TextView textView = (TextView) view.findViewById(2131364954); if (textView != null) { - i = 2131365020; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365020); + i = 2131365024; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365024); if (linearLayout != null) { - i = 2131365021; - View findViewById = view.findViewById(2131365021); + i = 2131365025; + View findViewById = view.findViewById(2131365025); if (findViewById != null) { - i = 2131365022; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365022); + i = 2131365026; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365026); if (linkifiedTextView != null) { - i = 2131365023; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365023); + i = 2131365027; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365027); if (checkedSetting != null) { - i = 2131365024; - LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131365024); + i = 2131365028; + LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(2131365028); if (linkifiedTextView2 != null) { - i = 2131365025; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365025); + i = 2131365029; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365029); if (checkedSetting2 != null) { - i = 2131365026; - ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131365026); + i = 2131365030; + ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131365030); if (screenTitleView != null) { - i = 2131365027; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365027); + i = 2131365031; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365031); if (textInputLayout != null) { - i = 2131365028; - TextView textView2 = (TextView) view.findViewById(2131365028); + i = 2131365032; + TextView textView2 = (TextView) view.findViewById(2131365032); if (textView2 != null) { - i = 2131365036; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365036); + i = 2131365040; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365040); if (materialButton != null) { - i = 2131365037; - Space space = (Space) view.findViewById(2131365037); + i = 2131365041; + Space space = (Space) view.findViewById(2131365041); if (space != null) { - i = 2131365297; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365297); + i = 2131365302; + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365302); if (textInputEditText != null) { return new WidgetStageSettingsBinding((CoordinatorLayout) view, textView, linearLayout, findViewById, linkifiedTextView, checkedSetting, linkifiedTextView2, checkedSetting2, screenTitleView, textInputLayout, textView2, materialButton, space, textInputEditText); } diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java index 30da123ad8..24dd8d3917 100644 --- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java +++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings$configureUI$5.java @@ -105,7 +105,7 @@ public final class WidgetStageSettings$configureUI$5 extends o implements Functi hook.a.add(new ForegroundColorSpan(ColorCompat.getThemedColor(this.this$0.this$0.getContext(), 2130968986))); AnonymousClass2 r0 = new AnonymousClass2(this); m.checkNotNullParameter(r0, "onClick"); - hook.f2009c = new Hook.a(null, r0); + hook.f2011c = new Hook.a(null, r0); } } diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java index 08707f0c92..b8baa5ec78 100644 --- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java +++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettings.java @@ -91,7 +91,7 @@ public final class WidgetStageSettings extends AppFragment { } public WidgetStageSettings() { - super(2131559231); + super(2131559232); WidgetStageSettings$viewModel$2 widgetStageSettings$viewModel$2 = new WidgetStageSettings$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetStageSettingsViewModel.class), new WidgetStageSettings$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetStageSettings$viewModel$2)); @@ -130,13 +130,13 @@ public final class WidgetStageSettings extends AppFragment { } boolean z2 = loaded.getStageInstance() == null; ScreenTitleView screenTitleView = getBinding().g; - String string = getString(z2 ? 2131893419 : 2131888198); + String string = getString(z2 ? 2131893460 : 2131888208); m.checkNotNullExpressionValue(string, "getString(\n i…e\n }\n )"); screenTitleView.setTitle(string); - getBinding().g.setSubtitle(getString(z2 ? 2131893418 : 2131888197)); + getBinding().g.setSubtitle(getString(z2 ? 2131893459 : 2131888207)); MaterialButton materialButton = getBinding().i; materialButton.setEnabled(loaded.getStagePrivacyLevel() != null); - materialButton.setText(getString(z2 ? 2131893416 : 2131892926)); + materialButton.setText(getString(z2 ? 2131893457 : 2131892968)); TextView textView = getBinding().b; m.checkNotNullExpressionValue(textView, "binding.speakerHint"); textView.setVisibility(z2 ? 0 : 8); @@ -148,7 +148,7 @@ public final class WidgetStageSettings extends AppFragment { boolean canEveryoneJoin = loaded.getCanEveryoneJoin(); CheckedSetting checkedSetting = getBinding().f; checkedSetting.setChecked(loaded.getStagePrivacyLevel() == stageInstancePrivacyLevel); - checkedSetting.setLabelTagText(2131892498); + checkedSetting.setLabelTagText(2131892540); checkedSetting.setLabelTagVisibility(loaded.isPublicRecommended()); if (z3) { checkedSetting.e(WidgetStageSettings$configureUI$2$1.INSTANCE); @@ -160,13 +160,13 @@ public final class WidgetStageSettings extends AppFragment { LinkifiedTextView linkifiedTextView = getBinding().e; boolean z4 = loaded.getStagePrivacyLevel() == stageInstancePrivacyLevel; if (z3) { - charSequence = getString(2131893426); + charSequence = getString(2131893467); } else if (!canInvite) { - charSequence = getString(2131893427); + charSequence = getString(2131893468); } else if (!canEveryoneJoin) { - charSequence = getString(2131893424); + charSequence = getString(2131893465); } else if (z4) { - String string2 = getString(2131893425); + String string2 = getString(2131893466); m.checkNotNullExpressionValue(string2, "getString(R.string.start…event_public_explanation)"); charSequence = b.k(string2, new Object[]{f.a.a(1500010879761L, null)}, null, 2); } else { @@ -180,13 +180,13 @@ public final class WidgetStageSettings extends AppFragment { } else if (!z3) { checkedSetting2.e(new WidgetStageSettings$configureUI$$inlined$apply$lambda$2(this, viewState, z3)); } - LinkifiedTextView linkifiedTextView2 = getBinding().f1955c; + LinkifiedTextView linkifiedTextView2 = getBinding().f1957c; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.stageStartHelpText"); linkifiedTextView2.setVisibility(z2 ? 0 : 8); if (z2) { - LinkifiedTextView linkifiedTextView3 = getBinding().f1955c; + LinkifiedTextView linkifiedTextView3 = getBinding().f1957c; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.stageStartHelpText"); - linkifiedTextView3.setText(b.d(this, loaded.getHasOtherStageChannels() ? 2131893445 : 2131893447, new Object[]{loaded.getChannel().l()}, new WidgetStageSettings$configureUI$5(this, viewState))); + linkifiedTextView3.setText(b.d(this, loaded.getHasOtherStageChannels() ? 2131893486 : 2131893488, new Object[]{loaded.getChannel().l()}, new WidgetStageSettings$configureUI$5(this, viewState))); } } } diff --git a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java index 61c69f5d3b..fb2f3c22c0 100644 --- a/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java +++ b/app/src/main/java/com/discord/widgets/stage/settings/WidgetStageSettingsViewModel.java @@ -730,7 +730,7 @@ public final class WidgetStageSettingsViewModel extends AppViewModel ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(stageChannelAPI2.updateStageInstance(o02.longValue(), obj, loaded.getStagePrivacyLevel()), false, 1, null), this, null, 2, null), WidgetStageSettingsViewModel.class, context, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetStageSettingsViewModel$openStage$2(this), 60, (Object) null); return; } - this.eventSubject.j.onNext(new Event.InvalidTopic(2131893422)); + this.eventSubject.j.onNext(new Event.InvalidTopic(2131893463)); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java index 8cf997ea9d..6649e92cae 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/StageAudienceBlockedBottomSheetAdapter.java @@ -54,8 +54,8 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap int i = 2131362846; MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131362846); if (materialTextView != null) { - i = 2131365281; - MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131365281); + i = 2131365286; + MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131365286); if (materialTextView2 != null) { StageAudienceBlockedBottomSheetHeaderItemBinding stageAudienceBlockedBottomSheetHeaderItemBinding = new StageAudienceBlockedBottomSheetHeaderItemBinding((ConstraintLayout) view, materialTextView, materialTextView2); m.checkNotNullExpressionValue(stageAudienceBlockedBottomSheetHeaderItemBinding, "StageAudienceBlockedBott…temBinding.bind(itemView)"); @@ -70,13 +70,13 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap m.checkNotNullParameter(mGRecyclerDataPayload, "data"); super.onConfigure(i, (int) mGRecyclerDataPayload); if (mGRecyclerDataPayload instanceof ListItem.Header) { - MaterialTextView materialTextView = this.binding.f1625c; + MaterialTextView materialTextView = this.binding.f1627c; m.checkNotNullExpressionValue(materialTextView, "binding.title"); ListItem.Header header = (ListItem.Header) mGRecyclerDataPayload; - materialTextView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893284, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755321, header.getNumBlockedUsers(), new Object[0])}, null, 4)); + materialTextView.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893326, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755322, header.getNumBlockedUsers(), new Object[0])}, null, 4)); MaterialTextView materialTextView2 = this.binding.b; m.checkNotNullExpressionValue(materialTextView2, "binding.description"); - materialTextView2.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893280, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755319, header.getNumBlockedUsers(), Integer.valueOf(header.getNumBlockedUsers()))}, null, 4)); + materialTextView2.setText(b.g(a.T(this.itemView, "itemView", "itemView.context"), 2131893322, new Object[]{StringResourceUtilsKt.getI18nPluralString(a.T(this.itemView, "itemView", "itemView.context"), 2131755320, header.getNumBlockedUsers(), Integer.valueOf(header.getNumBlockedUsers()))}, null, 4)); } } } @@ -247,26 +247,26 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap m.checkNotNullParameter(stageAudienceBlockedBottomSheetAdapter, "adapter"); View view = this.itemView; ConstraintLayout constraintLayout = (ConstraintLayout) view; - int i = 2131364977; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364977); + int i = 2131364980; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364980); if (simpleDraweeView != null) { - i = 2131364978; - CutoutView cutoutView = (CutoutView) view.findViewById(2131364978); + i = 2131364981; + CutoutView cutoutView = (CutoutView) view.findViewById(2131364981); if (cutoutView != null) { - i = 2131364979; - TextView textView = (TextView) view.findViewById(2131364979); + i = 2131364982; + TextView textView = (TextView) view.findViewById(2131364982); if (textView != null) { - i = 2131364980; - ImageView imageView = (ImageView) view.findViewById(2131364980); + i = 2131364983; + ImageView imageView = (ImageView) view.findViewById(2131364983); if (imageView != null) { - i = 2131364981; - TextView textView2 = (TextView) view.findViewById(2131364981); + i = 2131364984; + TextView textView2 = (TextView) view.findViewById(2131364984); if (textView2 != null) { - i = 2131364982; - View findViewById = view.findViewById(2131364982); + i = 2131364985; + View findViewById = view.findViewById(2131364985); if (findViewById != null) { - i = 2131364983; - TextView textView3 = (TextView) view.findViewById(2131364983); + i = 2131364986; + TextView textView3 = (TextView) view.findViewById(2131364986); if (textView3 != null) { StageAudienceBlockedBottomSheetItemBinding stageAudienceBlockedBottomSheetItemBinding = new StageAudienceBlockedBottomSheetItemBinding((ConstraintLayout) view, constraintLayout, simpleDraweeView, cutoutView, textView, imageView, textView2, findViewById, textView3); m.checkNotNullExpressionValue(stageAudienceBlockedBottomSheetItemBinding, "StageAudienceBlockedBott…temBinding.bind(itemView)"); @@ -287,10 +287,10 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap super.onConfigure(i, (int) mGRecyclerDataPayload); if (mGRecyclerDataPayload instanceof ListItem.Participant) { ListItem.Participant participant = (ListItem.Participant) mGRecyclerDataPayload; - this.binding.f1626c.setCutoutEnabled(participant.isSpeaker()); + this.binding.f1628c.setCutoutEnabled(participant.isSpeaker()); ImageView imageView = this.binding.e; imageView.setBackgroundResource(2131231254); - imageView.setImageResource(2131231736); + imageView.setImageResource(2131231739); imageView.setVisibility(participant.isSpeaker() ? 0 : 4); imageView.setActivated(participant.isSpeaker()); View view = this.itemView; @@ -298,7 +298,7 @@ public final class StageAudienceBlockedBottomSheetAdapter extends MGRecyclerAdap Resources resources = view.getResources(); TextView textView = this.binding.f; m.checkNotNullExpressionValue(textView, "binding.stageChannelBlockedTextSpeaker"); - textView.setText(participant.isSpeaker() ? resources.getString(2131893406) : resources.getString(2131893278)); + textView.setText(participant.isSpeaker() ? resources.getString(2131893448) : resources.getString(2131893320)); TextView textView2 = this.binding.d; User user = participant.getParticipant().getUser(); String nickname = participant.getParticipant().getNickname(); diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java index 862d002988..dacbd110da 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetEndStageBottomSheet.java @@ -93,7 +93,7 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131558998; + return 2131558999; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -101,6 +101,6 @@ public final class WidgetEndStageBottomSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); getBinding().b.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$1(this)); - getBinding().f1771c.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$2(this)); + getBinding().f1773c.setOnClickListener(new WidgetEndStageBottomSheet$onViewCreated$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java index b4f0cba3b5..29e55d66f1 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceBlockedBottomSheet.java @@ -112,7 +112,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559219; + return 2131559220; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -128,7 +128,7 @@ public final class WidgetStageAudienceBlockedBottomSheet extends AppBottomSheet WidgetStageAudienceBlockedBottomSheetBinding binding = getBinding(); m.checkNotNullExpressionValue(binding, "binding"); setPeekHeightBottomView(binding.a); - MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1947c; + MaxHeightRecyclerView maxHeightRecyclerView = getBinding().f1949c; m.checkNotNullExpressionValue(maxHeightRecyclerView, "binding.blockedUsers"); this.adapter = new StageAudienceBlockedBottomSheetAdapter(maxHeightRecyclerView); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java index 8a70df4326..b0ca64e388 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet$binding$2.java @@ -50,11 +50,11 @@ public final /* synthetic */ class WidgetStageAudienceNoticeBottomSheet$binding$ i = 2131362183; MaterialButton materialButton = (MaterialButton) view.findViewById(2131362183); if (materialButton != null) { - i = 2131364949; - ImageView imageView5 = (ImageView) view.findViewById(2131364949); + i = 2131364952; + ImageView imageView5 = (ImageView) view.findViewById(2131364952); if (imageView5 != null) { - i = 2131365281; - TextView textView5 = (TextView) view.findViewById(2131365281); + i = 2131365286; + TextView textView5 = (TextView) view.findViewById(2131365286); if (textView5 != null) { return new WidgetStageAudienceNoticeBottomSheetBinding((CoordinatorLayout) view, barrier, imageView, textView, imageView2, textView2, imageView3, textView3, imageView4, textView4, materialButton, imageView5, textView5); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java index 0a7df723cc..dd221071cd 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageAudienceNoticeBottomSheet.java @@ -71,7 +71,7 @@ public final class WidgetStageAudienceNoticeBottomSheet extends AppBottomSheet { ImageView imageView = getBinding().b; m.checkNotNullExpressionValue(imageView, "binding.bullet4Icon"); imageView.setVisibility(z2 ? 0 : 8); - TextView textView = getBinding().f1948c; + TextView textView = getBinding().f1950c; m.checkNotNullExpressionValue(textView, "binding.bullet4Label"); if (!z2) { i = 8; @@ -89,7 +89,7 @@ public final class WidgetStageAudienceNoticeBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559220; + return 2131559221; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java index 2d34de5037..0a939fa9cc 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$binding$2.java @@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetStageModeratorJoinBottomSheet$binding$2 public final WidgetStageModeratorJoinBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363716; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363716); + int i = 2131363719; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363719); if (materialButton != null) { - i = 2131363718; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363718); + i = 2131363721; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363721); if (materialButton2 != null) { - i = 2131364949; - AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364949); + i = 2131364952; + AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364952); if (appCompatImageView != null) { - i = 2131365129; - TextView textView = (TextView) view.findViewById(2131365129); + i = 2131365133; + TextView textView = (TextView) view.findViewById(2131365133); if (textView != null) { - i = 2131365281; - TextView textView2 = (TextView) view.findViewById(2131365281); + i = 2131365286; + TextView textView2 = (TextView) view.findViewById(2131365286); if (textView2 != null) { return new WidgetStageModeratorJoinBottomSheetBinding((CoordinatorLayout) view, materialButton, materialButton2, appCompatImageView, textView, textView2); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java index 4df0171930..a029265e2c 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet$onViewCreated$1.java @@ -22,7 +22,7 @@ public final class WidgetStageModeratorJoinBottomSheet$onViewCreated$1 implement @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - c.a.d.o.g(this.this$0.this$0.getContext(), 2131893312, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java index 4bef4245cf..de27471fd5 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageModeratorJoinBottomSheet.java @@ -76,14 +76,14 @@ public final class WidgetStageModeratorJoinBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559228; + return 2131559229; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment public void onViewCreated(View view, Bundle bundle) { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); - getBinding().f1952c.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$1(this)); + getBinding().f1954c.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$1(this)); getBinding().b.setOnClickListener(new WidgetStageModeratorJoinBottomSheet$onViewCreated$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java index 52e94679ae..500c7c0cf5 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet$binding$2.java @@ -21,23 +21,23 @@ public final /* synthetic */ class WidgetStagePublicNoticeBottomSheet$binding$2 public final WidgetStagePublicNoticeBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364373; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364373); + int i = 2131364376; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364376); if (materialButton != null) { - i = 2131364374; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364374); + i = 2131364377; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364377); if (materialButton2 != null) { - i = 2131364375; - AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364375); + i = 2131364378; + AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364378); if (appCompatImageView != null) { - i = 2131364376; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364376); + i = 2131364379; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131364379); if (linearLayout != null) { - i = 2131364377; - ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364377); + i = 2131364380; + ScreenTitleView screenTitleView = (ScreenTitleView) view.findViewById(2131364380); if (screenTitleView != null) { - i = 2131364558; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364558); + i = 2131364561; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131364561); if (linkifiedTextView != null) { return new WidgetStagePublicNoticeBottomSheetBinding((CoordinatorLayout) view, materialButton, materialButton2, appCompatImageView, linearLayout, screenTitleView, linkifiedTextView); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java index 6af1faa790..c608aad461 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStagePublicNoticeBottomSheet.java @@ -64,7 +64,7 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559229; + return 2131559230; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -74,10 +74,10 @@ public final class WidgetStagePublicNoticeBottomSheet extends AppBottomSheet { WidgetStagePublicNoticeBottomSheetBinding binding = getBinding(); m.checkNotNullExpressionValue(binding, "binding"); setPeekHeightBottomView(binding.a); - getBinding().f1953c.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$1(this)); + getBinding().f1955c.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$1(this)); getBinding().b.setOnClickListener(new WidgetStagePublicNoticeBottomSheet$onViewCreated$2(this)); LinkifiedTextView linkifiedTextView = getBinding().d; m.checkNotNullExpressionValue(linkifiedTextView, "binding.sectionThree"); - b.n(linkifiedTextView, 2131893455, new Object[]{f.a.a(1500010879761L, null)}, null, 4); + b.n(linkifiedTextView, 2131893496, new Object[]{f.a.a(1500010879761L, null)}, null, 4); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java index 7621167dba..e2a194285a 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$binding$2.java @@ -21,45 +21,45 @@ public final /* synthetic */ class WidgetStageRaisedHandsBottomSheet$binding$2 e public final WidgetStageRaisedHandsBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363503; - View findViewById = view.findViewById(2131363503); + int i = 2131363505; + View findViewById = view.findViewById(2131363505); if (findViewById != null) { - i = 2131364387; - MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364387); + i = 2131364390; + MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364390); if (materialTextView != null) { - i = 2131364388; - Group group = (Group) view.findViewById(2131364388); + i = 2131364391; + Group group = (Group) view.findViewById(2131364391); if (group != null) { - i = 2131364389; - ImageView imageView = (ImageView) view.findViewById(2131364389); + i = 2131364392; + ImageView imageView = (ImageView) view.findViewById(2131364392); if (imageView != null) { - i = 2131364390; - MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131364390); + i = 2131364393; + MaterialTextView materialTextView2 = (MaterialTextView) view.findViewById(2131364393); if (materialTextView2 != null) { - i = 2131364391; - MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131364391); + i = 2131364394; + MaterialTextView materialTextView3 = (MaterialTextView) view.findViewById(2131364394); if (materialTextView3 != null) { - i = 2131365012; - SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365012); + i = 2131365016; + SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365016); if (switchMaterial != null) { CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view; - i = 2131365019; - MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365019); + i = 2131365023; + MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365023); if (maxHeightRecyclerView != null) { - i = 2131365129; - MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(2131365129); + i = 2131365133; + MaterialTextView materialTextView4 = (MaterialTextView) view.findViewById(2131365133); if (materialTextView4 != null) { - i = 2131365281; - MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(2131365281); + i = 2131365286; + MaterialTextView materialTextView5 = (MaterialTextView) view.findViewById(2131365286); if (materialTextView5 != null) { - i = 2131365286; - MaterialTextView materialTextView6 = (MaterialTextView) view.findViewById(2131365286); + i = 2131365291; + MaterialTextView materialTextView6 = (MaterialTextView) view.findViewById(2131365291); if (materialTextView6 != null) { - i = 2131365287; - Group group2 = (Group) view.findViewById(2131365287); + i = 2131365292; + Group group2 = (Group) view.findViewById(2131365292); if (group2 != null) { - i = 2131365288; - ImageView imageView2 = (ImageView) view.findViewById(2131365288); + i = 2131365293; + ImageView imageView2 = (ImageView) view.findViewById(2131365293); if (imageView2 != null) { return new WidgetStageRaisedHandsBottomSheetBinding(coordinatorLayout, findViewById, materialTextView, group, imageView, materialTextView2, materialTextView3, switchMaterial, coordinatorLayout, maxHeightRecyclerView, materialTextView4, materialTextView5, materialTextView6, group2, imageView2); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java index 0ac175de90..18e9c08f70 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState$1.java @@ -24,7 +24,7 @@ public final class WidgetStageRaisedHandsBottomSheet$configureToggleSpeakerState @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - c.a.d.o.g(this.this$0.this$0.getContext(), 2131893312, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java index 4462ad8061..39e6dc5699 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheet.java @@ -104,9 +104,9 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet { m.checkNotNullExpressionValue(materialTextView, "binding.toggleSpeakerStateButton"); boolean isSpeaker = loaded.isSpeaker(); if (isSpeaker) { - str = getString(2131891219); + str = getString(2131891252); } else if (!isSpeaker) { - str = getString(2131891208); + str = getString(2131891241); } else { throw new NoWhenBranchMatchedException(); } @@ -114,9 +114,9 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet { ImageView imageView = getBinding().h; boolean isSpeaker2 = loaded.isSpeaker(); if (isSpeaker2) { - i = 2131231947; + i = 2131231950; } else if (!isSpeaker2) { - i = 2131231948; + i = 2131231951; } else { throw new NoWhenBranchMatchedException(); } @@ -126,7 +126,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet { private final void configureUI(WidgetStageRaisedHandsBottomSheetViewModel.ViewState viewState) { if (viewState instanceof WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded) { WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded loaded = (WidgetStageRaisedHandsBottomSheetViewModel.ViewState.Loaded) viewState; - getBinding().f.setText(loaded.isRequestToSpeakEnabled() ? 2131892578 : 2131892579); + getBinding().f.setText(loaded.isRequestToSpeakEnabled() ? 2131892620 : 2131892621); SwitchMaterial switchMaterial = getBinding().d; switchMaterial.setEnabled(!loaded.isUpdatingRequestToSpeakPermissions()); if (!loaded.isUpdatingRequestToSpeakPermissions()) { @@ -136,12 +136,12 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet { this.hasReceivedInitialRaisedHandsState = true; switchMaterial.jumpDrawablesToCurrentState(); } - Group group = getBinding().f1954c; + Group group = getBinding().f1956c; m.checkNotNullExpressionValue(group, "binding.raisedHandsEmptyGroup"); group.setVisibility(loaded.isEmpty() ? 0 : 8); MaterialTextView materialTextView = getBinding().b; m.checkNotNullExpressionValue(materialTextView, "binding.raisedHandsCountLabel"); - b.n(materialTextView, 2131892587, new Object[]{Integer.valueOf(loaded.getRaisedHandsParticipants().size())}, null, 4); + b.n(materialTextView, 2131892629, new Object[]{Integer.valueOf(loaded.getRaisedHandsParticipants().size())}, null, 4); configureToggleSpeakerState(loaded); getAdapter().setData(loaded.getRaisedHandsParticipants()); } @@ -173,7 +173,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559230; + return 2131559231; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -190,7 +190,7 @@ public final class WidgetStageRaisedHandsBottomSheet extends AppBottomSheet { this.hasReceivedInitialRaisedHandsState = false; MaxHeightRecyclerView maxHeightRecyclerView = getBinding().e; DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(getContext(), 1); - Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131232345); + Drawable drawable = ContextCompat.getDrawable(view.getContext(), 2131232348); if (drawable != null) { dividerItemDecoration.setDrawable(drawable); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java index 46bcf5eed0..e1b961acb3 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageRaisedHandsBottomSheetAdapter.java @@ -165,20 +165,20 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd super(2131558664, widgetStageRaisedHandsBottomSheetAdapter); m.checkNotNullParameter(widgetStageRaisedHandsBottomSheetAdapter, "adapter"); View view = this.itemView; - int i = 2131365014; - ImageView imageView = (ImageView) view.findViewById(2131365014); + int i = 2131365018; + ImageView imageView = (ImageView) view.findViewById(2131365018); if (imageView != null) { - i = 2131365015; - ImageView imageView2 = (ImageView) view.findViewById(2131365015); + i = 2131365019; + ImageView imageView2 = (ImageView) view.findViewById(2131365019); if (imageView2 != null) { - i = 2131365016; - TextView textView = (TextView) view.findViewById(2131365016); + i = 2131365020; + TextView textView = (TextView) view.findViewById(2131365020); if (textView != null) { - i = 2131365017; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365017); + i = 2131365021; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365021); if (simpleDraweeView != null) { - i = 2131365018; - TextView textView2 = (TextView) view.findViewById(2131365018); + i = 2131365022; + TextView textView2 = (TextView) view.findViewById(2131365022); if (textView2 != null) { StageRaisedHandsItemUserBinding stageRaisedHandsItemUserBinding = new StageRaisedHandsItemUserBinding((ConstraintLayout) view, imageView, imageView2, textView, simpleDraweeView, textView2); m.checkNotNullExpressionValue(stageRaisedHandsItemUserBinding, "StageRaisedHandsItemUserBinding.bind(itemView)"); @@ -203,7 +203,7 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd StoreVoiceParticipants.VoiceUser component1 = participant.component1(); GuildRole component3 = participant.component3(); this.binding.e.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$1(this, component1)); - ImageView imageView = this.binding.f1627c; + ImageView imageView = this.binding.f1629c; ViewExtensions.setEnabledAndAlpha$default(imageView, !component1.isInvitedToSpeak(), 0.0f, 2, null); imageView.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$$inlined$apply$lambda$1(this, component1)); this.binding.b.setOnClickListener(new WidgetStageRaisedHandsBottomSheetAdapter$ViewHolderParticipant$onConfigure$3(this, component1)); @@ -217,7 +217,7 @@ public final class WidgetStageRaisedHandsBottomSheetAdapter extends MGRecyclerAd if (component3 != null) { textView2.setText(component3.f()); } else { - textView2.setText(2131887311); + textView2.setText(2131887313); } } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java index e965ff2ee9..ae245176e8 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet$binding$2.java @@ -21,29 +21,29 @@ public final /* synthetic */ class WidgetStageStartEventBottomSheet$binding$2 ex public final WidgetStageStartEventBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364949; - AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364949); + int i = 2131364952; + AppCompatImageView appCompatImageView = (AppCompatImageView) view.findViewById(2131364952); if (appCompatImageView != null) { - i = 2131364951; - TextView textView = (TextView) view.findViewById(2131364951); + i = 2131364954; + TextView textView = (TextView) view.findViewById(2131364954); if (textView != null) { - i = 2131365036; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365036); + i = 2131365040; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365040); if (materialButton != null) { - i = 2131365129; - TextView textView2 = (TextView) view.findViewById(2131365129); + i = 2131365133; + TextView textView2 = (TextView) view.findViewById(2131365133); if (textView2 != null) { - i = 2131365281; - TextView textView3 = (TextView) view.findViewById(2131365281); + i = 2131365286; + TextView textView3 = (TextView) view.findViewById(2131365286); if (textView3 != null) { - i = 2131365297; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365297); + i = 2131365302; + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365302); if (textInputEditText != null) { - i = 2131365298; - TextView textView4 = (TextView) view.findViewById(2131365298); + i = 2131365303; + TextView textView4 = (TextView) view.findViewById(2131365303); if (textView4 != null) { - i = 2131365299; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365299); + i = 2131365304; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365304); if (textInputLayout != null) { return new WidgetStageStartEventBottomSheetBinding((CoordinatorLayout) view, appCompatImageView, textView, materialButton, textView2, textView3, textInputEditText, textView4, textInputLayout); } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java index afaf0f6293..7b392fbd87 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheet.java @@ -90,7 +90,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet { private final void configureUI(WidgetStageStartEventBottomSheetViewModel.ViewState viewState) { if (viewState instanceof WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded) { - MaterialButton materialButton = getBinding().f1956c; + MaterialButton materialButton = getBinding().f1958c; m.checkNotNullExpressionValue(materialButton, "binding.startStageButton"); WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded loaded = (WidgetStageStartEventBottomSheetViewModel.ViewState.Loaded) viewState; boolean z2 = true; @@ -104,13 +104,13 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet { } TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.title"); - textView.setText(getString(loaded.getStageInstance() == null ? 2131893419 : 2131888200)); + textView.setText(getString(loaded.getStageInstance() == null ? 2131893460 : 2131888210)); TextView textView2 = getBinding().d; m.checkNotNullExpressionValue(textView2, "binding.subtitle"); - textView2.setText(getString(loaded.getStageInstance() == null ? 2131893418 : 2131888199)); - MaterialButton materialButton2 = getBinding().f1956c; + textView2.setText(getString(loaded.getStageInstance() == null ? 2131893459 : 2131888209)); + MaterialButton materialButton2 = getBinding().f1958c; m.checkNotNullExpressionValue(materialButton2, "binding.startStageButton"); - materialButton2.setText(getString(loaded.getStageInstance() == null ? 2131893416 : 2131892926)); + materialButton2.setText(getString(loaded.getStageInstance() == null ? 2131893457 : 2131892968)); TextView textView3 = getBinding().b; m.checkNotNullExpressionValue(textView3, "binding.speakerHint"); if (loaded.getStageInstance() != null) { @@ -150,7 +150,7 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559232; + return 2131559233; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -167,6 +167,6 @@ public final class WidgetStageStartEventBottomSheet extends AppBottomSheet { TextInputEditText textInputEditText = getBinding().f; m.checkNotNullExpressionValue(textInputEditText, "binding.topicInput"); TextWatcherKt.addBindedTextWatcher(textInputEditText, this, new WidgetStageStartEventBottomSheet$onViewCreated$1(this)); - getBinding().f1956c.setOnClickListener(new WidgetStageStartEventBottomSheet$onViewCreated$2(this)); + getBinding().f1958c.setOnClickListener(new WidgetStageStartEventBottomSheet$onViewCreated$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java index a9064ab89a..b1f625b281 100644 --- a/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/stage/sheet/WidgetStageStartEventBottomSheetViewModel.java @@ -461,7 +461,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode private final void emitSetStatusFailureEvent() { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.SetTopicFailure(2131888048)); + publishSubject.j.onNext(new Event.SetTopicFailure(2131888049)); } private final void emitSetStatusSuccessEvent(Channel channel) { @@ -507,7 +507,7 @@ public final class WidgetStageStartEventBottomSheetViewModel extends AppViewMode String obj = w.trim(topic).toString(); String str = obj.length() > 0 ? obj : null; if (str == null) { - this.eventSubject.j.onNext(new Event.InvalidTopic(2131893422)); + this.eventSubject.j.onNext(new Event.InvalidTopic(2131893463)); } else if (loaded.getStageInstance() == null) { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.INSTANCE.startStageInstance(this.channelId, str, StageInstancePrivacyLevel.GUILD_ONLY), false, 1, null), this, null, 2, null), WidgetStageStartEventBottomSheetViewModel.class, (Context) null, (Function1) null, new WidgetStageStartEventBottomSheetViewModel$openStage$1(this), (Function0) null, (Function0) null, new WidgetStageStartEventBottomSheetViewModel$openStage$2(this, z2, loaded), 54, (Object) null); } else { diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java index 42a7a9f47e..395a7aa0d9 100644 --- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java +++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionAdapter.java @@ -34,18 +34,18 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public BulletViewHolder(StartStageServerSelectionAdapter startStageServerSelectionAdapter) { - super(2131559235, startStageServerSelectionAdapter); + super(2131559236, startStageServerSelectionAdapter); m.checkNotNullParameter(startStageServerSelectionAdapter, "adapter"); View view = this.itemView; ConstraintLayout constraintLayout = (ConstraintLayout) view; - int i = 2131365041; - ImageView imageView = (ImageView) view.findViewById(2131365041); + int i = 2131365045; + ImageView imageView = (ImageView) view.findViewById(2131365045); if (imageView != null) { - i = 2131365042; - ImageView imageView2 = (ImageView) view.findViewById(2131365042); + i = 2131365046; + ImageView imageView2 = (ImageView) view.findViewById(2131365046); if (imageView2 != null) { - i = 2131365043; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365043); + i = 2131365047; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365047); if (linkifiedTextView != null) { WidgetStartStageServerSelectionBulletItemBinding widgetStartStageServerSelectionBulletItemBinding = new WidgetStartStageServerSelectionBulletItemBinding((ConstraintLayout) view, constraintLayout, imageView, imageView2, linkifiedTextView); m.checkNotNullExpressionValue(widgetStartStageServerSelectionBulletItemBinding, "WidgetStartStageServerSe…temBinding.bind(itemView)"); @@ -70,7 +70,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim @Override // com.discord.widgets.stage.start.StartStageServerSelectionAdapter.ListItemViewHolder public View getDivider() { - ImageView imageView = this.binding.f1959c; + ImageView imageView = this.binding.f1961c; m.checkNotNullExpressionValue(imageView, "binding.startStageServerSelectionBulletItemDivider"); return imageView; } @@ -91,7 +91,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim this.binding.d.setImageResource(bulletItem.getImageRes()); LinkifiedTextView linkifiedTextView = this.binding.e; m.checkNotNullExpressionValue(linkifiedTextView, "binding.startStageServerSelectionBulletItemText"); - if (bulletItem.getStringRes() != 2131893436) { + if (bulletItem.getStringRes() != 2131893477) { m.checkNotNullExpressionValue(context, "context"); charSequence = b.g(context, bulletItem.getStringRes(), new Object[0], null, 4); } else { @@ -109,21 +109,21 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public GuildViewHolder(StartStageServerSelectionAdapter startStageServerSelectionAdapter) { - super(2131559236, startStageServerSelectionAdapter); + super(2131559237, startStageServerSelectionAdapter); m.checkNotNullParameter(startStageServerSelectionAdapter, "adapter"); View view = this.itemView; - int i = 2131365046; - ImageView imageView = (ImageView) view.findViewById(2131365046); + int i = 2131365050; + ImageView imageView = (ImageView) view.findViewById(2131365050); if (imageView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131365048; - ImageView imageView2 = (ImageView) view.findViewById(2131365048); + i = 2131365052; + ImageView imageView2 = (ImageView) view.findViewById(2131365052); if (imageView2 != null) { - i = 2131365049; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365049); + i = 2131365053; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365053); if (simpleDraweeView != null) { - i = 2131365050; - TextView textView = (TextView) view.findViewById(2131365050); + i = 2131365054; + TextView textView = (TextView) view.findViewById(2131365054); if (textView != null) { WidgetStartStageServerSelectionGuildItemBinding widgetStartStageServerSelectionGuildItemBinding = new WidgetStartStageServerSelectionGuildItemBinding(constraintLayout, imageView, constraintLayout, imageView2, simpleDraweeView, textView); m.checkNotNullExpressionValue(widgetStartStageServerSelectionGuildItemBinding, "WidgetStartStageServerSe…temBinding.bind(itemView)"); @@ -153,7 +153,7 @@ public final class StartStageServerSelectionAdapter extends MGRecyclerAdapterSim @Override // com.discord.widgets.stage.start.StartStageServerSelectionAdapter.ListItemViewHolder public View getDivider() { - ImageView imageView = this.binding.f1960c; + ImageView imageView = this.binding.f1962c; m.checkNotNullExpressionValue(imageView, "binding.startStageServerSelectionGuildItemDivider"); return imageView; } diff --git a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java index cc6abafdd8..750e1e0f58 100644 --- a/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java +++ b/app/src/main/java/com/discord/widgets/stage/start/StartStageServerSelectionViewModel.java @@ -196,7 +196,7 @@ public final class StartStageServerSelectionViewModel extends AppViewModel function0) { m.checkNotNullParameter(function0, "onMoveToAudience"); - this.binding.f1637c.setOnClickListener(new UserProfileStageActionsView$setOnMoveToAudience$1(function0)); + this.binding.f1639c.setOnClickListener(new UserProfileStageActionsView$setOnMoveToAudience$1(function0)); } public final void updateView(ViewState viewState) { @@ -251,9 +251,9 @@ public final class UserProfileStageActionsView extends LinearLayout { TextView textView = this.binding.b; textView.setVisibility(viewState.getUserRequestToSpeakState().getCanBeInvitedToSpeak() ? 0 : 8); textView.setEnabled(!viewState.isInvitingToSpeak()); - textView.setText(viewState.isMe() ? 2131891208 : 2131893317); - DrawableCompat.setCompoundDrawablesCompat$default(textView, viewState.isMe() ? 2131231948 : 2131231945, 0, 0, 0, 14, (Object) null); - TextView textView2 = this.binding.f1637c; + textView.setText(viewState.isMe() ? 2131891241 : 2131893359); + DrawableCompat.setCompoundDrawablesCompat$default(textView, viewState.isMe() ? 2131231951 : 2131231948, 0, 0, 0, 14, (Object) null); + TextView textView2 = this.binding.f1639c; StageRoles r4 = viewState.m53getUserStageRoletwRsX0(); if (r4 != null && StageRoles.m26isSpeakerimpl(r4.m28unboximpl())) { i = 0; diff --git a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java index 19ef5298a0..efaa470c91 100644 --- a/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java +++ b/app/src/main/java/com/discord/widgets/status/WidgetChatStatus.java @@ -194,7 +194,7 @@ public final class WidgetChatStatus extends AppFragment { } public WidgetChatStatus() { - super(2131558969); + super(2131558970); } public static final /* synthetic */ void access$configureUI(WidgetChatStatus widgetChatStatus, Model model) { @@ -210,7 +210,7 @@ public final class WidgetChatStatus extends AppFragment { TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.chatStatusUnreadMessagesText"); textView.setText(getUnreadMessageText(model.isUnreadEstimate(), model.getUnreadCount(), model.getUnreadMessageId())); - getBinding().f1750c.setOnClickListener(new WidgetChatStatus$configureUI$2(model)); + getBinding().f1752c.setOnClickListener(new WidgetChatStatus$configureUI$2(model)); } private final WidgetChatStatusBinding getBinding() { @@ -222,14 +222,14 @@ public final class WidgetChatStatus extends AppFragment { if (z2) { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - return c.a.l.b.h(resources, 2131891311, new Object[]{String.valueOf(i), renderUtcDate$default}, null, 4); + return c.a.l.b.h(resources, 2131891344, new Object[]{String.valueOf(i), renderUtcDate$default}, null, 4); } Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755221, i, Integer.valueOf(i)); + CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755222, i, Integer.valueOf(i)); Resources resources3 = getResources(); m.checkNotNullExpressionValue(resources3, "resources"); - return c.a.l.b.h(resources3, 2131891309, new Object[]{quantityString, renderUtcDate$default}, null, 4); + return c.a.l.b.h(resources3, 2131891342, new Object[]{quantityString, renderUtcDate$default}, null, 4); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java index 141a56e954..49526f178d 100644 --- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java +++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$binding$2.java @@ -23,23 +23,23 @@ public final /* synthetic */ class WidgetGlobalStatusIndicator$binding$2 extends TextView textView = (TextView) view.findViewById(2131361943); if (textView != null) { LinearLayout linearLayout = (LinearLayout) view; - i = 2131363568; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363568); + i = 2131363570; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363570); if (materialButton != null) { - i = 2131363569; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363569); + i = 2131363571; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363571); if (linearLayout2 != null) { - i = 2131363570; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363570); + i = 2131363572; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131363572); if (linearLayout3 != null) { - i = 2131363571; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363571); + i = 2131363573; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363573); if (materialButton2 != null) { - i = 2131363572; - ImageView imageView = (ImageView) view.findViewById(2131363572); + i = 2131363574; + ImageView imageView = (ImageView) view.findViewById(2131363574); if (imageView != null) { - i = 2131363573; - TextView textView2 = (TextView) view.findViewById(2131363573); + i = 2131363575; + TextView textView2 = (TextView) view.findViewById(2131363575); if (textView2 != null) { return new WidgetGlobalStatusIndicatorBinding(linearLayout, textView, linearLayout, materialButton, linearLayout2, linearLayout3, materialButton2, imageView, textView2); } diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java index 0c0ca06e7b..c8b73b35e8 100644 --- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java +++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator$setupStageContainerClicks$2.java @@ -22,7 +22,7 @@ public final class WidgetGlobalStatusIndicator$setupStageContainerClicks$2 imple @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - c.a.d.o.g(this.this$0.this$0.getContext(), 2131893312, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java index 0e46311252..6a19b5bc06 100644 --- a/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java +++ b/app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java @@ -56,7 +56,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { private final Lazy viewModel$delegate; public WidgetGlobalStatusIndicator() { - super(2131559023); + super(2131559024); WidgetGlobalStatusIndicator$viewModel$2 widgetGlobalStatusIndicator$viewModel$2 = WidgetGlobalStatusIndicator$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetGlobalStatusIndicatorViewModel.class), new WidgetGlobalStatusIndicator$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetGlobalStatusIndicator$viewModel$2)); @@ -135,7 +135,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { } WidgetGlobalStatusIndicatorState.State state = this.lastIndicatorState; if (state != null && state.isViewingCall()) { - LinearLayout linearLayout = getBinding().f1787c; + LinearLayout linearLayout = getBinding().f1789c; m.checkNotNullExpressionValue(linearLayout, "binding.indicator"); LinearLayout linearLayout2 = getBinding().e; m.checkNotNullExpressionValue(linearLayout2, "binding.indicatorActions"); @@ -152,7 +152,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { private final void configureUIVisibility(WidgetGlobalStatusIndicatorState.State state) { this.lastIndicatorState = state; - LinearLayout linearLayout = getBinding().f1787c; + LinearLayout linearLayout = getBinding().f1789c; m.checkNotNullExpressionValue(linearLayout, "binding.indicator"); linearLayout.setVisibility(state.isVisible() ? 0 : 8); } @@ -204,11 +204,11 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { private final void setupConnectingState() { resetContentAnimationsAndVisibility(getBinding()); - getBinding().f1787c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907)); + getBinding().f1789c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907)); getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130968932)); TextView textView = getBinding().i; m.checkNotNullExpressionValue(textView, "binding.indicatorText"); - textView.setText(getString(2131887522)); + textView.setText(getString(2131887524)); AnimatedVectorDrawableCompat animatedVectorDrawableCompat = null; if (this.connectingVector == null) { this.connectingVector = AnimatedVectorDrawableCompat.create(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969429, 0, 2, (Object) null)); @@ -225,7 +225,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { } private final void setupContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) { - getBinding().f1787c.setOnClickListener(new WidgetGlobalStatusIndicator$setupContainerClicks$1(this, callOngoing)); + getBinding().f1789c.setOnClickListener(new WidgetGlobalStatusIndicator$setupContainerClicks$1(this, callOngoing)); } private final void setupIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) { @@ -237,7 +237,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { LinearLayout linearLayout = getBinding().e; m.checkNotNullExpressionValue(linearLayout, "binding.indicatorActions"); linearLayout.setVisibility(8); - LinearLayout linearLayout2 = getBinding().f1787c; + LinearLayout linearLayout2 = getBinding().f1789c; VoiceViewUtils voiceViewUtils = VoiceViewUtils.INSTANCE; linearLayout2.setBackgroundColor(voiceViewUtils.getConnectionStatusColor(callOngoing.getConnectionState(), callOngoing.getConnectionQuality(), requireContext())); String A0 = AnimatableValueParser.A0(callOngoing.getSelectedVoiceChannel(), requireContext(), false, 2); @@ -250,7 +250,7 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { TextView textView = getBinding().i; m.checkNotNullExpressionValue(textView, "binding.indicatorText"); textView.setText(str); - getBinding().i.setTextColor(ColorCompat.getColor(getContext(), 2131100427)); + getBinding().i.setTextColor(ColorCompat.getColor(getContext(), 2131100428)); ImageView imageView = getBinding().h; imageView.setVisibility(0); imageView.setImageResource(voiceViewUtils.getCallIndicatorIcon(callOngoing.getHasVideo(), callOngoing.getStreamContext())); @@ -258,16 +258,16 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { private final void setupOfflineState(boolean z2) { resetContentAnimationsAndVisibility(getBinding()); - getBinding().f1787c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907)); + getBinding().f1789c.setBackgroundColor(ColorCompat.getThemedColor(requireContext(), 2130968907)); getBinding().i.setTextColor(ColorCompat.getThemedColor(requireContext(), 2130968932)); - getBinding().i.setText(z2 ? 2131891298 : 2131891297); + getBinding().i.setText(z2 ? 2131891331 : 2131891330); ImageView imageView = getBinding().h; imageView.setVisibility(0); imageView.setImageResource(z2 ? DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969428, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(requireContext(), 2130969430, 0, 2, (Object) null)); } private final void setupStageContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) { - getBinding().f1787c.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$1(this, stageChannelOngoing)); + getBinding().f1789c.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$1(this, stageChannelOngoing)); getBinding().d.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$2(this)); getBinding().g.setOnClickListener(new WidgetGlobalStatusIndicator$setupStageContainerClicks$3(this)); } @@ -275,8 +275,8 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x014c: APUT (r3v4 java.lang.Object[]), (0 ??[int, short, byte, char]), (r11v3 java.lang.CharSequence) */ private final void setupStageIndicatorStatus(WidgetGlobalStatusIndicatorViewModel.ViewState.StageChannelOngoing stageChannelOngoing) { resetContentAnimationsAndVisibility(getBinding()); - int color = stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100427) : ColorCompat.getThemedColor(requireContext(), 2130968932); - getBinding().f1787c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100249) : ColorCompat.getThemedColor(requireContext(), 2130968907)); + int color = stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100428) : ColorCompat.getThemedColor(requireContext(), 2130968932); + getBinding().f1789c.setBackgroundColor(stageChannelOngoing.isSpeakingInOngoingCall() ? ContextCompat.getColor(requireContext(), 2131100249) : ColorCompat.getThemedColor(requireContext(), 2130968907)); getBinding().i.setTextColor(color); getBinding().g.setTextColor(color); LinearLayout linearLayout = getBinding().e; @@ -296,12 +296,12 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { } imageView.setImageDrawable(drawable); if (stageChannelOngoing.isInvitedToSpeak()) { - getBinding().i.setText(2131893402); - getBinding().d.setText(2131893399); + getBinding().i.setText(2131893444); + getBinding().d.setText(2131893441); MaterialButton materialButton = getBinding().d; m.checkNotNullExpressionValue(materialButton, "binding.indicatorAccept"); materialButton.setEnabled(!stageChannelOngoing.isAckingInvitation()); - getBinding().g.setText(2131893401); + getBinding().g.setText(2131893443); MaterialButton materialButton2 = getBinding().g; m.checkNotNullExpressionValue(materialButton2, "binding.indicatorDecline"); materialButton2.setEnabled(!stageChannelOngoing.isAckingInvitation()); @@ -317,8 +317,8 @@ public final class WidgetGlobalStatusIndicator extends AppFragment { if (context != null) { Object[] objArr = new Object[1]; Context context2 = getContext(); - objArr[0] = context2 != null ? StringResourceUtilsKt.getI18nPluralString(context2, 2131755331, stageChannelOngoing.getBlockedUsersOnStage(), Integer.valueOf(stageChannelOngoing.getBlockedUsersOnStage())) : null; - charSequence = b.g(context, 2131893400, objArr, null, 4); + objArr[0] = context2 != null ? StringResourceUtilsKt.getI18nPluralString(context2, 2131755332, stageChannelOngoing.getBlockedUsersOnStage(), Integer.valueOf(stageChannelOngoing.getBlockedUsersOnStage())) : null; + charSequence = b.g(context, 2131893442, objArr, null, 4); } textView2.setText(charSequence); return; diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java index fa079051d5..01a138dbb8 100644 --- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java +++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus$binding$2.java @@ -19,11 +19,11 @@ public final /* synthetic */ class WidgetThreadStatus$binding$2 extends k implem public final WidgetThreadStatusBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); ConstraintLayout constraintLayout = (ConstraintLayout) view; - int i = 2131365273; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365273); + int i = 2131365277; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365277); if (loadingButton != null) { - i = 2131365274; - TextView textView = (TextView) view.findViewById(2131365274); + i = 2131365278; + TextView textView = (TextView) view.findViewById(2131365278); if (textView != null) { return new WidgetThreadStatusBinding((ConstraintLayout) view, constraintLayout, loadingButton, textView); } diff --git a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java index 6972ae5fa0..86fd6a319c 100644 --- a/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java +++ b/app/src/main/java/com/discord/widgets/status/WidgetThreadStatus.java @@ -562,7 +562,7 @@ public final class WidgetThreadStatus extends AppFragment { } public WidgetThreadStatus() { - super(2131559251); + super(2131559252); WidgetThreadStatus$viewModel$2 widgetThreadStatus$viewModel$2 = WidgetThreadStatus$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetThreadStatusViewModel.class), new WidgetThreadStatus$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetThreadStatus$viewModel$2)); @@ -591,13 +591,13 @@ public final class WidgetThreadStatus extends AppFragment { private final void handleEvent(Event event) { if (event instanceof Event.Error) { Integer abortCodeMessageResId = RestAPIAbortMessages.getAbortCodeMessageResId(((Event.Error) event).getCode()); - c.a.d.o.i(this, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891287, 0, 4); + c.a.d.o.i(this, abortCodeMessageResId != null ? abortCodeMessageResId.intValue() : 2131891320, 0, 4); } } @MainThread private final void updateView(WidgetThreadStatusViewModel.ViewState viewState) { - getBinding().f1974c.setIsLoading(viewState.isLoading()); + getBinding().f1976c.setIsLoading(viewState.isLoading()); WidgetThreadStatusViewModel.Status threadStatus = viewState.getThreadStatus(); int i = 8; if (m.areEqual(threadStatus, WidgetThreadStatusViewModel.Status.Hide.INSTANCE)) { @@ -608,7 +608,7 @@ public final class WidgetThreadStatus extends AppFragment { ConstraintLayout constraintLayout2 = getBinding().b; m.checkNotNullExpressionValue(constraintLayout2, "binding.threadStatus"); constraintLayout2.setVisibility(0); - LoadingButton loadingButton = getBinding().f1974c; + LoadingButton loadingButton = getBinding().f1976c; m.checkNotNullExpressionValue(loadingButton, "binding.threadStatusButton"); WidgetThreadStatusViewModel.Status.Archived archived = (WidgetThreadStatusViewModel.Status.Archived) threadStatus; if (archived.getCanArchive()) { @@ -617,27 +617,27 @@ public final class WidgetThreadStatus extends AppFragment { loadingButton.setVisibility(i); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.threadStatusText"); - textView.setText(archived.isLocked() ? getResources().getString(2131893837) : getResources().getString(2131893835)); - getBinding().f1974c.setText(getResources().getString(2131894004)); - LoadingButton loadingButton2 = getBinding().f1974c; + textView.setText(archived.isLocked() ? getResources().getString(2131893876) : getResources().getString(2131893874)); + getBinding().f1976c.setText(getResources().getString(2131894043)); + LoadingButton loadingButton2 = getBinding().f1976c; m.checkNotNullExpressionValue(loadingButton2, "binding.threadStatusButton"); loadingButton2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968892))); - getBinding().f1974c.setOnClickListener(new WidgetThreadStatus$updateView$1(this)); + getBinding().f1976c.setOnClickListener(new WidgetThreadStatus$updateView$1(this)); } else if (m.areEqual(threadStatus, WidgetThreadStatusViewModel.Status.Unjoined.INSTANCE)) { ConstraintLayout constraintLayout3 = getBinding().b; m.checkNotNullExpressionValue(constraintLayout3, "binding.threadStatus"); constraintLayout3.setVisibility(0); - LoadingButton loadingButton3 = getBinding().f1974c; + LoadingButton loadingButton3 = getBinding().f1976c; m.checkNotNullExpressionValue(loadingButton3, "binding.threadStatusButton"); loadingButton3.setVisibility(0); TextView textView2 = getBinding().d; m.checkNotNullExpressionValue(textView2, "binding.threadStatusText"); - textView2.setText(getResources().getString(2131893836)); - getBinding().f1974c.setText(getResources().getString(2131890612)); - LoadingButton loadingButton4 = getBinding().f1974c; + textView2.setText(getResources().getString(2131893875)); + getBinding().f1976c.setText(getResources().getString(2131890642)); + LoadingButton loadingButton4 = getBinding().f1976c; m.checkNotNullExpressionValue(loadingButton4, "binding.threadStatusButton"); loadingButton4.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130969007))); - getBinding().f1974c.setOnClickListener(new WidgetThreadStatus$updateView$2(this)); + getBinding().f1976c.setOnClickListener(new WidgetThreadStatus$updateView$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java b/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java index b98ef4cbb8..902586cb6f 100644 --- a/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java +++ b/app/src/main/java/com/discord/widgets/stickers/StickerPurchaseLocation.java @@ -5,8 +5,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker; public enum StickerPurchaseLocation { EXPRESSION_PICKER("Expression Picker"), STICKER_POPOUT("Sticker Popout"), - STICKER_UPSELL_POPOUT("Sticker Upsell Popout"), - NUDGED_STICKER("Nudged Sticker"); + STICKER_UPSELL_POPOUT("Sticker Upsell Popout"); public static final Companion Companion = new Companion(null); private final String analyticsValue; @@ -19,7 +18,7 @@ public enum StickerPurchaseLocation { static { StickerPurchaseLocation.values(); - int[] iArr = new int[4]; + int[] iArr = new int[3]; $EnumSwitchMapping$0 = iArr; iArr[StickerPurchaseLocation.STICKER_POPOUT.ordinal()] = 1; iArr[StickerPurchaseLocation.STICKER_UPSELL_POPOUT.ordinal()] = 2; diff --git a/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java b/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java index f476462507..c78ba5e1e1 100644 --- a/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/stickers/StickerSheetViewModel.java @@ -73,9 +73,9 @@ public final class StickerSheetViewModel extends AppViewModel { } private final Observable observeStoreState(StoreStickers storeStickers, StoreUser storeUser, Sticker sticker) { - Long g = sticker.g(); - m.checkNotNull(g); - Observable j = Observable.j(storeStickers.observeStickerPack(g.longValue()), StoreUser.observeMe$default(storeUser, false, 1, null), StickerSheetViewModel$Companion$observeStoreState$1.INSTANCE); + Long h = sticker.h(); + m.checkNotNull(h); + Observable j = Observable.j(storeStickers.observeStickerPack(h.longValue()), StoreUser.observeMe$default(storeUser, false, 1, null), StickerSheetViewModel$Companion$observeStoreState$1.INSTANCE); m.checkNotNullExpressionValue(j, "Observable.combineLatest…ser\n )\n }"); return j; } @@ -305,9 +305,9 @@ public final class StickerSheetViewModel extends AppViewModel { private final void fetchStickersData() { StoreStickers storeStickers = this.storeStickers; - Long g = this.sticker.g(); - m.checkNotNull(g); - storeStickers.fetchStickerPack(g.longValue()); + Long h = this.sticker.h(); + m.checkNotNull(h); + storeStickers.fetchStickerPack(h.longValue()); this.storeStickers.fetchEnabledStickerDirectory(); } @@ -322,9 +322,9 @@ public final class StickerSheetViewModel extends AppViewModel { if (!this.hasFiredAnalytics && this.location != null) { StickerPurchaseLocation popoutPurchaseLocation = StickerPurchaseLocation.Companion.getPopoutPurchaseLocation(stickerPack2.canBePurchased()); AnalyticsTracker analyticsTracker = AnalyticsTracker.INSTANCE; - Long g = this.sticker.g(); - m.checkNotNull(g); - analyticsTracker.stickerPopoutOpened(g.longValue(), this.location, new Traits.Location(null, popoutPurchaseLocation.getAnalyticsValue(), null, null, null, 29, null)); + Long h = this.sticker.h(); + m.checkNotNull(h); + analyticsTracker.stickerPopoutOpened(h.longValue(), this.location, new Traits.Location(null, popoutPurchaseLocation.getAnalyticsValue(), null, null, null, 29, null)); this.hasFiredAnalytics = true; } Sticker sticker = this.sticker; diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java index 167b5aa29e..34c7ed3437 100644 --- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog$binding$2.java @@ -17,20 +17,20 @@ public final /* synthetic */ class WidgetStickerPackDetailsDialog$binding$2 exte public final StickerPackDetailsDialogBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365074; - TextView textView = (TextView) view.findViewById(2131365074); + int i = 2131365078; + TextView textView = (TextView) view.findViewById(2131365078); if (textView != null) { - i = 2131365075; - TextView textView2 = (TextView) view.findViewById(2131365075); + i = 2131365079; + TextView textView2 = (TextView) view.findViewById(2131365079); if (textView2 != null) { - i = 2131365076; - TextView textView3 = (TextView) view.findViewById(2131365076); + i = 2131365080; + TextView textView3 = (TextView) view.findViewById(2131365080); if (textView3 != null) { - i = 2131365077; - TextView textView4 = (TextView) view.findViewById(2131365077); + i = 2131365081; + TextView textView4 = (TextView) view.findViewById(2131365081); if (textView4 != null) { - i = 2131365078; - TextView textView5 = (TextView) view.findViewById(2131365078); + i = 2131365082; + TextView textView5 = (TextView) view.findViewById(2131365082); if (textView5 != null) { return new StickerPackDetailsDialogBinding((FrameLayout) view, textView, textView2, textView3, textView4, textView5); } diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java index a28738c63b..9f6ce3634b 100644 --- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java +++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerPackDetailsDialog.java @@ -79,20 +79,20 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog { ModelStickerPack stickerPack = ((StoreStickers.StickerPackState.Loaded) stickerPackState).getStickerPack(); TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.stickerPackDetailsPack"); - textView.setText(b.j(this, 2131893500, new Object[]{stickerPack.getName()}, null, 4)); + textView.setText(b.j(this, 2131893540, new Object[]{stickerPack.getName()}, null, 4)); TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.stickerPackDetailsAnimated"); int i = 8; textView2.setVisibility(stickerPack.isAnimatedPack() ? 0 : 8); TextView textView3 = getBinding().b; m.checkNotNullExpressionValue(textView3, "binding.stickerPackDetailsAnimated"); - textView3.setText("・ " + getString(2131893501)); + textView3.setText("・ " + getString(2131893541)); TextView textView4 = getBinding().f; m.checkNotNullExpressionValue(textView4, "binding.stickerPackDetailsPremium"); textView4.setVisibility(stickerPack.isPremiumPack() ? 0 : 8); TextView textView5 = getBinding().f; m.checkNotNullExpressionValue(textView5, "binding.stickerPackDetailsPremium"); - textView5.setText("・ " + getString(2131893503)); + textView5.setText("・ " + getString(2131893543)); TextView textView6 = getBinding().d; m.checkNotNullExpressionValue(textView6, "binding.stickerPackDetailsLimited"); if (stickerPack.isLimitedPack()) { @@ -106,7 +106,7 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog { StickerUtils stickerUtils = StickerUtils.INSTANCE; Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - sb.append(b.j(this, 2131893502, new Object[]{stickerUtils.getLimitedTimeLeftString(requireContext, stickerPack.getStoreListing())}, null, 4)); + sb.append(b.j(this, 2131893542, new Object[]{stickerUtils.getLimitedTimeLeftString(requireContext, stickerPack.getStoreListing())}, null, 4)); textView7.setText(sb.toString()); } } @@ -141,7 +141,7 @@ public final class WidgetStickerPackDetailsDialog extends AppDialog { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - getBinding().f1629c.setOnClickListener(new WidgetStickerPackDetailsDialog$onViewBound$1(this)); + getBinding().f1631c.setOnClickListener(new WidgetStickerPackDetailsDialog$onViewBound$1(this)); } @Override // com.discord.app.AppDialog diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java index bb480f8930..3d0ec9aaba 100644 --- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$binding$2.java @@ -22,38 +22,38 @@ public final /* synthetic */ class WidgetStickerSheet$binding$2 extends k implem public final WidgetStickerSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365089; - LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365089); + int i = 2131365093; + LoadingButton loadingButton = (LoadingButton) view.findViewById(2131365093); if (loadingButton != null) { - i = 2131365090; - TextView textView = (TextView) view.findViewById(2131365090); + i = 2131365094; + TextView textView = (TextView) view.findViewById(2131365094); if (textView != null) { - i = 2131365091; - TextView textView2 = (TextView) view.findViewById(2131365091); + i = 2131365095; + TextView textView2 = (TextView) view.findViewById(2131365095); if (textView2 != null) { - i = 2131365093; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365093); + i = 2131365097; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365097); if (linearLayout != null) { - i = 2131365094; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365094); + i = 2131365098; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365098); if (materialButton != null) { - i = 2131365095; - Chip chip = (Chip) view.findViewById(2131365095); + i = 2131365099; + Chip chip = (Chip) view.findViewById(2131365099); if (chip != null) { - i = 2131365096; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365096); + i = 2131365100; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365100); if (relativeLayout != null) { - i = 2131365112; - StickerView stickerView = (StickerView) view.findViewById(2131365112); + i = 2131365116; + StickerView stickerView = (StickerView) view.findViewById(2131365116); if (stickerView != null) { - i = 2131365113; - StickerView stickerView2 = (StickerView) view.findViewById(2131365113); + i = 2131365117; + StickerView stickerView2 = (StickerView) view.findViewById(2131365117); if (stickerView2 != null) { - i = 2131365114; - StickerView stickerView3 = (StickerView) view.findViewById(2131365114); + i = 2131365118; + StickerView stickerView3 = (StickerView) view.findViewById(2131365118); if (stickerView3 != null) { - i = 2131365115; - StickerView stickerView4 = (StickerView) view.findViewById(2131365115); + i = 2131365119; + StickerView stickerView4 = (StickerView) view.findViewById(2131365119); if (stickerView4 != null) { return new WidgetStickerSheetBinding((LinearLayout) view, loadingButton, textView, textView2, linearLayout, materialButton, chip, relativeLayout, stickerView, stickerView2, stickerView3, stickerView4); } diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java index c84ff57a4d..b5758f6d84 100644 --- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java +++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet$configureUI$4.java @@ -36,7 +36,7 @@ public final class WidgetStickerSheet$configureUI$4 implements View.OnClickListe m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion.show(parentFragmentManager, this.$sticker, StickerPackStoreSheetViewType.STICKER_POPOUT_VIEW_ALL, this.$location, StickerPurchaseLocation.Companion.getPopoutPurchaseLocation(this.$stickerPack.canBePurchased())); } else { - ExpressionPickerEventBus.Companion.getINSTANCE().emitEvent(new ExpressionPickerEvent.OpenStickerPicker(this.$sticker.g(), null, false, 2, null)); + ExpressionPickerEventBus.Companion.getINSTANCE().emitEvent(new ExpressionPickerEvent.OpenStickerPicker(this.$sticker.h(), null, false, 2, null)); } this.this$0.dismiss(); } diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java index 9ad4d3e53b..47bffa9d95 100644 --- a/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java +++ b/app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java @@ -57,7 +57,7 @@ public final class WidgetStickerSheet extends AppBottomSheet { Channel findChannelByIdInternal$app_productionGoogleRelease; m.checkNotNullParameter(fragmentManager, "fragmentManager"); m.checkNotNullParameter(sticker, "sticker"); - if (sticker.i() == StickerType.STANDARD && (findChannelByIdInternal$app_productionGoogleRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(j)) != null) { + if (sticker.j() == StickerType.STANDARD && (findChannelByIdInternal$app_productionGoogleRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionGoogleRelease(j)) != null) { String str = findChannelByIdInternal$app_productionGoogleRelease.e() == 0 ? "DM Channel" : "Guild Channel"; WidgetStickerSheet widgetStickerSheet = new WidgetStickerSheet(); Bundle bundle = new Bundle(); @@ -91,15 +91,15 @@ public final class WidgetStickerSheet extends AppBottomSheet { boolean component4 = viewState.component4(); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.stickerSheetStickerName"); - textView.setText(component2.f()); + textView.setText(component2.g()); if (!viewState.isUserPremiumTier2()) { - getBinding().f1964c.setOnClickListener(new WidgetStickerSheet$configureUI$1(this)); + getBinding().f1966c.setOnClickListener(new WidgetStickerSheet$configureUI$1(this)); } - TextView textView2 = getBinding().f1964c; + TextView textView2 = getBinding().f1966c; m.checkNotNullExpressionValue(textView2, "binding.stickerSheetStickerInfo"); boolean z2 = true; int i = 0; - textView2.setText((component4 || viewState.isUserPremiumTier2() || component1.isPremiumPack()) ? b.j(this, 2131893513, new Object[]{component1.getName()}, null, 4) : !component1.canBePurchased() ? b.j(this, 2131893514, new Object[]{component1.getName()}, null, 4) : b.d(this, 2131893511, new Object[]{component1.getName(), String.valueOf(StickerUtils.INSTANCE.calculatePremiumStickerPackDiscount())}, WidgetStickerSheet$configureUI$2.INSTANCE)); + textView2.setText((component4 || viewState.isUserPremiumTier2() || component1.isPremiumPack()) ? b.j(this, 2131893553, new Object[]{component1.getName()}, null, 4) : !component1.canBePurchased() ? b.j(this, 2131893554, new Object[]{component1.getName()}, null, 4) : b.d(this, 2131893551, new Object[]{component1.getName(), String.valueOf(StickerUtils.INSTANCE.calculatePremiumStickerPackDiscount())}, WidgetStickerSheet$configureUI$2.INSTANCE)); try { getBinding().h.c(component1.getStickers().get(0), 0); getBinding().i.c(component1.getStickers().get(1), 0); @@ -160,6 +160,6 @@ public final class WidgetStickerSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559240; + return 2131559241; } } diff --git a/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java b/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java index c723aa8333..4e6f0024c3 100644 --- a/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java +++ b/app/src/main/java/com/discord/widgets/tabs/TabsHostBottomNavigationView.java @@ -119,7 +119,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout { UserAvatarPresenceView userAvatarPresenceView = this.binding.o; NavigationTab navigationTab6 = NavigationTab.SETTINGS; this.iconToNavigationTabMap = h0.mapOf(o.to(this.binding.e, navigationTab), o.to(this.binding.b, navigationTab2), o.to(this.binding.j, navigationTab3), o.to(this.binding.h, navigationTab4), o.to(userAvatarPresenceView, navigationTab6), o.to(this.binding.l, navigationTab5)); - this.navigationTabToViewMap = h0.mapOf(o.to(navigationTab, this.binding.f), o.to(navigationTab2, this.binding.f1632c), o.to(navigationTab3, this.binding.k), o.to(navigationTab4, this.binding.i), o.to(navigationTab6, this.binding.p), o.to(navigationTab5, this.binding.m)); + this.navigationTabToViewMap = h0.mapOf(o.to(navigationTab, this.binding.f), o.to(navigationTab2, this.binding.f1634c), o.to(navigationTab3, this.binding.k), o.to(navigationTab4, this.binding.i), o.to(navigationTab6, this.binding.p), o.to(navigationTab5, this.binding.m)); UserAvatarPresenceView userAvatarPresenceView2 = this.binding.o; m.checkNotNullExpressionValue(userAvatarPresenceView2, "binding.tabsHostBottomNavUserAvatarPresenceView"); this.userAvatarPresenceViewController = new UserAvatarPresenceViewController(userAvatarPresenceView2, null, null, null, 14); @@ -137,7 +137,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout { m.checkNotNullExpressionValue(textView3, "binding.tabsHostBottomNavHomeNotificationsBadge"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - textView3.setContentDescription(b.h(resources, 2131891125, new Object[]{String.valueOf(i)}, null, 4)); + textView3.setContentDescription(b.h(resources, 2131891156, new Object[]{String.valueOf(i)}, null, 4)); TextView textView4 = this.binding.d; m.checkNotNullExpressionValue(textView4, "binding.tabsHostBottomNavFriendsNotificationsBadge"); textView4.setText(String.valueOf(i2)); @@ -151,7 +151,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout { m.checkNotNullExpressionValue(textView6, "binding.tabsHostBottomNavFriendsNotificationsBadge"); Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - textView6.setContentDescription(b.h(resources2, 2131890308, new Object[]{String.valueOf(i2)}, null, 4)); + textView6.setContentDescription(b.h(resources2, 2131890338, new Object[]{String.valueOf(i2)}, null, 4)); } public final void addHeightChangedListener(HeightChangedListener heightChangedListener) { @@ -181,7 +181,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout { m.checkNotNullExpressionValue(constraintLayout, "binding.tabsHostBottomNavHomeItem"); int i3 = 8; constraintLayout.setVisibility(set.contains(NavigationTab.HOME) ? 0 : 8); - ConstraintLayout constraintLayout2 = this.binding.f1632c; + ConstraintLayout constraintLayout2 = this.binding.f1634c; m.checkNotNullExpressionValue(constraintLayout2, "binding.tabsHostBottomNavFriendsItem"); constraintLayout2.setVisibility(set.contains(NavigationTab.FRIENDS) ? 0 : 8); FrameLayout frameLayout = this.binding.k; @@ -238,7 +238,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout { updateNotificationBadges(i, i2); if (z2) { this.binding.f.setOnClickListener(new TabsHostBottomNavigationView$updateView$4(function1)); - this.binding.f1632c.setOnClickListener(new TabsHostBottomNavigationView$updateView$5(function1)); + this.binding.f1634c.setOnClickListener(new TabsHostBottomNavigationView$updateView$5(function1)); this.binding.k.setOnClickListener(new TabsHostBottomNavigationView$updateView$6(function0)); this.binding.i.setOnClickListener(new TabsHostBottomNavigationView$updateView$7(function1)); this.binding.p.setOnClickListener(new TabsHostBottomNavigationView$updateView$8(function1)); @@ -255,7 +255,7 @@ public final class TabsHostBottomNavigationView extends LinearLayout { return; } this.binding.f.setOnClickListener(TabsHostBottomNavigationView$updateView$12.INSTANCE); - this.binding.f1632c.setOnClickListener(TabsHostBottomNavigationView$updateView$13.INSTANCE); + this.binding.f1634c.setOnClickListener(TabsHostBottomNavigationView$updateView$13.INSTANCE); this.binding.k.setOnClickListener(TabsHostBottomNavigationView$updateView$14.INSTANCE); this.binding.i.setOnClickListener(TabsHostBottomNavigationView$updateView$15.INSTANCE); this.binding.m.setOnClickListener(TabsHostBottomNavigationView$updateView$16.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java index 851b188846..8936a80530 100644 --- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java +++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost$binding$2.java @@ -18,33 +18,33 @@ public final /* synthetic */ class WidgetTabsHost$binding$2 extends k implements public final WidgetTabsHostBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365632; - TabsHostBottomNavigationView tabsHostBottomNavigationView = (TabsHostBottomNavigationView) view.findViewById(2131365632); + int i = 2131365638; + TabsHostBottomNavigationView tabsHostBottomNavigationView = (TabsHostBottomNavigationView) view.findViewById(2131365638); if (tabsHostBottomNavigationView != null) { ConstraintLayout constraintLayout = (ConstraintLayout) view; - i = 2131365634; - FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365634); + i = 2131365640; + FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365640); if (fragmentContainerView != null) { - i = 2131365635; - FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365635); + i = 2131365641; + FragmentContainerView fragmentContainerView2 = (FragmentContainerView) view.findViewById(2131365641); if (fragmentContainerView2 != null) { - i = 2131365636; - FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131365636); + i = 2131365642; + FragmentContainerView fragmentContainerView3 = (FragmentContainerView) view.findViewById(2131365642); if (fragmentContainerView3 != null) { - i = 2131365637; - FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131365637); + i = 2131365643; + FragmentContainerView fragmentContainerView4 = (FragmentContainerView) view.findViewById(2131365643); if (fragmentContainerView4 != null) { - i = 2131365638; - FragmentContainerView fragmentContainerView5 = (FragmentContainerView) view.findViewById(2131365638); + i = 2131365644; + FragmentContainerView fragmentContainerView5 = (FragmentContainerView) view.findViewById(2131365644); if (fragmentContainerView5 != null) { - i = 2131365639; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365639); + i = 2131365645; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131365645); if (frameLayout != null) { - i = 2131365640; - FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365640); + i = 2131365646; + FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365646); if (frameLayout2 != null) { - i = 2131365641; - FragmentContainerView fragmentContainerView6 = (FragmentContainerView) view.findViewById(2131365641); + i = 2131365647; + FragmentContainerView fragmentContainerView6 = (FragmentContainerView) view.findViewById(2131365647); if (fragmentContainerView6 != null) { return new WidgetTabsHostBinding(constraintLayout, tabsHostBottomNavigationView, constraintLayout, fragmentContainerView, fragmentContainerView2, fragmentContainerView3, fragmentContainerView4, fragmentContainerView5, frameLayout, frameLayout2, fragmentContainerView6); } diff --git a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java index 17fe15a852..c59ef66451 100644 --- a/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java +++ b/app/src/main/java/com/discord/widgets/tabs/WidgetTabsHost.java @@ -67,7 +67,7 @@ public final class WidgetTabsHost extends AppFragment { } public WidgetTabsHost() { - super(2131559242); + super(2131559243); WidgetTabsHost$viewModel$2 widgetTabsHost$viewModel$2 = WidgetTabsHost$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(TabsHostViewModel.class), new WidgetTabsHost$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetTabsHost$viewModel$2)); @@ -187,14 +187,14 @@ public final class WidgetTabsHost extends AppFragment { } private final void setPanelWindowInsetsListeners(boolean z2) { - ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1965c, WidgetTabsHost$setPanelWindowInsetsListeners$1.INSTANCE); + ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1967c, WidgetTabsHost$setPanelWindowInsetsListeners$1.INSTANCE); ViewCompat.setOnApplyWindowInsetsListener(getBinding().f, new WidgetTabsHost$setPanelWindowInsetsListeners$2(z2)); FrameLayout frameLayout = getBinding().h; m.checkNotNullExpressionValue(frameLayout, "binding.widgetTabsHostNavHost"); ViewExtensions.setForwardingWindowInsetsListener(frameLayout); ViewCompat.setOnApplyWindowInsetsListener(getBinding().i, new WidgetTabsHost$setPanelWindowInsetsListeners$3(z2)); ViewCompat.setOnApplyWindowInsetsListener(getBinding().b, WidgetTabsHost$setPanelWindowInsetsListeners$4.INSTANCE); - getBinding().f1965c.requestApplyInsets(); + getBinding().f1967c.requestApplyInsets(); } public static /* synthetic */ void setPanelWindowInsetsListeners$default(WidgetTabsHost widgetTabsHost, boolean z2, int i, Object obj) { diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java index 5a1f045371..fab6d6b98d 100644 --- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java @@ -13,7 +13,7 @@ public final class WidgetTosAccept$configureUI$1 implements CompoundButton.OnChe @Override // android.widget.CompoundButton.OnCheckedChangeListener public final void onCheckedChanged(CompoundButton compoundButton, boolean z2) { - MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).f1975c; + MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).f1977c; m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue"); materialButton.setEnabled(z2); } diff --git a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java index a8339498e4..53c1ebabfa 100644 --- a/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java +++ b/app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$2.java @@ -11,7 +11,7 @@ public final class WidgetTosAccept$onViewBound$2 implements Action2= 24) { - i2 = 2131231868; + i2 = 2131231871; } else if (premiumGuildMonthsSubscribed.intValue() >= 18) { - i2 = 2131231867; + i2 = 2131231870; } else if (premiumGuildMonthsSubscribed.intValue() >= 15) { - i2 = 2131231866; + i2 = 2131231869; } else if (premiumGuildMonthsSubscribed.intValue() >= 12) { - i2 = 2131231865; + i2 = 2131231868; } else if (premiumGuildMonthsSubscribed.intValue() >= 9) { - i2 = 2131231864; + i2 = 2131231867; } else if (premiumGuildMonthsSubscribed.intValue() >= 6) { - i2 = 2131231863; + i2 = 2131231866; } else if (premiumGuildMonthsSubscribed.intValue() >= 3) { - i2 = 2131231862; + i2 = 2131231865; } else if (premiumGuildMonthsSubscribed.intValue() >= 2) { - i2 = 2131231861; + i2 = 2131231864; } else { premiumGuildMonthsSubscribed.intValue(); } - String string = context.getString(2131892269); - CharSequence g = b.g(context, 2131892103, new Object[]{modelUserProfile.getPremiumGuildSince(context)}, null, 4); + String string = context.getString(2131892307); + CharSequence g = b.g(context, 2131892141, new Object[]{modelUserProfile.getPremiumGuildSince(context)}, null, 4); if (!z2 && z3) { z4 = true; } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java b/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java index 9eda2a074a..8e94c994d5 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetBanUser.java @@ -103,7 +103,7 @@ public final class WidgetBanUser extends AppDialog { TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.banUserBody"); b.n(textView2, 2131886819, new Object[]{string}, null, 4); - getBinding().f1681c.setOnClickListener(new WidgetBanUser$onViewBound$2(this)); + getBinding().f1683c.setOnClickListener(new WidgetBanUser$onViewBound$2(this)); getBinding().d.setOnClickListener(new WidgetBanUser$onViewBound$3(this, j, j2, string)); } } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java index 32539f101f..d5893dc748 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$binding$2.java @@ -19,20 +19,20 @@ public final /* synthetic */ class WidgetKickUser$binding$2 extends k implements public final WidgetKickUserBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363722; - TextView textView = (TextView) view.findViewById(2131363722); + int i = 2131363725; + TextView textView = (TextView) view.findViewById(2131363725); if (textView != null) { - i = 2131363723; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363723); + i = 2131363726; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363726); if (materialButton != null) { - i = 2131363724; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363724); + i = 2131363727; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363727); if (materialButton2 != null) { - i = 2131363725; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363725); + i = 2131363728; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363728); if (textInputLayout != null) { - i = 2131363726; - TextView textView2 = (TextView) view.findViewById(2131363726); + i = 2131363729; + TextView textView2 = (TextView) view.findViewById(2131363729); if (textView2 != null) { return new WidgetKickUserBinding((LinearLayout) view, textView, materialButton, materialButton2, textInputLayout, textView2); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java index dd78831365..ad3c160291 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2.java @@ -42,7 +42,7 @@ public final class WidgetKickUser$onViewBoundOrOnResume$2 implements View.OnClic public final void invoke(Void r7) { Context context = this.this$0.this$0.getContext(); Context context2 = this.this$0.this$0.getContext(); - c.a.d.o.h(context, context2 != null ? b.g(context2, 2131890732, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12); + c.a.d.o.h(context, context2 != null ? b.g(context2, 2131890762, new Object[]{this.this$0.$userName}, null, 4) : null, 0, null, 12); this.this$0.this$0.dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java index b423b3e978..cac34ea806 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java @@ -42,7 +42,7 @@ public final class WidgetKickUser extends AppDialog { } public WidgetKickUser() { - super(2131559070); + super(2131559071); } public static final /* synthetic */ WidgetKickUserBinding access$getBinding$p(WidgetKickUser widgetKickUser) { @@ -65,11 +65,11 @@ public final class WidgetKickUser extends AppDialog { long j2 = getArgumentsOrDefault().getLong("com.discord.intent.extra.EXTRA_USER_ID", -1); TextView textView = getBinding().f; m.checkNotNullExpressionValue(textView, "binding.kickUserTitle"); - b.n(textView, 2131890735, new Object[]{string}, null, 4); + b.n(textView, 2131890765, new Object[]{string}, null, 4); TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.kickUserBody"); - b.n(textView2, 2131890731, new Object[]{string}, null, 4); - getBinding().f1822c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this)); + b.n(textView2, 2131890761, new Object[]{string}, null, 4); + getBinding().f1824c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this)); getBinding().d.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$2(this, j, j2, string)); } } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java index b91463ed0b..c393ce417f 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers$binding$2.java @@ -20,26 +20,26 @@ public final /* synthetic */ class WidgetPruneUsers$binding$2 extends k implemen public final WidgetPruneUsersBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364364; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364364); + int i = 2131364367; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364367); if (materialButton != null) { - i = 2131364365; - TextView textView = (TextView) view.findViewById(2131364365); + i = 2131364368; + TextView textView = (TextView) view.findViewById(2131364368); if (textView != null) { - i = 2131364366; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364366); + i = 2131364369; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131364369); if (materialButton2 != null) { - i = 2131364367; - TextView textView2 = (TextView) view.findViewById(2131364367); + i = 2131364370; + TextView textView2 = (TextView) view.findViewById(2131364370); if (textView2 != null) { - i = 2131364368; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364368); + i = 2131364371; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131364371); if (checkedSetting != null) { - i = 2131364369; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364369); + i = 2131364372; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131364372); if (checkedSetting2 != null) { - i = 2131364370; - ProgressBar progressBar = (ProgressBar) view.findViewById(2131364370); + i = 2131364373; + ProgressBar progressBar = (ProgressBar) view.findViewById(2131364373); if (progressBar != null) { return new WidgetPruneUsersBinding((ScrollView) view, materialButton, textView, materialButton2, textView2, checkedSetting, checkedSetting2, progressBar); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java index f03641a33c..155930faea 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetPruneUsers.java @@ -77,7 +77,7 @@ public final class WidgetPruneUsers extends AppDialog { } public WidgetPruneUsers() { - super(2131559110); + super(2131559111); WidgetPruneUsers$viewModel$2 widgetPruneUsers$viewModel$2 = new WidgetPruneUsers$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetPruneUsersViewModel.class), new WidgetPruneUsers$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetPruneUsers$viewModel$2)); @@ -138,12 +138,12 @@ public final class WidgetPruneUsers extends AppDialog { CheckedSetting checkedSetting; if (viewState instanceof WidgetPruneUsersViewModel.ViewState.Loading) { StringBuilder sb = new StringBuilder(); - sb.append(b.j(this, 2131892397, new Object[0], null, 4)); + sb.append(b.j(this, 2131892438, new Object[0], null, 4)); sb.append(" - "); WidgetPruneUsersViewModel.ViewState.Loading loading = (WidgetPruneUsersViewModel.ViewState.Loading) viewState; sb.append(loading.getGuildName()); String sb2 = sb.toString(); - TextView textView = getBinding().f1846c; + TextView textView = getBinding().f1848c; m.checkNotNullExpressionValue(textView, "binding.pruneUserHeader"); textView.setText(sb2); int ordinal = loading.getWhichPruneDays().ordinal(); @@ -174,12 +174,12 @@ public final class WidgetPruneUsers extends AppDialog { Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); WidgetPruneUsersViewModel.ViewState.Loaded loaded = (WidgetPruneUsersViewModel.ViewState.Loaded) viewState; - CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755079, loaded.getPruneCount(), Integer.valueOf(loaded.getPruneCount())); + CharSequence i18nPluralString = StringResourceUtilsKt.getI18nPluralString(requireContext, 2131755080, loaded.getPruneCount(), Integer.valueOf(loaded.getPruneCount())); Context requireContext2 = requireContext(); m.checkNotNullExpressionValue(requireContext2, "requireContext()"); - CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext2, 2131755078, loaded.getPruneDays().getCount(), Integer.valueOf(loaded.getPruneDays().getCount())); + CharSequence i18nPluralString2 = StringResourceUtilsKt.getI18nPluralString(requireContext2, 2131755079, loaded.getPruneDays().getCount(), Integer.valueOf(loaded.getPruneDays().getCount())); TextView textView3 = getBinding().e; - b.n(textView3, 2131888573, new Object[]{i18nPluralString, i18nPluralString2}, null, 4); + b.n(textView3, 2131888583, new Object[]{i18nPluralString, i18nPluralString2}, null, 4); textView3.setVisibility(0); MaterialButton materialButton2 = getBinding().d; m.checkNotNullExpressionValue(materialButton2, "binding.pruneUserPrune"); @@ -212,12 +212,12 @@ public final class WidgetPruneUsers extends AppDialog { CheckedSetting checkedSetting = getBinding().f; Context context = checkedSetting.getContext(); m.checkNotNullExpressionValue(context, "context"); - checkedSetting.setText(StringResourceUtilsKt.getI18nPluralString(context, 2131755208, 7, 7)); + checkedSetting.setText(StringResourceUtilsKt.getI18nPluralString(context, 2131755209, 7, 7)); checkedSetting.e(new WidgetPruneUsers$onViewBound$$inlined$apply$lambda$1(this)); CheckedSetting checkedSetting2 = getBinding().g; Context context2 = checkedSetting2.getContext(); m.checkNotNullExpressionValue(context2, "context"); - checkedSetting2.setText(StringResourceUtilsKt.getI18nPluralString(context2, 2131755208, 30, 30)); + checkedSetting2.setText(StringResourceUtilsKt.getI18nPluralString(context2, 2131755209, 30, 30)); checkedSetting2.e(new WidgetPruneUsers$onViewBound$$inlined$apply$lambda$2(this)); getBinding().b.setOnClickListener(new WidgetPruneUsers$onViewBound$3(this)); getBinding().d.setOnClickListener(new WidgetPruneUsers$onViewBound$4(this)); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java index a86b681ece..7e262bdebf 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.java @@ -2,9 +2,9 @@ package com.discord.widgets.user; import c.d.b.a.a; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.MessageReference; import com.discord.api.role.GuildRole; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.models.member.GuildMember; import com.discord.stores.StoreMessageReplies; @@ -48,10 +48,10 @@ public final class WidgetUserMentions$Model$Companion$get$1 extends o implements ArrayList arrayList = new ArrayList(loadingState.getMentions().size() * 2); Set emptySet = n0.emptySet(); Map allMessageReferences = StoreStream.Companion.getRepliedMessages().getAllMessageReferences(); - for (ModelMessage modelMessage : loadingState.getMentions()) { - Channel channel = map6.get(Long.valueOf(modelMessage.getChannelId())); + for (Message message : loadingState.getMentions()) { + Channel channel = map6.get(Long.valueOf(message.i())); if (channel != null) { - Object obj = map5.get(Long.valueOf(modelMessage.getChannelId())); + Object obj = map5.get(Long.valueOf(message.i())); if (obj == null) { obj = h0.emptyMap(); } @@ -62,8 +62,8 @@ public final class WidgetUserMentions$Model$Companion$get$1 extends o implements } Map map8 = (Map) c2; LinkedHashMap linkedHashMap = new LinkedHashMap(); - MessageReference messageReference = modelMessage.getMessageReference(); - Long c3 = messageReference != null ? messageReference.c() : null; + MessageReference A = message.A(); + Long c3 = A != null ? A.c() : null; if (c3 != null) { Object obj2 = (StoreMessageReplies.MessageState) allMessageReferences.get(c3); if (obj2 == null) { @@ -71,8 +71,8 @@ public final class WidgetUserMentions$Model$Companion$get$1 extends o implements } linkedHashMap.put(c3, obj2); } - arrayList.add(MessageHeaderEntry.Companion.create(modelMessage, channel, (Guild) a.c(channel, map3))); - arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map7, map8, h0.emptyMap(), null, null, modelMessage, null, linkedHashMap, false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, h0.emptyMap(), inviteEmbedModel, false, 262144, null)); + arrayList.add(MessageHeaderEntry.Companion.create(message, channel, (Guild) a.c(channel, map3))); + arrayList.addAll(WidgetChatListModelMessages.Companion.getMessageItems$default(WidgetChatListModelMessages.Companion, channel, map7, map8, h0.emptyMap(), null, null, message, null, linkedHashMap, false, false, null, z2, z3, StoreStream.Companion.getUserSettings().getIsRenderEmbedsEnabled(), false, h0.emptyMap(), inviteEmbedModel, false, 262144, null)); } map6 = map; } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java index 9cdc71cdbf..d41f59a611 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$tryLoad$3.java @@ -1,6 +1,6 @@ package com.discord.widgets.user; -import com.discord.models.domain.ModelMessage; +import com.discord.api.message.Message; import com.discord.widgets.user.WidgetUserMentions; import d0.z.d.m; import d0.z.d.o; @@ -8,7 +8,7 @@ import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetUserMentions.kt */ -public final class WidgetUserMentions$Model$MessageLoader$tryLoad$3 extends o implements Function1, Unit> { +public final class WidgetUserMentions$Model$MessageLoader$tryLoad$3 extends o implements Function1, Unit> { public final /* synthetic */ WidgetUserMentions.Model.MessageLoader this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -20,12 +20,12 @@ public final class WidgetUserMentions$Model$MessageLoader$tryLoad$3 extends o im /* 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(List list) { - invoke(list); + public /* bridge */ /* synthetic */ Unit invoke(List list) { + invoke((List) list); return Unit.a; } - public final void invoke(List list) { + public final void invoke(List list) { m.checkNotNullParameter(list, "it"); WidgetUserMentions.Model.MessageLoader.access$handleLoaded(this.this$0, list); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java index 2a3e3fb62c..c8c6161245 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$binding$2.java @@ -17,14 +17,14 @@ public final /* synthetic */ class WidgetUserMentions$WidgetUserMentionFilter$bi public final WidgetUserMentionsFilterBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365371; - CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365371); + int i = 2131365376; + CheckedSetting checkedSetting = (CheckedSetting) view.findViewById(2131365376); if (checkedSetting != null) { - i = 2131365372; - CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365372); + i = 2131365377; + CheckedSetting checkedSetting2 = (CheckedSetting) view.findViewById(2131365377); if (checkedSetting2 != null) { - i = 2131365373; - CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365373); + i = 2131365378; + CheckedSetting checkedSetting3 = (CheckedSetting) view.findViewById(2131365378); if (checkedSetting3 != null) { return new WidgetUserMentionsFilterBinding((NestedScrollView) view, checkedSetting, checkedSetting2, checkedSetting3); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.java index c648930287..356249c836 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1.java @@ -42,7 +42,7 @@ public final class WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1 e if (i == 0) { l.throwOnFailure(obj); this.label = 1; - if (a.m(600, this) == coroutine_suspended) { + if (a.n(600, this) == coroutine_suspended) { return coroutine_suspended; } } else if (i == 1) { diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java index 923c248a7e..2ed4757684 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter$onResume$3.java @@ -15,7 +15,7 @@ public final class WidgetUserMentions$WidgetUserMentionFilter$onResume$3 impl public final void call(Boolean bool) { WidgetUserMentions.WidgetUserMentionFilter widgetUserMentionFilter = this.this$0; WidgetUserMentions.Model.MessageLoader.Filters access$getFilters$p = WidgetUserMentions.WidgetUserMentionFilter.access$getFilters$p(widgetUserMentionFilter); - CheckedSetting checkedSetting = WidgetUserMentions.WidgetUserMentionFilter.access$getBinding$p(this.this$0).f1983c; + CheckedSetting checkedSetting = WidgetUserMentions.WidgetUserMentionFilter.access$getBinding$p(this.this$0).f1985c; m.checkNotNullExpressionValue(checkedSetting, "binding.userMentionsFilterIncludeRoles"); WidgetUserMentions.WidgetUserMentionFilter.access$updateFilters(widgetUserMentionFilter, WidgetUserMentions.Model.MessageLoader.Filters.copy$default(access$getFilters$p, 0, false, false, checkedSetting.isChecked(), 7, null)); WidgetUserMentions.WidgetUserMentionFilter.access$delayedDismiss(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java index c7bc47d919..845b4fdae5 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$binding$2.java @@ -21,8 +21,8 @@ public final /* synthetic */ class WidgetUserMentions$binding$2 extends k implem int i = 2131361871; Toolbar toolbar = (Toolbar) view.findViewById(2131361871); if (toolbar != null) { - i = 2131365374; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365374); + i = 2131365379; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365379); if (recyclerView != null) { return new WidgetUserMentionsBinding((CoordinatorLayout) view, toolbar, recyclerView); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java index 709e45f574..f320637001 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$configureToolbar$1.java @@ -46,7 +46,7 @@ public final class WidgetUserMentions$configureToolbar$1 implements Acti public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363913) { + if (menuItem.getItemId() == 2131363915) { WidgetUserMentions.WidgetUserMentionFilter.Companion companion = WidgetUserMentions.WidgetUserMentionFilter.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java index 508e5a9cc8..05f3d838ff 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions$createAdapter$1.java @@ -4,11 +4,11 @@ import android.net.Uri; import com.discord.api.activity.Activity; import com.discord.api.application.Application; import com.discord.api.channel.Channel; +import com.discord.api.message.Message; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.message.reaction.MessageReaction; import com.discord.api.sticker.BaseSticker; import com.discord.api.sticker.Sticker; -import com.discord.models.domain.ModelMessage; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreChat; import com.discord.stores.StoreNavigation; @@ -27,9 +27,9 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA this.$onInteractionStateUpdated = function1; } - private final void jumpToMessage(ModelMessage modelMessage) { + private final void jumpToMessage(Message message) { StoreStream.Companion companion = StoreStream.Companion; - companion.getMessagesLoader().jumpToMessage(modelMessage.getChannelId(), modelMessage.getId()); + companion.getMessagesLoader().jumpToMessage(message.i(), message.r()); companion.getTabsNavigation().selectHomeTab(StoreNavigation.PanelAction.CLOSE, WidgetUserMentions.access$isEmbedded$p(this.this$0)); } @@ -50,9 +50,9 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onDismissClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - WidgetChatListAdapter.EventHandler.DefaultImpls.onDismissClicked(this, modelMessage); + public void onDismissClicked(Message message) { + m.checkNotNullParameter(message, "message"); + WidgetChatListAdapter.EventHandler.DefaultImpls.onDismissClicked(this, message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -66,40 +66,40 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorAvatarClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToMessage(modelMessage); + public void onMessageAuthorAvatarClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + jumpToMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorLongClicked(ModelMessage modelMessage, Long l) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToMessage(modelMessage); + public void onMessageAuthorLongClicked(Message message, Long l) { + m.checkNotNullParameter(message, "message"); + jumpToMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageAuthorNameClicked(ModelMessage modelMessage, long j) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToMessage(modelMessage); + public void onMessageAuthorNameClicked(Message message, long j) { + m.checkNotNullParameter(message, "message"); + jumpToMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageBlockedGroupClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToMessage(modelMessage); + public void onMessageBlockedGroupClicked(Message message) { + m.checkNotNullParameter(message, "message"); + jumpToMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageClicked(ModelMessage modelMessage, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); - jumpToMessage(modelMessage); + public void onMessageClicked(Message message, boolean z2) { + m.checkNotNullParameter(message, "message"); + jumpToMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onMessageLongClicked(ModelMessage modelMessage, CharSequence charSequence, boolean z2) { - m.checkNotNullParameter(modelMessage, "message"); + public void onMessageLongClicked(Message message, CharSequence charSequence, boolean z2) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(charSequence, "formattedMessage"); - jumpToMessage(modelMessage); + jumpToMessage(message); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -107,8 +107,8 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onOpenPinsClicked(ModelMessage modelMessage) { - m.checkNotNullParameter(modelMessage, "message"); + public void onOpenPinsClicked(Message message) { + m.checkNotNullParameter(message, "message"); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler @@ -139,10 +139,10 @@ public final class WidgetUserMentions$createAdapter$1 implements WidgetChatListA } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler - public void onStickerClicked(ModelMessage modelMessage, BaseSticker baseSticker) { - m.checkNotNullParameter(modelMessage, "message"); + public void onStickerClicked(Message message, BaseSticker baseSticker) { + m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(baseSticker, "sticker"); - StoreStream.Companion.getMessagesLoader().jumpToMessage(modelMessage.getChannelId(), modelMessage.getId()); + StoreStream.Companion.getMessagesLoader().jumpToMessage(message.i(), message.r()); } @Override // com.discord.widgets.chat.list.adapter.WidgetChatListAdapter.EventHandler diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java index 4185f4d346..4d0226f72b 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMentions.java @@ -13,11 +13,11 @@ import androidx.recyclerview.widget.RecyclerView; import c.a.d.h0; import c.a.d.j0; import c.d.b.a.a; +import com.discord.api.message.Message; import com.discord.app.AppBottomSheet; import com.discord.app.AppFragment; import com.discord.databinding.WidgetUserMentionsBinding; import com.discord.databinding.WidgetUserMentionsFilterBinding; -import com.discord.models.domain.ModelMessage; import com.discord.models.guild.Guild; import com.discord.stores.StoreChat; import com.discord.stores.StoreStream; @@ -145,7 +145,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect private Long loadBeforeMessageId; private Subscription loadSubscription; private final int mentionLimit = 25; - private final ArrayList mentions = new ArrayList<>(); + private final ArrayList mentions = new ArrayList<>(); private LoadingState mentionsLoadingState = new LoadingState(false, false, null, 7, null); private final BehaviorSubject mentionsLoadingStateSubject; private Function0 retryAction; @@ -280,15 +280,13 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect public static final class LoadingState { private final boolean isAllLoaded; private final boolean isLoading; - private final List mentions; + private final List mentions; public LoadingState() { this(false, false, null, 7, null); } - /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List */ - /* JADX WARN: Multi-variable type inference failed */ - public LoadingState(boolean z2, boolean z3, List list) { + public LoadingState(boolean z2, boolean z3, List list) { m.checkNotNullParameter(list, "mentions"); this.isLoading = z2; this.isAllLoaded = z3; @@ -323,11 +321,11 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect return this.isAllLoaded; } - public final List component3() { + public final List component3() { return this.mentions; } - public final LoadingState copy(boolean z2, boolean z3, List list) { + public final LoadingState copy(boolean z2, boolean z3, List list) { m.checkNotNullParameter(list, "mentions"); return new LoadingState(z2, z3, list); } @@ -343,7 +341,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect return this.isLoading == loadingState.isLoading && this.isAllLoaded == loadingState.isAllLoaded && m.areEqual(this.mentions, loadingState.mentions); } - public final List getMentions() { + public final List getMentions() { return this.mentions; } @@ -362,7 +360,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect i = z3 ? 1 : 0; } int i6 = (i5 + i) * 31; - List list = this.mentions; + List list = this.mentions; return i6 + (list != null ? list.hashCode() : 0); } @@ -421,10 +419,10 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect } @MainThread - private final void handleLoaded(List list) { + private final void handleLoaded(List list) { boolean z2 = list.isEmpty() || list.size() < this.mentionLimit; - ModelMessage modelMessage = (ModelMessage) u.lastOrNull((List) list); - this.loadBeforeMessageId = modelMessage != null ? Long.valueOf(modelMessage.getId()) : null; + Message message = (Message) u.lastOrNull((List) list); + this.loadBeforeMessageId = message != null ? Long.valueOf(message.r()) : null; this.mentions.addAll(list); setMentionsLoadingState(LoadingState.copy$default(this.mentionsLoadingState, false, false, new ArrayList(this.mentions), 3, null)); retry(new WidgetUserMentions$Model$MessageLoader$handleLoaded$1(this, z2)); @@ -818,7 +816,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect if (view == null || (coroutineScope = ViewCoroutineScopeKt.getCoroutineScope(view)) == null) { return null; } - return c.q.a.k.a.F(coroutineScope, null, null, new WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1(this, null), 3, null); + return c.q.a.k.a.G(coroutineScope, null, null, new WidgetUserMentions$WidgetUserMentionFilter$delayedDismiss$1(this, null), 3, null); } private final WidgetUserMentionsFilterBinding getBinding() { @@ -836,7 +834,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559262; + return 2131559263; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -864,7 +862,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect Context context = getContext(); CharSequence charSequence = null; if (context != null) { - charSequence = c.a.l.b.g(context, 2131893806, new Object[]{this.guildName}, null, 4); + charSequence = c.a.l.b.g(context, 2131893846, new Object[]{this.guildName}, null, 4); } checkedSetting3.setText(charSequence); getBinding().d.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$1(this)); @@ -881,19 +879,19 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect } checkedSetting5.setChecked(filters2.getIncludeEveryone()); getBinding().b.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$2(this)); - CheckedSetting checkedSetting6 = getBinding().f1983c; + CheckedSetting checkedSetting6 = getBinding().f1985c; m.checkNotNullExpressionValue(checkedSetting6, "binding.userMentionsFilterIncludeRoles"); Model.MessageLoader.Filters filters3 = this.filters; if (filters3 == null) { m.throwUninitializedPropertyAccessException("filters"); } checkedSetting6.setChecked(filters3.getIncludeRoles()); - getBinding().f1983c.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$3(this)); + getBinding().f1985c.setOnCheckedListener(new WidgetUserMentions$WidgetUserMentionFilter$onResume$3(this)); } } public WidgetUserMentions() { - super(2131559261); + super(2131559262); WidgetUserMentions$viewModel$2 widgetUserMentions$viewModel$2 = WidgetUserMentions$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetUserMentionsViewModel.class), new WidgetUserMentions$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetUserMentions$viewModel$2)); @@ -947,7 +945,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect } private final WidgetChatListAdapter createAdapter(Function1 function1) { - RecyclerView recyclerView = getBinding().f1982c; + RecyclerView recyclerView = getBinding().f1984c; m.checkNotNullExpressionValue(recyclerView, "binding.userMentionsList"); FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); @@ -1021,7 +1019,7 @@ public final class WidgetUserMentions extends AppFragment implements OnTabSelect AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); getBinding().b.setNavigationOnClickListener(new WidgetUserMentions$onViewBound$1(this)); } else { - setActionBarTitle(2131892485); + setActionBarTitle(2131892527); } WidgetChatListAdapter widgetChatListAdapter = (WidgetChatListAdapter) MGRecyclerAdapter.Companion.configure(createAdapter(new WidgetUserMentions$onViewBound$2(this.mentionsLoader))); this.mentionsAdapter = widgetChatListAdapter; diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java index 754008b184..d1b07f532f 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetUserMutualFriends$binding$2 extends k i public final WidgetUserMutualFriendsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365375); + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365380); if (recyclerView != null) { return new WidgetUserMutualFriendsBinding((CoordinatorLayout) view, recyclerView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365375))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365380))); } } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java index fbf336dd1b..b97a3ae61d 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualFriends.java @@ -382,39 +382,39 @@ public final class WidgetUserMutualFriends extends AppFragment { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public ViewHolder(MutualFriendsAdapter mutualFriendsAdapter) { - super(2131559269, mutualFriendsAdapter); + super(2131559270, mutualFriendsAdapter); m.checkNotNullParameter(mutualFriendsAdapter, "adapter"); View view = this.itemView; - int i = 2131363986; - View findViewById = view.findViewById(2131363986); + int i = 2131363988; + View findViewById = view.findViewById(2131363988); if (findViewById != null) { j5 a = j5.a(findViewById); - i = 2131363987; - View findViewById2 = view.findViewById(2131363987); + i = 2131363989; + View findViewById2 = view.findViewById(2131363989); if (findViewById2 != null) { j5 a2 = j5.a(findViewById2); - i = 2131363988; - View findViewById3 = view.findViewById(2131363988); + i = 2131363990; + View findViewById3 = view.findViewById(2131363990); if (findViewById3 != null) { j5 a3 = j5.a(findViewById3); - i = 2131363989; - View findViewById4 = view.findViewById(2131363989); + i = 2131363991; + View findViewById4 = view.findViewById(2131363991); if (findViewById4 != null) { j5 a4 = j5.a(findViewById4); - i = 2131365383; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365383); + i = 2131365388; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365388); if (simpleDraweeView != null) { - i = 2131365384; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365384); + i = 2131365389; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365389); if (linearLayout != null) { - i = 2131365387; - StatusView statusView = (StatusView) view.findViewById(2131365387); + i = 2131365392; + StatusView statusView = (StatusView) view.findViewById(2131365392); if (statusView != null) { - i = 2131365388; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365388); + i = 2131365393; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) view.findViewById(2131365393); if (simpleDraweeSpanTextView != null) { - i = 2131365389; - TextView textView = (TextView) view.findViewById(2131365389); + i = 2131365394; + TextView textView = (TextView) view.findViewById(2131365394); if (textView != null) { WidgetUserProfileAdapterItemFriendBinding widgetUserProfileAdapterItemFriendBinding = new WidgetUserProfileAdapterItemFriendBinding((RelativeLayout) view, a, a2, a3, a4, simpleDraweeView, linearLayout, statusView, simpleDraweeSpanTextView, textView); m.checkNotNullExpressionValue(widgetUserProfileAdapterItemFriendBinding, "WidgetUserProfileAdapter…endBinding.bind(itemView)"); @@ -451,13 +451,13 @@ public final class WidgetUserMutualFriends extends AppFragment { m.checkNotNull(isApplicationStreaming); boolean booleanValue = isApplicationStreaming.booleanValue(); m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "it"); - PresenceUtils.setPresenceText(presence, booleanValue, simpleDraweeSpanTextView, true); + PresenceUtils.setPresenceText$default(presence, booleanValue, simpleDraweeSpanTextView, true, false, 16, null); SimpleDraweeView simpleDraweeView = this.binding.f; m.checkNotNullExpressionValue(simpleDraweeView, "binding.userProfileAdapterItemFriendAvatar"); IconUtils.setIcon$default(simpleDraweeView, mutualFriend.getUser(), 2131165296, null, null, null, 56, null); int i2 = 0; while (i2 <= 3) { - j5 j5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f1988c : this.binding.b; + j5 j5Var = i2 != 1 ? i2 != 2 ? i2 != 3 ? i2 != 4 ? this.binding.e : this.binding.e : this.binding.d : this.binding.f1990c : this.binding.b; m.checkNotNullExpressionValue(j5Var, "when (i) {\n 1…mutualServer4\n }"); RelativeLayout relativeLayout = j5Var.a; m.checkNotNullExpressionValue(relativeLayout, "item.root"); @@ -510,7 +510,7 @@ public final class WidgetUserMutualFriends extends AppFragment { public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 0) { - return new WidgetUserProfileEmptyListItem(2131559268, this, 2130969513, 2131891369); + return new WidgetUserProfileEmptyListItem(2131559269, this, 2130969513, 2131891402); } if (i == 1) { return new ViewHolder(this); @@ -520,7 +520,7 @@ public final class WidgetUserMutualFriends extends AppFragment { } public WidgetUserMutualFriends() { - super(2131559263); + super(2131559264); } public static final /* synthetic */ void access$configureUI(WidgetUserMutualFriends widgetUserMutualFriends, Model model) { @@ -534,7 +534,7 @@ public final class WidgetUserMutualFriends extends AppFragment { private final void configureUI(Model model) { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - setActionBarTitle(StringResourceUtilsKt.getQuantityString(resources, 2131755351, 2131891280, model.getNumMutualFriends(), Integer.valueOf(model.getNumMutualFriends()))); + setActionBarTitle(StringResourceUtilsKt.getQuantityString(resources, 2131755352, 2131891313, model.getNumMutualFriends(), Integer.valueOf(model.getNumMutualFriends()))); User user = model.getUser(); setActionBarSubtitle(user != null ? user.getUsername() : null); MutualFriendsAdapter mutualFriendsAdapter = this.adapter; diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java index e9c564ca05..35b60fe61e 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetUserMutualGuilds$binding$2 extends k im public final WidgetUserMutualGuildsBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365376); + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131365381); if (recyclerView != null) { return new WidgetUserMutualGuildsBinding((CoordinatorLayout) view, recyclerView); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365376))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365381))); } } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java index 23ece173e4..0fc0ff9133 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserMutualGuilds.java @@ -61,20 +61,20 @@ public final class WidgetUserMutualGuilds extends AppFragment { super(i, adapter); m.checkNotNullParameter(adapter, "adapter"); View view = this.itemView; - int i2 = 2131365390; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365390); + int i2 = 2131365395; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131365395); if (simpleDraweeView != null) { - i2 = 2131365391; - TextView textView = (TextView) view.findViewById(2131365391); + i2 = 2131365396; + TextView textView = (TextView) view.findViewById(2131365396); if (textView != null) { - i2 = 2131365392; - TextView textView2 = (TextView) view.findViewById(2131365392); + i2 = 2131365397; + TextView textView2 = (TextView) view.findViewById(2131365397); if (textView2 != null) { - i2 = 2131365393; - TextView textView3 = (TextView) view.findViewById(2131365393); + i2 = 2131365398; + TextView textView3 = (TextView) view.findViewById(2131365398); if (textView3 != null) { - i2 = 2131365394; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365394); + i2 = 2131365399; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365399); if (relativeLayout != null) { WidgetUserProfileAdapterItemServerBinding widgetUserProfileAdapterItemServerBinding = new WidgetUserProfileAdapterItemServerBinding((RelativeLayout) view, simpleDraweeView, textView, textView2, textView3, relativeLayout); m.checkNotNullExpressionValue(widgetUserProfileAdapterItemServerBinding, "WidgetUserProfileAdapter…verBinding.bind(itemView)"); @@ -108,7 +108,7 @@ public final class WidgetUserMutualGuilds extends AppFragment { textView.setVisibility((guild2 != null ? guild2.getIcon() : null) == null ? 0 : 8); Guild guild3 = item.getGuild(); textView.setText(guild3 != null ? guild3.getShortName() : null); - TextView textView2 = this.binding.f1989c; + TextView textView2 = this.binding.f1991c; Guild guild4 = item.getGuild(); if (guild4 != null) { str = guild4.getName(); @@ -139,10 +139,10 @@ public final class WidgetUserMutualGuilds extends AppFragment { public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 0) { - return new WidgetUserProfileEmptyListItem(2131559268, this, 2130969514, 2131891370); + return new WidgetUserProfileEmptyListItem(2131559269, this, 2130969514, 2131891403); } if (i == 1) { - return new ViewHolder(2131559271, this); + return new ViewHolder(2131559272, this); } throw invalidViewTypeException(i); } @@ -415,7 +415,7 @@ public final class WidgetUserMutualGuilds extends AppFragment { } public WidgetUserMutualGuilds() { - super(2131559264); + super(2131559265); } public static final /* synthetic */ void access$configureUI(WidgetUserMutualGuilds widgetUserMutualGuilds, Model model) { @@ -424,7 +424,7 @@ public final class WidgetUserMutualGuilds extends AppFragment { private final void configureUI(Model model) { int numMutualGuilds = model.getNumMutualGuilds(); - setActionBarTitle(StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755352, 2131891281, Integer.valueOf(numMutualGuilds), Integer.valueOf(numMutualGuilds))); + setActionBarTitle(StringResourceUtilsKt.getI18nPluralString(requireContext(), 2131755353, 2131891314, Integer.valueOf(numMutualGuilds), Integer.valueOf(numMutualGuilds))); User user = model.getUser(); setActionBarSubtitle(user != null ? user.getUsername() : null); Adapter adapter = this.adapter; diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java index 2d8f786df5..7752c57e09 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$binding$2.java @@ -22,11 +22,11 @@ public final /* synthetic */ class WidgetUserPasswordVerify$binding$2 extends k int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131362960; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362960); + i = 2131362962; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131362962); if (textInputLayout != null) { - i = 2131364769; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364769); + i = 2131364772; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364772); if (floatingActionButton != null) { return new WidgetUserPasswordVerifyBinding((CoordinatorLayout) view, dimmerView, textInputLayout, floatingActionButton); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java index af951da346..329834363e 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify$validationManager$2.java @@ -21,8 +21,8 @@ public final class WidgetUserPasswordVerify$validationManager$2 extends o implem @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final ValidationManager mo1invoke() { - TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f1984c; + TextInputLayout textInputLayout = WidgetUserPasswordVerify.access$getBinding$p(this.this$0).f1986c; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap"); - return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131891744), AuthUtils.INSTANCE.createPasswordInputValidator(2131891733))); + return new ValidationManager(new Input.TextInputLayoutInput("password", textInputLayout, BasicTextInputValidator.Companion.createRequiredInputValidator(2131891781), AuthUtils.INSTANCE.createPasswordInputValidator(2131891770))); } } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java index f2d1fa7cbd..5ad57b10ea 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserPasswordVerify.java @@ -48,7 +48,7 @@ public final class WidgetUserPasswordVerify extends AppFragment { private static final String INTENT_EXTRA_PHONE_TOKEN = "INTENT_EXTRA_PHONE_TOKEN"; private static final String INTENT_EXTRA_USERNAME = "INTENT_EXTRA_USERNAME"; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetUserPasswordVerify$binding$2.INSTANCE, null, 2, null); - private final StatefulViews state = new StatefulViews(2131362960); + private final StatefulViews state = new StatefulViews(2131362962); private final Lazy validationManager$delegate = g.lazy(new WidgetUserPasswordVerify$validationManager$2(this)); /* compiled from: WidgetUserPasswordVerify.kt */ @@ -129,7 +129,7 @@ public final class WidgetUserPasswordVerify extends AppFragment { } public WidgetUserPasswordVerify() { - super(2131559265); + super(2131559266); } public static final /* synthetic */ void access$finishWithSuccess(WidgetUserPasswordVerify widgetUserPasswordVerify) { @@ -150,7 +150,7 @@ public final class WidgetUserPasswordVerify extends AppFragment { private final void finishWithSuccess() { StatefulViews.clear$default(this.state, false, 1, null); - o.i(this, 2131892932, 0, 4); + o.i(this, 2131892974, 0, 4); FragmentActivity activity = getActivity(); if (activity != null) { activity.setResult(-1); @@ -188,7 +188,7 @@ public final class WidgetUserPasswordVerify extends AppFragment { private final void saveInfo() { if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) { AppFragment.hideKeyboard$default(this, null, 1, null); - TextInputLayout textInputLayout = getBinding().f1984c; + TextInputLayout textInputLayout = getBinding().f1986c; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); Serializable serializableExtra = getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_ACTION"); @@ -222,15 +222,15 @@ public final class WidgetUserPasswordVerify extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarSubtitle(2131894217); - setActionBarTitle(2131894240); + setActionBarSubtitle(2131894256); + setActionBarTitle(2131894279); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); StatefulViews statefulViews = this.state; FloatingActionButton floatingActionButton = getBinding().d; - TextInputLayout textInputLayout = getBinding().f1984c; + TextInputLayout textInputLayout = getBinding().f1986c; m.checkNotNullExpressionValue(textInputLayout, "binding.editAccountPasswordWrap"); statefulViews.setupTextWatcherWithSaveAction(this, floatingActionButton, textInputLayout); - TextInputLayout textInputLayout2 = getBinding().f1984c; + TextInputLayout textInputLayout2 = getBinding().f1986c; m.checkNotNullExpressionValue(textInputLayout2, "binding.editAccountPasswordWrap"); ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserPasswordVerify$onViewBound$1(this), 1, null); getBinding().d.setOnClickListener(new WidgetUserPasswordVerify$onViewBound$2(this)); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java index 60374284d9..e782c25677 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus$binding$2.java @@ -22,35 +22,35 @@ public final /* synthetic */ class WidgetUserSetCustomStatus$binding$2 extends k public final WidgetUserSetCustomStatusBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364711; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364711); + int i = 2131364714; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364714); if (simpleDraweeView != null) { - i = 2131364712; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364712); + i = 2131364715; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364715); if (frameLayout != null) { - i = 2131364713; - RadioGroup radioGroup = (RadioGroup) view.findViewById(2131364713); + i = 2131364716; + RadioGroup radioGroup = (RadioGroup) view.findViewById(2131364716); if (radioGroup != null) { - i = 2131364714; - MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(2131364714); + i = 2131364717; + MaterialRadioButton materialRadioButton = (MaterialRadioButton) view.findViewById(2131364717); if (materialRadioButton != null) { - i = 2131364715; - MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(2131364715); + i = 2131364718; + MaterialRadioButton materialRadioButton2 = (MaterialRadioButton) view.findViewById(2131364718); if (materialRadioButton2 != null) { - i = 2131364716; - MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(2131364716); + i = 2131364719; + MaterialRadioButton materialRadioButton3 = (MaterialRadioButton) view.findViewById(2131364719); if (materialRadioButton3 != null) { - i = 2131364717; - MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(2131364717); + i = 2131364720; + MaterialRadioButton materialRadioButton4 = (MaterialRadioButton) view.findViewById(2131364720); if (materialRadioButton4 != null) { - i = 2131364718; - MaterialRadioButton materialRadioButton5 = (MaterialRadioButton) view.findViewById(2131364718); + i = 2131364721; + MaterialRadioButton materialRadioButton5 = (MaterialRadioButton) view.findViewById(2131364721); if (materialRadioButton5 != null) { - i = 2131364719; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364719); + i = 2131364722; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131364722); if (floatingActionButton != null) { - i = 2131364720; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364720); + i = 2131364723; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131364723); if (textInputLayout != null) { return new WidgetUserSetCustomStatusBinding((CoordinatorLayout) view, simpleDraweeView, frameLayout, radioGroup, materialRadioButton, materialRadioButton2, materialRadioButton3, materialRadioButton4, materialRadioButton5, floatingActionButton, textInputLayout); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java index 60540f60b6..6d480e76e5 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatus.java @@ -83,7 +83,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment { } public WidgetUserSetCustomStatus() { - super(2131559273); + super(2131559274); WidgetUserSetCustomStatus$viewModel$2 widgetUserSetCustomStatus$viewModel$2 = WidgetUserSetCustomStatus$viewModel$2.INSTANCE; h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(WidgetUserSetCustomStatusViewModel.class), new WidgetUserSetCustomStatus$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetUserSetCustomStatus$viewModel$2)); @@ -151,7 +151,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment { this.currentEmojiUri = imageUri; } } else { - getBinding().b.setActualImageResource(2131231929); + getBinding().b.setActualImageResource(2131231932); this.currentEmojiUri = null; } TextInputLayout textInputLayout = getBinding().j; @@ -209,9 +209,9 @@ public final class WidgetUserSetCustomStatus extends AppFragment { window.setSoftInputMode(32); } AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131887988); + setActionBarTitle(2131887989); this.expirationRadioManager = new RadioManager(n.listOf((Object[]) new MaterialRadioButton[]{getBinding().g, getBinding().e, getBinding().d, getBinding().f, getBinding().h})); - getBinding().f1990c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this)); + getBinding().f1992c.setOnClickListener(new WidgetUserSetCustomStatus$onViewBound$1(this)); getBinding().j.setEndIconOnClickListener(new WidgetUserSetCustomStatus$onViewBound$2(this)); TextInputLayout textInputLayout = getBinding().j; m.checkNotNullExpressionValue(textInputLayout, "binding.setCustomStatusText"); @@ -224,7 +224,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment { CharSequence quantityString = StringResourceUtilsKt.getQuantityString(resources, requireContext(), 2131755057, 30, 30); MaterialRadioButton materialRadioButton2 = getBinding().e; m.checkNotNullExpressionValue(materialRadioButton2, "binding.setCustomStatusExpiration30Minutes"); - materialRadioButton2.setText(b.j(this, 2131887992, new Object[]{quantityString}, null, 4)); + materialRadioButton2.setText(b.j(this, 2131887993, new Object[]{quantityString}, null, 4)); MaterialRadioButton materialRadioButton3 = getBinding().e; m.checkNotNullExpressionValue(materialRadioButton3, "binding.setCustomStatusExpiration30Minutes"); setExpirationOnCheck(materialRadioButton3, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_30_MINUTES); @@ -233,7 +233,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment { CharSequence quantityString2 = StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755056, 1, 1); MaterialRadioButton materialRadioButton4 = getBinding().d; m.checkNotNullExpressionValue(materialRadioButton4, "binding.setCustomStatusExpiration1Hour"); - materialRadioButton4.setText(b.j(this, 2131887991, new Object[]{quantityString2}, null, 4)); + materialRadioButton4.setText(b.j(this, 2131887992, new Object[]{quantityString2}, null, 4)); MaterialRadioButton materialRadioButton5 = getBinding().d; m.checkNotNullExpressionValue(materialRadioButton5, "binding.setCustomStatusExpiration1Hour"); setExpirationOnCheck(materialRadioButton5, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_1_HOUR); @@ -242,7 +242,7 @@ public final class WidgetUserSetCustomStatus extends AppFragment { CharSequence quantityString3 = StringResourceUtilsKt.getQuantityString(resources3, requireContext(), 2131755056, 4, 4); MaterialRadioButton materialRadioButton6 = getBinding().f; m.checkNotNullExpressionValue(materialRadioButton6, "binding.setCustomStatusExpiration4Hours"); - materialRadioButton6.setText(b.j(this, 2131887991, new Object[]{quantityString3}, null, 4)); + materialRadioButton6.setText(b.j(this, 2131887992, new Object[]{quantityString3}, null, 4)); MaterialRadioButton materialRadioButton7 = getBinding().f; m.checkNotNullExpressionValue(materialRadioButton7, "binding.setCustomStatusExpiration4Hours"); setExpirationOnCheck(materialRadioButton7, WidgetUserSetCustomStatusViewModel.FormState.Expiration.IN_4_HOURS); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java index c0f7dde245..f6f5fd3f78 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.java @@ -507,12 +507,12 @@ public final class WidgetUserSetCustomStatusViewModel extends AppViewModel publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.SetStatusFailure(2131888048)); + publishSubject.j.onNext(new Event.SetStatusFailure(2131888049)); } private final void emitSetStatusSuccessEvent() { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.SetStatusSuccess(2131888003)); + publishSubject.j.onNext(new Event.SetStatusSuccess(2131888004)); } private final Emoji getEmojiFromSetting(ModelCustomStatusSetting modelCustomStatusSetting, EmojiSet emojiSet) { diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java index cfd7911d2f..ca1f1e3313 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet$binding$2.java @@ -19,26 +19,26 @@ public final /* synthetic */ class WidgetUserStatusSheet$binding$2 extends k imp public final WidgetUserStatusUpdateBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363340; - TextView textView = (TextView) view.findViewById(2131363340); + int i = 2131363342; + TextView textView = (TextView) view.findViewById(2131363342); if (textView != null) { - i = 2131365458; - UserStatusPresenceCustomView userStatusPresenceCustomView = (UserStatusPresenceCustomView) view.findViewById(2131365458); + i = 2131365464; + UserStatusPresenceCustomView userStatusPresenceCustomView = (UserStatusPresenceCustomView) view.findViewById(2131365464); if (userStatusPresenceCustomView != null) { - i = 2131365459; - View findViewById = view.findViewById(2131365459); + i = 2131365465; + View findViewById = view.findViewById(2131365465); if (findViewById != null) { q3 a = q3.a(findViewById); - i = 2131365460; - View findViewById2 = view.findViewById(2131365460); + i = 2131365466; + View findViewById2 = view.findViewById(2131365466); if (findViewById2 != null) { q3 a2 = q3.a(findViewById2); - i = 2131365461; - View findViewById3 = view.findViewById(2131365461); + i = 2131365467; + View findViewById3 = view.findViewById(2131365467); if (findViewById3 != null) { q3 a3 = q3.a(findViewById3); - i = 2131365462; - View findViewById4 = view.findViewById(2131365462); + i = 2131365468; + View findViewById4 = view.findViewById(2131365468); if (findViewById4 != null) { return new WidgetUserStatusUpdateBinding((NestedScrollView) view, textView, userStatusPresenceCustomView, a, a2, a3, q3.a(findViewById4)); } diff --git a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java index 8dc44bf466..218ede0191 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetUserStatusSheet.java @@ -109,7 +109,7 @@ public final class WidgetUserStatusSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559275; + return 2131559276; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -128,25 +128,25 @@ public final class WidgetUserStatusSheet extends AppBottomSheet { public void onViewCreated(View view, Bundle bundle) { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); - getBinding().f.b.setImageResource(2131231959); - getBinding().f.d.setText(2131893471); + getBinding().f.b.setImageResource(2131231962); + getBinding().f.d.setText(2131893511); q3 q3Var = getBinding().f; m.checkNotNullExpressionValue(q3Var, "binding.userStatusUpdateOnline"); q3Var.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$1(this)); - getBinding().d.b.setImageResource(2131231957); - getBinding().d.d.setText(2131893467); + getBinding().d.b.setImageResource(2131231960); + getBinding().d.d.setText(2131893507); q3 q3Var2 = getBinding().d; m.checkNotNullExpressionValue(q3Var2, "binding.userStatusUpdateIdle"); q3Var2.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$2(this)); - getBinding().f1996c.b.setImageResource(2131231956); - getBinding().f1996c.d.setText(2131893465); - getBinding().f1996c.f143c.setText(2131893466); - q3 q3Var3 = getBinding().f1996c; + getBinding().f1998c.b.setImageResource(2131231959); + getBinding().f1998c.d.setText(2131893505); + getBinding().f1998c.f143c.setText(2131893506); + q3 q3Var3 = getBinding().f1998c; m.checkNotNullExpressionValue(q3Var3, "binding.userStatusUpdateDnd"); q3Var3.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$3(this)); - getBinding().e.b.setImageResource(2131231958); - getBinding().e.d.setText(2131893468); - getBinding().e.f143c.setText(2131893469); + getBinding().e.b.setImageResource(2131231961); + getBinding().e.d.setText(2131893508); + getBinding().e.f143c.setText(2131893509); q3 q3Var4 = getBinding().e; m.checkNotNullExpressionValue(q3Var4, "binding.userStatusUpdateInvisible"); q3Var4.a.setOnClickListener(new WidgetUserStatusSheet$onViewCreated$4(this)); diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java index 8674791ec3..59b99fc340 100644 --- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify$binding$2.java @@ -18,17 +18,17 @@ public final /* synthetic */ class WidgetUserAccountVerify$binding$2 extends k i public final WidgetUserAccountVerifyBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365470; - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365470); + int i = 2131365476; + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365476); if (relativeLayout != null) { - i = 2131365471; - RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365471); + i = 2131365477; + RelativeLayout relativeLayout2 = (RelativeLayout) view.findViewById(2131365477); if (relativeLayout2 != null) { - i = 2131365472; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365472); + i = 2131365478; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131365478); if (linkifiedTextView != null) { - i = 2131365473; - TextView textView = (TextView) view.findViewById(2131365473); + i = 2131365479; + TextView textView = (TextView) view.findViewById(2131365479); if (textView != null) { return new WidgetUserAccountVerifyBinding((RelativeLayout) view, relativeLayout, relativeLayout2, linkifiedTextView, textView); } diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java index 1a398d0529..16ea30527d 100644 --- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java +++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerify.java @@ -51,7 +51,7 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase { } public WidgetUserAccountVerify() { - super(2131559258); + super(2131559259); } private final WidgetUserAccountVerifyBinding getBinding() { @@ -67,14 +67,14 @@ public final class WidgetUserAccountVerify extends WidgetUserAccountVerifyBase { WidgetUserAccountVerifyBinding binding = getBinding(); TextView textView = binding.e; m.checkNotNullExpressionValue(textView, "verifyAccountTextBody"); - textView.setText(b.j(this, 2131894379, new Object[0], null, 4)); + textView.setText(b.j(this, 2131894426, new Object[0], null, 4)); LinkifiedTextView linkifiedTextView = binding.d; m.checkNotNullExpressionValue(linkifiedTextView, "verifyAccountSupport"); - linkifiedTextView.setText(b.j(this, 2131894387, new Object[]{f.c()}, null, 4)); + linkifiedTextView.setText(b.j(this, 2131894434, new Object[]{f.c()}, null, 4)); RelativeLayout relativeLayout = binding.b; relativeLayout.setVisibility(isEmailAllowed() ? 0 : 8); relativeLayout.setOnClickListener(new WidgetUserAccountVerify$onViewBound$$inlined$with$lambda$1(this)); - RelativeLayout relativeLayout2 = binding.f1979c; + RelativeLayout relativeLayout2 = binding.f1981c; if (!isPhoneAllowed()) { i = 8; } diff --git a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java index 820fd49ad6..b7308a0505 100644 --- a/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java +++ b/app/src/main/java/com/discord/widgets/user/account/WidgetUserAccountVerifyBase$setOptionsMenu$1.java @@ -11,7 +11,7 @@ public final class WidgetUserAccountVerifyBase$setOptionsMenu$1 implemen public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363905) { + if (menuItem.getItemId() == 2131363907) { StoreStream.Companion.getAuthentication().logout(); } } diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java index c9c87dc8de..d4ad7c6c03 100644 --- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java +++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate$onViewBound$3.java @@ -36,7 +36,7 @@ public final class WidgetUserEmailUpdate$onViewBound$3 implements View.OnClickLi public final void onClick(View view) { RestAPI api = RestAPI.Companion.getApi(); RestAPIParams.UserInfo.Companion companion = RestAPIParams.UserInfo.Companion; - TextInputLayout textInputLayout = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).f1980c; + TextInputLayout textInputLayout = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).f1982c; m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangeEmail"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); TextInputLayout textInputLayout2 = WidgetUserEmailUpdate.access$getBinding$p(this.this$0).d; diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java index 64789033cd..286a08968c 100644 --- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java +++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailUpdate.java @@ -69,7 +69,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase { } public WidgetUserEmailUpdate() { - super(2131559259); + super(2131559260); } public static final /* synthetic */ WidgetUserEmailUpdateBinding access$getBinding$p(WidgetUserEmailUpdate widgetUserEmailUpdate) { @@ -94,7 +94,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase { m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangePassword"); if (ViewExtensions.getTextOrEmpty(textInputLayout).length() >= 3) { Pattern pattern = Patterns.EMAIL_ADDRESS; - TextInputLayout textInputLayout2 = getBinding().f1980c; + TextInputLayout textInputLayout2 = getBinding().f1982c; m.checkNotNullExpressionValue(textInputLayout2, "binding.alertVerifyEmailChangeEmail"); if (pattern.matcher(ViewExtensions.getTextOrEmpty(textInputLayout2)).matches()) { z2 = true; @@ -125,7 +125,7 @@ public final class WidgetUserEmailUpdate extends WidgetUserAccountVerifyBase { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - TextInputLayout textInputLayout = getBinding().f1980c; + TextInputLayout textInputLayout = getBinding().f1982c; m.checkNotNullExpressionValue(textInputLayout, "binding.alertVerifyEmailChangeEmail"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetUserEmailUpdate$onViewBound$1(this)); TextInputLayout textInputLayout2 = getBinding().d; diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java index 52cd243ea9..5b55dd48bc 100644 --- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java +++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify$configureUI$2.java @@ -37,7 +37,7 @@ public final class WidgetUserEmailVerify$configureUI$2 implements View.OnClickLi public final void invoke(Void r6) { WidgetUserEmailVerify$configureUI$2 widgetUserEmailVerify$configureUI$2 = this.this$0; WidgetUserEmailVerify widgetUserEmailVerify = widgetUserEmailVerify$configureUI$2.this$0; - c.a.d.o.j(widgetUserEmailVerify, b.j(widgetUserEmailVerify, 2131894381, new Object[]{widgetUserEmailVerify$configureUI$2.$model.getEmail()}, null, 4), 0, 4); + c.a.d.o.j(widgetUserEmailVerify, b.j(widgetUserEmailVerify, 2131894428, new Object[]{widgetUserEmailVerify$configureUI$2.$model.getEmail()}, null, 4), 0, 4); } } diff --git a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java index 153be3b6c3..31611c2de8 100644 --- a/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java +++ b/app/src/main/java/com/discord/widgets/user/email/WidgetUserEmailVerify.java @@ -127,7 +127,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase { } public WidgetUserEmailVerify() { - super(2131559260); + super(2131559261); } public static final /* synthetic */ void access$configureUI(WidgetUserEmailVerify widgetUserEmailVerify, Model model) { @@ -150,7 +150,7 @@ public final class WidgetUserEmailVerify extends WidgetUserAccountVerifyBase { WidgetUserEmailUpdate.Companion.launch(requireContext(), getMode(), this.emailUpdateLauncher); } else { getBinding().b.setOnClickListener(new WidgetUserEmailVerify$configureUI$1(this)); - getBinding().f1981c.setOnClickListener(new WidgetUserEmailVerify$configureUI$2(this, model)); + getBinding().f1983c.setOnClickListener(new WidgetUserEmailVerify$configureUI$2(this, model)); } } diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java index a9fa0c7ed4..25e55ce593 100644 --- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage$binding$2.java @@ -23,20 +23,20 @@ public final /* synthetic */ class WidgetUserPhoneManage$binding$2 extends k imp int i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364408; - TextView textView = (TextView) view.findViewById(2131364408); + i = 2131364411; + TextView textView = (TextView) view.findViewById(2131364411); if (textView != null) { - i = 2131365377; - TextView textView2 = (TextView) view.findViewById(2131365377); + i = 2131365382; + TextView textView2 = (TextView) view.findViewById(2131365382); if (textView2 != null) { - i = 2131365378; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365378); + i = 2131365383; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365383); if (materialButton != null) { - i = 2131365379; - PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131365379); + i = 2131365384; + PhoneOrEmailInputView phoneOrEmailInputView = (PhoneOrEmailInputView) view.findViewById(2131365384); if (phoneOrEmailInputView != null) { - i = 2131365380; - TextView textView3 = (TextView) view.findViewById(2131365380); + i = 2131365385; + TextView textView3 = (TextView) view.findViewById(2131365385); if (textView3 != null) { return new WidgetUserPhoneManageBinding((FrameLayout) view, dimmerView, textView, textView2, materialButton, phoneOrEmailInputView, textView3); } diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java index ee53e8f497..acfe655ea4 100644 --- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneManage.java @@ -65,7 +65,7 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase { } public WidgetUserPhoneManage() { - super(2131559266); + super(2131559267); } public static final /* synthetic */ void access$configureUI(WidgetUserPhoneManage widgetUserPhoneManage, MeUser meUser) { @@ -102,22 +102,22 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase { private final void configureUI(MeUser meUser) { if (meUser.getPhoneNumber() != null) { - getBinding().g.setText(2131891842); + getBinding().g.setText(2131891879); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.userPhoneAddDescriptionNote"); - b.n(textView, 2131891838, new Object[]{meUser.getPhoneNumber()}, null, 4); - TextView textView2 = getBinding().f1985c; + b.n(textView, 2131891875, new Object[]{meUser.getPhoneNumber()}, null, 4); + TextView textView2 = getBinding().f1987c; m.checkNotNullExpressionValue(textView2, "binding.removePhone"); textView2.setVisibility(0); } else { - getBinding().g.setText(2131888365); - getBinding().d.setText(2131888362); - TextView textView3 = getBinding().f1985c; + getBinding().g.setText(2131888375); + getBinding().d.setText(2131888372); + TextView textView3 = getBinding().f1987c; m.checkNotNullExpressionValue(textView3, "binding.removePhone"); textView3.setVisibility(8); } if (meUser.getEmail() == null) { - TextView textView4 = getBinding().f1985c; + TextView textView4 = getBinding().f1987c; m.checkNotNullExpressionValue(textView4, "binding.removePhone"); textView4.setVisibility(8); } @@ -148,29 +148,29 @@ public final class WidgetUserPhoneManage extends WidgetUserAccountVerifyBase { m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - CharSequence h = b.h(resources, 2131894236, new Object[0], null, 4); + CharSequence h = b.h(resources, 2131894275, new Object[0], null, 4); Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - CharSequence h2 = b.h(resources2, 2131894235, new Object[0], null, 4); + CharSequence h2 = b.h(resources2, 2131894274, new Object[0], null, 4); Resources resources3 = getResources(); m.checkNotNullExpressionValue(resources3, "resources"); - CharSequence h3 = b.h(resources3, 2131892516, new Object[0], null, 4); + CharSequence h3 = b.h(resources3, 2131892558, new Object[0], null, 4); Resources resources4 = getResources(); m.checkNotNullExpressionValue(resources4, "resources"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, h, h2, h3, b.h(resources4, 2131887177, new Object[0], null, 4), g0.mapOf(o.to(2131364030, new WidgetUserPhoneManage$removePhoneNumber$1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, h, h2, h3, b.h(resources4, 2131887178, new Object[0], null, 4), g0.mapOf(o.to(2131364032, new WidgetUserPhoneManage$removePhoneNumber$1(this))), null, null, null, 2130969788, null, null, 0, null, 15808, null); } @Override // com.discord.widgets.user.account.WidgetUserAccountVerifyBase, com.discord.app.AppFragment public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, !isForced(), Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(view, 2130969369, 0, 2, (Object) null)), !isForced() ? 2131887391 : null, null, 8, null); + AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, !isForced(), Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(view, 2130969369, 0, 2, (Object) null)), !isForced() ? 2131887393 : null, null, 8, null); getBinding().f.b(this); StorePhone phone = StoreStream.Companion.getPhone(); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservationDeck.connectRx$default(ObservationDeckProvider.get(), new ObservationDeck.UpdateSource[]{phone}, false, null, null, new WidgetUserPhoneManage$onViewBound$1(phone), 14, null), this, null, 2, null), WidgetUserPhoneManage.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserPhoneManage$onViewBound$2(this), 62, (Object) null); getBinding().f.a(this, new WidgetUserPhoneManage$onViewBound$3(this)); getBinding().e.setOnClickListener(new WidgetUserPhoneManage$onViewBound$4(this)); - getBinding().f1985c.setOnClickListener(new WidgetUserPhoneManage$onViewBound$5(this)); + getBinding().f1987c.setOnClickListener(new WidgetUserPhoneManage$onViewBound$5(this)); } @Override // com.discord.widgets.user.account.WidgetUserAccountVerifyBase, com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java index 74ab4ab60a..16d53f3366 100644 --- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$binding$2.java @@ -25,8 +25,8 @@ public final /* synthetic */ class WidgetUserPhoneVerify$binding$2 extends k imp i = 2131362896; DimmerView dimmerView = (DimmerView) view.findViewById(2131362896); if (dimmerView != null) { - i = 2131364211; - CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131364211); + i = 2131364213; + CodeVerificationView codeVerificationView = (CodeVerificationView) view.findViewById(2131364213); if (codeVerificationView != null) { return new WidgetUserPhoneVerifyBinding((RelativeLayout) view, imageView, dimmerView, codeVerificationView); } diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java index 4811334e19..cc1eb45d19 100644 --- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java @@ -63,7 +63,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase { } public WidgetUserPhoneVerify() { - super(2131559267); + super(2131559268); } public static final /* synthetic */ WidgetUserPhoneVerifyBinding access$getBinding$p(WidgetUserPhoneVerify widgetUserPhoneVerify) { @@ -94,7 +94,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase { String stringExtra = getMostRecentIntent().getStringExtra("INTENT_EXTRA_PHONE_NUMBER"); if (stringExtra != null) { m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…A_PHONE_NUMBER) ?: return"); - ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), false, 1, null), getBinding().f1986c, 0, 2, null), this, null, 2, null).k(q.h(new WidgetUserPhoneVerify$handleCodeEntered$1(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$2(this))); + ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), false, 1, null), getBinding().f1988c, 0, 2, null), this, null, 2, null).k(q.h(new WidgetUserPhoneVerify$handleCodeEntered$1(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$2(this))); } } diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java index 01a9d2e095..1c104c98c9 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderGameRichPresence.java @@ -54,7 +54,7 @@ public final class ViewHolderGameRichPresence extends ViewHolderUserRichPresence ActivityParty i = activity.i(); if (i != null) { PresenceUtils presenceUtils = PresenceUtils.INSTANCE; - charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = getRoot().getContext()) == null) ? null : b.g(context, 2131894167, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4); + charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = getRoot().getContext()) == null) ? null : b.g(context, 2131894206, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4); } charSequence = ""; String str2 = l + ' ' + charSequence; diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java index 49e11df0a1..2eac0edfa4 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.java @@ -87,14 +87,14 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc TextView richPresenceDetails = getRichPresenceDetails(); if (richPresenceDetails != null) { m.checkNotNullExpressionValue(context2, "context"); - ViewExtensions.setTextAndVisibilityBy(richPresenceDetails, b.g(context2, 2131894160, new Object[]{replace$default}, null, 4)); + ViewExtensions.setTextAndVisibilityBy(richPresenceDetails, b.g(context2, 2131894199, new Object[]{replace$default}, null, 4)); } TextView richPresenceTime = getRichPresenceTime(); m.checkNotNullExpressionValue(context2, "context"); Object[] objArr = new Object[1]; ActivityAssets b = primaryActivity.b(); objArr[0] = b != null ? b.b() : null; - ViewExtensions.setTextAndVisibilityBy(richPresenceTime, b.g(context2, 2131894159, objArr, null, 4)); + ViewExtensions.setTextAndVisibilityBy(richPresenceTime, b.g(context2, 2131894198, objArr, null, 4)); getRichPresenceTextContainer().setSelected(true); configureAssetUi(primaryActivity, streamContext); Button richPresencePrimaryButton = getRichPresencePrimaryButton(); @@ -111,7 +111,7 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc if (z2) { Button richPresencePrimaryButton2 = getRichPresencePrimaryButton(); if (richPresencePrimaryButton2 != null) { - b.n(richPresencePrimaryButton2, 2131894138, new Object[0], null, 4); + b.n(richPresencePrimaryButton2, 2131894177, new Object[0], null, 4); } Button richPresencePrimaryButton3 = getRichPresencePrimaryButton(); if (richPresencePrimaryButton3 != null) { @@ -120,7 +120,7 @@ public final class ViewHolderMusicRichPresence extends ViewHolderUserRichPresenc } else { Button richPresencePrimaryButton4 = getRichPresencePrimaryButton(); if (richPresencePrimaryButton4 != null) { - b.n(richPresencePrimaryButton4, 2131894163, new Object[]{primaryActivity.h()}, null, 4); + b.n(richPresencePrimaryButton4, 2131894202, new Object[]{primaryActivity.h()}, null, 4); } Button richPresencePrimaryButton5 = getRichPresencePrimaryButton(); if (richPresencePrimaryButton5 != null) { diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java index f5d52336ba..ae3a4d4b1a 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java @@ -118,7 +118,7 @@ public final class ViewHolderPlatformRichPresence extends ViewHolderUserRichPres if (richPresencePrimaryButton2 != null) { Context context3 = getRoot().getContext(); m.checkNotNullExpressionValue(context3, "root.context"); - richPresencePrimaryButton2.setText(b.g(context3, 2131894141, new Object[]{from.getProperName()}, null, 4)); + richPresencePrimaryButton2.setText(b.g(context3, 2131894180, new Object[]{from.getProperName()}, null, 4)); } if (from.getEnabled()) { Observable s2 = StoreStream.Companion.getUserConnections().observeConnectedAccounts().G(new ViewHolderPlatformRichPresence$configureUi$1(from)).s(); diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java index 8224b3043f..1ec96defa0 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStageChannelRichPresence.java @@ -116,7 +116,7 @@ public final class ViewHolderStageChannelRichPresence extends ViewHolderUserRich richPresenceDetails.setVisibility((b != null ? b.d() : null) != null ? 0 : 8); ActivityAssets b2 = activity.b(); if (b2 != null && (d = b2.d()) != null) { - b.n(richPresenceDetails, 2131893355, new Object[]{d}, null, 4); + b.n(richPresenceDetails, 2131893397, new Object[]{d}, null, 4); return; } return; diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java index cb0e260aeb..d20450ca19 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.java @@ -63,7 +63,7 @@ public final class ViewHolderStreamRichPresence extends ViewHolderUserRichPresen if (activityParty != null) { PresenceUtils presenceUtils = PresenceUtils.INSTANCE; if (presenceUtils.getMaxSize(activityParty) != 0) { - charSequence = b.i(getRoot(), 2131894167, new Object[]{String.valueOf(presenceUtils.getCurrentSize(activityParty)), String.valueOf(presenceUtils.getMaxSize(activityParty))}, null, 4); + charSequence = b.i(getRoot(), 2131894206, new Object[]{String.valueOf(presenceUtils.getCurrentSize(activityParty)), String.valueOf(presenceUtils.getMaxSize(activityParty))}, null, 4); } } charSequence = ""; @@ -84,7 +84,7 @@ public final class ViewHolderStreamRichPresence extends ViewHolderUserRichPresen Guild guild = streamContext.getGuild(); CharSequence charSequence = null; String name = guild != null ? guild.getName() : null; - getRichPresenceHeader().setText(name != null ? b.i(getRichPresenceHeader(), 2131894148, new Object[]{name}, null, 4) : b.i(getRichPresenceHeader(), 2131894147, new Object[0], null, 4)); + getRichPresenceHeader().setText(name != null ? b.i(getRichPresenceHeader(), 2131894187, new Object[]{name}, null, 4) : b.i(getRichPresenceHeader(), 2131894186, new Object[0], null, 4)); if (activity == null || !ActivityUtilsKt.isGameActivity(activity)) { getRichPresenceTextContainer().setVisibility(8); return; diff --git a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java index c53bba56b5..608b1190c9 100644 --- a/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java +++ b/app/src/main/java/com/discord/widgets/user/presence/ViewHolderUserRichPresence.java @@ -125,25 +125,25 @@ public class ViewHolderUserRichPresence { return new ViewHolderGameRichPresence(viewGroup, simpleDraweeView, simpleDraweeView2, textView, textView2, textView3, textView4, textView5, linearLayout, materialButton, materialButton2); } else if (i != 2) { if (i == 3) { - View inflate = from.inflate(2131559107, viewGroup, false); + View inflate = from.inflate(2131559108, viewGroup, false); viewGroup.addView(inflate); Barrier barrier = (Barrier) inflate.findViewById(2131362092); if (barrier != null) { - Space space = (Space) inflate.findViewById(2131363538); + Space space = (Space) inflate.findViewById(2131363540); if (space != null) { - LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131364435); + LinearLayout linearLayout2 = (LinearLayout) inflate.findViewById(2131364438); if (linearLayout2 != null) { - TextView textView6 = (TextView) inflate.findViewById(2131364437); + TextView textView6 = (TextView) inflate.findViewById(2131364440); if (textView6 != null) { - SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) inflate.findViewById(2131364438); + SimpleDraweeView simpleDraweeView3 = (SimpleDraweeView) inflate.findViewById(2131364441); if (simpleDraweeView3 != null) { - SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) inflate.findViewById(2131364441); + SimpleDraweeView simpleDraweeView4 = (SimpleDraweeView) inflate.findViewById(2131364444); if (simpleDraweeView4 != null) { - MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131364445); + MaterialButton materialButton3 = (MaterialButton) inflate.findViewById(2131364448); if (materialButton3 != null) { - TextView textView7 = (TextView) inflate.findViewById(2131364449); + TextView textView7 = (TextView) inflate.findViewById(2131364452); if (textView7 != null) { - TextView textView8 = (TextView) inflate.findViewById(2131364450); + TextView textView8 = (TextView) inflate.findViewById(2131364453); if (textView8 != null) { m.checkNotNullExpressionValue(new y4((LinearLayout) inflate, barrier, space, linearLayout2, textView6, simpleDraweeView3, simpleDraweeView4, materialButton3, textView7, textView8), "WidgetPlatformRichPresen…e(inflater, parent, true)"); m.checkNotNullExpressionValue(simpleDraweeView3, "binding.richPresenceImageLarge"); @@ -155,52 +155,52 @@ public class ViewHolderUserRichPresence { m.checkNotNullExpressionValue(materialButton3, "binding.richPresencePrimaryButton"); viewHolderUserRichPresence = new ViewHolderPlatformRichPresence(viewGroup, simpleDraweeView3, simpleDraweeView4, textView6, textView8, textView7, linearLayout2, materialButton3); } else { - i3 = 2131364450; + i3 = 2131364453; } } else { - i3 = 2131364449; + i3 = 2131364452; } } else { - i3 = 2131364445; + i3 = 2131364448; } } else { - i3 = 2131364441; + i3 = 2131364444; } } else { - i3 = 2131364438; + i3 = 2131364441; } } else { - i3 = 2131364437; + i3 = 2131364440; } } else { - i3 = 2131364435; + i3 = 2131364438; } } else { - i3 = 2131363538; + i3 = 2131363540; } } else { i3 = 2131362092; } throw new NullPointerException("Missing required view with ID: ".concat(inflate.getResources().getResourceName(i3))); } else if (i == 4) { - View inflate2 = from.inflate(2131559241, viewGroup, false); + View inflate2 = from.inflate(2131559242, viewGroup, false); viewGroup.addView(inflate2); - LinearLayout linearLayout3 = (LinearLayout) inflate2.findViewById(2131364435); + LinearLayout linearLayout3 = (LinearLayout) inflate2.findViewById(2131364438); if (linearLayout3 != null) { - TextView textView9 = (TextView) inflate2.findViewById(2131364436); + TextView textView9 = (TextView) inflate2.findViewById(2131364439); if (textView9 != null) { - TextView textView10 = (TextView) inflate2.findViewById(2131364437); + TextView textView10 = (TextView) inflate2.findViewById(2131364440); if (textView10 != null) { - SimpleDraweeView simpleDraweeView5 = (SimpleDraweeView) inflate2.findViewById(2131364438); + SimpleDraweeView simpleDraweeView5 = (SimpleDraweeView) inflate2.findViewById(2131364441); if (simpleDraweeView5 != null) { - TextView textView11 = (TextView) inflate2.findViewById(2131364448); + TextView textView11 = (TextView) inflate2.findViewById(2131364451); if (textView11 != null) { - TextView textView12 = (TextView) inflate2.findViewById(2131364449); + TextView textView12 = (TextView) inflate2.findViewById(2131364452); if (textView12 != null) { - TextView textView13 = (TextView) inflate2.findViewById(2131364450); + TextView textView13 = (TextView) inflate2.findViewById(2131364453); str2 = "Missing required view with ID: "; if (textView13 != null) { - StreamPreviewView streamPreviewView = (StreamPreviewView) inflate2.findViewById(2131365119); + StreamPreviewView streamPreviewView = (StreamPreviewView) inflate2.findViewById(2131365123); if (streamPreviewView != null) { m.checkNotNullExpressionValue(new h5((ConstraintLayout) inflate2, linearLayout3, textView9, textView10, simpleDraweeView5, textView11, textView12, textView13, streamPreviewView), "WidgetStreamRichPresence…e(inflater, parent, true)"); m.checkNotNullExpressionValue(simpleDraweeView5, "binding.richPresenceImageLarge"); @@ -213,34 +213,34 @@ public class ViewHolderUserRichPresence { m.checkNotNullExpressionValue(streamPreviewView, "binding.streamPreview"); viewHolderUserRichPresence = new ViewHolderStreamRichPresence(viewGroup, simpleDraweeView5, textView10, textView13, textView9, textView12, textView11, linearLayout3, streamPreviewView); } else { - i4 = 2131365119; + i4 = 2131365123; } } else { - i4 = 2131364450; + i4 = 2131364453; } } else { str2 = "Missing required view with ID: "; - i4 = 2131364449; + i4 = 2131364452; } } else { str2 = "Missing required view with ID: "; - i4 = 2131364448; + i4 = 2131364451; } } else { str2 = "Missing required view with ID: "; - i4 = 2131364438; + i4 = 2131364441; } } else { str2 = "Missing required view with ID: "; - i4 = 2131364437; + i4 = 2131364440; } } else { str2 = "Missing required view with ID: "; - i4 = 2131364436; + i4 = 2131364439; } } else { str2 = "Missing required view with ID: "; - i4 = 2131364435; + i4 = 2131364438; } throw new NullPointerException(str2.concat(inflate2.getResources().getResourceName(i4))); } else if (i != 5) { @@ -261,30 +261,30 @@ public class ViewHolderUserRichPresence { m.checkNotNullExpressionValue(linearLayout4, "binding.richPresenceContainerData"); return new ViewHolderUserRichPresence(viewGroup, simpleDraweeView6, simpleDraweeView7, textView14, textView15, textView16, textView17, textView18, linearLayout4, a2.g, a2.h, 0, 2048, null); } else { - View inflate3 = from.inflate(2131559226, viewGroup, false); + View inflate3 = from.inflate(2131559227, viewGroup, false); viewGroup.addView(inflate3); Barrier barrier2 = (Barrier) inflate3.findViewById(2131362092); if (barrier2 != null) { - Space space2 = (Space) inflate3.findViewById(2131363538); + Space space2 = (Space) inflate3.findViewById(2131363540); if (space2 != null) { - LinearLayout linearLayout5 = (LinearLayout) inflate3.findViewById(2131364435); + LinearLayout linearLayout5 = (LinearLayout) inflate3.findViewById(2131364438); if (linearLayout5 != null) { - TextView textView19 = (TextView) inflate3.findViewById(2131364436); + TextView textView19 = (TextView) inflate3.findViewById(2131364439); if (textView19 != null) { - TextView textView20 = (TextView) inflate3.findViewById(2131364437); + TextView textView20 = (TextView) inflate3.findViewById(2131364440); if (textView20 != null) { - SimpleDraweeView simpleDraweeView8 = (SimpleDraweeView) inflate3.findViewById(2131364438); + SimpleDraweeView simpleDraweeView8 = (SimpleDraweeView) inflate3.findViewById(2131364441); if (simpleDraweeView8 != null) { - TextView textView21 = (TextView) inflate3.findViewById(2131364439); + TextView textView21 = (TextView) inflate3.findViewById(2131364442); if (textView21 != null) { - FrameLayout frameLayout = (FrameLayout) inflate3.findViewById(2131364440); + FrameLayout frameLayout = (FrameLayout) inflate3.findViewById(2131364443); if (frameLayout != null) { - MaterialButton materialButton4 = (MaterialButton) inflate3.findViewById(2131364445); + MaterialButton materialButton4 = (MaterialButton) inflate3.findViewById(2131364448); if (materialButton4 != null) { - TextView textView22 = (TextView) inflate3.findViewById(2131364449); + TextView textView22 = (TextView) inflate3.findViewById(2131364452); str3 = "Missing required view with ID: "; if (textView22 != null) { - TextView textView23 = (TextView) inflate3.findViewById(2131364450); + TextView textView23 = (TextView) inflate3.findViewById(2131364453); if (textView23 != null) { m.checkNotNullExpressionValue(new g5((LinearLayout) inflate3, barrier2, space2, linearLayout5, textView19, textView20, simpleDraweeView8, textView21, frameLayout, materialButton4, textView22, textView23), "WidgetStageChannelRichPr…e(inflater, parent, true)"); m.checkNotNullExpressionValue(simpleDraweeView8, "binding.richPresenceImageLarge"); @@ -297,42 +297,42 @@ public class ViewHolderUserRichPresence { m.checkNotNullExpressionValue(textView21, "binding.richPresenceImageLargeText"); viewHolderUserRichPresence = new ViewHolderStageChannelRichPresence(viewGroup, simpleDraweeView8, textView20, textView23, textView19, textView22, linearLayout5, materialButton4, textView21); } else { - i5 = 2131364450; + i5 = 2131364453; } } else { - i5 = 2131364449; + i5 = 2131364452; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364445; + i5 = 2131364448; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364440; + i5 = 2131364443; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364439; + i5 = 2131364442; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364438; + i5 = 2131364441; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364437; + i5 = 2131364440; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364436; + i5 = 2131364439; } } else { str3 = "Missing required view with ID: "; - i5 = 2131364435; + i5 = 2131364438; } } else { str3 = "Missing required view with ID: "; - i5 = 2131363538; + i5 = 2131363540; } } else { str3 = "Missing required view with ID: "; @@ -342,37 +342,37 @@ public class ViewHolderUserRichPresence { } return viewHolderUserRichPresence; } else { - View inflate4 = from.inflate(2131559089, viewGroup, false); + View inflate4 = from.inflate(2131559090, viewGroup, false); viewGroup.addView(inflate4); Barrier barrier3 = (Barrier) inflate4.findViewById(2131362092); if (barrier3 != null) { - Space space3 = (Space) inflate4.findViewById(2131363538); + Space space3 = (Space) inflate4.findViewById(2131363540); if (space3 != null) { - LinearLayout linearLayout6 = (LinearLayout) inflate4.findViewById(2131364435); + LinearLayout linearLayout6 = (LinearLayout) inflate4.findViewById(2131364438); if (linearLayout6 != null) { - TextView textView24 = (TextView) inflate4.findViewById(2131364436); + TextView textView24 = (TextView) inflate4.findViewById(2131364439); if (textView24 != null) { - TextView textView25 = (TextView) inflate4.findViewById(2131364437); + TextView textView25 = (TextView) inflate4.findViewById(2131364440); if (textView25 != null) { - i2 = 2131364438; - SimpleDraweeView simpleDraweeView9 = (SimpleDraweeView) inflate4.findViewById(2131364438); + i2 = 2131364441; + SimpleDraweeView simpleDraweeView9 = (SimpleDraweeView) inflate4.findViewById(2131364441); if (simpleDraweeView9 != null) { - SimpleDraweeView simpleDraweeView10 = (SimpleDraweeView) inflate4.findViewById(2131364441); + SimpleDraweeView simpleDraweeView10 = (SimpleDraweeView) inflate4.findViewById(2131364444); if (simpleDraweeView10 != null) { - TextView textView26 = (TextView) inflate4.findViewById(2131364442); + TextView textView26 = (TextView) inflate4.findViewById(2131364445); str = "Missing required view with ID: "; if (textView26 != null) { - TextView textView27 = (TextView) inflate4.findViewById(2131364443); + TextView textView27 = (TextView) inflate4.findViewById(2131364446); if (textView27 != null) { - FrameLayout frameLayout2 = (FrameLayout) inflate4.findViewById(2131364444); + FrameLayout frameLayout2 = (FrameLayout) inflate4.findViewById(2131364447); if (frameLayout2 != null) { - MaterialButton materialButton5 = (MaterialButton) inflate4.findViewById(2131364445); + MaterialButton materialButton5 = (MaterialButton) inflate4.findViewById(2131364448); if (materialButton5 != null) { - SeekBar seekBar = (SeekBar) inflate4.findViewById(2131364447); + SeekBar seekBar = (SeekBar) inflate4.findViewById(2131364450); if (seekBar != null) { - TextView textView28 = (TextView) inflate4.findViewById(2131364449); + TextView textView28 = (TextView) inflate4.findViewById(2131364452); if (textView28 != null) { - TextView textView29 = (TextView) inflate4.findViewById(2131364450); + TextView textView29 = (TextView) inflate4.findViewById(2131364453); if (textView29 != null) { m.checkNotNullExpressionValue(new x4((LinearLayout) inflate4, barrier3, space3, linearLayout6, textView24, textView25, simpleDraweeView9, simpleDraweeView10, textView26, textView27, frameLayout2, materialButton5, seekBar, textView28, textView29), "WidgetMusicRichPresenceB…e(inflater, parent, true)"); m.checkNotNullExpressionValue(simpleDraweeView9, "binding.richPresenceImageLarge"); @@ -388,47 +388,47 @@ public class ViewHolderUserRichPresence { m.checkNotNullExpressionValue(textView27, "binding.richPresenceMusicElapsed"); return new ViewHolderMusicRichPresence(viewGroup, simpleDraweeView9, simpleDraweeView10, textView25, textView29, textView24, textView28, linearLayout6, materialButton5, seekBar, textView26, textView27); } - i2 = 2131364450; + i2 = 2131364453; } else { - i2 = 2131364449; + i2 = 2131364452; } } else { - i2 = 2131364447; + i2 = 2131364450; } } else { - i2 = 2131364445; + i2 = 2131364448; } } else { - i2 = 2131364444; + i2 = 2131364447; } } else { - i2 = 2131364443; + i2 = 2131364446; } } else { - i2 = 2131364442; + i2 = 2131364445; } } else { str = "Missing required view with ID: "; - i2 = 2131364441; + i2 = 2131364444; } } else { str = "Missing required view with ID: "; } } else { str = "Missing required view with ID: "; - i2 = 2131364437; + i2 = 2131364440; } } else { str = "Missing required view with ID: "; - i2 = 2131364436; + i2 = 2131364439; } } else { str = "Missing required view with ID: "; - i2 = 2131364435; + i2 = 2131364438; } } else { str = "Missing required view with ID: "; - i2 = 2131363538; + i2 = 2131363540; } } else { str = "Missing required view with ID: "; @@ -608,7 +608,7 @@ public class ViewHolderUserRichPresence { ActivityParty i = activity.i(); if (i != null) { PresenceUtils presenceUtils = PresenceUtils.INSTANCE; - charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = this.root.getContext()) == null) ? null : b.g(context, 2131894167, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4); + charSequence = (presenceUtils.getMaxSize(i) == 0 || (context = this.root.getContext()) == null) ? null : b.g(context, 2131894206, new Object[]{String.valueOf(presenceUtils.getCurrentSize(i)), String.valueOf(presenceUtils.getMaxSize(i))}, null, 4); } charSequence = ""; String str2 = l + ' ' + charSequence; @@ -691,10 +691,10 @@ public class ViewHolderUserRichPresence { public final CharSequence friendlyTime(ActivityTimestamps activityTimestamps) { m.checkNotNullParameter(activityTimestamps, "$this$friendlyTime"); if (activityTimestamps.b() > 0) { - return TimeUtils.INSTANCE.toFriendlyString(ClockFactory.get().currentTimeMillis(), activityTimestamps.b(), getString(2131894169), "timeDelta"); + return TimeUtils.INSTANCE.toFriendlyString(ClockFactory.get().currentTimeMillis(), activityTimestamps.b(), getString(2131894208), "timeDelta"); } if (activityTimestamps.c() > 0) { - return TimeUtils.INSTANCE.toFriendlyString(activityTimestamps.c(), ClockFactory.get().currentTimeMillis(), getString(2131894171), "timeDelta"); + return TimeUtils.INSTANCE.toFriendlyString(activityTimestamps.c(), ClockFactory.get().currentTimeMillis(), getString(2131894210), "timeDelta"); } return null; } diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java index 62a3f75303..7733549adf 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java +++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileAdminView.java @@ -275,26 +275,26 @@ public final class UserProfileAdminView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558708, (ViewGroup) this, false); addView(inflate); - int i = 2131365395; - TextView textView = (TextView) inflate.findViewById(2131365395); + int i = 2131365400; + TextView textView = (TextView) inflate.findViewById(2131365400); if (textView != null) { - i = 2131365396; - TextView textView2 = (TextView) inflate.findViewById(2131365396); + i = 2131365401; + TextView textView2 = (TextView) inflate.findViewById(2131365401); if (textView2 != null) { - i = 2131365397; - TextView textView3 = (TextView) inflate.findViewById(2131365397); + i = 2131365402; + TextView textView3 = (TextView) inflate.findViewById(2131365402); if (textView3 != null) { - i = 2131365398; - TextView textView4 = (TextView) inflate.findViewById(2131365398); + i = 2131365403; + TextView textView4 = (TextView) inflate.findViewById(2131365403); if (textView4 != null) { - i = 2131365399; - TextView textView5 = (TextView) inflate.findViewById(2131365399); + i = 2131365404; + TextView textView5 = (TextView) inflate.findViewById(2131365404); if (textView5 != null) { - i = 2131365400; - TextView textView6 = (TextView) inflate.findViewById(2131365400); + i = 2131365405; + TextView textView6 = (TextView) inflate.findViewById(2131365405); if (textView6 != null) { - i = 2131365401; - TextView textView7 = (TextView) inflate.findViewById(2131365401); + i = 2131365406; + TextView textView7 = (TextView) inflate.findViewById(2131365406); if (textView7 != null) { UserProfileAdminViewBinding userProfileAdminViewBinding = new UserProfileAdminViewBinding((LinearLayout) inflate, textView, textView2, textView3, textView4, textView5, textView6, textView7); m.checkNotNullExpressionValue(userProfileAdminViewBinding, "UserProfileAdminViewBind…rom(context), this, true)"); @@ -322,7 +322,7 @@ public final class UserProfileAdminView extends LinearLayout { public final void setOnEditMember(Function0 function0) { m.checkNotNullParameter(function0, "onEditMember"); - this.binding.f1634c.setOnClickListener(new UserProfileAdminView$setOnEditMember$1(function0)); + this.binding.f1636c.setOnClickListener(new UserProfileAdminView$setOnEditMember$1(function0)); } public final void setOnKick(Function0 function0) { @@ -347,14 +347,14 @@ public final class UserProfileAdminView extends LinearLayout { public final void updateView(ViewState viewState) { m.checkNotNullParameter(viewState, "viewState"); - TextView textView = this.binding.f1634c; + TextView textView = this.binding.f1636c; m.checkNotNullExpressionValue(textView, "binding.userProfileAdminEditMember"); int i = 8; textView.setVisibility(viewState.getShowEditMemberButton() ? 0 : 8); TextView textView2 = this.binding.d; m.checkNotNullExpressionValue(textView2, "binding.userProfileAdminKick"); textView2.setVisibility(viewState.getShowKickButton() ? 0 : 8); - this.binding.d.setText(viewState.isMultiUserDM() ? 2131892526 : 2131890727); + this.binding.d.setText(viewState.isMultiUserDM() ? 2131892568 : 2131890757); TextView textView3 = this.binding.b; m.checkNotNullExpressionValue(textView3, "binding.userProfileAdminBan"); textView3.setVisibility(viewState.getShowBanButton() ? 0 : 8); @@ -364,7 +364,7 @@ public final class UserProfileAdminView extends LinearLayout { boolean isServerMuted = viewState.isServerMuted(); boolean isMe = viewState.isMe(); int themedDrawableRes$default = isServerMuted ? DrawableCompat.getThemedDrawableRes$default(this, 2130969423, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969421, 0, 2, (Object) null); - int i2 = isServerMuted ? 2131893147 : 2131893134; + int i2 = isServerMuted ? 2131893189 : 2131893176; TextView textView5 = this.binding.h; m.checkNotNullExpressionValue(textView5, "binding.userProfileAdminServerMute"); ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView5, themedDrawableRes$default, 0, 0, 0, 14, null); @@ -374,8 +374,8 @@ public final class UserProfileAdminView extends LinearLayout { textView6.setVisibility(viewState.getShowServerDeafenButton() ? 0 : 8); boolean isServerDeafened = viewState.isServerDeafened(); int themedDrawableRes$default2 = isServerDeafened ? DrawableCompat.getThemedDrawableRes$default(this, 2130969413, 0, 2, (Object) null) : DrawableCompat.getThemedDrawableRes$default(this, 2130969413, 0, 2, (Object) null); - int i3 = isServerDeafened ? 2131893146 : 2131893123; - int i4 = isMe ? 2131888136 : 2131888135; + int i3 = isServerDeafened ? 2131893188 : 2131893165; + int i4 = isMe ? 2131888146 : 2131888145; TextView textView7 = this.binding.e; m.checkNotNullExpressionValue(textView7, "binding.userProfileAdminServerDeafen"); ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView7, themedDrawableRes$default2, 0, 0, 0, 14, null); diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java index 5ccea87c01..f800868511 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java +++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java @@ -265,14 +265,14 @@ public final class UserProfileConnectionsView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558709, (ViewGroup) this, false); addView(inflate); - int i = 2131365402; - TextView textView = (TextView) inflate.findViewById(2131365402); + int i = 2131365407; + TextView textView = (TextView) inflate.findViewById(2131365407); if (textView != null) { - i = 2131365403; - TextView textView2 = (TextView) inflate.findViewById(2131365403); + i = 2131365408; + TextView textView2 = (TextView) inflate.findViewById(2131365408); if (textView2 != null) { - i = 2131365404; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365404); + i = 2131365409; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365409); if (recyclerView != null) { UserProfileConnectionsViewBinding userProfileConnectionsViewBinding = new UserProfileConnectionsViewBinding((LinearLayout) inflate, textView, textView2, recyclerView); m.checkNotNullExpressionValue(userProfileConnectionsViewBinding, "UserProfileConnectionsVi…rom(context), this, true)"); @@ -301,8 +301,8 @@ public final class UserProfileConnectionsView extends LinearLayout { m.checkNotNullParameter(function02, "onMutualFriendsItemClick"); this.connectedAccountsAdapter.setOnConnectedAccountClick(new UserProfileConnectionsView$updateViewState$1(function3)); this.connectedAccountsAdapter.setData(viewState.getConnectedAccountItems()); - this.binding.f1635c.setOnClickListener(new UserProfileConnectionsView$updateViewState$2(function0)); - TextView textView = this.binding.f1635c; + this.binding.f1637c.setOnClickListener(new UserProfileConnectionsView$updateViewState$2(function0)); + TextView textView = this.binding.f1637c; m.checkNotNullExpressionValue(textView, "binding.userProfileConnectionsMutualGuildsItem"); int i = 0; textView.setVisibility(viewState.getShowMutualGuildsAndFriends() ? 0 : 8); diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java index 621c1ce63e..a16e0ea034 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java +++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView$onFinishInflate$1.java @@ -23,6 +23,6 @@ public final class UserProfileHeaderView$onFinishInflate$1 extends o implements public final void invoke(View view) { m.checkNotNullParameter(view, "view"); - c.a.d.o.g(view.getContext(), 2131892375, 1, null, 8); + c.a.d.o.g(view.getContext(), 2131892414, 1, null, 8); } } diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java index c32fa7c809..8f86531e08 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java +++ b/app/src/main/java/com/discord/widgets/user/profile/UserProfileHeaderView.java @@ -152,26 +152,26 @@ public final class UserProfileHeaderView extends ConstraintLayout { i = 2131362097; CardView cardView = (CardView) inflate.findViewById(2131362097); if (cardView != null) { - i = 2131363733; - UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131363733); + i = 2131363736; + UserAvatarPresenceView userAvatarPresenceView = (UserAvatarPresenceView) inflate.findViewById(2131363736); if (userAvatarPresenceView != null) { - i = 2131363734; - Barrier barrier = (Barrier) inflate.findViewById(2131363734); + i = 2131363737; + Barrier barrier = (Barrier) inflate.findViewById(2131363737); if (barrier != null) { - i = 2131365405; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365405); + i = 2131365410; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131365410); if (recyclerView != null) { - i = 2131365406; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131365406); + i = 2131365411; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = (SimpleDraweeSpanTextView) inflate.findViewById(2131365411); if (simpleDraweeSpanTextView != null) { - i = 2131365407; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365407); + i = 2131365412; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365412); if (linearLayout != null) { - i = 2131365408; - UsernameView usernameView = (UsernameView) inflate.findViewById(2131365408); + i = 2131365413; + UsernameView usernameView = (UsernameView) inflate.findViewById(2131365413); if (usernameView != null) { - i = 2131365409; - SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = (SimpleDraweeSpanTextView) inflate.findViewById(2131365409); + i = 2131365414; + SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = (SimpleDraweeSpanTextView) inflate.findViewById(2131365414); if (simpleDraweeSpanTextView2 != null) { ConstraintLayout constraintLayout = (ConstraintLayout) inflate; UserProfileHeaderViewBinding userProfileHeaderViewBinding = new UserProfileHeaderViewBinding(constraintLayout, simpleDraweeView, cardView, userAvatarPresenceView, barrier, recyclerView, simpleDraweeSpanTextView, linearLayout, usernameView, simpleDraweeSpanTextView2, constraintLayout); @@ -250,7 +250,7 @@ public final class UserProfileHeaderView extends ConstraintLayout { m.checkNotNullExpressionValue(c02, "representativeColorObser….takeUntil { it != null }"); ObservableExtensionsKt.appSubscribe$default(c02, UserProfileHeaderView.class, (Context) null, new UserProfileHeaderView$configureBanner$2(this), (Function1) null, (Function0) null, (Function0) null, new UserProfileHeaderView$configureBanner$3(this), 58, (Object) null); } - CardView cardView = this.binding.f1636c; + CardView cardView = this.binding.f1638c; m.checkNotNullExpressionValue(cardView, "binding.betaTag"); if (!z2) { i2 = 8; @@ -263,7 +263,7 @@ public final class UserProfileHeaderView extends ConstraintLayout { GuildMember guildMember = loaded.getGuildMember(); int dimension = (int) getResources().getDimension(2131165290); this.binding.g.b(getPrimaryNameTextForUser(user, guildMember), loaded.getShowMediumAvatar() ? IconUtils.getForUser(loaded.getUser(), true, Integer.valueOf(dimension)) : null, true, Integer.valueOf(dimension), Integer.valueOf(this.userProfileHeaderBackgroundColor)); - this.binding.g.a(user.isBot(), user.isSystemUser() ? 2131893685 : 2131887049, UserUtils.INSTANCE.isVerifiedBot(user)); + this.binding.g.a(user.isBot(), user.isSystemUser() ? 2131893725 : 2131887050, UserUtils.INSTANCE.isVerifiedBot(user)); } private final void configureSecondaryName(UserProfileHeaderViewModel.ViewState.Loaded loaded) { @@ -339,7 +339,7 @@ public final class UserProfileHeaderView extends ConstraintLayout { setBackgroundColor(i); this.binding.d.setAvatarBackgroundColor(this.userProfileHeaderBackgroundColor); } - CardView cardView = this.binding.f1636c; + CardView cardView = this.binding.f1638c; m.checkNotNullExpressionValue(cardView, "binding.betaTag"); ViewExtensions.setOnLongClickListenerConsumeClick(cardView, UserProfileHeaderView$onFinishInflate$1.INSTANCE); } diff --git a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java index b37f644971..10730af348 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java +++ b/app/src/main/java/com/discord/widgets/user/profile/UserStatusPresenceCustomView.java @@ -275,14 +275,14 @@ public final class UserStatusPresenceCustomView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558823, (ViewGroup) this, false); addView(inflate); - int i = 2131365452; - AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131365452); + int i = 2131365458; + AppCompatImageView appCompatImageView = (AppCompatImageView) inflate.findViewById(2131365458); if (appCompatImageView != null) { - i = 2131365453; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365453); + i = 2131365459; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) inflate.findViewById(2131365459); if (simpleDraweeView != null) { - i = 2131365454; - TextView textView = (TextView) inflate.findViewById(2131365454); + i = 2131365460; + TextView textView = (TextView) inflate.findViewById(2131365460); if (textView != null) { ViewUserStatusPresenceCustomBinding viewUserStatusPresenceCustomBinding = new ViewUserStatusPresenceCustomBinding((LinearLayout) inflate, appCompatImageView, simpleDraweeView, textView); m.checkNotNullExpressionValue(viewUserStatusPresenceCustomBinding, "ViewUserStatusPresenceCu…rom(context), this, true)"); @@ -299,10 +299,10 @@ public final class UserStatusPresenceCustomView extends LinearLayout { } private final void configurePlaceholderEmoji(ModelEmojiUnicode modelEmojiUnicode) { - SimpleDraweeView simpleDraweeView = this.binding.f1662c; + SimpleDraweeView simpleDraweeView = this.binding.f1664c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.userStatusPresenceCustomEmoji"); MGImages.setImage$default(simpleDraweeView, ModelEmojiUnicode.getImageUri(modelEmojiUnicode.getCodePoints(), getContext()), 0, 0, false, UserStatusPresenceCustomView$configurePlaceholderEmoji$1.INSTANCE, null, 92, null); - SimpleDraweeView simpleDraweeView2 = this.binding.f1662c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1664c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.userStatusPresenceCustomEmoji"); simpleDraweeView2.setVisibility(0); } @@ -319,10 +319,10 @@ public final class UserStatusPresenceCustomView extends LinearLayout { } } } - SimpleDraweeView simpleDraweeView = this.binding.f1662c; + SimpleDraweeView simpleDraweeView = this.binding.f1664c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.userStatusPresenceCustomEmoji"); MGImages.setImage$default(simpleDraweeView, str, 0, 0, false, null, null, 124, null); - SimpleDraweeView simpleDraweeView2 = this.binding.f1662c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1664c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.userStatusPresenceCustomEmoji"); int i = 0; if (!(str != null)) { @@ -349,7 +349,7 @@ public final class UserStatusPresenceCustomView extends LinearLayout { appCompatImageView.setVisibility(0); } else if (viewState instanceof ViewState.WithPlaceholder) { configurePlaceholderEmoji(((ViewState.WithPlaceholder) viewState).getPlaceholderEmoji()); - this.binding.d.setText(2131888000); + this.binding.d.setText(2131888001); AppCompatImageView appCompatImageView2 = this.binding.b; m.checkNotNullExpressionValue(appCompatImageView2, "binding.userStatusPresenceCustomClear"); appCompatImageView2.setVisibility(8); diff --git a/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java b/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java index cc99cd6a7c..66c36710f4 100644 --- a/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java +++ b/app/src/main/java/com/discord/widgets/user/profile/WidgetUserProfileEmptyListItem.java @@ -21,11 +21,11 @@ public final class WidgetUserProfileEmptyListItem super(i, t); m.checkNotNullParameter(t, "adapter"); View view = this.itemView; - int i4 = 2131365381; - ImageView imageView = (ImageView) view.findViewById(2131365381); + int i4 = 2131365386; + ImageView imageView = (ImageView) view.findViewById(2131365386); if (imageView != null) { - i4 = 2131365382; - TextView textView = (TextView) view.findViewById(2131365382); + i4 = 2131365387; + TextView textView = (TextView) view.findViewById(2131365387); if (textView != null) { WidgetUserProfileAdapterItemEmptyBinding widgetUserProfileAdapterItemEmptyBinding = new WidgetUserProfileAdapterItemEmptyBinding((LinearLayout) view, imageView, textView); m.checkNotNullExpressionValue(widgetUserProfileAdapterItemEmptyBinding, "WidgetUserProfileAdapter…ptyBinding.bind(itemView)"); diff --git a/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java b/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java index 9f797f139e..ba1812105d 100644 --- a/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java +++ b/app/src/main/java/com/discord/widgets/user/search/ViewGlobalSearchItem.java @@ -44,26 +44,26 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { super(context, attributeSet, i); m.checkNotNullParameter(context, "ctx"); LayoutInflater.from(context).inflate(2131558751, this); - int i2 = 2131363337; - Guideline guideline = (Guideline) findViewById(2131363337); + int i2 = 2131363339; + Guideline guideline = (Guideline) findViewById(2131363339); if (guideline != null) { - i2 = 2131363645; - TextView textView = (TextView) findViewById(2131363645); + i2 = 2131363648; + TextView textView = (TextView) findViewById(2131363648); if (textView != null) { - i2 = 2131363667; - TextView textView2 = (TextView) findViewById(2131363667); + i2 = 2131363670; + TextView textView2 = (TextView) findViewById(2131363670); if (textView2 != null) { - i2 = 2131363679; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363679); + i2 = 2131363682; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(2131363682); if (simpleDraweeView != null) { - i2 = 2131363706; - TextView textView3 = (TextView) findViewById(2131363706); + i2 = 2131363709; + TextView textView3 = (TextView) findViewById(2131363709); if (textView3 != null) { - i2 = 2131363708; - TextView textView4 = (TextView) findViewById(2131363708); + i2 = 2131363711; + TextView textView4 = (TextView) findViewById(2131363711); if (textView4 != null) { - i2 = 2131363712; - ImageView imageView = (ImageView) findViewById(2131363712); + i2 = 2131363715; + ImageView imageView = (ImageView) findViewById(2131363715); if (imageView != null) { ViewGlobalSearchItemBinding viewGlobalSearchItemBinding = new ViewGlobalSearchItemBinding(this, guideline, textView, textView2, simpleDraweeView, textView3, textView4, imageView); m.checkNotNullExpressionValue(viewGlobalSearchItemBinding, "ViewGlobalSearchItemBind…Inflater.from(ctx), this)"); @@ -137,7 +137,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { m.checkNotNullExpressionValue(simpleDraweeView4, "binding.itemIconIv"); MGImages.setImage$default(mGImages2, simpleDraweeView4, 2131231485, (MGImages.ChangeDetector) null, 4, (Object) null); } - TextView textView = this.binding.f1651c; + TextView textView = this.binding.f1653c; m.checkNotNullExpressionValue(textView, "binding.itemGroupTv"); Guild guild = itemChannel.getGuild(); ViewExtensions.setTextAndVisibilityBy(textView, guild != null ? guild.getName() : null); @@ -150,7 +150,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { TextView textView3 = this.binding.b; m.checkNotNullExpressionValue(textView3, "binding.itemDescriptionTv"); textView3.setVisibility(8); - TextView textView4 = this.binding.f1651c; + TextView textView4 = this.binding.f1653c; m.checkNotNullExpressionValue(textView4, "binding.itemGroupTv"); User v0 = AnimatableValueParser.v0(itemChannel.getChannel()); if (v0 != null) { @@ -162,7 +162,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { if (z2 == 3) { TextView textView5 = this.binding.b; m.checkNotNullExpressionValue(textView5, "binding.itemDescriptionTv"); - int color = ColorCompat.getColor(textView5, 2131100464); + int color = ColorCompat.getColor(textView5, 2131100465); TextView textView6 = this.binding.b; m.checkNotNullExpressionValue(textView6, "binding.itemDescriptionTv"); textView6.setText(u.joinToString$default(AnimatableValueParser.G0(itemChannel.getChannel()), null, null, null, 0, null, new ViewGlobalSearchItem$onConfigure$2(color), 31, null)); @@ -199,7 +199,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { TextView textView = this.binding.f; m.checkNotNullExpressionValue(textView, "binding.itemNameTv"); textView.setText(toStyledText(itemGuild.getMatchedResult(), itemGuild.getGuild().getName())); - TextView textView2 = this.binding.f1651c; + TextView textView2 = this.binding.f1653c; m.checkNotNullExpressionValue(textView2, "binding.itemGroupTv"); ViewExtensions.setTextAndVisibilityBy(textView2, null); TextView textView3 = this.binding.b; @@ -214,9 +214,9 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIconIv"); IconUtils.setIcon$default(simpleDraweeView, itemUser.getUser(), 0, null, null, null, 60, null); if (itemUser.isFriend()) { - this.binding.f1651c.setText(2131888800); + this.binding.f1653c.setText(2131888810); } else { - TextView textView = this.binding.f1651c; + TextView textView = this.binding.f1653c; m.checkNotNullExpressionValue(textView, "binding.itemGroupTv"); textView.setText((CharSequence) null); } @@ -226,7 +226,7 @@ public final class ViewGlobalSearchItem extends ConstraintLayout { TextView textView3 = this.binding.f; m.checkNotNullExpressionValue(textView3, "binding.itemNameTv"); textView3.setImportantForAccessibility(2); - TextView textView4 = this.binding.f1651c; + TextView textView4 = this.binding.f1653c; m.checkNotNullExpressionValue(textView4, "binding.itemGroupTv"); ViewExtensions.setTextAndVisibilityBy(textView4, (CharSequence) u.firstOrNull((List) itemUser.getAliases())); TextView textView5 = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java index 509bc843bd..7d36166249 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$binding$2.java @@ -21,26 +21,26 @@ public final /* synthetic */ class WidgetGlobalSearch$binding$2 extends k implem public final WidgetGlobalSearchBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363313; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363313); + int i = 2131363315; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363315); if (materialButton != null) { - i = 2131363314; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363314); + i = 2131363316; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363316); if (textInputLayout != null) { - i = 2131363315; - TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363315); + i = 2131363317; + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131363317); if (textInputEditText != null) { - i = 2131363316; - RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363316); + i = 2131363318; + RecyclerView recyclerView = (RecyclerView) view.findViewById(2131363318); if (recyclerView != null) { - i = 2131363317; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363317); + i = 2131363319; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131363319); if (materialButton2 != null) { - i = 2131363318; - RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363318); + i = 2131363320; + RecyclerView recyclerView2 = (RecyclerView) view.findViewById(2131363320); if (recyclerView2 != null) { - i = 2131363319; - AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363319); + i = 2131363321; + AppViewFlipper appViewFlipper = (AppViewFlipper) view.findViewById(2131363321); if (appViewFlipper != null) { return new WidgetGlobalSearchBinding((CoordinatorLayout) view, materialButton, textInputLayout, textInputEditText, recyclerView, materialButton2, recyclerView2, appViewFlipper); } diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java index 6ac18ca6a3..e54f7efc1c 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$4.java @@ -12,7 +12,7 @@ public final class WidgetGlobalSearch$onViewBound$4 implements View.OnClickListe @Override // android.view.View.OnClickListener public final void onClick(View view) { WidgetGlobalSearch widgetGlobalSearch = this.this$0; - widgetGlobalSearch.hideKeyboard(WidgetGlobalSearch.access$getBinding$p(widgetGlobalSearch).f1785c); + widgetGlobalSearch.hideKeyboard(WidgetGlobalSearch.access$getBinding$p(widgetGlobalSearch).f1787c); WidgetGlobalSearch.access$getDismissViewModel$p(this.this$0).dismiss(); } } diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java index 2bb1cde55b..9dcab51fbe 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch$onViewBound$6.java @@ -21,7 +21,7 @@ public final class WidgetGlobalSearch$onViewBound$6 implements View.OnClickListe public final void onClick(View view) { WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion; Context T = a.T(view, "it", "it.context"); - TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f1785c; + TextInputLayout textInputLayout = WidgetGlobalSearch.access$getBinding$p(this.this$0).f1787c; m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar"); companion.show(T, w.trimStart(ViewExtensions.getTextOrEmpty(textInputLayout), '@', '#', '*'), "QuickSwitcher"); WidgetGlobalSearch.onSelected$default(this.this$0, NavigationTab.FRIENDS, null, 2, null); diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java index 6c18300676..92a7ec170f 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearch.java @@ -98,7 +98,7 @@ public final class WidgetGlobalSearch extends AppFragment { } private final Pair[] getFILTER_OPTIONS_LIST() { - return new Pair[]{o.to(2131894362, '@'), o.to(2131893789, '#'), o.to(2131894480, '!'), o.to(2131893150, '*')}; + return new Pair[]{o.to(2131894409, '@'), o.to(2131893829, '#'), o.to(2131894527, '!'), o.to(2131893192, '*')}; } private final WidgetGlobalSearchModel.ItemDataPayload toWidgetGlobalSearchModelItem(WidgetGlobalSearchGuildsModel.Item item) { @@ -124,7 +124,7 @@ public final class WidgetGlobalSearch extends AppFragment { } public WidgetGlobalSearch() { - super(2131559018); + super(2131559019); } public static final /* synthetic */ void access$configureUI(WidgetGlobalSearch widgetGlobalSearch, WidgetGlobalSearchModel widgetGlobalSearchModel) { @@ -289,7 +289,7 @@ public final class WidgetGlobalSearch extends AppFragment { @MainThread private final void setSearchPrefix(String str) { CharSequence charSequence; - TextInputLayout textInputLayout = getBinding().f1785c; + TextInputLayout textInputLayout = getBinding().f1787c; m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar"); SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(ViewExtensions.getTextOrEmpty(textInputLayout)); if (spannableStringBuilder.length() == 0) { @@ -304,7 +304,7 @@ public final class WidgetGlobalSearch extends AppFragment { } m.checkNotNullExpressionValue(charSequence, "newQuery"); if (!t.isBlank(charSequence)) { - TextInputLayout textInputLayout2 = getBinding().f1785c; + TextInputLayout textInputLayout2 = getBinding().f1787c; ViewExtensions.setText(textInputLayout2, charSequence); textInputLayout2.post(new WidgetGlobalSearch$setSearchPrefix$1$1(textInputLayout2)); } @@ -321,13 +321,13 @@ public final class WidgetGlobalSearch extends AppFragment { m.a aVar = c.a.a.m.j; FragmentManager parentFragmentManager = getParentFragmentManager(); d0.z.d.m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - String string = getString(2131888507); + String string = getString(2131888517); d0.z.d.m.checkNotNullExpressionValue(string, "getString(R.string.filter_options)"); aVar.a(parentFragmentManager, string, (String[]) array, new WidgetGlobalSearch$showFilterPickerDialog$1(this)); } public final void onDismiss() { - hideKeyboard(getBinding().f1785c); + hideKeyboard(getBinding().f1787c); } @Override // com.discord.app.AppFragment @@ -342,20 +342,20 @@ public final class WidgetGlobalSearch extends AppFragment { RecyclerView recyclerView2 = getBinding().e; d0.z.d.m.checkNotNullExpressionValue(recyclerView2, "binding.globalSearchGuildList"); this.guildsAdapter = (WidgetGlobalSearchGuildsAdapter) companion.configure(new WidgetGlobalSearchGuildsAdapter(recyclerView2, ColorCompat.getThemedColor(view, 2130969890))); - TextInputLayout textInputLayout = getBinding().f1785c; + TextInputLayout textInputLayout = getBinding().f1787c; d0.z.d.m.checkNotNullExpressionValue(textInputLayout, "binding.globalSearchBar"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetGlobalSearch$onViewBound$1(this)); Bundle arguments = getArguments(); if (!(arguments == null || (string = arguments.getString("EXTRA_SEARCH_TEXT")) == null)) { - TextInputLayout textInputLayout2 = getBinding().f1785c; + TextInputLayout textInputLayout2 = getBinding().f1787c; d0.z.d.m.checkNotNullExpressionValue(textInputLayout2, "binding.globalSearchBar"); ViewExtensions.setText(textInputLayout2, string); - TextInputLayout textInputLayout3 = getBinding().f1785c; + TextInputLayout textInputLayout3 = getBinding().f1787c; d0.z.d.m.checkNotNullExpressionValue(textInputLayout3, "binding.globalSearchBar"); ViewExtensions.setSelectionEnd(textInputLayout3); } - getBinding().f1785c.setEndIconOnClickListener(new WidgetGlobalSearch$onViewBound$3(this)); - getBinding().f1785c.setStartIconOnClickListener(new WidgetGlobalSearch$onViewBound$4(this)); + getBinding().f1787c.setEndIconOnClickListener(new WidgetGlobalSearch$onViewBound$3(this)); + getBinding().f1787c.setStartIconOnClickListener(new WidgetGlobalSearch$onViewBound$4(this)); j jVar = new j(Unit.a); d0.z.d.m.checkNotNullExpressionValue(jVar, "Observable.just(Unit)"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(jVar, this, null, 2, null), WidgetGlobalSearch.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetGlobalSearch$onViewBound$5(this), 62, (Object) null); diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java index 91e1bf82c6..00ad9b49f9 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchDialog.java @@ -63,7 +63,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog { } public WidgetGlobalSearchDialog() { - super(2131559019); + super(2131559020); } private final WidgetGlobalSearchDismissModel getDismissViewModel() { @@ -71,7 +71,7 @@ public final class WidgetGlobalSearchDialog extends AppDialog { } private final WidgetGlobalSearch getFragment() { - Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365600); + Fragment findFragmentById = getChildFragmentManager().findFragmentById(2131365606); Objects.requireNonNull(findFragmentById, "null cannot be cast to non-null type com.discord.widgets.user.search.WidgetGlobalSearch"); return (WidgetGlobalSearch) findFragmentById; } diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java index 136d9322b0..dfca2dffbd 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java @@ -55,7 +55,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp Context context = textView.getContext(); m.checkNotNullExpressionValue(context, "context"); textView.setBackgroundResource(DrawableCompat.getThemedDrawableRes$default(context, 2130969804, 0, 2, (Object) null)); - textView.setContentDescription(b.g(context, 2131891125, new Object[]{String.valueOf(i)}, null, 4)); + textView.setContentDescription(b.g(context, 2131891156, new Object[]{String.valueOf(i)}, null, 4)); } public void onConfigure(int i, WidgetGlobalSearchGuildsModel.Item item) { @@ -85,7 +85,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp public void onConfigure(int i, WidgetGlobalSearchGuildsModel.Item item) { m.checkNotNullParameter(item, "data"); super.onConfigure(i, item); - TextView textView = this.binding.f1813c; + TextView textView = this.binding.f1815c; m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount"); configureMentionsCount(textView, item.getMentionCount()); SimpleDraweeView simpleDraweeView = this.binding.b; @@ -115,11 +115,11 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp m.checkNotNullParameter(widgetGlobalSearchGuildsAdapter, "adapter"); this.overlayColor = i2; View view = this.itemView; - int i3 = 2131363495; - ImageView imageView = (ImageView) view.findViewById(2131363495); + int i3 = 2131363497; + ImageView imageView = (ImageView) view.findViewById(2131363497); if (imageView != null) { - i3 = 2131363496; - ImageView imageView2 = (ImageView) view.findViewById(2131363496); + i3 = 2131363498; + ImageView imageView2 = (ImageView) view.findViewById(2131363498); if (imageView2 != null) { WidgetGlobalSearchItemGuildBinding widgetGlobalSearchItemGuildBinding = new WidgetGlobalSearchItemGuildBinding((RelativeLayout) view, imageView, imageView2); m.checkNotNullExpressionValue(widgetGlobalSearchItemGuildBinding, "WidgetGlobalSearchItemGuildBinding.bind(itemView)"); @@ -165,7 +165,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp ImageView imageView = this.bindingGuild.h; m.checkNotNullExpressionValue(imageView, "bindingGuild.guildsItemVoice"); imageView.setVisibility(item.getConnectedToVoice() ? 0 : 8); - ImageView imageView2 = this.binding.f1786c; + ImageView imageView2 = this.binding.f1788c; m.checkNotNullExpressionValue(imageView2, "binding.guildsItemUnread"); imageView2.setVisibility(item.isUnread() ? 0 : 8); ImageView imageView3 = this.binding.b; @@ -198,13 +198,13 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp public MGRecyclerViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { m.checkNotNullParameter(viewGroup, "parent"); if (i == 1) { - return new ItemDivider(this, 2131559020); + return new ItemDivider(this, 2131559021); } if (i == 2) { - return new ItemDirectMessage(this, 2131559021); + return new ItemDirectMessage(this, 2131559022); } if (i == 3) { - return new ItemGuild(this, 2131559022, this.overlayColor); + return new ItemGuild(this, 2131559023, this.overlayColor); } throw invalidViewTypeException(i); } diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java index dff1c858d7..e74d40b0df 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchModel.java @@ -388,10 +388,10 @@ public final class WidgetGlobalSearchModel { if (searchType == 0 && t.isBlank(searchContext.getFilter())) { Channel channel = channelContext.getChannels().get(function12.invoke(searchContext)); ItemDataPayload invoke = channel != null ? widgetGlobalSearchModel$Companion$create$4.invoke(channel, "") : null; - return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(invoke == null ? q.plus(n.sequenceOf(new ItemHeader(2131893643, 0, false, 6, null)), take) : q.plus(q.plus(n.sequenceOf(new ItemHeader(2131892440, 0, false, 6, null), invoke), n.sequenceOf(new ItemHeader(2131893643, 0, false, 6, null))), q.filterNot(take, new WidgetGlobalSearchModel$Companion$create$results$1(channel)))), widgetGlobalSearchGuildsModel.getItems()); + return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(invoke == null ? q.plus(n.sequenceOf(new ItemHeader(2131893683, 0, false, 6, null)), take) : q.plus(q.plus(n.sequenceOf(new ItemHeader(2131892482, 0, false, 6, null), invoke), n.sequenceOf(new ItemHeader(2131893683, 0, false, 6, null))), q.filterNot(take, new WidgetGlobalSearchModel$Companion$create$results$1(channel)))), widgetGlobalSearchGuildsModel.getItems()); } if (q.firstOrNull(take) != null) { - take = q.plus(n.sequenceOf(new ItemHeader(2131893643, 0, false, 6, null)), take); + take = q.plus(n.sequenceOf(new ItemHeader(2131893683, 0, false, 6, null)), take); } return new WidgetGlobalSearchModel(sanitizedFilter, searchType, q.toList(take), null, 8, null); } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java b/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java index 6bdf31579a..f3d3c449d9 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView.java @@ -122,17 +122,17 @@ public final class UserProfileVoiceSettingsView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558713, (ViewGroup) this, false); addView(inflate); - int i = 2131365425; - SwitchMaterial switchMaterial = (SwitchMaterial) inflate.findViewById(2131365425); + int i = 2131365430; + SwitchMaterial switchMaterial = (SwitchMaterial) inflate.findViewById(2131365430); if (switchMaterial != null) { - i = 2131365437; - SwitchMaterial switchMaterial2 = (SwitchMaterial) inflate.findViewById(2131365437); + i = 2131365442; + SwitchMaterial switchMaterial2 = (SwitchMaterial) inflate.findViewById(2131365442); if (switchMaterial2 != null) { - i = 2131365450; - TextView textView = (TextView) inflate.findViewById(2131365450); + i = 2131365456; + TextView textView = (TextView) inflate.findViewById(2131365456); if (textView != null) { - i = 2131365451; - VolumeSliderView volumeSliderView = (VolumeSliderView) inflate.findViewById(2131365451); + i = 2131365457; + VolumeSliderView volumeSliderView = (VolumeSliderView) inflate.findViewById(2131365457); if (volumeSliderView != null) { UserProfileVoiceSettingsViewBinding userProfileVoiceSettingsViewBinding = new UserProfileVoiceSettingsViewBinding((LinearLayout) inflate, switchMaterial, switchMaterial2, textView, volumeSliderView); m.checkNotNullExpressionValue(userProfileVoiceSettingsViewBinding, "UserProfileVoiceSettings…rom(context), this, true)"); @@ -152,7 +152,7 @@ public final class UserProfileVoiceSettingsView extends LinearLayout { public final void setOnMuteChecked(Function1 function1) { m.checkNotNullParameter(function1, "onChecked"); - this.binding.f1638c.setOnCheckedChangeListener(new UserProfileVoiceSettingsView$setOnMuteChecked$1(function1)); + this.binding.f1640c.setOnCheckedChangeListener(new UserProfileVoiceSettingsView$setOnMuteChecked$1(function1)); } public final void setOnVolumeChange(Function2 function2) { @@ -177,7 +177,7 @@ public final class UserProfileVoiceSettingsView extends LinearLayout { TextView textView = this.binding.d; m.checkNotNullExpressionValue(textView, "binding.userSheetVolumeLabel"); textView.setVisibility(viewState.getOutputVolume() != null ? 0 : 8); - SwitchMaterial switchMaterial = this.binding.f1638c; + SwitchMaterial switchMaterial = this.binding.f1640c; m.checkNotNullExpressionValue(switchMaterial, "binding.userSheetMuted"); switchMaterial.setChecked(viewState.isMuted()); SwitchMaterial switchMaterial2 = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java index f6c74a2e6f..e177823a95 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$binding$2.java @@ -17,6 +17,7 @@ import com.discord.widgets.user.profile.UserProfileAdminView; import com.discord.widgets.user.profile.UserProfileConnectionsView; import com.discord.widgets.user.profile.UserProfileHeaderView; import com.google.android.material.button.MaterialButton; +import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import d0.z.d.k; import d0.z.d.m; @@ -40,106 +41,110 @@ public final /* synthetic */ class WidgetUserSheet$binding$2 extends k implement i = 2131361810; LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131361810); if (linkifiedTextView != null) { - i = 2131363767; - ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(2131363767); + i = 2131363770; + ContentLoadingProgressBar contentLoadingProgressBar = (ContentLoadingProgressBar) view.findViewById(2131363770); if (contentLoadingProgressBar != null) { - i = 2131364434; - FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364434); + i = 2131364437; + FrameLayout frameLayout = (FrameLayout) view.findViewById(2131364437); if (frameLayout != null) { - i = 2131365416; - Button button = (Button) view.findViewById(2131365416); + i = 2131365421; + Button button = (Button) view.findViewById(2131365421); if (button != null) { - i = 2131365417; - CardView cardView2 = (CardView) view.findViewById(2131365417); + i = 2131365422; + CardView cardView2 = (CardView) view.findViewById(2131365422); if (cardView2 != null) { - i = 2131365418; - UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(2131365418); + i = 2131365423; + UserProfileAdminView userProfileAdminView = (UserProfileAdminView) view.findViewById(2131365423); if (userProfileAdminView != null) { - i = 2131365420; - Button button2 = (Button) view.findViewById(2131365420); + i = 2131365425; + Button button2 = (Button) view.findViewById(2131365425); if (button2 != null) { - i = 2131365421; - TextView textView2 = (TextView) view.findViewById(2131365421); + i = 2131365426; + TextView textView2 = (TextView) view.findViewById(2131365426); if (textView2 != null) { - i = 2131365422; - UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(2131365422); + i = 2131365427; + UserProfileConnectionsView userProfileConnectionsView = (UserProfileConnectionsView) view.findViewById(2131365427); if (userProfileConnectionsView != null) { - i = 2131365423; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365423); + i = 2131365428; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131365428); if (linearLayout != null) { - i = 2131365424; - TextView textView3 = (TextView) view.findViewById(2131365424); + i = 2131365429; + TextView textView3 = (TextView) view.findViewById(2131365429); if (textView3 != null) { - i = 2131365426; - TextView textView4 = (TextView) view.findViewById(2131365426); + i = 2131365431; + TextView textView4 = (TextView) view.findViewById(2131365431); if (textView4 != null) { - i = 2131365427; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365427); + i = 2131365432; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365432); if (materialButton != null) { - i = 2131365428; - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365428); + i = 2131365433; + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365433); if (materialButton2 != null) { - i = 2131365429; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365429); + i = 2131365434; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131365434); if (linearLayout2 != null) { - i = 2131365430; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365430); + i = 2131365435; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131365435); if (linearLayout3 != null) { - i = 2131365431; - TextView textView5 = (TextView) view.findViewById(2131365431); + i = 2131365436; + TextView textView5 = (TextView) view.findViewById(2131365436); if (textView5 != null) { - i = 2131365433; - TextView textView6 = (TextView) view.findViewById(2131365433); + i = 2131365438; + TextView textView6 = (TextView) view.findViewById(2131365438); if (textView6 != null) { - i = 2131365434; - FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365434); + i = 2131365439; + FrameLayout frameLayout2 = (FrameLayout) view.findViewById(2131365439); if (frameLayout2 != null) { - i = 2131365435; - Button button3 = (Button) view.findViewById(2131365435); + i = 2131365440; + Button button3 = (Button) view.findViewById(2131365440); if (button3 != null) { - i = 2131365436; - ImageView imageView = (ImageView) view.findViewById(2131365436); + i = 2131365441; + ImageView imageView = (ImageView) view.findViewById(2131365441); if (imageView != null) { - i = 2131365438; - TextView textView7 = (TextView) view.findViewById(2131365438); + i = 2131365443; + TextView textView7 = (TextView) view.findViewById(2131365443); if (textView7 != null) { - i = 2131365439; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365439); - if (textInputLayout != null) { - i = 2131365440; - Button button4 = (Button) view.findViewById(2131365440); - if (button4 != null) { - i = 2131365441; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131365441); - if (linearLayout4 != null) { - i = 2131365442; - View findViewById = view.findViewById(2131365442); - if (findViewById != null) { - i = 2131365443; - UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365443); - if (userProfileHeaderView != null) { - i = 2131365444; - CardView cardView3 = (CardView) view.findViewById(2131365444); - if (cardView3 != null) { - i = 2131365445; - UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(2131365445); - if (userProfileStageActionsView != null) { - i = 2131365446; - TextView textView8 = (TextView) view.findViewById(2131365446); - if (textView8 != null) { - i = 2131365447; - UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(2131365447); - if (userProfileVoiceSettingsView != null) { - i = 2131365448; - RolesListView rolesListView = (RolesListView) view.findViewById(2131365448); - if (rolesListView != null) { - i = 2131365449; - Button button5 = (Button) view.findViewById(2131365449); - if (button5 != null) { - i = 2131365546; - CardView cardView4 = (CardView) view.findViewById(2131365546); - if (cardView4 != null) { - return new WidgetUserSheetBinding((NestedScrollView) view, cardView, textView, linkifiedTextView, contentLoadingProgressBar, frameLayout, button, cardView2, userProfileAdminView, button2, textView2, userProfileConnectionsView, linearLayout, textView3, textView4, materialButton, materialButton2, linearLayout2, linearLayout3, textView5, textView6, frameLayout2, button3, imageView, textView7, textInputLayout, button4, linearLayout4, findViewById, userProfileHeaderView, cardView3, userProfileStageActionsView, textView8, userProfileVoiceSettingsView, rolesListView, button5, cardView4); + i = 2131365444; + TextInputEditText textInputEditText = (TextInputEditText) view.findViewById(2131365444); + if (textInputEditText != null) { + i = 2131365445; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131365445); + if (textInputLayout != null) { + i = 2131365446; + Button button4 = (Button) view.findViewById(2131365446); + if (button4 != null) { + i = 2131365447; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131365447); + if (linearLayout4 != null) { + i = 2131365448; + View findViewById = view.findViewById(2131365448); + if (findViewById != null) { + i = 2131365449; + UserProfileHeaderView userProfileHeaderView = (UserProfileHeaderView) view.findViewById(2131365449); + if (userProfileHeaderView != null) { + i = 2131365450; + CardView cardView3 = (CardView) view.findViewById(2131365450); + if (cardView3 != null) { + i = 2131365451; + UserProfileStageActionsView userProfileStageActionsView = (UserProfileStageActionsView) view.findViewById(2131365451); + if (userProfileStageActionsView != null) { + i = 2131365452; + TextView textView8 = (TextView) view.findViewById(2131365452); + if (textView8 != null) { + i = 2131365453; + UserProfileVoiceSettingsView userProfileVoiceSettingsView = (UserProfileVoiceSettingsView) view.findViewById(2131365453); + if (userProfileVoiceSettingsView != null) { + i = 2131365454; + RolesListView rolesListView = (RolesListView) view.findViewById(2131365454); + if (rolesListView != null) { + i = 2131365455; + Button button5 = (Button) view.findViewById(2131365455); + if (button5 != null) { + i = 2131365552; + CardView cardView4 = (CardView) view.findViewById(2131365552); + if (cardView4 != null) { + return new WidgetUserSheetBinding((NestedScrollView) view, cardView, textView, linkifiedTextView, contentLoadingProgressBar, frameLayout, button, cardView2, userProfileAdminView, button2, textView2, userProfileConnectionsView, linearLayout, textView3, textView4, materialButton, materialButton2, linearLayout2, linearLayout3, textView5, textView6, frameLayout2, button3, imageView, textView7, textInputEditText, textInputLayout, button4, linearLayout4, findViewById, userProfileHeaderView, cardView3, userProfileStageActionsView, textView8, userProfileVoiceSettingsView, rolesListView, button5, cardView4); + } } } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java index 8284d03514..790b22ce3a 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.java @@ -98,7 +98,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$5 implements Vi m.checkNotNullParameter(requireContext, "context"); m.checkNotNullParameter(r9, "onAccept"); m.checkNotNullParameter(r10, "onIgnore"); - WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager, b.g(requireContext, 2131890306, new Object[0], null, 4), b.g(requireContext, 2131894205, new Object[0], null, 4), b.g(requireContext, 2131888784, new Object[0], null, 4), b.g(requireContext, 2131888790, new Object[0], null, 4), h0.mapOf(d0.o.to(2131364030, new k(0, r9)), d0.o.to(2131364025, new k(1, r10))), null, null, null, null, null, null, 0, null, 16320, null); + WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager, b.g(requireContext, 2131890336, new Object[0], null, 4), b.g(requireContext, 2131894244, new Object[0], null, 4), b.g(requireContext, 2131888794, new Object[0], null, 4), b.g(requireContext, 2131888800, new Object[0], null, 4), h0.mapOf(d0.o.to(2131364032, new k(0, r9)), d0.o.to(2131364027, new k(1, r10))), null, null, null, null, null, null, 0, null, 16320, null); } else if (i == 4) { User user = this.$viewState.getUser(); Context requireContext2 = this.this$0.requireContext(); @@ -110,7 +110,7 @@ public final class WidgetUserSheet$configureProfileActionButtons$5 implements Vi m.checkNotNullParameter(requireContext2, "context"); m.checkNotNullParameter(parentFragmentManager2, "fragmentManager"); m.checkNotNullParameter(r102, "onConfirm"); - WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager2, b.g(requireContext2, 2131891669, new Object[0], null, 4), b.g(requireContext2, 2131891670, new Object[]{user.getUsername()}, null, 4), b.g(requireContext2, 2131888051, new Object[0], null, 4), b.g(requireContext2, 2131887177, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364030, new c.a.a.k(r102))), null, null, null, 2130969788, null, null, 0, null, 15808, null); + WidgetNoticeDialog.Companion.show$default(WidgetNoticeDialog.Companion, parentFragmentManager2, b.g(requireContext2, 2131891706, new Object[0], null, 4), b.g(requireContext2, 2131891707, new Object[]{user.getUsername()}, null, 4), b.g(requireContext2, 2131888052, new Object[0], null, 4), b.g(requireContext2, 2131887178, new Object[0], null, 4), g0.mapOf(d0.o.to(2131364032, new c.a.a.k(r102))), null, null, null, 2130969788, null, null, 0, null, 15808, null); } } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java index 871967bea3..e1449eaf3e 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$14.java @@ -1,24 +1,29 @@ package com.discord.widgets.user.usersheet; -import android.view.View; -import com.discord.utilities.view.extensions.ViewExtensions; -import com.google.android.material.textfield.TextInputLayout; import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; /* compiled from: WidgetUserSheet.kt */ -public final class WidgetUserSheet$onViewCreated$14 implements View.OnFocusChangeListener { +public final class WidgetUserSheet$onViewCreated$14 extends o implements Function1 { public final /* synthetic */ WidgetUserSheet this$0; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetUserSheet$onViewCreated$14(WidgetUserSheet widgetUserSheet) { + super(1); this.this$0 = widgetUserSheet; } - @Override // android.view.View.OnFocusChangeListener - public final void onFocusChange(View view, boolean z2) { - if (!z2) { - WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0); - TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f1994y; - m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); - access$getViewModel$p.updateUserNote(ViewExtensions.getTextOrEmpty(textInputLayout)); - } + /* 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(String str) { + invoke(str); + return Unit.a; + } + + public final void invoke(String str) { + m.checkNotNullParameter(str, "noteText"); + WidgetUserSheet.access$getViewModel$p(this.this$0).updateUserNote(str); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java index 7a359bd9ba..4d72a3ee6a 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$15.java @@ -1,36 +1,26 @@ package com.discord.widgets.user.usersheet; -import android.widget.TextView; +import android.content.Context; +import android.view.View; import com.discord.utilities.view.extensions.ViewExtensions; import com.google.android.material.textfield.TextInputLayout; import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; /* compiled from: WidgetUserSheet.kt */ -public final class WidgetUserSheet$onViewCreated$15 extends o implements Function1 { +public final class WidgetUserSheet$onViewCreated$15 implements View.OnFocusChangeListener { public final /* synthetic */ WidgetUserSheet this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetUserSheet$onViewCreated$15(WidgetUserSheet widgetUserSheet) { - super(1); this.this$0 = widgetUserSheet; } - /* 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(TextView textView) { - invoke(textView); - return Unit.a; - } - - public final void invoke(TextView textView) { - m.checkNotNullParameter(textView, "it"); - WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0); - TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f1994y; - m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); - access$getViewModel$p.updateUserNote(ViewExtensions.getTextOrEmpty(textInputLayout)); - WidgetUserSheet.access$getBinding$p(this.this$0).f1994y.clearFocus(); + @Override // android.view.View.OnFocusChangeListener + public final void onFocusChange(View view, boolean z2) { + if (!z2) { + WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0); + Context context = this.this$0.getContext(); + TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f1997z; + m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); + access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout)); + } } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java index 0f26b66bcb..f9174f15a0 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$16.java @@ -1,22 +1,42 @@ package com.discord.widgets.user.usersheet; +import android.content.Context; import android.view.View; -import androidx.core.view.AccessibilityDelegateCompat; -import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import android.widget.TextView; +import com.discord.utilities.view.extensions.ViewExtensions; +import com.google.android.material.textfield.TextInputLayout; import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; /* compiled from: WidgetUserSheet.kt */ -public final class WidgetUserSheet$onViewCreated$16 extends AccessibilityDelegateCompat { +public final class WidgetUserSheet$onViewCreated$16 extends o implements Function1 { + public final /* synthetic */ View $view; public final /* synthetic */ WidgetUserSheet this$0; - public WidgetUserSheet$onViewCreated$16(WidgetUserSheet widgetUserSheet) { + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetUserSheet$onViewCreated$16(WidgetUserSheet widgetUserSheet, View view) { + super(1); this.this$0 = widgetUserSheet; + this.$view = view; } - @Override // androidx.core.view.AccessibilityDelegateCompat - public void onInitializeAccessibilityNodeInfo(View view, AccessibilityNodeInfoCompat accessibilityNodeInfoCompat) { - m.checkNotNullParameter(view, "host"); - m.checkNotNullParameter(accessibilityNodeInfoCompat, "info"); - super.onInitializeAccessibilityNodeInfo(view, accessibilityNodeInfoCompat); - accessibilityNodeInfoCompat.setTraversalAfter(WidgetUserSheet.access$getBinding$p(this.this$0).m); + /* 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(TextView textView) { + invoke(textView); + return Unit.a; + } + + public final void invoke(TextView textView) { + m.checkNotNullParameter(textView, "it"); + WidgetUserSheetViewModel access$getViewModel$p = WidgetUserSheet.access$getViewModel$p(this.this$0); + Context context = this.this$0.getContext(); + TextInputLayout textInputLayout = WidgetUserSheet.access$getBinding$p(this.this$0).f1997z; + m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); + access$getViewModel$p.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout)); + WidgetUserSheet.access$getBinding$p(this.this$0).f1997z.clearFocus(); + this.this$0.hideKeyboard(this.$view); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java index 192f2ccece..f16fe58417 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$17.java @@ -1,29 +1,22 @@ package com.discord.widgets.user.usersheet; +import android.view.View; +import androidx.core.view.AccessibilityDelegateCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function2; /* compiled from: WidgetUserSheet.kt */ -public final class WidgetUserSheet$onViewCreated$17 extends o implements Function2 { +public final class WidgetUserSheet$onViewCreated$17 extends AccessibilityDelegateCompat { public final /* synthetic */ WidgetUserSheet this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public WidgetUserSheet$onViewCreated$17(WidgetUserSheet widgetUserSheet) { - super(2); this.this$0 = widgetUserSheet; } - /* 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, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function2 - public /* bridge */ /* synthetic */ Unit invoke(Long l, String str) { - invoke(l.longValue(), str); - return Unit.a; - } - - public final void invoke(long j, String str) { - m.checkNotNullParameter(str, ""); - WidgetUserSheet.access$getViewModel$p(this.this$0).moveUserToChannel(j); + @Override // androidx.core.view.AccessibilityDelegateCompat + public void onInitializeAccessibilityNodeInfo(View view, AccessibilityNodeInfoCompat accessibilityNodeInfoCompat) { + m.checkNotNullParameter(view, "host"); + m.checkNotNullParameter(accessibilityNodeInfoCompat, "info"); + super.onInitializeAccessibilityNodeInfo(view, accessibilityNodeInfoCompat); + accessibilityNodeInfoCompat.setTraversalAfter(WidgetUserSheet.access$getBinding$p(this.this$0).m); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$18.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$18.java new file mode 100644 index 0000000000..97af9bfa47 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$18.java @@ -0,0 +1,29 @@ +package com.discord.widgets.user.usersheet; + +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function2; +/* compiled from: WidgetUserSheet.kt */ +public final class WidgetUserSheet$onViewCreated$18 extends o implements Function2 { + public final /* synthetic */ WidgetUserSheet this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetUserSheet$onViewCreated$18(WidgetUserSheet widgetUserSheet) { + super(2); + this.this$0 = widgetUserSheet; + } + + /* 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, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(Long l, String str) { + invoke(l.longValue(), str); + return Unit.a; + } + + public final void invoke(long j, String str) { + m.checkNotNullParameter(str, ""); + WidgetUserSheet.access$getViewModel$p(this.this$0).moveUserToChannel(j); + } +} diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java index 2563b521eb..3a1c3dbf75 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$2.java @@ -22,7 +22,7 @@ public final class WidgetUserSheet$onViewCreated$2 extends o implements Function @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final void mo1invoke() { - c.a.d.o.g(this.this$0.this$0.getContext(), 2131893312, 0, null, 12); + c.a.d.o.g(this.this$0.this$0.getContext(), 2131893354, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java index 6fde0a4331..706799fa32 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet.java @@ -48,6 +48,7 @@ import com.discord.utilities.textprocessing.AstRenderer; import com.discord.utilities.textprocessing.MessageRenderContext; import com.discord.utilities.view.extensions.ViewExtensions; import com.discord.utilities.view.text.LinkifiedTextView; +import com.discord.utilities.view.text.TextWatcherKt; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; import com.discord.widgets.channels.WidgetChannelSelector; @@ -67,6 +68,7 @@ import com.discord.widgets.user.profile.UserProfileHeaderViewModel; import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView; import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel; import com.discord.widgets.voice.fullscreen.WidgetCallFullscreen; +import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; import d0.t.n; import d0.z.d.a0; @@ -227,12 +229,12 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void addFriend(String str) { - getViewModel().addRelationship(null, str, 2131888799); + getViewModel().addRelationship(null, str, 2131888809); } private final void configureAboutMe(WidgetUserSheetViewModel.ViewState.Loaded loaded) { List> bioAst = loaded.getBioAst(); - TextView textView = getBinding().f1991c; + TextView textView = getBinding().f1993c; m.checkNotNullExpressionValue(textView, "binding.aboutMeHeader"); boolean z2 = true; int i = 0; @@ -304,16 +306,16 @@ public final class WidgetUserSheet extends AppBottomSheet { z2 = false; } linearLayout.setVisibility(z2 ? 0 : 8); - RolesListView rolesListView = getBinding().H; + RolesListView rolesListView = getBinding().I; m.checkNotNullExpressionValue(rolesListView, "binding.userSheetRolesList"); rolesListView.setVisibility(z3 ? 0 : 8); - RolesListView rolesListView2 = getBinding().H; - RolesListView rolesListView3 = getBinding().H; + RolesListView rolesListView2 = getBinding().I; + RolesListView rolesListView3 = getBinding().I; m.checkNotNullExpressionValue(rolesListView3, "binding.userSheetRolesList"); rolesListView2.updateView(roleItems, ColorCompat.getThemedColor(rolesListView3.getContext(), 2130969877)); String guildSectionHeaderText = loaded.getGuildSectionHeaderText(); if (guildSectionHeaderText != null) { - TextView textView = getBinding().f1992s; + TextView textView = getBinding().f1994s; m.checkNotNullExpressionValue(textView, "binding.userSheetGuildHeader"); textView.setText(guildSectionHeaderText); } @@ -348,37 +350,38 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void configureNote(WidgetUserSheetViewModel.ViewState.Loaded loaded) { - StoreUserNotes.UserNoteState userNote = loaded.getUserNote(); - if (userNote instanceof StoreUserNotes.UserNoteState.Empty) { - TextInputLayout textInputLayout = getBinding().f1994y; + getBinding().f1996y.setRawInputType(1); + StoreUserNotes.UserNoteState userNoteFetchState = loaded.getUserNoteFetchState(); + if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Empty) { + TextInputLayout textInputLayout = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); - textInputLayout.setHint(getString(2131891413)); - TextInputLayout textInputLayout2 = getBinding().f1994y; + textInputLayout.setHint(getString(2131891446)); + TextInputLayout textInputLayout2 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap"); - ViewExtensions.setText(textInputLayout2, ""); - TextInputLayout textInputLayout3 = getBinding().f1994y; + textInputLayout2.setEnabled(true); + TextInputLayout textInputLayout3 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout3, "binding.userSheetNoteTextFieldWrap"); - textInputLayout3.setEnabled(true); - } else if (userNote instanceof StoreUserNotes.UserNoteState.Loading) { - TextInputLayout textInputLayout4 = getBinding().f1994y; + ViewExtensions.setTextIfDifferent(textInputLayout3, loaded.getUserNote()); + } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loading) { + TextInputLayout textInputLayout4 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout4, "binding.userSheetNoteTextFieldWrap"); - textInputLayout4.setHint(getString(2131890813)); - TextInputLayout textInputLayout5 = getBinding().f1994y; + textInputLayout4.setHint(getString(2131890843)); + TextInputLayout textInputLayout5 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout5, "binding.userSheetNoteTextFieldWrap"); - ViewExtensions.setText(textInputLayout5, ""); - TextInputLayout textInputLayout6 = getBinding().f1994y; + textInputLayout5.setEnabled(false); + TextInputLayout textInputLayout6 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout6, "binding.userSheetNoteTextFieldWrap"); - textInputLayout6.setEnabled(false); - } else if (userNote instanceof StoreUserNotes.UserNoteState.Loaded) { - TextInputLayout textInputLayout7 = getBinding().f1994y; + ViewExtensions.setTextIfDifferent(textInputLayout6, loaded.getUserNote()); + } else if (userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded) { + TextInputLayout textInputLayout7 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout7, "binding.userSheetNoteTextFieldWrap"); - textInputLayout7.setHint(getString(2131891413)); - TextInputLayout textInputLayout8 = getBinding().f1994y; + textInputLayout7.setHint(getString(2131891446)); + TextInputLayout textInputLayout8 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout8, "binding.userSheetNoteTextFieldWrap"); - ViewExtensions.setText(textInputLayout8, ((StoreUserNotes.UserNoteState.Loaded) loaded.getUserNote()).getNote().getNote()); - TextInputLayout textInputLayout9 = getBinding().f1994y; + textInputLayout8.setEnabled(true); + TextInputLayout textInputLayout9 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout9, "binding.userSheetNoteTextFieldWrap"); - textInputLayout9.setEnabled(true); + ViewExtensions.setTextIfDifferent(textInputLayout9, loaded.getUserNote()); } } @@ -390,10 +393,10 @@ public final class WidgetUserSheet extends AppBottomSheet { boolean z2 = true; int i = 0; boolean z3 = !isMe && !isSystemUser; - View view = getBinding().B; + View view = getBinding().C; m.checkNotNullExpressionValue(view, "binding.userSheetProfileActionsDivider"); view.setVisibility(z3 ? 0 : 8); - LinearLayout linearLayout = getBinding().A; + LinearLayout linearLayout = getBinding().B; m.checkNotNullExpressionValue(linearLayout, "binding.userSheetProfileActionsContainer"); linearLayout.setVisibility(z3 ? 0 : 8); if (z3) { @@ -403,26 +406,26 @@ public final class WidgetUserSheet extends AppBottomSheet { button.setVisibility(channel == null || channel.z() != 1 ? 0 : 8); getBinding().v.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$1(this, loaded)); getBinding().j.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$2(this)); - getBinding().I.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$3(this)); + getBinding().J.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$3(this)); if (userRelationshipType == 0) { Button button2 = getBinding().g; m.checkNotNullExpressionValue(button2, "binding.userSheetAddFriendActionButton"); button2.setVisibility(0); - Button button3 = getBinding().f1995z; + Button button3 = getBinding().A; m.checkNotNullExpressionValue(button3, "binding.userSheetPendingFriendRequestActionButton"); button3.setVisibility(8); } else if (userRelationshipType == 3 || userRelationshipType == 4) { Button button4 = getBinding().g; m.checkNotNullExpressionValue(button4, "binding.userSheetAddFriendActionButton"); button4.setVisibility(8); - Button button5 = getBinding().f1995z; + Button button5 = getBinding().A; m.checkNotNullExpressionValue(button5, "binding.userSheetPendingFriendRequestActionButton"); button5.setVisibility(0); } else { Button button6 = getBinding().g; m.checkNotNullExpressionValue(button6, "binding.userSheetAddFriendActionButton"); button6.setVisibility(8); - Button button7 = getBinding().f1995z; + Button button7 = getBinding().A; m.checkNotNullExpressionValue(button7, "binding.userSheetPendingFriendRequestActionButton"); button7.setVisibility(8); } @@ -436,15 +439,15 @@ public final class WidgetUserSheet extends AppBottomSheet { } button8.setVisibility(i); getBinding().g.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$4(this, loaded)); - getBinding().f1995z.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$5(this, userRelationshipType, loaded)); + getBinding().A.setOnClickListener(new WidgetUserSheet$configureProfileActionButtons$5(this, userRelationshipType, loaded)); } } private final void configureStageActionsSection(WidgetUserSheetViewModel.ViewState.Loaded loaded) { - getBinding().E.updateView(loaded.getStageViewState()); - CardView cardView = getBinding().D; + getBinding().F.updateView(loaded.getStageViewState()); + CardView cardView = getBinding().E; m.checkNotNullExpressionValue(cardView, "binding.userSheetProfileStageActionsCard"); - UserProfileStageActionsView userProfileStageActionsView = getBinding().E; + UserProfileStageActionsView userProfileStageActionsView = getBinding().F; m.checkNotNullExpressionValue(userProfileStageActionsView, "binding.userSheetProfileStageActionsView"); int i = 0; if (!(userProfileStageActionsView.getVisibility() == 0)) { @@ -526,17 +529,17 @@ public final class WidgetUserSheet extends AppBottomSheet { private final void configureVoiceSection(WidgetUserSheetViewModel.ViewState.Loaded loaded) { UserProfileVoiceSettingsView.ViewState voiceSettingsViewState = loaded.getVoiceSettingsViewState(); boolean showVoiceSettings = loaded.getShowVoiceSettings(); - TextView textView = getBinding().F; + TextView textView = getBinding().G; m.checkNotNullExpressionValue(textView, "binding.userSheetProfileVoiceSettingsHeader"); int i = 0; textView.setVisibility(showVoiceSettings ? 0 : 8); - CardView cardView = getBinding().J; + CardView cardView = getBinding().K; m.checkNotNullExpressionValue(cardView, "binding.voiceSettingsViewCard"); if (!showVoiceSettings) { i = 8; } cardView.setVisibility(i); - getBinding().G.updateView(voiceSettingsViewState); + getBinding().H.updateView(voiceSettingsViewState); } private final WidgetUserSheetBinding getBinding() { @@ -581,7 +584,7 @@ public final class WidgetUserSheet extends AppBottomSheet { } else if (event instanceof WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream) { handleRequestPermissionsForSpectateStream((WidgetUserSheetViewModel.Event.RequestPermissionsForSpectateStream) event); } else if (event instanceof WidgetUserSheetViewModel.Event.UserNotFound) { - o.i(this, 2131894203, 0, 4); + o.i(this, 2131894242, 0, 4); handleDismissSheet(); } else if (event instanceof WidgetUserSheetViewModel.Event.DismissSheet) { handleDismissSheet(); @@ -654,7 +657,7 @@ public final class WidgetUserSheet extends AppBottomSheet { } private final void ignoreFriendRequest() { - getViewModel().removeRelationship(2131888791); + getViewModel().removeRelationship(2131888801); } private final void onStreamPreviewClicked(StreamContext streamContext) { @@ -691,14 +694,14 @@ public final class WidgetUserSheet extends AppBottomSheet { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getViewModel().observeViewState(), this, null, 2, null), WidgetUserSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheet$bindSubscriptions$1(this), 62, (Object) null); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(getViewModel().observeEvents(), this, null, 2, null), WidgetUserSheet.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheet$bindSubscriptions$2(this), 62, (Object) null); UserProfileHeaderView.Companion companion = UserProfileHeaderView.Companion; - UserProfileHeaderView userProfileHeaderView = getBinding().C; + UserProfileHeaderView userProfileHeaderView = getBinding().D; m.checkNotNullExpressionValue(userProfileHeaderView, "binding.userSheetProfileHeaderView"); companion.bind(userProfileHeaderView, this, getViewModelUserProfileHeader()); } @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559274; + return 2131559275; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -723,11 +726,12 @@ public final class WidgetUserSheet extends AppBottomSheet { if (j > 0 && j2 > 0) { StoreStream.Companion.getGuildSubscriptions().unsubscribeUser(j2, j); } - hideKeyboard(getBinding().f1994y); + hideKeyboard(getBinding().f1997z); WidgetUserSheetViewModel viewModel = getViewModel(); - TextInputLayout textInputLayout = getBinding().f1994y; + Context context = getContext(); + TextInputLayout textInputLayout = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); - viewModel.updateUserNote(ViewExtensions.getTextOrEmpty(textInputLayout)); + viewModel.saveUserNote(context, ViewExtensions.getTextOrEmpty(textInputLayout)); super.onPause(); } @@ -749,18 +753,18 @@ public final class WidgetUserSheet extends AppBottomSheet { long j = getArgumentsOrDefault().getLong("ARG_USER_ID"); boolean z2 = j == StoreStream.Companion.getUsers().getMe().getId(); getBinding().w.setOnClickListener(new WidgetUserSheet$onViewCreated$1(this, j)); - UserProfileHeaderView userProfileHeaderView = getBinding().C; + UserProfileHeaderView userProfileHeaderView = getBinding().D; Badge.Companion companion = Badge.Companion; FragmentManager parentFragmentManager = getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); userProfileHeaderView.setOnBadgeClick(companion.onBadgeClick(parentFragmentManager, requireContext)); - getBinding().E.setOnInviteToSpeak(new WidgetUserSheet$onViewCreated$2(this, z2)); - getBinding().E.setOnMoveToAudience(new WidgetUserSheet$onViewCreated$3(this)); - getBinding().G.setOnMuteChecked(new WidgetUserSheet$onViewCreated$4(this)); - getBinding().G.setOnDeafenChecked(new WidgetUserSheet$onViewCreated$5(this)); - getBinding().G.setOnVolumeChange(new WidgetUserSheet$onViewCreated$6(this)); + getBinding().F.setOnInviteToSpeak(new WidgetUserSheet$onViewCreated$2(this, z2)); + getBinding().F.setOnMoveToAudience(new WidgetUserSheet$onViewCreated$3(this)); + getBinding().H.setOnMuteChecked(new WidgetUserSheet$onViewCreated$4(this)); + getBinding().H.setOnDeafenChecked(new WidgetUserSheet$onViewCreated$5(this)); + getBinding().H.setOnVolumeChange(new WidgetUserSheet$onViewCreated$6(this)); getBinding().i.setOnEditMember(new WidgetUserSheet$onViewCreated$7(this)); getBinding().i.setOnKick(new WidgetUserSheet$onViewCreated$8(this)); getBinding().i.setOnBan(new WidgetUserSheet$onViewCreated$9(this)); @@ -768,20 +772,23 @@ public final class WidgetUserSheet extends AppBottomSheet { getBinding().i.setOnServerDeafen(new WidgetUserSheet$onViewCreated$11(this)); getBinding().i.setOnServerMove(new WidgetUserSheet$onViewCreated$12(this)); getBinding().i.setOnDisconnect(new WidgetUserSheet$onViewCreated$13(this)); - TextInputLayout textInputLayout = getBinding().f1994y; + TextInputEditText textInputEditText = getBinding().f1996y; + m.checkNotNullExpressionValue(textInputEditText, "binding.userSheetNoteTextField"); + TextWatcherKt.addLifecycleAwareTextWatcher(textInputEditText, this, new WidgetUserSheet$onViewCreated$14(this)); + TextInputLayout textInputLayout = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout, "binding.userSheetNoteTextFieldWrap"); - ViewExtensions.setOnEditTextFocusChangeListener(textInputLayout, new WidgetUserSheet$onViewCreated$14(this)); - TextInputLayout textInputLayout2 = getBinding().f1994y; + ViewExtensions.setOnEditTextFocusChangeListener(textInputLayout, new WidgetUserSheet$onViewCreated$15(this)); + TextInputLayout textInputLayout2 = getBinding().f1997z; m.checkNotNullExpressionValue(textInputLayout2, "binding.userSheetNoteTextFieldWrap"); - ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserSheet$onViewCreated$15(this), 1, null); - ViewCompat.setAccessibilityDelegate(getBinding().w, new WidgetUserSheet$onViewCreated$16(this)); - for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().f1992s, getBinding().f1993x, getBinding().n, getBinding().t, getBinding().F})) { + ViewExtensions.setOnImeActionDone$default(textInputLayout2, false, new WidgetUserSheet$onViewCreated$16(this, view), 1, null); + ViewCompat.setAccessibilityDelegate(getBinding().w, new WidgetUserSheet$onViewCreated$17(this)); + for (TextView textView : n.listOf((Object[]) new TextView[]{getBinding().k, getBinding().f1994s, getBinding().f1995x, getBinding().n, getBinding().t, getBinding().G})) { AccessibilityUtils accessibilityUtils = AccessibilityUtils.INSTANCE; m.checkNotNullExpressionValue(textView, "header"); accessibilityUtils.setViewIsHeading(textView); } - WidgetChannelSelector.Companion.registerForResult$default(WidgetChannelSelector.Companion, this, "REQUEST_KEY_MOVE_USER", false, new WidgetUserSheet$onViewCreated$17(this), 4, null); - RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1593c; + WidgetChannelSelector.Companion.registerForResult$default(WidgetChannelSelector.Companion, this, "REQUEST_KEY_MOVE_USER", false, new WidgetUserSheet$onViewCreated$18(this), 4, null); + RebrandFeatureFlag rebrandFeatureFlag = RebrandFeatureFlag.f1595c; int color = RebrandFeatureFlag.b ? ColorCompat.getColor(view, 2131099764) : ColorCompat.getColor(view, 2131099736); ContentLoadingProgressBar contentLoadingProgressBar = getBinding().e; m.checkNotNullExpressionValue(contentLoadingProgressBar, "binding.loadingProgressBar"); diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java index e0c1314daf..a87ca5cd8e 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.java @@ -50,7 +50,7 @@ public final class WidgetUserSheetViewModel$addRelationship$2 extends o implemen @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Boolean mo1invoke() { - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0.this$0, 2131888049); return null; } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java index f47dea56e0..4a62c6e01f 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$1.java @@ -22,6 +22,6 @@ public final class WidgetUserSheetViewModel$disconnectUser$1 extends o implement } public final void invoke(Void r2) { - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888137); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888147); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java index 2428315fac..b6bd78476a 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$disconnectUser$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$disconnectUser$2 extends o implement public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java index 7e83f69bf5..63257590f9 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$guildDeafenUser$2 extends o implemen public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java index 798f18f1c1..72856eb4fc 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$guildMuteUser$2 extends o implements public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java index 936cc80d92..350714a551 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$inviteUserToSpeak$1.java @@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$inviteUserToSpeak$1 extends o implem return Unit.a; } - public final void invoke(Void r24) { + public final void invoke(Void r25) { WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0); if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) { access$getViewState$p = null; } WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p; if (loaded != null) { - WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 127, null), null, null, null, 0, null, null, false, null, 261631, null)); + WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 127, null), null, null, null, 0, null, null, null, false, null, 523775, null)); WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java index c0334b72f4..114403e5e3 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$launchVideoCall$2 extends o implemen public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java index 13df8a05be..1fbc046e48 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$launchVoiceCall$2 extends o implemen public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java index efe246124b..a89e754a48 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.java @@ -22,6 +22,6 @@ public final class WidgetUserSheetViewModel$moveUserToChannel$1 extends o implem } public final void invoke(Void r2) { - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131891223); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131891256); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java index 0025969667..8a64f2c906 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$moveUserToChannel$2 extends o implem public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java index 13501ea011..64044bcede 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.java @@ -25,6 +25,6 @@ public final class WidgetUserSheetViewModel$removeRelationship$2 extends o imple public final void invoke(Error error) { m.checkNotNullParameter(error, "it"); - WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888048); + WidgetUserSheetViewModel.access$emitShowToastEvent(this.this$0, 2131888049); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java index 6d49114fff..cf2b87b9e5 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$setUserSuppressedInChannel$1.java @@ -23,14 +23,14 @@ public final class WidgetUserSheetViewModel$setUserSuppressedInChannel$1 extends return Unit.a; } - public final void invoke(Void r24) { + public final void invoke(Void r25) { WidgetUserSheetViewModel.ViewState access$getViewState$p = WidgetUserSheetViewModel.access$getViewState$p(this.this$0); if (!(access$getViewState$p instanceof WidgetUserSheetViewModel.ViewState.Loaded)) { access$getViewState$p = null; } WidgetUserSheetViewModel.ViewState.Loaded loaded = (WidgetUserSheetViewModel.ViewState.Loaded) access$getViewState$p; if (loaded != null) { - WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 191, null), null, null, null, 0, null, null, false, null, 261631, null)); + WidgetUserSheetViewModel.access$updateViewState(this.this$0, WidgetUserSheetViewModel.ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, false, 191, null), null, null, null, 0, null, null, null, false, null, 523775, null)); WidgetUserSheetViewModel.access$emitDismissSheetEvent(this.this$0); } } diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.java deleted file mode 100644 index 0999a0bb72..0000000000 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$updateUserNote$1.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.discord.widgets.user.usersheet; - -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: WidgetUserSheetViewModel.kt */ -public final class WidgetUserSheetViewModel$updateUserNote$1 extends o implements Function1 { - public static final WidgetUserSheetViewModel$updateUserNote$1 INSTANCE = new WidgetUserSheetViewModel$updateUserNote$1(); - - public WidgetUserSheetViewModel$updateUserNote$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(Void r1) { - invoke(r1); - return Unit.a; - } - - public final void invoke(Void r1) { - } -} diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java index ad9ac9ddef..03177c408a 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java @@ -13,6 +13,7 @@ import com.discord.api.voice.state.VoiceState; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelApplicationStream; import com.discord.models.domain.ModelConnectedAccount; +import com.discord.models.domain.ModelUserNote; import com.discord.models.domain.ModelUserProfile; import com.discord.models.domain.ModelUserRelationship; import com.discord.models.guild.Guild; @@ -47,6 +48,7 @@ import com.discord.widgets.user.profile.UserProfileAdminView; import com.discord.widgets.user.profile.UserProfileConnectionsView; import com.discord.widgets.user.usersheet.UserProfileVoiceSettingsView; import com.discord.widgets.user.usersheet.WidgetUserSheet; +import d0.g0.t; import d0.t.n; import d0.t.u; import d0.z.d.m; @@ -79,6 +81,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final StoreApplicationStreamPreviews storeApplicationStreamPreviews; private final StoreApplicationStreaming storeApplicationStreaming; private final StoreMediaSettings storeMediaSettings; + private final StoreUserNotes storeUserNotes; private final WidgetUserSheet.StreamPreviewClickBehavior streamPreviewClickBehavior; private final long userId; @@ -751,7 +754,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final Channel stageChannel; private final StreamContext streamContext; private final User user; - private final StoreUserNotes.UserNoteState userNote; + private final StoreUserNotes.UserNoteState userNoteFetchState; private final ModelUserProfile userProfile; private final Integer userRelationshipType; private final StageRequestToSpeakState userRequestToSpeakState; @@ -775,7 +778,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { this.streamContext = streamContext; this.userProfile = modelUserProfile; this.userRelationshipType = num; - this.userNote = userNoteState; + this.userNoteFetchState = userNoteState; this.stageChannel = channel2; this.userStageRoles = stageRoles; this.userRequestToSpeakState = stageRequestToSpeakState; @@ -788,7 +791,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { /* renamed from: copy-1YV1AGg$default reason: not valid java name */ public static /* synthetic */ StoreState m54copy1YV1AGg$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, ModelUserProfile modelUserProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, int i, Object obj) { - return storeState.m57copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2154me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : modelUserProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNote : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2); + return storeState.m57copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2154me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : modelUserProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2); } public final User component1() { @@ -828,7 +831,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } public final StoreUserNotes.UserNoteState component18() { - return this.userNote; + return this.userNoteFetchState; } public final Channel component19() { @@ -890,7 +893,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { m.checkNotNullParameter(map3, "mySelectedVoiceChannelVoiceStates"); m.checkNotNullParameter(map4, "currentChannelVoiceStates"); m.checkNotNullParameter(modelUserProfile, "userProfile"); - m.checkNotNullParameter(userNoteState, "userNote"); + m.checkNotNullParameter(userNoteState, "userNoteFetchState"); m.checkNotNullParameter(stageRequestToSpeakState, "userRequestToSpeakState"); return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, modelUserProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2); } @@ -903,7 +906,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return false; } StoreState storeState = (StoreState) obj; - return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2154me, storeState.f2154me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNote, storeState.userNote) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles); + return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2154me, storeState.f2154me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles); } public final Channel getChannel() { @@ -975,8 +978,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.user; } - public final StoreUserNotes.UserNoteState getUserNote() { - return this.userNote; + public final StoreUserNotes.UserNoteState getUserNoteFetchState() { + return this.userNoteFetchState; } public final ModelUserProfile getUserProfile() { @@ -1046,7 +1049,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { int hashCode12 = (hashCode11 + (modelUserProfile != null ? modelUserProfile.hashCode() : 0)) * 31; Integer num = this.userRelationshipType; int hashCode13 = (hashCode12 + (num != null ? num.hashCode() : 0)) * 31; - StoreUserNotes.UserNoteState userNoteState = this.userNote; + StoreUserNotes.UserNoteState userNoteState = this.userNoteFetchState; int hashCode14 = (hashCode13 + (userNoteState != null ? userNoteState.hashCode() : 0)) * 31; Channel channel2 = this.stageChannel; int hashCode15 = (hashCode14 + (channel2 != null ? channel2.hashCode() : 0)) * 31; @@ -1096,8 +1099,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { L.append(this.userProfile); L.append(", userRelationshipType="); L.append(this.userRelationshipType); - L.append(", userNote="); - L.append(this.userNote); + L.append(", userNoteFetchState="); + L.append(this.userNoteFetchState); L.append(", stageChannel="); L.append(this.stageChannel); L.append(", userStageRoles="); @@ -1131,19 +1134,21 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final StreamContext streamContext; private final User user; private final boolean userInSameVoiceChannel; - private final StoreUserNotes.UserNoteState userNote; + private final String userNote; + private final StoreUserNotes.UserNoteState userNoteFetchState; private final int userRelationshipType; private final UserProfileVoiceSettingsView.ViewState voiceSettingsViewState; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, boolean z4, List> list2) { + public Loaded(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List> list2) { super(null); m.checkNotNullParameter(user, "user"); m.checkNotNullParameter(viewState, "voiceSettingsViewState"); m.checkNotNullParameter(list, "roleItems"); m.checkNotNullParameter(viewState3, "stageViewState"); m.checkNotNullParameter(viewState4, "connectionsViewState"); - m.checkNotNullParameter(userNoteState, "userNote"); + m.checkNotNullParameter(userNoteState, "userNoteFetchState"); + m.checkNotNullParameter(str3, "userNote"); this.user = user; this.isMe = z2; this.showVoiceSettings = z3; @@ -1159,13 +1164,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel { this.guildName = str2; this.userRelationshipType = i; this.connectionsViewState = viewState4; - this.userNote = userNoteState; + this.userNoteFetchState = userNoteState; + this.userNote = str3; this.userInSameVoiceChannel = z4; this.bioAst = list2; } - public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, boolean z4, List list2, int i2, Object obj) { - return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNote : userNoteState, (i2 & 65536) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 131072) != 0 ? loaded.bioAst : list2); + public static /* synthetic */ Loaded copy$default(Loaded loaded, User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List list2, int i2, Object obj) { + return loaded.copy((i2 & 1) != 0 ? loaded.user : user, (i2 & 2) != 0 ? loaded.isMe : z2, (i2 & 4) != 0 ? loaded.showVoiceSettings : z3, (i2 & 8) != 0 ? loaded.voiceSettingsViewState : viewState, (i2 & 16) != 0 ? loaded.channelVoiceState : voiceState, (i2 & 32) != 0 ? loaded.richPresence : modelRichPresence, (i2 & 64) != 0 ? loaded.guildSectionHeaderText : str, (i2 & 128) != 0 ? loaded.roleItems : list, (i2 & 256) != 0 ? loaded.adminViewState : viewState2, (i2 & 512) != 0 ? loaded.stageViewState : viewState3, (i2 & 1024) != 0 ? loaded.channel : channel, (i2 & 2048) != 0 ? loaded.streamContext : streamContext, (i2 & 4096) != 0 ? loaded.guildName : str2, (i2 & 8192) != 0 ? loaded.userRelationshipType : i, (i2 & 16384) != 0 ? loaded.connectionsViewState : viewState4, (i2 & 32768) != 0 ? loaded.userNoteFetchState : userNoteState, (i2 & 65536) != 0 ? loaded.userNote : str3, (i2 & 131072) != 0 ? loaded.userInSameVoiceChannel : z4, (i2 & 262144) != 0 ? loaded.bioAst : list2); } public final User component1() { @@ -1197,14 +1203,18 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } public final StoreUserNotes.UserNoteState component16() { + return this.userNoteFetchState; + } + + public final String component17() { return this.userNote; } - public final boolean component17() { + public final boolean component18() { return this.userInSameVoiceChannel; } - public final List> component18() { + public final List> component19() { return this.bioAst; } @@ -1240,14 +1250,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.adminViewState; } - public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, boolean z4, List> list2) { + public final Loaded copy(User user, boolean z2, boolean z3, UserProfileVoiceSettingsView.ViewState viewState, VoiceState voiceState, ModelRichPresence modelRichPresence, String str, List list, UserProfileAdminView.ViewState viewState2, UserProfileStageActionsView.ViewState viewState3, Channel channel, StreamContext streamContext, String str2, int i, UserProfileConnectionsView.ViewState viewState4, StoreUserNotes.UserNoteState userNoteState, String str3, boolean z4, List> list2) { m.checkNotNullParameter(user, "user"); m.checkNotNullParameter(viewState, "voiceSettingsViewState"); m.checkNotNullParameter(list, "roleItems"); m.checkNotNullParameter(viewState3, "stageViewState"); m.checkNotNullParameter(viewState4, "connectionsViewState"); - m.checkNotNullParameter(userNoteState, "userNote"); - return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, z4, list2); + m.checkNotNullParameter(userNoteState, "userNoteFetchState"); + m.checkNotNullParameter(str3, "userNote"); + return new Loaded(user, z2, z3, viewState, voiceState, modelRichPresence, str, list, viewState2, viewState3, channel, streamContext, str2, i, viewState4, userNoteState, str3, z4, list2); } public boolean equals(Object obj) { @@ -1258,7 +1269,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return false; } Loaded loaded = (Loaded) obj; - return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst); + return m.areEqual(this.user, loaded.user) && this.isMe == loaded.isMe && this.showVoiceSettings == loaded.showVoiceSettings && m.areEqual(this.voiceSettingsViewState, loaded.voiceSettingsViewState) && m.areEqual(this.channelVoiceState, loaded.channelVoiceState) && m.areEqual(this.richPresence, loaded.richPresence) && m.areEqual(this.guildSectionHeaderText, loaded.guildSectionHeaderText) && m.areEqual(this.roleItems, loaded.roleItems) && m.areEqual(this.adminViewState, loaded.adminViewState) && m.areEqual(this.stageViewState, loaded.stageViewState) && m.areEqual(this.channel, loaded.channel) && m.areEqual(this.streamContext, loaded.streamContext) && m.areEqual(this.guildName, loaded.guildName) && this.userRelationshipType == loaded.userRelationshipType && m.areEqual(this.connectionsViewState, loaded.connectionsViewState) && m.areEqual(this.userNoteFetchState, loaded.userNoteFetchState) && m.areEqual(this.userNote, loaded.userNote) && this.userInSameVoiceChannel == loaded.userInSameVoiceChannel && m.areEqual(this.bioAst, loaded.bioAst); } public final UserProfileAdminView.ViewState getAdminViewState() { @@ -1325,10 +1336,14 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.userInSameVoiceChannel; } - public final StoreUserNotes.UserNoteState getUserNote() { + public final String getUserNote() { return this.userNote; } + public final StoreUserNotes.UserNoteState getUserNoteFetchState() { + return this.userNoteFetchState; + } + public final int getUserRelationshipType() { return this.userRelationshipType; } @@ -1380,13 +1395,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel { int hashCode11 = (((hashCode10 + (str2 != null ? str2.hashCode() : 0)) * 31) + this.userRelationshipType) * 31; UserProfileConnectionsView.ViewState viewState4 = this.connectionsViewState; int hashCode12 = (hashCode11 + (viewState4 != null ? viewState4.hashCode() : 0)) * 31; - StoreUserNotes.UserNoteState userNoteState = this.userNote; + StoreUserNotes.UserNoteState userNoteState = this.userNoteFetchState; int hashCode13 = (hashCode12 + (userNoteState != null ? userNoteState.hashCode() : 0)) * 31; + String str3 = this.userNote; + int hashCode14 = (hashCode13 + (str3 != null ? str3.hashCode() : 0)) * 31; boolean z4 = this.userInSameVoiceChannel; if (!z4) { i2 = z4 ? 1 : 0; } - int i11 = (hashCode13 + i2) * 31; + int i11 = (hashCode14 + i2) * 31; List> list2 = this.bioAst; if (list2 != null) { i = list2.hashCode(); @@ -1429,6 +1446,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { L.append(this.userRelationshipType); L.append(", connectionsViewState="); L.append(this.connectionsViewState); + L.append(", userNoteFetchState="); + L.append(this.userNoteFetchState); L.append(", userNote="); L.append(this.userNote); L.append(", userInSameVoiceChannel="); @@ -1473,16 +1492,16 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetUserSheetViewModel(long j, long j2, String str, boolean z2, Observable observable, WidgetUserSheet.StreamPreviewClickBehavior streamPreviewClickBehavior, StoreMediaSettings storeMediaSettings, StoreApplicationStreaming storeApplicationStreaming, RestAPI restAPI, RestAPI restAPI2, StoreApplicationStreamPreviews storeApplicationStreamPreviews, StoreUserNotes storeUserNotes, Parser, MessageParseState> parser) { + public WidgetUserSheetViewModel(long j, long j2, String str, boolean z2, Observable observable, WidgetUserSheet.StreamPreviewClickBehavior streamPreviewClickBehavior, StoreMediaSettings storeMediaSettings, StoreApplicationStreaming storeApplicationStreaming, StoreUserNotes storeUserNotes, RestAPI restAPI, RestAPI restAPI2, StoreApplicationStreamPreviews storeApplicationStreamPreviews, Parser, MessageParseState> parser) { super(ViewState.Uninitialized.INSTANCE); m.checkNotNullParameter(observable, "storeObservable"); m.checkNotNullParameter(streamPreviewClickBehavior, "streamPreviewClickBehavior"); m.checkNotNullParameter(storeMediaSettings, "storeMediaSettings"); m.checkNotNullParameter(storeApplicationStreaming, "storeApplicationStreaming"); + m.checkNotNullParameter(storeUserNotes, "storeUserNotes"); m.checkNotNullParameter(restAPI, "restAPI"); m.checkNotNullParameter(restAPI2, "restAPISerializeNulls"); m.checkNotNullParameter(storeApplicationStreamPreviews, "storeApplicationStreamPreviews"); - m.checkNotNullParameter(storeUserNotes, "storeUserNotes"); m.checkNotNullParameter(parser, "bioParser"); this.userId = j; this.channelId = j2; @@ -1491,6 +1510,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { this.streamPreviewClickBehavior = streamPreviewClickBehavior; this.storeMediaSettings = storeMediaSettings; this.storeApplicationStreaming = storeApplicationStreaming; + this.storeUserNotes = storeUserNotes; this.restAPI = restAPI; this.restAPISerializeNulls = restAPI2; this.storeApplicationStreamPreviews = storeApplicationStreamPreviews; @@ -1503,8 +1523,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ WidgetUserSheetViewModel(long j, long j2, String str, boolean z2, Observable observable, WidgetUserSheet.StreamPreviewClickBehavior streamPreviewClickBehavior, StoreMediaSettings storeMediaSettings, StoreApplicationStreaming storeApplicationStreaming, RestAPI restAPI, RestAPI restAPI2, StoreApplicationStreamPreviews storeApplicationStreamPreviews, StoreUserNotes storeUserNotes, Parser parser, int i, DefaultConstructorMarker defaultConstructorMarker) { - this(j, j2, str, z2, (i & 16) != 0 ? WidgetUserSheetViewModelStoreState.observeStoreState$default(WidgetUserSheetViewModelStoreState.INSTANCE, j, Long.valueOf(j2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, 65532, null) : observable, streamPreviewClickBehavior, (i & 64) != 0 ? StoreStream.Companion.getMediaSettings() : storeMediaSettings, (i & 128) != 0 ? StoreStream.Companion.getApplicationStreaming() : storeApplicationStreaming, (i & 256) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 512) != 0 ? RestAPI.Companion.getApiSerializeNulls() : restAPI2, (i & 1024) != 0 ? StoreStream.Companion.getApplicationStreamPreviews() : storeApplicationStreamPreviews, (i & 2048) != 0 ? StoreStream.Companion.getUsersNotes() : storeUserNotes, (i & 4096) != 0 ? DiscordParser.createParser$default(false, false, false, 4, null) : parser); + public /* synthetic */ WidgetUserSheetViewModel(long j, long j2, String str, boolean z2, Observable observable, WidgetUserSheet.StreamPreviewClickBehavior streamPreviewClickBehavior, StoreMediaSettings storeMediaSettings, StoreApplicationStreaming storeApplicationStreaming, StoreUserNotes storeUserNotes, RestAPI restAPI, RestAPI restAPI2, StoreApplicationStreamPreviews storeApplicationStreamPreviews, Parser parser, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(j, j2, str, z2, (i & 16) != 0 ? WidgetUserSheetViewModelStoreState.observeStoreState$default(WidgetUserSheetViewModelStoreState.INSTANCE, j, Long.valueOf(j2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, 65532, null) : observable, streamPreviewClickBehavior, (i & 64) != 0 ? StoreStream.Companion.getMediaSettings() : storeMediaSettings, (i & 128) != 0 ? StoreStream.Companion.getApplicationStreaming() : storeApplicationStreaming, (i & 256) != 0 ? StoreStream.Companion.getUsersNotes() : storeUserNotes, (i & 512) != 0 ? RestAPI.Companion.getApi() : restAPI, (i & 1024) != 0 ? RestAPI.Companion.getApiSerializeNulls() : restAPI2, (i & 2048) != 0 ? StoreStream.Companion.getApplicationStreamPreviews() : storeApplicationStreamPreviews, (i & 4096) != 0 ? DiscordParser.createParser$default(false, false, false, 4, null) : parser); } public static final /* synthetic */ void access$emitDismissSheetEvent(WidgetUserSheetViewModel widgetUserSheetViewModel) { @@ -1574,6 +1594,15 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return new UserProfileAdminView.ViewState(z4, z6, p1, z7, z8, z9, z10, z11, z12, z5, z3); } + private final List> createAndProcessBioAstFromText(String str) { + if (str == null || t.isBlank(str)) { + return null; + } + List> generateAst = generateAst(str); + createMessagePreprocessor().process(generateAst); + return generateAst; + } + private final UserProfileConnectionsView.ViewState createConnectionsViewState(ModelUserProfile modelUserProfile, boolean z2, boolean z3) { List connectedAccounts = modelUserProfile.getConnectedAccounts(); m.checkNotNullExpressionValue(connectedAccounts, "userProfile.connectedAccounts"); @@ -1646,17 +1675,28 @@ public final class WidgetUserSheetViewModel extends AppViewModel { /* 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 r1v15, resolved type: java.lang.Float */ + /* JADX DEBUG: Multi-variable search result rejected for r1v23, resolved type: java.lang.Float */ /* JADX DEBUG: Multi-variable search result rejected for r14v4, resolved type: java.lang.Boolean */ /* JADX WARN: Multi-variable type inference failed */ - /* JADX WARNING: Code restructure failed: missing block: B:19:0x008a, code lost: - if (r8 != null) goto L_0x0091; + /* JADX WARNING: Code restructure failed: missing block: B:105:0x022a, code lost: + if ((r5 == null || r5.length() == 0) == false) goto L_0x022f; */ - /* 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:71:0x01cc */ - /* JADX WARNING: Removed duplicated region for block: B:74:0x01db */ - /* JADX WARNING: Removed duplicated region for block: B:75:0x01e0 */ + /* JADX WARNING: Code restructure failed: missing block: B:19:0x008c, code lost: + if (r8 != null) goto L_0x0093; + */ + /* JADX WARNING: Removed duplicated region for block: B:100:0x021e */ + /* JADX WARNING: Removed duplicated region for block: B:113:0x023d */ + /* JADX WARNING: Removed duplicated region for block: B:117:0x024a */ + /* JADX WARNING: Removed duplicated region for block: B:118:0x024f */ + /* JADX WARNING: Removed duplicated region for block: B:68:0x01c6 */ + /* JADX WARNING: Removed duplicated region for block: B:69:0x01cb */ + /* JADX WARNING: Removed duplicated region for block: B:72:0x01d6 */ + /* JADX WARNING: Removed duplicated region for block: B:75:0x01db */ + /* JADX WARNING: Removed duplicated region for block: B:76:0x01e0 */ + /* JADX WARNING: Removed duplicated region for block: B:79:0x01e9 */ + /* JADX WARNING: Removed duplicated region for block: B:88:0x0202 */ + /* JADX WARNING: Removed duplicated region for block: B:91:0x0207 */ + /* JADX WARNING: Removed duplicated region for block: B:92:0x020c */ private final void handleStoreState(StoreState storeState) { List list; ManageUserContext manageUserContext; @@ -1666,9 +1706,16 @@ public final class WidgetUserSheetViewModel extends AppViewModel { String str2; StreamContext streamContext; String encodedStreamKey; - List> generateAst; - ModelApplicationStream stream; + ViewState viewState; + String userNote; + StoreUserNotes.UserNoteState userNoteFetchState; + String note; + ViewState viewState2; + boolean z3; String str3; + ModelUserNote note2; + ModelApplicationStream stream; + String str4; List roles; if (storeState == null) { this.eventSubject.j.onNext(Event.UserNotFound.INSTANCE); @@ -1680,7 +1727,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { Map computedMembers = storeState.getComputedMembers(); Map guildRoles = storeState.getGuildRoles(); Guild guild = storeState.getGuild(); - boolean z3 = me2.getId() == user.getId(); + boolean z4 = true; + boolean z5 = me2.getId() == user.getId(); boolean isSystemUser = user.isSystemUser(); GuildMember guildMember = (GuildMember) a.e(user, computedMembers); GuildMember guildMember2 = computedMembers.get(Long.valueOf(me2.getId())); @@ -1702,64 +1750,118 @@ public final class WidgetUserSheetViewModel extends AppViewModel { str = null; manageUserContext = ManageUserContext.Companion.from(guild, me2, user, guildMember2.getRoles(), guildMember.getRoles(), storeState.getPermissions(), guildRoles); } - boolean z4 = channel != null && channel.p() == me2.getId(); + boolean z6 = channel != null && channel.p() == me2.getId(); int type = ModelUserRelationship.getType(storeState.getUserRelationshipType()); VoiceState voiceState = (VoiceState) a.e(user, storeState.getMySelectedVoiceChannelVoiceStates()); VoiceState voiceState2 = storeState.getMySelectedVoiceChannelVoiceStates().get(Long.valueOf(me2.getId())); boolean isInSameVoiceChannel = isInSameVoiceChannel(voiceState2, voiceState); - boolean z5 = this.isVoiceContext || isInSameVoiceChannel; - boolean selfMuted = z3 ? storeState.getSelfMuted() : storeState.getMuted(); - Boolean valueOf = z3 ? Boolean.valueOf(storeState.getSelfDeafened()) : str; - if (!z3) { + boolean z7 = this.isVoiceContext || isInSameVoiceChannel; + boolean selfMuted = z5 ? storeState.getSelfMuted() : storeState.getMuted(); + Boolean valueOf = z5 ? Boolean.valueOf(storeState.getSelfDeafened()) : str; + if (!z5) { z2 = isSystemUser; f = Float.valueOf(PerceptualVolumeUtils.amplitudeToPerceptual$default(PerceptualVolumeUtils.INSTANCE, storeState.getOutputVolume(), 0.0f, 2, str)); } else { z2 = isSystemUser; f = str; } - UserProfileVoiceSettingsView.ViewState viewState = new UserProfileVoiceSettingsView.ViewState(selfMuted, valueOf, f); + UserProfileVoiceSettingsView.ViewState viewState3 = new UserProfileVoiceSettingsView.ViewState(selfMuted, valueOf, f); VoiceState voiceState3 = (VoiceState) a.e(user, storeState.getCurrentChannelVoiceStates()); if (channel != null) { if (AnimatableValueParser.p1(channel)) { - str3 = AnimatableValueParser.y0(channel); + str4 = AnimatableValueParser.y0(channel); } else if (guild != null) { - str3 = guild.getName(); + str4 = guild.getName(); } - str2 = str3; - UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z4, z3, manageUserContext, voiceState3); + str2 = str4; + UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z6, z5, manageUserContext, voiceState3); ModelUserProfile userProfile = storeState.getUserProfile(); - UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z3, z2); + UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z5, z2); streamContext = storeState.getStreamContext(); encodedStreamKey = (streamContext != null || (stream = streamContext.getStream()) == null) ? null : stream.getEncodedStreamKey(); if (encodedStreamKey != null && !this.fetchedPreviews.contains(encodedStreamKey)) { this.storeApplicationStreamPreviews.fetchStreamPreviewIfNotFetching(streamContext); this.fetchedPreviews.add(encodedStreamKey); } - UserProfileStageActionsView.ViewState viewState2 = new UserProfileStageActionsView.ViewState(z3, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null); + UserProfileStageActionsView.ViewState viewState4 = new UserProfileStageActionsView.ViewState(z5, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null); String d = userProfile.getUser().d(); - generateAst = d == null ? generateAst(d) : null; - if (generateAst != null) { - createMessagePreprocessor().process(generateAst); + List> createAndProcessBioAstFromText = d == null ? createAndProcessBioAstFromText(d) : null; + viewState = getViewState(); + if (!(viewState instanceof ViewState.Loaded)) { + viewState = null; } - updateViewState(new ViewState.Loaded(user, z3, z5, viewState, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState2, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNote(), isInSameVoiceChannel, generateAst)); + ViewState.Loaded loaded = (ViewState.Loaded) viewState; + userNote = loaded == null ? loaded.getUserNote() : null; + userNoteFetchState = storeState.getUserNoteFetchState(); + if (!(userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded)) { + userNoteFetchState = null; + } + StoreUserNotes.UserNoteState.Loaded loaded2 = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState; + note = (loaded2 != null || (note2 = loaded2.getNote()) == null) ? null : note2.getNote(); + viewState2 = getViewState(); + if (!(viewState2 instanceof ViewState.Loaded)) { + viewState2 = null; + } + ViewState.Loaded loaded3 = (ViewState.Loaded) viewState2; + z3 = !((loaded3 == null ? loaded3.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading) && !(storeState.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Loading); + if (userNote == null) { + } + z4 = false; + if (!z3 || z4) { + if (note != null) { + str3 = note; + updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText)); + this.mostRecentStoreState = storeState; + } + } else if (userNote != null) { + str3 = userNote; + updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText)); + this.mostRecentStoreState = storeState; + } + str3 = ""; + updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText)); this.mostRecentStoreState = storeState; } str2 = str; - UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z4, z3, manageUserContext, voiceState3); + UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z6, z5, manageUserContext, voiceState3); ModelUserProfile userProfile = storeState.getUserProfile(); - UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z3, z2); + UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z5, z2); streamContext = storeState.getStreamContext(); if (streamContext != null) { } this.storeApplicationStreamPreviews.fetchStreamPreviewIfNotFetching(streamContext); this.fetchedPreviews.add(encodedStreamKey); - UserProfileStageActionsView.ViewState viewState2 = new UserProfileStageActionsView.ViewState(z3, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null); + UserProfileStageActionsView.ViewState viewState4 = new UserProfileStageActionsView.ViewState(z5, storeState.getStageChannel(), storeState.m58getMyStageRolestwRsX0(), storeState.m59getUserStageRolestwRsX0(), storeState.getUserRequestToSpeakState(), isInSameVoiceChannel(voiceState2, voiceState), false, false, 192, null); String d = userProfile.getUser().d(); if (d == null) { } - if (generateAst != null) { + viewState = getViewState(); + if (!(viewState instanceof ViewState.Loaded)) { } - updateViewState(new ViewState.Loaded(user, z3, z5, viewState, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState2, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNote(), isInSameVoiceChannel, generateAst)); + ViewState.Loaded loaded = (ViewState.Loaded) viewState; + if (loaded == null) { + } + userNoteFetchState = storeState.getUserNoteFetchState(); + if (!(userNoteFetchState instanceof StoreUserNotes.UserNoteState.Loaded)) { + } + StoreUserNotes.UserNoteState.Loaded loaded2 = (StoreUserNotes.UserNoteState.Loaded) userNoteFetchState; + if (loaded2 != null) { + } + viewState2 = getViewState(); + if (!(viewState2 instanceof ViewState.Loaded)) { + } + ViewState.Loaded loaded3 = (ViewState.Loaded) viewState2; + if (!((loaded3 == null ? loaded3.getUserNoteFetchState() : null) instanceof StoreUserNotes.UserNoteState.Loading)) { + } + if (userNote == null) { + } + z4 = false; + if (!z3) { + } + if (note != null) { + } + str3 = ""; + updateViewState(new ViewState.Loaded(user, z5, z7, viewState3, voiceState3, storeState.getRichPresence(), str2, list, createAdminViewState, viewState4, channel, streamContext, guild == null ? guild.getName() : null, type, createConnectionsViewState, storeState.getUserNoteFetchState(), str3, isInSameVoiceChannel, createAndProcessBioAstFromText)); this.mostRecentStoreState = storeState; } @@ -1878,10 +1980,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } 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) { - List> generateAst = generateAst(d); 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, false, generateAst, 131071, 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, createAndProcessBioAstFromText(d), 262143, null)); } } @@ -1894,7 +1994,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) { long id2 = loaded.getUser().getId(); - updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, true, 127, null), null, null, null, 0, null, null, false, null, 261631, null)); + updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, false, true, 127, null), null, null, null, 0, null, null, null, false, null, 523775, null)); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, false, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$inviteUserToSpeak$1(this), 62, (Object) null); } } @@ -1966,7 +2066,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { public final void onStreamPreviewClicked(StreamContext streamContext) { m.checkNotNullParameter(streamContext, "streamContext"); if (streamContext.getJoinability() == StreamContext.Joinability.MISSING_PERMISSIONS) { - emitShowToastEvent(2131887272); + emitShowToastEvent(2131887273); } else { emitRequestStreamPermissionsEvent(streamContext.getStream()); } @@ -1976,6 +2076,24 @@ public final class WidgetUserSheetViewModel extends AppViewModel { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.removeRelationship("User Profile", this.userId), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, new WidgetUserSheetViewModel$removeRelationship$2(this), (Function0) null, (Function0) null, new WidgetUserSheetViewModel$removeRelationship$1(this, i), 54, (Object) null); } + public final void saveUserNote(Context context, String str) { + m.checkNotNullParameter(str, "noteText"); + ViewState viewState = getViewState(); + if (!(viewState instanceof ViewState.Loaded)) { + viewState = null; + } + ViewState.Loaded loaded = (ViewState.Loaded) viewState; + if (loaded != null) { + boolean z2 = true; + if ((!(loaded.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Empty) || !(!m.areEqual(str, ""))) && (!(loaded.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Loaded) || !(!m.areEqual(((StoreUserNotes.UserNoteState.Loaded) loaded.getUserNoteFetchState()).getNote().getNote(), str)))) { + z2 = false; + } + if (z2) { + this.storeUserNotes.saveNote(context, this.userId, str); + } + } + } + public final void setUserOutputVolume(float f) { this.storeMediaSettings.setUserOutputVolume(this.userId, PerceptualVolumeUtils.perceptualToAmplitude$default(PerceptualVolumeUtils.INSTANCE, f, 0.0f, 2, null)); } @@ -1989,7 +2107,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { ViewState.Loaded loaded = (ViewState.Loaded) viewState; if (loaded != null && (channel = loaded.getStageViewState().getChannel()) != null) { long id2 = loaded.getUser().getId(); - updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, true, false, 191, null), null, null, null, 0, null, null, false, null, 261631, null)); + updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, UserProfileStageActionsView.ViewState.m48copypGLTHTc$default(loaded.getStageViewState(), false, null, null, null, null, false, true, false, 191, null), null, null, null, 0, null, null, null, false, null, 523775, null)); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.setUserSuppressedInChannel$default(StageChannelAPI.INSTANCE, channel, id2, z2, 0, 8, null), false, 1, null), this, null, 2, null), WidgetUserSheetViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserSheetViewModel$setUserSuppressedInChannel$1(this), 62, (Object) null); } } @@ -2015,7 +2133,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (loaded.isMe()) { StoreMediaSettings.SelfMuteFailure selfMuteFailure = this.storeMediaSettings.toggleSelfMuted(); if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) { - emitShowToastEvent(2131894368); + emitShowToastEvent(2131894415); return; } return; @@ -2034,8 +2152,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (loaded == null) { return; } - if (!(loaded.getUserNote() instanceof StoreUserNotes.UserNoteState.Loaded) || (!m.areEqual(((StoreUserNotes.UserNoteState.Loaded) loaded.getUserNote()).getNote().getNote(), str))) { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.updateUserNotes(this.userId, new RestAPIParams.UserNoteUpdate(str)), false, 1, null), (Context) null, "updateNote", (Function1) null, WidgetUserSheetViewModel$updateUserNote$1.INSTANCE, (Function1) null, (Function0) null, (Function0) null, 117, (Object) null); + if ((!m.areEqual(loaded.getUserNote(), str)) && !(loaded.getUserNoteFetchState() instanceof StoreUserNotes.UserNoteState.Loading)) { + updateViewState(ViewState.Loaded.copy$default(loaded, null, false, false, null, null, null, null, null, null, null, null, null, null, 0, null, null, str, false, null, 458751, null)); } } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java index be13c54a42..31e961790a 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java +++ b/app/src/main/java/com/discord/widgets/voice/call/PrivateCallLaunchUtilsKt$callAndLaunch$1.java @@ -177,7 +177,7 @@ public final class PrivateCallLaunchUtilsKt$callAndLaunch$1 extends o implements if (str != null) { this.$doCall$6.mo1invoke(); } else { - c.a.d.o.g(this.this$0.$context, 2131891393, 0, null, 12); + c.a.d.o.g(this.this$0.$context, 2131891426, 0, null, 12); } } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java index af0deed46f..f346fb430d 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.java @@ -22,6 +22,6 @@ public final class WidgetCallFailed$sendFriendRequest$1 extends o implements Fun } public final void invoke(Void r4) { - c.a.d.o.i(this.this$0, 2131888799, 0, 4); + c.a.d.o.i(this.this$0, 2131888809, 0, 4); } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java index 9ba98cefed..252171a4e7 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetCallFailed.java @@ -65,8 +65,8 @@ public final class WidgetCallFailed extends AppDialog { if (user != null) { TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationText"); - b.n(textView, 2131887132, new Object[]{user.getUsername()}, null, 4); - MaterialButton materialButton = getBinding().f1647c; + b.n(textView, 2131887133, new Object[]{user.getUsername()}, null, 4); + MaterialButton materialButton = getBinding().f1649c; m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm"); setOnClickAndDismissListener(materialButton, new WidgetCallFailed$configureUI$$inlined$let$lambda$1(this, user)); return; @@ -88,13 +88,13 @@ public final class WidgetCallFailed extends AppDialog { super.onViewBound(view); TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.viewDialogConfirmationHeader"); - textView.setText(getString(2131893411)); - MaterialButton materialButton = getBinding().f1647c; + textView.setText(getString(2131893452)); + MaterialButton materialButton = getBinding().f1649c; m.checkNotNullExpressionValue(materialButton, "binding.viewDialogConfirmationConfirm"); materialButton.setText(getString(2131886252)); MaterialButton materialButton2 = getBinding().b; m.checkNotNullExpressionValue(materialButton2, "binding.viewDialogConfirmationCancel"); - materialButton2.setText(getString(2131891633)); + materialButton2.setText(getString(2131891666)); getBinding().b.setOnClickListener(new WidgetCallFailed$onViewBound$1(this)); } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java index bc007d912d..4bf77ae5d6 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$binding$2.java @@ -22,35 +22,35 @@ public final /* synthetic */ class WidgetVoiceCallIncoming$binding$2 extends k i public final WidgetVoiceCallIncomingBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363554; - LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363554); + int i = 2131363556; + LinearLayout linearLayout = (LinearLayout) view.findViewById(2131363556); if (linearLayout != null) { - i = 2131363555; - FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363555); + i = 2131363557; + FloatingActionButton floatingActionButton = (FloatingActionButton) view.findViewById(2131363557); if (floatingActionButton != null) { - i = 2131363556; - FloatingActionButton floatingActionButton2 = (FloatingActionButton) view.findViewById(2131363556); + i = 2131363558; + FloatingActionButton floatingActionButton2 = (FloatingActionButton) view.findViewById(2131363558); if (floatingActionButton2 != null) { - i = 2131363557; - PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) view.findViewById(2131363557); + i = 2131363559; + PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) view.findViewById(2131363559); if (privateCallBlurredGridView != null) { - i = 2131363558; - FloatingActionButton floatingActionButton3 = (FloatingActionButton) view.findViewById(2131363558); + i = 2131363560; + FloatingActionButton floatingActionButton3 = (FloatingActionButton) view.findViewById(2131363560); if (floatingActionButton3 != null) { - i = 2131363559; - LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363559); + i = 2131363561; + LinearLayout linearLayout2 = (LinearLayout) view.findViewById(2131363561); if (linearLayout2 != null) { - i = 2131363560; - TextView textView = (TextView) view.findViewById(2131363560); + i = 2131363562; + TextView textView = (TextView) view.findViewById(2131363562); if (textView != null) { - i = 2131363561; - TextView textView2 = (TextView) view.findViewById(2131363561); + i = 2131363563; + TextView textView2 = (TextView) view.findViewById(2131363563); if (textView2 != null) { - i = 2131363562; - Guideline guideline = (Guideline) view.findViewById(2131363562); + i = 2131363564; + Guideline guideline = (Guideline) view.findViewById(2131363564); if (guideline != null) { - i = 2131363563; - PrivateCallGridView privateCallGridView = (PrivateCallGridView) view.findViewById(2131363563); + i = 2131363565; + PrivateCallGridView privateCallGridView = (PrivateCallGridView) view.findViewById(2131363565); if (privateCallGridView != null) { return new WidgetVoiceCallIncomingBinding((ConstraintLayout) view, linearLayout, floatingActionButton, floatingActionButton2, privateCallBlurredGridView, floatingActionButton3, linearLayout2, textView, textView2, guideline, privateCallGridView); } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java index 92140f1df4..971e1e20ef 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.java @@ -218,7 +218,7 @@ public class WidgetVoiceCallIncoming extends AppFragment { } public WidgetVoiceCallIncoming() { - super(2131559277); + super(2131559278); } private final WidgetVoiceCallIncomingBinding getBinding() { @@ -248,7 +248,7 @@ public class WidgetVoiceCallIncoming extends AppFragment { } } textView.setText(str); - getBinding().h.setText(component1.isVideoCall() ? 2131890309 : 2131890303); + getBinding().h.setText(component1.isVideoCall() ? 2131890339 : 2131890333); getBinding().i.configure(component2); getBinding().e.configure(component2); LinearLayout linearLayout = getBinding().b; @@ -258,7 +258,7 @@ public class WidgetVoiceCallIncoming extends AppFragment { } linearLayout.setVisibility(i); getBinding().d.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$2(this, model)); - getBinding().f1998c.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$3(this, model)); + getBinding().f2000c.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$3(this, model)); getBinding().f.setOnClickListener(new WidgetVoiceCallIncoming$configureUI$4(this, model)); } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java index b3d89f8370..45607e84a9 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline$binding$2.java @@ -18,10 +18,10 @@ public final /* synthetic */ class WidgetVoiceCallInline$binding$2 extends k imp public final WidgetVoiceCallInlineBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); LinearLayout linearLayout = (LinearLayout) view; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365531); + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365537); if (materialButton != null) { return new WidgetVoiceCallInlineBinding((LinearLayout) view, linearLayout, materialButton); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365531))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131365537))); } } diff --git a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java index 3fd3db6091..c31011ba78 100644 --- a/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java +++ b/app/src/main/java/com/discord/widgets/voice/call/WidgetVoiceCallInline.java @@ -210,7 +210,7 @@ public final class WidgetVoiceCallInline extends AppFragment { } public WidgetVoiceCallInline() { - super(2131559278); + super(2131559279); } public static final /* synthetic */ void access$configureUI(WidgetVoiceCallInline widgetVoiceCallInline, Model model) { @@ -239,7 +239,7 @@ public final class WidgetVoiceCallInline extends AppFragment { private final void onViewBindingDestroy(WidgetVoiceCallInlineBinding widgetVoiceCallInlineBinding) { b a = b.C0032b.a(); - MaterialButton materialButton = widgetVoiceCallInlineBinding.f1999c; + MaterialButton materialButton = widgetVoiceCallInlineBinding.f2001c; m.checkNotNullExpressionValue(materialButton, "binding.voiceConnectedPtt"); a.i.remove(Integer.valueOf(materialButton.getId())); a.a(); @@ -253,9 +253,9 @@ public final class WidgetVoiceCallInline extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - getBinding().f1999c.setOnClickListener(WidgetVoiceCallInline$onViewBound$1.INSTANCE); - getBinding().f1999c.setOnTouchListener(new OnPressListener(WidgetVoiceCallInline$onViewBound$2.INSTANCE)); - getBinding().f1999c.addOnLayoutChangeListener(b.C0032b.a()); + getBinding().f2001c.setOnClickListener(WidgetVoiceCallInline$onViewBound$1.INSTANCE); + getBinding().f2001c.setOnTouchListener(new OnPressListener(WidgetVoiceCallInline$onViewBound$2.INSTANCE)); + getBinding().f2001c.addOnLayoutChangeListener(b.C0032b.a()); setWindowInsetsListeners(); } diff --git a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java index 55445140d0..1b168d3d39 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/AnchoredVoiceControlsView.java @@ -63,26 +63,26 @@ public final class AnchoredVoiceControlsView extends FrameLayout { m.checkNotNullParameter(context, "context"); View inflate = LayoutInflater.from(context).inflate(2131558432, (ViewGroup) this, false); addView(inflate); - int i2 = 2131365533; - ImageView imageView = (ImageView) inflate.findViewById(2131365533); + int i2 = 2131365539; + ImageView imageView = (ImageView) inflate.findViewById(2131365539); if (imageView != null) { - i2 = 2131365534; - LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365534); + i2 = 2131365540; + LinearLayout linearLayout = (LinearLayout) inflate.findViewById(2131365540); if (linearLayout != null) { - i2 = 2131365535; - ImageView imageView2 = (ImageView) inflate.findViewById(2131365535); + i2 = 2131365541; + ImageView imageView2 = (ImageView) inflate.findViewById(2131365541); if (imageView2 != null) { - i2 = 2131365536; - ImageView imageView3 = (ImageView) inflate.findViewById(2131365536); + i2 = 2131365542; + ImageView imageView3 = (ImageView) inflate.findViewById(2131365542); if (imageView3 != null) { - i2 = 2131365537; - MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365537); + i2 = 2131365543; + MaterialButton materialButton = (MaterialButton) inflate.findViewById(2131365543); if (materialButton != null) { - i2 = 2131365538; - ImageView imageView4 = (ImageView) inflate.findViewById(2131365538); + i2 = 2131365544; + ImageView imageView4 = (ImageView) inflate.findViewById(2131365544); if (imageView4 != null) { - i2 = 2131365539; - ImageView imageView5 = (ImageView) inflate.findViewById(2131365539); + i2 = 2131365545; + ImageView imageView5 = (ImageView) inflate.findViewById(2131365545); if (imageView5 != null) { AnchoredVoiceControlsViewBinding anchoredVoiceControlsViewBinding = new AnchoredVoiceControlsViewBinding((LinearLayout) inflate, imageView, linearLayout, imageView2, imageView3, materialButton, imageView4, imageView5); m.checkNotNullExpressionValue(anchoredVoiceControlsViewBinding, "AnchoredVoiceControlsVie…rom(context), this, true)"); @@ -184,14 +184,14 @@ public final class AnchoredVoiceControlsView extends FrameLayout { imageView2.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968946))); ImageView imageView3 = this.binding.b; m.checkNotNullExpressionValue(imageView3, "binding.voiceFullscreenControlsCamera"); - imageView3.setContentDescription(getContext().getString(2131887144)); + imageView3.setContentDescription(getContext().getString(2131887145)); } else { ImageView imageView4 = this.binding.b; m.checkNotNullExpressionValue(imageView4, "binding.voiceFullscreenControlsCamera"); imageView4.setImageTintList(ColorStateList.valueOf(ColorCompat.getThemedColor(getContext(), 2130968949))); ImageView imageView5 = this.binding.b; m.checkNotNullExpressionValue(imageView5, "binding.voiceFullscreenControlsCamera"); - imageView5.setContentDescription(getContext().getString(2131887143)); + imageView5.setContentDescription(getContext().getString(2131887144)); } if (audioDevicesState.getSelectedOutputDevice() instanceof StoreAudioDevices.OutputDevice.BluetoothAudio) { this.binding.g.setImageResource(2131231402); @@ -222,24 +222,24 @@ public final class AnchoredVoiceControlsView extends FrameLayout { imageView11.setActivated(z2); ImageView imageView12 = this.binding.d; m.checkNotNullExpressionValue(imageView12, "binding.voiceFullscreenControlsMuteState"); - imageView12.setContentDescription(getContext().getString(z2 ? 2131894024 : 2131891261)); + imageView12.setContentDescription(getContext().getString(z2 ? 2131894063 : 2131891294)); this.binding.d.setOnClickListener(new AnchoredVoiceControlsView$configureUI$3(function0)); ImageView imageView13 = this.binding.f; m.checkNotNullExpressionValue(imageView13, "binding.voiceFullscreenControlsScreenshare"); imageView13.setActivated(z3); - this.binding.f.setImageResource(z3 ? 2131231755 : 2131231754); + this.binding.f.setImageResource(z3 ? 2131231758 : 2131231757); ImageView imageView14 = this.binding.f; m.checkNotNullExpressionValue(imageView14, "binding.voiceFullscreenControlsScreenshare"); Context context = getContext(); if (context != null) { - str = context.getString(z3 ? 2131893550 : 2131892995); + str = context.getString(z3 ? 2131893590 : 2131893037); } else { str = null; } imageView14.setContentDescription(str); this.binding.f.setOnClickListener(new AnchoredVoiceControlsView$configureUI$4(function02)); configureScreenShareButtonSparkle(z4, appComponent, fragmentManager, j, z5, featureContext, function06, function02); - this.binding.f1598c.setOnClickListener(new AnchoredVoiceControlsView$configureUI$5(function05)); + this.binding.f1600c.setOnClickListener(new AnchoredVoiceControlsView$configureUI$5(function05)); } public final void hidePtt() { diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java index 59ae51dafa..2112db8d51 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsOutputSelectorState.java @@ -3,11 +3,11 @@ package com.discord.widgets.voice.controls; import androidx.annotation.DrawableRes; /* compiled from: VoiceControlsOutputSelectorState.kt */ public enum VoiceControlsOutputSelectorState { - SPEAKER_ON(2131231932, true, false), - SPEAKER_OFF(2131231934, false, false), - BLUETOOTH_ON_AND_MORE(2131231933, true, true), - SPEAKER_ON_AND_MORE(2131231932, true, true), - SPEAKER_OFF_AND_MORE(2131231934, false, true); + SPEAKER_ON(2131231935, true, false), + SPEAKER_OFF(2131231937, false, false), + BLUETOOTH_ON_AND_MORE(2131231936, true, true), + SPEAKER_ON_AND_MORE(2131231935, true, true), + SPEAKER_OFF_AND_MORE(2131231937, false, true); private final int audioOutputIconRes; private final boolean isButtonActive; diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureUI$5.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureInviteButtons$1.java similarity index 69% rename from app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureUI$5.java rename to app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureInviteButtons$1.java index aaf8590b02..a039d6d278 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureUI$5.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureInviteButtons$1.java @@ -3,10 +3,10 @@ package com.discord.widgets.voice.controls; import android.view.View; import kotlin.jvm.functions.Function0; /* compiled from: VoiceControlsSheetView.kt */ -public final class VoiceControlsSheetView$configureUI$5 implements View.OnClickListener { +public final class VoiceControlsSheetView$configureInviteButtons$1 implements View.OnClickListener { public final /* synthetic */ Function0 $onInviteClick; - public VoiceControlsSheetView$configureUI$5(Function0 function0) { + public VoiceControlsSheetView$configureInviteButtons$1(Function0 function0) { this.$onInviteClick = function0; } diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureInviteButtons$2.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureInviteButtons$2.java new file mode 100644 index 0000000000..22d895b486 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView$configureInviteButtons$2.java @@ -0,0 +1,17 @@ +package com.discord.widgets.voice.controls; + +import android.view.View; +import kotlin.jvm.functions.Function0; +/* compiled from: VoiceControlsSheetView.kt */ +public final class VoiceControlsSheetView$configureInviteButtons$2 implements View.OnClickListener { + public final /* synthetic */ Function0 $onInviteClick; + + public VoiceControlsSheetView$configureInviteButtons$2(Function0 function0) { + this.$onInviteClick = function0; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + this.$onInviteClick.mo1invoke(); + } +} diff --git a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java index a4416216bf..6c138191d7 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/VoiceControlsSheetView.java @@ -50,7 +50,7 @@ public final class VoiceControlsSheetView extends LinearLayout { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); this.isGestureNavigationEnabled = DisplayUtils.isGestureNavigationEnabled(resources); - CardView cardView = a.q; + CardView cardView = a.r; m.checkNotNullExpressionValue(cardView, "binding.secondaryActionsCard"); cardView.setVisibility(this.isGestureNavigationEnabled ? 0 : 4); } @@ -65,7 +65,7 @@ public final class VoiceControlsSheetView extends LinearLayout { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); this.isGestureNavigationEnabled = DisplayUtils.isGestureNavigationEnabled(resources); - CardView cardView = a.q; + CardView cardView = a.r; m.checkNotNullExpressionValue(cardView, "binding.secondaryActionsCard"); cardView.setVisibility(this.isGestureNavigationEnabled ? 0 : 4); } @@ -80,7 +80,7 @@ public final class VoiceControlsSheetView extends LinearLayout { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); this.isGestureNavigationEnabled = DisplayUtils.isGestureNavigationEnabled(resources); - CardView cardView = a.q; + CardView cardView = a.r; m.checkNotNullExpressionValue(cardView, "binding.secondaryActionsCard"); cardView.setVisibility(this.isGestureNavigationEnabled ? 0 : 4); } @@ -95,9 +95,33 @@ public final class VoiceControlsSheetView extends LinearLayout { this(context, (i & 2) != 0 ? null : attributeSet); } + private final void configureInviteButtons(CallModel callModel, Function0 function0, boolean z2) { + this.binding.h.setOnClickListener(new VoiceControlsSheetView$configureInviteButtons$1(function0)); + this.binding.i.setOnClickListener(new VoiceControlsSheetView$configureInviteButtons$2(function0)); + ImageView imageView = this.binding.h; + m.checkNotNullExpressionValue(imageView, "binding.inviteButton"); + boolean z3 = true; + int i = 8; + imageView.setVisibility(callModel.canInvite() && z2 ? 0 : 8); + TextView textView = this.binding.i; + m.checkNotNullExpressionValue(textView, "binding.inviteSecondaryButton"); + if (!callModel.canInvite() || z2) { + z3 = false; + } + if (z3) { + i = 0; + } + textView.setVisibility(i); + ImageView imageView2 = this.binding.h; + m.checkNotNullExpressionValue(imageView2, "binding.inviteButton"); + Context context = getContext(); + m.checkNotNullExpressionValue(context, "context"); + imageView2.setBackgroundTintList(ColorStateList.valueOf(getDefaultButtonBackgroundTint(context, false))); + } + /* renamed from: configureMoveToAudienceButton-yox5PQY reason: not valid java name */ private final void m60configureMoveToAudienceButtonyox5PQY(StageRoles stageRoles, Function0 function0) { - ImageView imageView = this.binding.i; + ImageView imageView = this.binding.j; int i = 0; boolean z2 = true; if (stageRoles == null || !StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl()) || StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) { @@ -107,41 +131,41 @@ public final class VoiceControlsSheetView extends LinearLayout { i = 8; } imageView.setVisibility(i); - ImageView imageView2 = this.binding.i; + ImageView imageView2 = this.binding.j; m.checkNotNullExpressionValue(imageView2, "binding.moveToAudienceButton"); - imageView2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(imageView.getContext(), 2131100462))); + imageView2.setBackgroundTintList(ColorStateList.valueOf(ColorCompat.getColor(imageView.getContext(), 2131100463))); imageView.setOnClickListener(new VoiceControlsSheetView$configureMoveToAudienceButton$$inlined$apply$lambda$1(this, stageRoles, function0)); } /* renamed from: configureMuteButton-P2fzehM reason: not valid java name */ private final void m61configureMuteButtonP2fzehM(CallModel callModel, StageRoles stageRoles, Function0 function0) { if (stageRoles == null || StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) { - ImageView imageView = this.binding.j; + ImageView imageView = this.binding.k; m.checkNotNullExpressionValue(imageView, "binding.muteButton"); imageView.setVisibility(0); boolean isMeMutedByAnySource = callModel.isMeMutedByAnySource(); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); int defaultButtonBackgroundTint = getDefaultButtonBackgroundTint(context, isMeMutedByAnySource); - ImageView imageView2 = this.binding.j; + ImageView imageView2 = this.binding.k; m.checkNotNullExpressionValue(imageView2, "binding.muteButton"); imageView2.setBackgroundTintList(ColorStateList.valueOf(defaultButtonBackgroundTint)); - this.binding.j.setImageResource(isMeMutedByAnySource ? 2131231740 : 2131231751); - this.binding.j.setOnClickListener(new VoiceControlsSheetView$configureMuteButton$1(function0)); - ImageView imageView3 = this.binding.j; + this.binding.k.setImageResource(isMeMutedByAnySource ? 2131231743 : 2131231754); + this.binding.k.setOnClickListener(new VoiceControlsSheetView$configureMuteButton$1(function0)); + ImageView imageView3 = this.binding.k; m.checkNotNullExpressionValue(imageView3, "binding.muteButton"); Context context2 = getContext(); m.checkNotNullExpressionValue(context2, "context"); - imageView3.setContentDescription(b.g(context2, isMeMutedByAnySource ? 2131894024 : 2131891261, new Object[0], null, 4)); + imageView3.setContentDescription(b.g(context2, isMeMutedByAnySource ? 2131894063 : 2131891294, new Object[0], null, 4)); return; } - ImageView imageView4 = this.binding.j; + ImageView imageView4 = this.binding.k; m.checkNotNullExpressionValue(imageView4, "binding.muteButton"); imageView4.setVisibility(8); } private final void configureOutputSelectors(VoiceControlsOutputSelectorState voiceControlsOutputSelectorState, Function0 function0, boolean z2) { - FrameLayout frameLayout = this.binding.f1663c; + FrameLayout frameLayout = this.binding.f1665c; m.checkNotNullExpressionValue(frameLayout, "binding.audioOutputContainer"); int i = 0; frameLayout.setVisibility(z2 ? 0 : 8); @@ -179,27 +203,27 @@ public final class VoiceControlsSheetView extends LinearLayout { /* renamed from: configureRaiseHandButton-fw_bWyM reason: not valid java name */ private final void m62configureRaiseHandButtonfw_bWyM(CallModel callModel, StageRoles stageRoles, int i, boolean z2, Function0 function0) { if (stageRoles == null || (!StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl()) && !StageRoles.m23isAudienceimpl(stageRoles.m28unboximpl()))) { - NumericBadgingView numericBadgingView = this.binding.m; + NumericBadgingView numericBadgingView = this.binding.n; m.checkNotNullExpressionValue(numericBadgingView, "binding.raiseHandBadge"); numericBadgingView.setVisibility(8); return; } - NumericBadgingView numericBadgingView2 = this.binding.m; + NumericBadgingView numericBadgingView2 = this.binding.n; boolean z3 = false; numericBadgingView2.setVisibility(0); if (!StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) { i = 0; } numericBadgingView2.setBadgeNumber(i); - ImageView imageView = this.binding.n; + ImageView imageView = this.binding.o; if (StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) { - imageView.setContentDescription(imageView.getResources().getString(2131892582)); + imageView.setContentDescription(imageView.getResources().getString(2131892624)); ViewExtensions.setEnabledAndAlpha$default(imageView, true, 0.0f, 2, null); - imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231952)); + imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231955)); } else { imageView.setContentDescription(imageView.getResources().getString(!callModel.canRequestToSpeak() ? 2131886740 : callModel.isMyHandRaised() ? 2131886737 : 2131886738)); ViewExtensions.setEnabledAndAlpha(imageView, !z2 && callModel.canRequestToSpeak(), 0.2f); - imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231949)); + imageView.setImageDrawable(ContextCompat.getDrawable(imageView.getContext(), 2131231952)); } if (callModel.isMyHandRaised() && !StageRoles.m25isModeratorimpl(stageRoles.m28unboximpl())) { z3 = true; @@ -219,25 +243,25 @@ public final class VoiceControlsSheetView extends LinearLayout { boolean z3 = true; boolean z4 = !AnimatableValueParser.u1(callModel.getChannel()); boolean isStreaming = callModel.isStreaming(); - int i = isStreaming ? 2131893550 : 2131891203; - ImageView imageView = this.binding.o; + int i = isStreaming ? 2131893590 : 2131891236; + ImageView imageView = this.binding.p; m.checkNotNullExpressionValue(imageView, "binding.screenShareButton"); int i2 = 0; imageView.setVisibility(z4 && z2 ? 0 : 8); - int i3 = isStreaming ? 2131231755 : 2131231754; + int i3 = isStreaming ? 2131231758 : 2131231757; int i4 = isStreaming ? -16777216 : -1; Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); int defaultButtonBackgroundTint = getDefaultButtonBackgroundTint(context, isStreaming); - this.binding.o.setImageResource(i3); - ImageView imageView2 = this.binding.o; + this.binding.p.setImageResource(i3); + ImageView imageView2 = this.binding.p; m.checkNotNullExpressionValue(imageView2, "binding.screenShareButton"); imageView2.setBackgroundTintList(ColorStateList.valueOf(defaultButtonBackgroundTint)); - ImageView imageView3 = this.binding.o; + ImageView imageView3 = this.binding.p; m.checkNotNullExpressionValue(imageView3, "binding.screenShareButton"); imageView3.setImageTintList(ColorStateList.valueOf(i4)); - this.binding.o.setOnClickListener(new VoiceControlsSheetView$configureScreenshareButtons$1(function0)); - TextView textView = this.binding.p; + this.binding.p.setOnClickListener(new VoiceControlsSheetView$configureScreenshareButtons$1(function0)); + TextView textView = this.binding.q; m.checkNotNullExpressionValue(textView, "binding.screenShareSecondaryButton"); if (!z4 || z2) { z3 = false; @@ -246,30 +270,30 @@ public final class VoiceControlsSheetView extends LinearLayout { i2 = 8; } textView.setVisibility(i2); - this.binding.p.setOnClickListener(new VoiceControlsSheetView$configureScreenshareButtons$2(function0)); - TextView textView2 = this.binding.p; + this.binding.q.setOnClickListener(new VoiceControlsSheetView$configureScreenshareButtons$2(function0)); + TextView textView2 = this.binding.q; m.checkNotNullExpressionValue(textView2, "binding.screenShareSecondaryButton"); ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, i3, 0, 0, 0, 14, null); - this.binding.p.setText(i); + this.binding.q.setText(i); } private final void configureStreamVolume(boolean z2, float f, Function2 function2) { - TextView textView = this.binding.t; + TextView textView = this.binding.u; m.checkNotNullExpressionValue(textView, "binding.streamVolumeLabel"); int i = 8; textView.setVisibility(z2 ? 0 : 8); - VolumeSliderView volumeSliderView = this.binding.u; + VolumeSliderView volumeSliderView = this.binding.v; m.checkNotNullExpressionValue(volumeSliderView, "binding.streamVolumeSlider"); if (z2) { i = 0; } volumeSliderView.setVisibility(i); - VolumeSliderView volumeSliderView2 = this.binding.u; + VolumeSliderView volumeSliderView2 = this.binding.v; int roundToInt = a.roundToInt(f); SeekBar seekBar = volumeSliderView2.i.d; m.checkNotNullExpressionValue(seekBar, "binding.volumeSliderSeekBar"); seekBar.setProgress(roundToInt); - this.binding.u.setOnVolumeChange(function2); + this.binding.v.setOnVolumeChange(function2); } private final void configureVideoButton(CallModel callModel, Function0 function0, boolean z2) { @@ -277,7 +301,7 @@ public final class VoiceControlsSheetView extends LinearLayout { int i = 0; boolean z4 = callModel.getSelectedVideoDevice() != null; boolean z5 = !callModel.getVideoDevices().isEmpty(); - ImageView imageView = this.binding.v; + ImageView imageView = this.binding.w; m.checkNotNullExpressionValue(imageView, "binding.videoButton"); if (!z5 || !z2) { z3 = false; @@ -287,31 +311,31 @@ public final class VoiceControlsSheetView extends LinearLayout { } imageView.setVisibility(i); int i2 = z4 ? -16777216 : -1; - ImageView imageView2 = this.binding.v; + ImageView imageView2 = this.binding.w; m.checkNotNullExpressionValue(imageView2, "binding.videoButton"); imageView2.setImageTintList(ColorStateList.valueOf(i2)); Context context = getContext(); m.checkNotNullExpressionValue(context, "context"); int defaultButtonBackgroundTint = getDefaultButtonBackgroundTint(context, z4); - ImageView imageView3 = this.binding.v; + ImageView imageView3 = this.binding.w; m.checkNotNullExpressionValue(imageView3, "binding.videoButton"); imageView3.setBackgroundTintList(ColorStateList.valueOf(defaultButtonBackgroundTint)); - this.binding.v.setOnClickListener(new VoiceControlsSheetView$configureVideoButton$1(function0)); + this.binding.w.setOnClickListener(new VoiceControlsSheetView$configureVideoButton$1(function0)); } private final int getDefaultButtonBackgroundTint(Context context, boolean z2) { if (z2) { - return ColorCompat.getColor(context, 2131100427); + return ColorCompat.getColor(context, 2131100428); } if (!z2) { - return ColorCompat.getColor(context, 2131100462); + return ColorCompat.getColor(context, 2131100463); } throw new NoWhenBranchMatchedException(); } private final int getDefaultButtonIconTint(Context context, boolean z2) { if (!z2) { - return ColorCompat.getColor(context, 2131100427); + return ColorCompat.getColor(context, 2131100428); } TypedValue typedValue = new TypedValue(); context.getTheme().resolveAttribute(2130968761, typedValue, true); @@ -320,6 +344,7 @@ public final class VoiceControlsSheetView extends LinearLayout { /* renamed from: configureUI-3jxq49Y reason: not valid java name */ public final void m63configureUI3jxq49Y(CallModel callModel, VoiceControlsOutputSelectorState voiceControlsOutputSelectorState, boolean z2, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, Function0 function06, Function0 function07, boolean z8, float f, Function2 function2, Function0 function08, int i, Function0 function09, Function0 function010, boolean z9, StageRoles stageRoles) { + int i2; m.checkNotNullParameter(callModel, "model"); m.checkNotNullParameter(voiceControlsOutputSelectorState, "outputSelectorState"); m.checkNotNullParameter(function0, "onStopWatchingClick"); @@ -333,16 +358,17 @@ public final class VoiceControlsSheetView extends LinearLayout { m.checkNotNullParameter(function08, "onDeafenPressed"); m.checkNotNullParameter(function09, "onRaiseHandClick"); m.checkNotNullParameter(function010, "onMoveToAudienceClick"); - ImageView imageView = this.binding.f1664s; + ImageView imageView = this.binding.t; m.checkNotNullExpressionValue(imageView, "binding.stopWatchingButton"); imageView.setVisibility(z6 ? 0 : 8); - this.binding.f1664s.setOnClickListener(new VoiceControlsSheetView$configureUI$1(function0)); + this.binding.t.setOnClickListener(new VoiceControlsSheetView$configureUI$1(function0)); if (stageRoles == null || StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) { - MaterialTextView materialTextView = this.binding.r; + MaterialTextView materialTextView = this.binding.f1666s; m.checkNotNullExpressionValue(materialTextView, "binding.stageDisconnectButtonLarge"); + i2 = 8; materialTextView.setVisibility(8); ImageView imageView2 = this.binding.g; - imageView2.setImageResource(stageRoles == null ? 2131231449 : 2131231946); + imageView2.setImageResource(stageRoles == null ? 2131231449 : 2131231949); imageView2.setVisibility(z7 ? 0 : 8); imageView2.setOnClickListener(new VoiceControlsSheetView$configureUI$$inlined$apply$lambda$2(stageRoles, z7, function02)); m.checkNotNullExpressionValue(imageView2, "binding.disconnectButton…sconnectClick() }\n }"); @@ -350,42 +376,43 @@ public final class VoiceControlsSheetView extends LinearLayout { ImageView imageView3 = this.binding.g; m.checkNotNullExpressionValue(imageView3, "binding.disconnectButton"); imageView3.setVisibility(8); - MaterialTextView materialTextView2 = this.binding.r; + MaterialTextView materialTextView2 = this.binding.f1666s; materialTextView2.setVisibility(z7 ? 0 : 8); materialTextView2.setOnClickListener(new VoiceControlsSheetView$configureUI$$inlined$apply$lambda$1(z7, function02)); m.checkNotNullExpressionValue(materialTextView2, "binding.stageDisconnectB…Click()\n }\n }"); + i2 = 8; } - Button button = this.binding.l; + Button button = this.binding.m; m.checkNotNullExpressionValue(button, "binding.pushToTalkButton"); - button.setVisibility((stageRoles == null || StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) && z3 ? 0 : 8); + if ((stageRoles == null || StageRoles.m26isSpeakerimpl(stageRoles.m28unboximpl())) && z3) { + i2 = 0; + } + button.setVisibility(i2); TextView textView = this.binding.f; m.checkNotNullExpressionValue(textView, "binding.deafenSecondaryButton"); - b.n(textView, z4 ? 2131894016 : 2131888040, new Object[0], null, 4); + b.n(textView, z4 ? 2131894055 : 2131888041, new Object[0], null, 4); this.binding.f.setOnClickListener(new VoiceControlsSheetView$configureUI$4(function08)); TextView textView2 = this.binding.f; m.checkNotNullExpressionValue(textView2, "binding.deafenSecondaryButton"); textView2.setActivated(z4); - TextView textView3 = this.binding.h; - m.checkNotNullExpressionValue(textView3, "binding.inviteSecondaryButton"); - textView3.setVisibility(callModel.canInvite() ? 0 : 8); - this.binding.h.setOnClickListener(new VoiceControlsSheetView$configureUI$5(function06)); m60configureMoveToAudienceButtonyox5PQY(stageRoles, function010); m62configureRaiseHandButtonfw_bWyM(callModel, stageRoles, i, z9, function09); m61configureMuteButtonP2fzehM(callModel, stageRoles, function05); - configureOutputSelectors(voiceControlsOutputSelectorState, function03, !z5); + configureOutputSelectors(voiceControlsOutputSelectorState, function03, !z5 && !AnimatableValueParser.u1(callModel.getChannel())); configureVideoButton(callModel, function04, z2); configureScreenshareButtons(callModel, function07, z5); configureStreamVolume(z8, f, function2); + configureInviteButtons(callModel, function06, AnimatableValueParser.u1(callModel.getChannel())); } public final int getPeekHeight() { - LinearLayout linearLayout = this.binding.k; + LinearLayout linearLayout = this.binding.l; m.checkNotNullExpressionValue(linearLayout, "binding.peekContainer"); return linearLayout.getMeasuredHeight(); } public final void handleSheetState(int i) { - CardView cardView = this.binding.q; + CardView cardView = this.binding.r; m.checkNotNullExpressionValue(cardView, "binding.secondaryActionsCard"); int i2 = 4; if (i != 4 || this.isGestureNavigationEnabled) { @@ -416,6 +443,6 @@ public final class VoiceControlsSheetView extends LinearLayout { public final void setOnPTTListener(OnPressListener onPressListener) { m.checkNotNullParameter(onPressListener, "listener"); - this.binding.l.setOnTouchListener(onPressListener); + this.binding.m.setOnTouchListener(onPressListener); } } diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java index fdfc2bcd17..ba6c22f51c 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet$binding$2.java @@ -18,11 +18,11 @@ public final /* synthetic */ class WidgetScreenShareNfxSheet$binding$2 extends k public final WidgetScreenShareNfxSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131364515; - TextView textView = (TextView) view.findViewById(2131364515); + int i = 2131364518; + TextView textView = (TextView) view.findViewById(2131364518); if (textView != null) { - i = 2131364516; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131364516); + i = 2131364519; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131364519); if (materialButton != null) { return new WidgetScreenShareNfxSheetBinding((NestedScrollView) view, textView, materialButton); } diff --git a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java index 416a15df76..ebb4aee2bb 100644 --- a/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/controls/WidgetScreenShareNfxSheet.java @@ -172,7 +172,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559117; + return 2131559118; } @Override // androidx.fragment.app.Fragment @@ -192,7 +192,7 @@ public final class WidgetScreenShareNfxSheet extends AppBottomSheet { public void onViewCreated(View view, Bundle bundle) { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); - getBinding().f1850c.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$1(this)); + getBinding().f1852c.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$1(this)); getBinding().b.setOnClickListener(new WidgetScreenShareNfxSheet$onViewCreated$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java index 5f415999b8..3dedf60856 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackIssue.java @@ -4,30 +4,30 @@ import androidx.annotation.StringRes; import com.discord.utilities.mg_recycler.MGRecyclerDataPayload; /* compiled from: FeedbackIssue.kt */ public enum FeedbackIssue implements MGRecyclerDataPayload { - OTHER(2131887125), - COULD_NOT_HEAR_AUDIO(2131887122), - NOBODY_COULD_HEAR_ME(2131887124), - AUDIO_ECHOS(2131887118), - AUDIO_ROBOTIC(2131887119), - AUDIO_CUT_IN_AND_OUT(2131887117), - VOLUME_TOO_LOW_OR_HIGH(2131887121), - BACKGROUND_NOISE_TOO_LOUD(2131887120), - SPEAKERPHONE_ISSUE(2131887126), - HEADSET_OR_BLUETOOTH_ISSUE(2131887123), - STREAM_REPORT_ENDED_BLACK(2131893598), - STREAM_REPORT_ENDED_BLURRY(2131893599), - STREAM_REPORT_ENDED_LAGGING(2131893600), - STREAM_REPORT_ENDED_OUT_OF_SYNC(2131893601), - STREAM_REPORT_ENDED_AUDIO_MISSING(2131893596), - STREAM_REPORT_ENDED_AUDIO_POOR(2131893597), - STREAM_REPORT_ENDED_STREAM_STOPPED_UNEXPECTEDLY(2131893602), - GUILD_DELETE_TOO_HARD(2131889189), - GUILD_DELETE_TEST(2131889188), - GUILD_DELETE_ACCIDENT(2131889180), - GUILD_DELETE_TEMPLATE(2131889187), - GUILD_DELETE_LONELY(2131889184), - GUILD_DELETE_INACTIVE(2131889183), - GUILD_DELETE_OTHER(2131889185); + OTHER(2131887126), + COULD_NOT_HEAR_AUDIO(2131887123), + NOBODY_COULD_HEAR_ME(2131887125), + AUDIO_ECHOS(2131887119), + AUDIO_ROBOTIC(2131887120), + AUDIO_CUT_IN_AND_OUT(2131887118), + VOLUME_TOO_LOW_OR_HIGH(2131887122), + BACKGROUND_NOISE_TOO_LOUD(2131887121), + SPEAKERPHONE_ISSUE(2131887127), + HEADSET_OR_BLUETOOTH_ISSUE(2131887124), + STREAM_REPORT_ENDED_BLACK(2131893638), + STREAM_REPORT_ENDED_BLURRY(2131893639), + STREAM_REPORT_ENDED_LAGGING(2131893640), + STREAM_REPORT_ENDED_OUT_OF_SYNC(2131893641), + STREAM_REPORT_ENDED_AUDIO_MISSING(2131893636), + STREAM_REPORT_ENDED_AUDIO_POOR(2131893637), + STREAM_REPORT_ENDED_STREAM_STOPPED_UNEXPECTEDLY(2131893642), + GUILD_DELETE_TOO_HARD(2131889199), + GUILD_DELETE_TEST(2131889198), + GUILD_DELETE_ACCIDENT(2131889190), + GUILD_DELETE_TEMPLATE(2131889197), + GUILD_DELETE_LONELY(2131889194), + GUILD_DELETE_INACTIVE(2131889193), + GUILD_DELETE_OTHER(2131889195); private final String key = String.valueOf(hashCode()); private final int reasonStringRes; diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java index 09ed82944d..24d2983088 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/FeedbackView.java @@ -93,29 +93,29 @@ public final class FeedbackView extends LinearLayout { m.checkNotNullParameter(attributeSet, "attrs"); View inflate = LayoutInflater.from(context).inflate(2131558502, (ViewGroup) this, false); addView(inflate); - int i = 2131363170; - ImageButton imageButton = (ImageButton) inflate.findViewById(2131363170); + int i = 2131363172; + ImageButton imageButton = (ImageButton) inflate.findViewById(2131363172); if (imageButton != null) { - i = 2131363171; - TextView textView = (TextView) inflate.findViewById(2131363171); + i = 2131363173; + TextView textView = (TextView) inflate.findViewById(2131363173); if (textView != null) { - i = 2131363172; - CardView cardView = (CardView) inflate.findViewById(2131363172); + i = 2131363174; + CardView cardView = (CardView) inflate.findViewById(2131363174); if (cardView != null) { - i = 2131363173; - RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363173); + i = 2131363175; + RecyclerView recyclerView = (RecyclerView) inflate.findViewById(2131363175); if (recyclerView != null) { - i = 2131363174; - ImageButton imageButton2 = (ImageButton) inflate.findViewById(2131363174); + i = 2131363176; + ImageButton imageButton2 = (ImageButton) inflate.findViewById(2131363176); if (imageButton2 != null) { - i = 2131363175; - ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363175); + i = 2131363177; + ConstraintLayout constraintLayout = (ConstraintLayout) inflate.findViewById(2131363177); if (constraintLayout != null) { - i = 2131363176; - TextView textView2 = (TextView) inflate.findViewById(2131363176); + i = 2131363178; + TextView textView2 = (TextView) inflate.findViewById(2131363178); if (textView2 != null) { - i = 2131363177; - ImageView imageView = (ImageView) inflate.findViewById(2131363177); + i = 2131363179; + ImageView imageView = (ImageView) inflate.findViewById(2131363179); if (imageView != null) { FeedbackViewBinding feedbackViewBinding = new FeedbackViewBinding((LinearLayout) inflate, imageButton, textView, cardView, recyclerView, imageButton2, constraintLayout, textView2, imageView); m.checkNotNullExpressionValue(feedbackViewBinding, "FeedbackViewBinding.infl…rom(context), this, true)"); @@ -162,10 +162,10 @@ public final class FeedbackView extends LinearLayout { ((View) entry.getKey()).setSelected(feedbackRating == ((FeedbackRating) entry.getValue())); } boolean z3 = !list.isEmpty(); - TextView textView2 = this.binding.f1607c; + TextView textView2 = this.binding.f1609c; m.checkNotNullExpressionValue(textView2, "binding.feedbackIssueSectionHeader"); textView2.setText(str2); - TextView textView3 = this.binding.f1607c; + TextView textView3 = this.binding.f1609c; m.checkNotNullExpressionValue(textView3, "binding.feedbackIssueSectionHeader"); textView3.setVisibility(z3 ? 0 : 8); CardView cardView = this.binding.d; diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java index 1f4ccd7cdc..fddd77aa91 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$binding$2.java @@ -19,14 +19,14 @@ public final /* synthetic */ class WidgetIssueDetailsForm$binding$2 extends k im public final WidgetIssueDetailsFormBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363638; - LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363638); + int i = 2131363641; + LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(2131363641); if (linkifiedTextView != null) { - i = 2131363639; - TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363639); + i = 2131363642; + TextInputLayout textInputLayout = (TextInputLayout) view.findViewById(2131363642); if (textInputLayout != null) { - i = 2131363640; - MaterialButton materialButton = (MaterialButton) view.findViewById(2131363640); + i = 2131363643; + MaterialButton materialButton = (MaterialButton) view.findViewById(2131363643); if (materialButton != null) { return new WidgetIssueDetailsFormBinding((NestedScrollView) view, linkifiedTextView, textInputLayout, materialButton); } diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java index 02c3925454..0a4091cdda 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java @@ -14,7 +14,7 @@ public final class WidgetIssueDetailsForm$onViewBound$1 implements View.OnClickL @Override // android.view.View.OnClickListener public final void onClick(View view) { - TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f1821c; + TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f1823c; m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput"); WidgetIssueDetailsForm.access$getViewModel$p(this.this$0).submitForm(ViewExtensions.getTextOrEmpty(textInputLayout)); } diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java index bf02395ee6..2294cda9f5 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java @@ -61,7 +61,7 @@ public final class WidgetIssueDetailsForm extends AppFragment { } public WidgetIssueDetailsForm() { - super(2131559069); + super(2131559070); WidgetIssueDetailsForm$viewModel$2 widgetIssueDetailsForm$viewModel$2 = new WidgetIssueDetailsForm$viewModel$2(this); h0 h0Var = new h0(this); this.viewModel$delegate = FragmentViewModelLazyKt.createViewModelLazy(this, a0.getOrCreateKotlinClass(IssueDetailsFormViewModel.class), new WidgetIssueDetailsForm$appViewModels$$inlined$viewModels$1(h0Var), new j0(widgetIssueDetailsForm$viewModel$2)); @@ -99,10 +99,10 @@ public final class WidgetIssueDetailsForm extends AppFragment { private final void handleEvent(IssueDetailsFormViewModel.Event event) { if (m.areEqual(event, IssueDetailsFormViewModel.Event.Close.INSTANCE)) { - o.i(this, 2131887115, 0, 4); + o.i(this, 2131887116, 0, 4); AppActivity appActivity = getAppActivity(); if (appActivity != null) { - appActivity.hideKeyboard(getBinding().f1821c); + appActivity.hideKeyboard(getBinding().f1823c); } requireActivity().onBackPressed(); } @@ -116,15 +116,15 @@ public final class WidgetIssueDetailsForm extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - setActionBarTitle(2131888492); + setActionBarTitle(2131888502); MaterialButton materialButton = getBinding().d; m.checkNotNullExpressionValue(materialButton, "binding.issueDetailsSubmitButton"); materialButton.setEnabled(false); getBinding().d.setOnClickListener(new WidgetIssueDetailsForm$onViewBound$1(this)); - TextInputLayout textInputLayout = getBinding().f1821c; + TextInputLayout textInputLayout = getBinding().f1823c; m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetIssueDetailsForm$onViewBound$2(this)); - TextInputLayout textInputLayout2 = getBinding().f1821c; + TextInputLayout textInputLayout2 = getBinding().f1823c; m.checkNotNullExpressionValue(textInputLayout2, "binding.issueDetailsInput"); showKeyboard(textInputLayout2); LinkifiedTextView linkifiedTextView = getBinding().b; @@ -132,7 +132,7 @@ public final class WidgetIssueDetailsForm extends AppFragment { linkifiedTextView.setVisibility(shouldShowCxPrompt() ? 0 : 8); LinkifiedTextView linkifiedTextView2 = getBinding().b; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.issueDetailsCxPrompt"); - b.n(linkifiedTextView2, 2131888493, new Object[]{f.c()}, null, 4); + b.n(linkifiedTextView2, 2131888503, new Object[]{f.c()}, null, 4); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java index 3785b22648..015b62fbe5 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/call/CallFeedbackSheetViewModel.java @@ -337,7 +337,7 @@ public final class CallFeedbackSheetViewModel extends AppViewModel observable) { - super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131887131, 2131887127, 2131887116)); + super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131887132, 2131887128, 2131887117)); m.checkNotNullParameter(config, "config"); m.checkNotNullParameter(storeAnalytics, "storeAnalytics"); m.checkNotNullParameter(storeExperiments, "storeExperiments"); @@ -376,7 +376,7 @@ public final class CallFeedbackSheetViewModel extends AppViewModel list) { - return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131887131, 2131887127, 2131887116); + return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131887132, 2131887128, 2131887117); } private final void emitSubmittedEvent(boolean z2) { diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java index c282a5b60d..d28beadb72 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/stream/StreamFeedbackSheetViewModel.java @@ -158,7 +158,7 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel observable) { - super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131893591, 2131893613, 2131893607)); + super(new FeedbackSheetViewModel.ViewState(FeedbackRating.NO_RESPONSE, n.emptyList(), 2131893631, 2131893653, 2131893647)); m.checkNotNullParameter(str, "streamKey"); m.checkNotNullParameter(storeExperiments, "storeExperiments"); m.checkNotNullParameter(storeAnalytics, "storeAnalytics"); @@ -193,7 +193,7 @@ public final class StreamFeedbackSheetViewModel extends AppViewModel list) { - return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131893591, 2131893613, 2131893607); + return new FeedbackSheetViewModel.ViewState(feedbackRating, list, 2131893631, 2131893653, 2131893647); } private final void emitSubmittedEvent(boolean z2) { diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java index 5def1601e5..13630e495e 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$binding$2.java @@ -83,65 +83,65 @@ public final /* synthetic */ class WidgetCallFullscreen$binding$2 extends k impl if (recyclerView2 != null) { StageCallVisitCommunityView stageCallVisitCommunityView = (StageCallVisitCommunityView) view.findViewById(2131362204); if (stageCallVisitCommunityView != null) { - View findViewById2 = view.findViewById(2131364334); + View findViewById2 = view.findViewById(2131364337); if (findViewById2 != null) { - int i2 = 2131364335; - PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) findViewById2.findViewById(2131364335); + int i2 = 2131364338; + PrivateCallBlurredGridView privateCallBlurredGridView = (PrivateCallBlurredGridView) findViewById2.findViewById(2131364338); if (privateCallBlurredGridView != null) { - i2 = 2131364336; - TextView textView4 = (TextView) findViewById2.findViewById(2131364336); + i2 = 2131364339; + TextView textView4 = (TextView) findViewById2.findViewById(2131364339); if (textView4 != null) { RelativeLayout relativeLayout2 = (RelativeLayout) findViewById2; - i2 = 2131364338; - LinearLayout linearLayout2 = (LinearLayout) findViewById2.findViewById(2131364338); + i2 = 2131364341; + LinearLayout linearLayout2 = (LinearLayout) findViewById2.findViewById(2131364341); if (linearLayout2 != null) { - i2 = 2131364339; - PrivateCallGridView privateCallGridView = (PrivateCallGridView) findViewById2.findViewById(2131364339); + i2 = 2131364342; + PrivateCallGridView privateCallGridView = (PrivateCallGridView) findViewById2.findViewById(2131364342); if (privateCallGridView != null) { - i2 = 2131364340; - TextView textView5 = (TextView) findViewById2.findViewById(2131364340); + i2 = 2131364343; + TextView textView5 = (TextView) findViewById2.findViewById(2131364343); if (textView5 != null) { - i2 = 2131364341; - TextView textView6 = (TextView) findViewById2.findViewById(2131364341); + i2 = 2131364344; + TextView textView6 = (TextView) findViewById2.findViewById(2131364344); if (textView6 != null) { - i2 = 2131364342; - TextView textView7 = (TextView) findViewById2.findViewById(2131364342); + i2 = 2131364345; + TextView textView7 = (TextView) findViewById2.findViewById(2131364345); if (textView7 != null) { a4 a4Var = new a4(relativeLayout2, privateCallBlurredGridView, textView4, relativeLayout2, linearLayout2, privateCallGridView, textView5, textView6, textView7); - ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131364964); + ConstraintLayout constraintLayout4 = (ConstraintLayout) view.findViewById(2131364967); if (constraintLayout4 != null) { - UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131364965); + UserSummaryView userSummaryView = (UserSummaryView) view.findViewById(2131364968); if (userSummaryView != null) { - MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364966); + MaterialTextView materialTextView = (MaterialTextView) view.findViewById(2131364969); if (materialTextView != null) { - ViewStub viewStub = (ViewStub) view.findViewById(2131365038); + ViewStub viewStub = (ViewStub) view.findViewById(2131365042); if (viewStub != null) { - Barrier barrier2 = (Barrier) view.findViewById(2131365295); + Barrier barrier2 = (Barrier) view.findViewById(2131365300); if (barrier2 != null) { - VoiceControlsSheetView voiceControlsSheetView = (VoiceControlsSheetView) view.findViewById(2131365532); + VoiceControlsSheetView voiceControlsSheetView = (VoiceControlsSheetView) view.findViewById(2131365538); if (voiceControlsSheetView != null) { - FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365601); + FragmentContainerView fragmentContainerView = (FragmentContainerView) view.findViewById(2131365607); if (fragmentContainerView != null) { return new WidgetCallFullscreenBinding(constraintLayout, toolbar, appBarLayout, relativeLayout, z3Var, barrier, constraintLayout, coordinatorLayout, materialButton, textView, constraintLayout2, linearLayout, materialButton2, videoCallParticipantView, recyclerView, materialButton3, constraintLayout3, textView2, textView3, imageView, recyclerView2, stageCallVisitCommunityView, a4Var, constraintLayout4, userSummaryView, materialTextView, viewStub, barrier2, voiceControlsSheetView, fragmentContainerView); } - i = 2131365601; + i = 2131365607; } else { - i = 2131365532; + i = 2131365538; } } else { - i = 2131365295; + i = 2131365300; } } else { - i = 2131365038; + i = 2131365042; } } else { - i = 2131364966; + i = 2131364969; } } else { - i = 2131364965; + i = 2131364968; } } else { - i = 2131364964; + i = 2131364967; } } } @@ -152,7 +152,7 @@ public final /* synthetic */ class WidgetCallFullscreen$binding$2 extends k impl } throw new NullPointerException("Missing required view with ID: ".concat(findViewById2.getResources().getResourceName(i2))); } - i = 2131364334; + i = 2131364337; } else { i = 2131362204; } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java index 95d514b6d1..1d58c776bb 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java @@ -3,7 +3,6 @@ package com.discord.widgets.voice.fullscreen; import android.content.Context; import android.view.MenuItem; import androidx.fragment.app.FragmentManager; -import com.discord.utilities.channel.ChannelInviteLaunchUtils; import com.discord.utilities.streams.StreamContext; import com.discord.utilities.voice.DiscordOverlayService; import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; @@ -52,24 +51,21 @@ public final class WidgetCallFullscreen$configureMenu$1 implements Actio public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); switch (menuItem.getItemId()) { - case 2131363861: - ChannelInviteLaunchUtils.INSTANCE.inviteToChannel(this.this$0, this.$viewState.getCallModel().getChannel(), "Voice Channel Menu Items"); - return; - case 2131363862: + case 2131363864: DiscordOverlayService.Companion companion = DiscordOverlayService.Companion; m.checkNotNullExpressionValue(context, "context"); companion.launchForConnect(context); return; - case 2131363863: + case 2131363865: WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed(); return; - case 2131363864: + case 2131363866: WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().g(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this)); return; - case 2131363865: + case 2131363867: WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion; Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().g()); FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager(); diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java index c738fe9b68..4eb2808d38 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java @@ -14,20 +14,17 @@ public final class WidgetCallFullscreen$configureMenu$2 implements Action1 speakingVoiceUsers = stageCallModel.getSpeakingVoiceUsers(); - ConstraintLayout constraintLayout = getBinding().f1684s; + ConstraintLayout constraintLayout = getBinding().f1686s; m.checkNotNullExpressionValue(constraintLayout, "binding.stageCallSpeakingChip"); if (!speakingVoiceUsers.isEmpty()) { if (!(speakingVoiceUsers instanceof Collection) || !speakingVoiceUsers.isEmpty()) { @@ -696,7 +695,7 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullExpressionValue(materialTextView, "binding.stageCallSpeakingUserSummaryLabel"); Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - materialTextView.setText(b.d(this, 2131893390, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, 2131755330, 2131893391, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$4(this))); + materialTextView.setText(b.d(this, 2131893432, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, 2131755331, 2131893433, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$4(this))); } arrayList = new ArrayList(); boolean z4 = !stageCallModel.getSpeakers().isEmpty(); @@ -755,7 +754,7 @@ public final class WidgetCallFullscreen extends AppFragment { VoiceControlsSheetView voiceControlsSheetView = getBinding().w; m.checkNotNullExpressionValue(voiceControlsSheetView, "binding.voiceControlsSheetView"); VoiceControlsSheetSwipeTooltip voiceControlsSheetSwipeTooltip = VoiceControlsSheetSwipeTooltip.INSTANCE; - String string = getResources().getString(2131894482); + String string = getResources().getString(2131894529); m.checkNotNullExpressionValue(string, "resources.getString(R.st…s_sheet_tooltip_swipe_up)"); int dpToPixels = DimenUtils.dpToPixels(-12); Observable G = getUnsubscribeSignal().G(WidgetCallFullscreen$configureSwipeTooltip$1.INSTANCE); @@ -868,7 +867,7 @@ public final class WidgetCallFullscreen extends AppFragment { private final void initializeSystemUiListeners(ViewGroup viewGroup) { ViewCompat.setOnApplyWindowInsetsListener(getBinding().w, new WidgetCallFullscreen$initializeSystemUiListeners$1(this)); - ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1683c, WidgetCallFullscreen$initializeSystemUiListeners$2.INSTANCE); + ViewCompat.setOnApplyWindowInsetsListener(getBinding().f1685c, WidgetCallFullscreen$initializeSystemUiListeners$2.INSTANCE); ViewCompat.setOnApplyWindowInsetsListener(getBinding().h, new WidgetCallFullscreen$initializeSystemUiListeners$3(this)); ViewCompat.setOnApplyWindowInsetsListener(getBinding().d, WidgetCallFullscreen$initializeSystemUiListeners$4.INSTANCE); CoordinatorLayout coordinatorLayout = getBinding().f; @@ -1070,10 +1069,10 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131891395); - String string2 = requireContext.getString(2131891382); + String string = requireContext.getString(2131891428); + String string2 = requireContext.getString(2131891415); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…e_permission_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showNoVadPermissionDialog() { @@ -1083,10 +1082,10 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131894369); - String string2 = requireContext.getString(2131894365); + String string = requireContext.getString(2131894416); + String string2 = requireContext.getString(2131894412); m.checkNotNullExpressionValue(string2, "context.getString(R.string.vad_permission_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showNoVideoPermissionDialog() { @@ -1096,10 +1095,10 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131891395); - String string2 = requireContext.getString(2131891394); + String string = requireContext.getString(2131891428); + String string2 = requireContext.getString(2131891427); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…o_permission_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showServerDeafenedDialog() { @@ -1109,10 +1108,10 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131893126); - String string2 = requireContext.getString(2131893125); + String string = requireContext.getString(2131893168); + String string2 = requireContext.getString(2131893167); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ver_deafened_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showServerMutedDialog() { @@ -1122,10 +1121,10 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131893137); - String string2 = requireContext.getString(2131893136); + String string = requireContext.getString(2131893179); + String string2 = requireContext.getString(2131893178); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…server_muted_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showSuppressedDialog() { @@ -1135,10 +1134,10 @@ public final class WidgetCallFullscreen extends AppFragment { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131893651); - String string2 = requireContext.getString(2131893654); + String string = requireContext.getString(2131893691); + String string2 = requireContext.getString(2131893694); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ppressed_permission_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } public final void handleEvent(WidgetCallFullscreenViewModel.Event event) { @@ -1261,7 +1260,7 @@ public final class WidgetCallFullscreen extends AppFragment { initializeSystemUiListeners(viewGroup); Context context = viewGroup.getContext(); m.checkNotNullExpressionValue(context, "view.context"); - AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(context, 2130969370, 0, 2, (Object) null)), 2131888148, null, 8, null); + AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, true, Integer.valueOf(DrawableCompat.getThemedDrawableRes$default(context, 2130969370, 0, 2, (Object) null)), 2131888158, null, 8, null); AppTransitionActivity.a aVar = requireAppActivity().j; setUpGridRecycler(); setUpStageRecycler(); diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java index 0bb8fe433b..b185b3176e 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java @@ -22,18 +22,14 @@ public final class WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2 ext @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Set mo1invoke() { - boolean z2; StageInstance stageInstance; if (!this.this$0.getCallModel().canInvite()) { StageCallModel stageCallModel = this.this$0.getStageCallModel(); - if (((stageCallModel == null || (stageInstance = stageCallModel.getStageInstance()) == null) ? null : stageInstance.d()) == null) { - z2 = false; - WidgetCallFullscreenViewModel.ViewState.Valid valid = this.this$0; - return WidgetCallFullscreenViewModel.ViewState.Valid.access$computeMenuItems(valid, PermissionUtils.can(16, valid.getCallModel().getChannelPermissions()), z2, this.this$0.getCallModel().isConnected(), AnimatableValueParser.u1(this.this$0.getCallModel().getChannel()), this.this$0.getCallModel().getSelectedVideoDevice(), this.this$0.getCallModel().getVideoDevices()); + if (stageCallModel != null && (stageInstance = stageCallModel.getStageInstance()) != null) { + stageInstance.d(); } } - z2 = true; WidgetCallFullscreenViewModel.ViewState.Valid valid = this.this$0; - return WidgetCallFullscreenViewModel.ViewState.Valid.access$computeMenuItems(valid, PermissionUtils.can(16, valid.getCallModel().getChannelPermissions()), z2, this.this$0.getCallModel().isConnected(), AnimatableValueParser.u1(this.this$0.getCallModel().getChannel()), this.this$0.getCallModel().getSelectedVideoDevice(), this.this$0.getCallModel().getVideoDevices()); + return WidgetCallFullscreenViewModel.ViewState.Valid.access$computeMenuItems(valid, PermissionUtils.can(16, valid.getCallModel().getChannelPermissions()), this.this$0.getCallModel().isConnected(), AnimatableValueParser.u1(this.this$0.getCallModel().getChannel()), this.this$0.getCallModel().getSelectedVideoDevice(), this.this$0.getCallModel().getVideoDevices()); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.java index 5c152a5e34..6229071fbf 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$1.java @@ -1,12 +1,12 @@ package com.discord.widgets.voice.fullscreen; -import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; +import rx.Subscription; /* compiled from: WidgetCallFullscreenViewModel.kt */ -public final class WidgetCallFullscreenViewModel$setTargetChannelId$1 extends o implements Function1 { +public final class WidgetCallFullscreenViewModel$setTargetChannelId$1 extends o implements Function1 { public final /* synthetic */ WidgetCallFullscreenViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -18,14 +18,13 @@ public final class WidgetCallFullscreenViewModel$setTargetChannelId$1 extends o /* 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(WidgetCallFullscreenViewModel.StoreState storeState) { - invoke(storeState); + public /* bridge */ /* synthetic */ Unit invoke(Subscription subscription) { + invoke(subscription); return Unit.a; } - public final void invoke(WidgetCallFullscreenViewModel.StoreState storeState) { - WidgetCallFullscreenViewModel widgetCallFullscreenViewModel = this.this$0; - m.checkNotNullExpressionValue(storeState, "storeState"); - widgetCallFullscreenViewModel.handleStoreState(storeState); + public final void invoke(Subscription subscription) { + m.checkNotNullParameter(subscription, "it"); + WidgetCallFullscreenViewModel.access$setStoreObservableSubscription$p(this.this$0, subscription); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$2.java new file mode 100644 index 0000000000..1d21b6a5ff --- /dev/null +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$setTargetChannelId$2.java @@ -0,0 +1,31 @@ +package com.discord.widgets.voice.fullscreen; + +import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetCallFullscreenViewModel.kt */ +public final class WidgetCallFullscreenViewModel$setTargetChannelId$2 extends o implements Function1 { + public final /* synthetic */ WidgetCallFullscreenViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetCallFullscreenViewModel$setTargetChannelId$2(WidgetCallFullscreenViewModel widgetCallFullscreenViewModel) { + super(1); + this.this$0 = widgetCallFullscreenViewModel; + } + + /* 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(WidgetCallFullscreenViewModel.StoreState storeState) { + invoke(storeState); + return Unit.a; + } + + public final void invoke(WidgetCallFullscreenViewModel.StoreState storeState) { + WidgetCallFullscreenViewModel widgetCallFullscreenViewModel = this.this$0; + m.checkNotNullExpressionValue(storeState, "storeState"); + widgetCallFullscreenViewModel.handleStoreState(storeState); + } +} diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java index e34fd76a6d..dacf448878 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel.java @@ -620,8 +620,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel CHANNEL_SETTINGS, VOICE_SETTINGS, SWITCH_CAMERA, - SHOW_PARTICIPANT_LIST, - INVITE + SHOW_PARTICIPANT_LIST } /* compiled from: WidgetCallFullscreenViewModel.kt */ @@ -1030,27 +1029,24 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel this(callModel, stageCallModel, overlayStatus, list, z2, z3, z4, cameraState, displayMode, voiceControlsOutputSelectorState, str, z5, participantData, bool, list2, z6, z7, f, i, z8, stageRoles, z9, z10, i2, z11, z12); } - public static final /* synthetic */ Set access$computeMenuItems(Valid valid, boolean z2, boolean z3, boolean z4, boolean z5, VideoInputDeviceDescription videoInputDeviceDescription, List list) { - return valid.computeMenuItems(z2, z3, z4, z5, videoInputDeviceDescription, list); + public static final /* synthetic */ Set access$computeMenuItems(Valid valid, boolean z2, boolean z3, boolean z4, VideoInputDeviceDescription videoInputDeviceDescription, List list) { + return valid.computeMenuItems(z2, z3, z4, videoInputDeviceDescription, list); } - private final Set computeMenuItems(boolean z2, boolean z3, boolean z4, boolean z5, VideoInputDeviceDescription videoInputDeviceDescription, List list) { + private final Set computeMenuItems(boolean z2, boolean z3, boolean z4, VideoInputDeviceDescription videoInputDeviceDescription, List list) { HashSet hashSetOf = n0.hashSetOf(MenuItem.VOICE_SETTINGS); if (z2) { hashSetOf.add(MenuItem.CHANNEL_SETTINGS); } - if (z4 && StoreStream.Companion.getUserSettings().getIsMobileOverlayEnabled()) { + if (z3 && StoreStream.Companion.getUserSettings().getIsMobileOverlayEnabled()) { hashSetOf.add(MenuItem.LAUNCH_OVERLAY); } if (videoInputDeviceDescription != null && list.size() > 1) { hashSetOf.add(MenuItem.SWITCH_CAMERA); } - if (!z5) { + if (!z4) { hashSetOf.add(MenuItem.SHOW_PARTICIPANT_LIST); } - if (z5 && z3) { - hashSetOf.add(MenuItem.INVITE); - } return hashSetOf; } @@ -1634,6 +1630,10 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel return widgetCallFullscreenViewModel.forwardVideoGridInteractionSubscription; } + public static final /* synthetic */ Subscription access$getStoreObservableSubscription$p(WidgetCallFullscreenViewModel widgetCallFullscreenViewModel) { + return widgetCallFullscreenViewModel.storeObservableSubscription; + } + public static final /* synthetic */ VideoPlayerIdleDetector access$getVideoPlayerIdleDetector$p(WidgetCallFullscreenViewModel widgetCallFullscreenViewModel) { return widgetCallFullscreenViewModel.videoPlayerIdleDetector; } @@ -1654,6 +1654,10 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel widgetCallFullscreenViewModel.setOffScreenVideoParticipants(list); } + public static final /* synthetic */ void access$setStoreObservableSubscription$p(WidgetCallFullscreenViewModel widgetCallFullscreenViewModel, Subscription subscription) { + widgetCallFullscreenViewModel.storeObservableSubscription = subscription; + } + private final VideoCallParticipantView.ParticipantData addStreamQualityMetadata(VideoCallParticipantView.ParticipantData participantData, RtcConnection.Quality quality) { StoreVideoStreams.UserStreams streams = participantData.b.getStreams(); VideoCallParticipantView.StreamFps streamFps = null; @@ -2240,7 +2244,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel public final void onCameraPermissionsGranted() { StoreMediaEngine.selectDefaultVideoDevice$default(this.mediaEngineStore, null, 1, null); PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.AccessibilityAnnouncement(2131887138)); + publishSubject.j.onNext(new Event.AccessibilityAnnouncement(2131887139)); } @Override // com.discord.app.AppViewModel, androidx.lifecycle.ViewModel @@ -2268,7 +2272,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel } ViewState.Valid valid3 = valid; if (valid3 != null) { - this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(valid3.isDeafened() ? 2131894478 : 2131894469)); + this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(valid3.isDeafened() ? 2131894525 : 2131894516)); return; } return; @@ -2336,7 +2340,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel if (selfMuteFailure == null) { if (valid != null) { boolean isMeMutedByAnySource = valid.getCallModel().isMeMutedByAnySource(); - this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(isMeMutedByAnySource ? 2131894479 : 2131894474)); + this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(isMeMutedByAnySource ? 2131894526 : 2131894521)); } } else if (selfMuteFailure.ordinal() == 0) { emitShowNoVadPermissionDialogEvent(); @@ -2445,7 +2449,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel this.channelId = j; Observable s2 = observeStoreState().s(); m.checkNotNullExpressionValue(s2, "observeStoreState()\n … .distinctUntilChanged()"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$setTargetChannelId$1(this), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.computationLatest(s2), this, null, 2, null), WidgetCallFullscreenViewModel.class, (Context) null, new WidgetCallFullscreenViewModel$setTargetChannelId$1(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallFullscreenViewModel$setTargetChannelId$2(this), 58, (Object) null); } @MainThread @@ -2542,7 +2546,7 @@ public final class WidgetCallFullscreenViewModel extends AppViewModel } if (valid.getCameraState() == CameraState.CAMERA_ON) { this.mediaEngineStore.selectVideoInputDevice(null); - this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(2131887137)); + this.eventSubject.j.onNext(new Event.AccessibilityAnnouncement(2131887138)); return; } int numUsersConnected = valid.getCallModel().getNumUsersConnected(); diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java index 27a6049277..f1c5654ab0 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet$binding$2.java @@ -17,10 +17,10 @@ public final /* synthetic */ class WidgetGuildCallOnboardingSheet$binding$2 exte public final WidgetGuildCallOnboardingBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - JoinVoiceChannelButton joinVoiceChannelButton = (JoinVoiceChannelButton) view.findViewById(2131363342); + JoinVoiceChannelButton joinVoiceChannelButton = (JoinVoiceChannelButton) view.findViewById(2131363344); if (joinVoiceChannelButton != null) { return new WidgetGuildCallOnboardingBinding((LinearLayout) view, joinVoiceChannelButton); } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363342))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131363344))); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java index 407d7e3a8e..8cb7012112 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetGuildCallOnboardingSheet.java @@ -100,24 +100,24 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet { int ordinal = joinability.ordinal(); if (ordinal != 0) { if (ordinal == 1) { - joinVoiceChannelButton.setText(2131887273); - joinVoiceChannelButton.a(joinVoiceChannelButton, 2131887272); + joinVoiceChannelButton.setText(2131887274); + joinVoiceChannelButton.a(joinVoiceChannelButton, 2131887273); return; } else if (ordinal != 2) { if (ordinal == 3) { - joinVoiceChannelButton.setText(2131894000); - joinVoiceChannelButton.a(joinVoiceChannelButton, 2131894000); + joinVoiceChannelButton.setText(2131894039); + joinVoiceChannelButton.a(joinVoiceChannelButton, 2131894039); return; } else if (ordinal == 4) { - joinVoiceChannelButton.setText(2131887503); - joinVoiceChannelButton.a(joinVoiceChannelButton, 2131889861); + joinVoiceChannelButton.setText(2131887505); + joinVoiceChannelButton.a(joinVoiceChannelButton, 2131889872); return; } else { return; } } } - joinVoiceChannelButton.setText(2131887503); + joinVoiceChannelButton.setText(2131887505); joinVoiceChannelButton.setOnClickListener(new f(widgetGuildCallOnboardingSheet$configureUI$1)); } } @@ -148,7 +148,7 @@ public final class WidgetGuildCallOnboardingSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559026; + return 2131559027; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java index 12d04e7263..cb10538504 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet$binding$2.java @@ -17,11 +17,11 @@ public final /* synthetic */ class WidgetStartCallSheet$binding$2 extends k impl public final WidgetStartCallSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365034; - TextView textView = (TextView) view.findViewById(2131365034); + int i = 2131365038; + TextView textView = (TextView) view.findViewById(2131365038); if (textView != null) { - i = 2131365035; - TextView textView2 = (TextView) view.findViewById(2131365035); + i = 2131365039; + TextView textView2 = (TextView) view.findViewById(2131365039); if (textView2 != null) { return new WidgetStartCallSheetBinding((LinearLayout) view, textView, textView2); } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java index 1899f77a94..58294ee333 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetStartCallSheet.java @@ -67,7 +67,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559233; + return 2131559234; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.DialogFragment, androidx.fragment.app.Fragment @@ -85,7 +85,7 @@ public final class WidgetStartCallSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); long j = getArgumentsOrDefault().getLong("ARG_VOICE_CHANNEL_ID"); - getBinding().f1957c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j)); + getBinding().f1959c.setOnClickListener(new WidgetStartCallSheet$onViewCreated$1(this, j)); getBinding().b.setOnClickListener(new WidgetStartCallSheet$onViewCreated$2(this, j)); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java index ecc71d8b3b..ace93d87ad 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceHeaderViewHolder.java @@ -17,10 +17,10 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AudienceHeaderViewHolder(StageCallAdapter stageCallAdapter) { - super(2131559222, stageCallAdapter, null); + super(2131559223, stageCallAdapter, null); m.checkNotNullParameter(stageCallAdapter, "adapter"); View view = this.itemView; - TextView textView = (TextView) view.findViewById(2131364975); + TextView textView = (TextView) view.findViewById(2131364978); if (textView != null) { WidgetStageChannelAudienceRoleBinding widgetStageChannelAudienceRoleBinding = new WidgetStageChannelAudienceRoleBinding((ConstraintLayout) view, textView); m.checkNotNullExpressionValue(widgetStageChannelAudienceRoleBinding, "WidgetStageChannelAudien…oleBinding.bind(itemView)"); @@ -31,7 +31,7 @@ public final class AudienceHeaderViewHolder extends StageCallViewHolder { this.numberFormatter = NumberFormat.getNumberInstance(localeManager.getPrimaryLocale(view2.getContext())); return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364975))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364978))); } @SuppressLint({"SetTextI18n"}) diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java index 56b03120f0..c89b7f9ea8 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/AudienceViewHolder.java @@ -20,21 +20,21 @@ public final class AudienceViewHolder extends StageCallViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AudienceViewHolder(StageCallAdapter stageCallAdapter) { - super(2131559221, stageCallAdapter, null); + super(2131559222, stageCallAdapter, null); m.checkNotNullParameter(stageCallAdapter, "adapter"); View view = this.itemView; ConstraintLayout constraintLayout = (ConstraintLayout) view; - int i = 2131364971; - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364971); + int i = 2131364974; + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(2131364974); if (simpleDraweeView != null) { - i = 2131364972; - CutoutView cutoutView = (CutoutView) view.findViewById(2131364972); + i = 2131364975; + CutoutView cutoutView = (CutoutView) view.findViewById(2131364975); if (cutoutView != null) { - i = 2131364973; - TextView textView = (TextView) view.findViewById(2131364973); + i = 2131364976; + TextView textView = (TextView) view.findViewById(2131364976); if (textView != null) { - i = 2131364974; - ImageView imageView = (ImageView) view.findViewById(2131364974); + i = 2131364977; + ImageView imageView = (ImageView) view.findViewById(2131364977); if (imageView != null) { WidgetStageChannelAudienceBinding widgetStageChannelAudienceBinding = new WidgetStageChannelAudienceBinding((ConstraintLayout) view, constraintLayout, simpleDraweeView, cutoutView, textView, imageView); m.checkNotNullExpressionValue(widgetStageChannelAudienceBinding, "WidgetStageChannelAudienceBinding.bind(itemView)"); @@ -52,7 +52,7 @@ public final class AudienceViewHolder extends StageCallViewHolder { m.checkNotNullParameter(stageCallItem, "data"); super.onConfigure(i, (int) stageCallItem); StageCallItem.AudienceItem audienceItem = (StageCallItem.AudienceItem) stageCallItem; - this.binding.f1949c.setCutoutEnabled(audienceItem.getVoiceUser().isRequestingToSpeak()); + this.binding.f1951c.setCutoutEnabled(audienceItem.getVoiceUser().isRequestingToSpeak()); ImageView imageView = this.binding.e; imageView.setVisibility(audienceItem.getVoiceUser().isRequestingToSpeak() ? 0 : 8); imageView.setActivated(audienceItem.getVoiceUser().isInvitedToSpeak()); diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java index 666229fc14..9e0905aa5e 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DetailsViewHolder.java @@ -19,44 +19,44 @@ public final class DetailsViewHolder extends StageCallViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public DetailsViewHolder(StageCallAdapter stageCallAdapter) { - super(2131559223, stageCallAdapter, null); + super(2131559224, stageCallAdapter, null); m.checkNotNullParameter(stageCallAdapter, "adapter"); View view = this.itemView; - int i = 2131364371; - ImageView imageView = (ImageView) view.findViewById(2131364371); + int i = 2131364374; + ImageView imageView = (ImageView) view.findViewById(2131364374); if (imageView != null) { - i = 2131364372; - ImageView imageView2 = (ImageView) view.findViewById(2131364372); + i = 2131364375; + ImageView imageView2 = (ImageView) view.findViewById(2131364375); if (imageView2 != null) { - i = 2131364378; - TextView textView = (TextView) view.findViewById(2131364378); + i = 2131364381; + TextView textView = (TextView) view.findViewById(2131364381); if (textView != null) { - i = 2131365622; - TextView textView2 = (TextView) view.findViewById(2131365622); + i = 2131365628; + TextView textView2 = (TextView) view.findViewById(2131365628); if (textView2 != null) { - i = 2131365623; - ImageView imageView3 = (ImageView) view.findViewById(2131365623); + i = 2131365629; + ImageView imageView3 = (ImageView) view.findViewById(2131365629); if (imageView3 != null) { - i = 2131365624; - ImageView imageView4 = (ImageView) view.findViewById(2131365624); + i = 2131365630; + ImageView imageView4 = (ImageView) view.findViewById(2131365630); if (imageView4 != null) { - i = 2131365625; - TextView textView3 = (TextView) view.findViewById(2131365625); + i = 2131365631; + TextView textView3 = (TextView) view.findViewById(2131365631); if (textView3 != null) { - i = 2131365626; - ImageView imageView5 = (ImageView) view.findViewById(2131365626); + i = 2131365632; + ImageView imageView5 = (ImageView) view.findViewById(2131365632); if (imageView5 != null) { - i = 2131365627; - TextView textView4 = (TextView) view.findViewById(2131365627); + i = 2131365633; + TextView textView4 = (TextView) view.findViewById(2131365633); if (textView4 != null) { - i = 2131365628; - TextView textView5 = (TextView) view.findViewById(2131365628); + i = 2131365634; + TextView textView5 = (TextView) view.findViewById(2131365634); if (textView5 != null) { - i = 2131365629; - ImageView imageView6 = (ImageView) view.findViewById(2131365629); + i = 2131365635; + ImageView imageView6 = (ImageView) view.findViewById(2131365635); if (imageView6 != null) { - i = 2131365630; - TextView textView6 = (TextView) view.findViewById(2131365630); + i = 2131365636; + TextView textView6 = (TextView) view.findViewById(2131365636); if (textView6 != null) { WidgetStageChannelDetailsBinding widgetStageChannelDetailsBinding = new WidgetStageChannelDetailsBinding((ConstraintLayout) view, imageView, imageView2, textView, textView2, imageView3, imageView4, textView3, imageView5, textView4, textView5, imageView6, textView6); m.checkNotNullExpressionValue(widgetStageChannelDetailsBinding, "WidgetStageChannelDetailsBinding.bind(itemView)"); @@ -128,7 +128,7 @@ public final class DetailsViewHolder extends StageCallViewHolder { ImageView imageView4 = this.binding.b; m.checkNotNullExpressionValue(imageView4, "binding.publicDot"); imageView4.setVisibility(detailsItem.isPublic() ? 0 : 8); - ImageView imageView5 = this.binding.f1950c; + ImageView imageView5 = this.binding.f1952c; m.checkNotNullExpressionValue(imageView5, "binding.publicIcon"); imageView5.setVisibility(detailsItem.isPublic() ? 0 : 8); TextView textView9 = this.binding.d; diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java index 838733ab61..8ca7d93989 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/DividerViewHolder.java @@ -5,7 +5,7 @@ import d0.z.d.m; public final class DividerViewHolder extends StageCallViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public DividerViewHolder(StageCallAdapter stageCallAdapter) { - super(2131559224, stageCallAdapter, null); + super(2131559225, stageCallAdapter, null); m.checkNotNullParameter(stageCallAdapter, "adapter"); } } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java index 8daa1579a7..9b5fceba74 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/stage/SpeakerViewHolder.java @@ -31,17 +31,17 @@ public final class SpeakerViewHolder extends StageCallViewHolder { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public SpeakerViewHolder(StageCallAdapter stageCallAdapter) { - super(2131559227, stageCallAdapter, null); + super(2131559228, stageCallAdapter, null); m.checkNotNullParameter(stageCallAdapter, "adapter"); View view = this.itemView; - StageCallSpeakerView stageCallSpeakerView = (StageCallSpeakerView) view.findViewById(2131364989); + StageCallSpeakerView stageCallSpeakerView = (StageCallSpeakerView) view.findViewById(2131364992); if (stageCallSpeakerView != null) { WidgetStageChannelSpeakerBinding widgetStageChannelSpeakerBinding = new WidgetStageChannelSpeakerBinding((ConstraintLayout) view, stageCallSpeakerView); m.checkNotNullExpressionValue(widgetStageChannelSpeakerBinding, "WidgetStageChannelSpeakerBinding.bind(itemView)"); this.binding = widgetStageChannelSpeakerBinding; return; } - throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364989))); + throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(2131364992))); } public void onConfigure(int i, StageCallItem stageCallItem) { @@ -65,25 +65,28 @@ public final class SpeakerViewHolder extends StageCallViewHolder { Objects.requireNonNull(stageCallSpeakerView2); m.checkNotNullParameter(voiceUser, "voiceUser"); stageCallSpeakerView2.i.b.setOnBitmapLoadedListener(new g(voiceUser)); - stageCallSpeakerView2.i.g.setPulsing(voiceUser.isSpeaking()); + stageCallSpeakerView2.i.h.setPulsing(voiceUser.isSpeaking()); stageCallSpeakerView2.i.b.a(voiceUser, 2131165288); stageCallSpeakerView2.i.b.setRingMargin(DimenUtils.dpToPixels(2)); - ImageView imageView = stageCallSpeakerView2.i.e; + ImageView imageView = stageCallSpeakerView2.i.f; m.checkNotNullExpressionValue(imageView, "binding.stageChannelSpeakerMuteIndicator"); int i2 = 0; - imageView.setVisibility(voiceUser.isMuted() ? 0 : 8); + imageView.setVisibility(voiceUser.isMuted() && !voiceUser.isDeafened() ? 0 : 8); ImageView imageView2 = stageCallSpeakerView2.i.d; - m.checkNotNullExpressionValue(imageView2, "binding.stageChannelSpeakerModIndicator"); - imageView2.setVisibility(isModerator ? 0 : 8); - TextView textView = stageCallSpeakerView2.i.f; + m.checkNotNullExpressionValue(imageView2, "binding.stageChannelSpeakerDeafenIndicator"); + imageView2.setVisibility(voiceUser.isDeafened() ? 0 : 8); + ImageView imageView3 = stageCallSpeakerView2.i.e; + m.checkNotNullExpressionValue(imageView3, "binding.stageChannelSpeakerModIndicator"); + imageView3.setVisibility(isModerator ? 0 : 8); + TextView textView = stageCallSpeakerView2.i.g; m.checkNotNullExpressionValue(textView, "binding.stageChannelSpeakerName"); textView.setText(voiceUser.getDisplayName()); - ImageView imageView3 = stageCallSpeakerView2.i.f105c; - m.checkNotNullExpressionValue(imageView3, "binding.stageChannelSpeakerBlocked"); + ImageView imageView4 = stageCallSpeakerView2.i.f105c; + m.checkNotNullExpressionValue(imageView4, "binding.stageChannelSpeakerBlocked"); if (!isBlocked) { i2 = 8; } - imageView3.setVisibility(i2); + imageView4.setVisibility(i2); Subscription subscription = stageCallSpeakerView2.j; if (subscription != null) { subscription.unsubscribe(); diff --git a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java index a48d4aea00..0a1cbcbc02 100644 --- a/app/src/main/java/com/discord/widgets/voice/model/CallModel.java +++ b/app/src/main/java/com/discord/widgets/voice/model/CallModel.java @@ -6,6 +6,7 @@ import co.discord.media_engine.VideoInputDeviceDescription; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; import com.discord.api.guild.GuildMaxVideoChannelUsers; +import com.discord.api.stageinstance.StageInstance; import com.discord.api.voice.state.VoiceState; import com.discord.models.domain.ModelApplicationStream; import com.discord.models.guild.Guild; @@ -360,7 +361,10 @@ public final class CallModel { } public final boolean canInvite() { - return AnimatableValueParser.r1(this.channel) || (AnimatableValueParser.k1(this.channel) && PermissionUtils.can(1, this.channelPermissions)); + boolean r1 = AnimatableValueParser.r1(this.channel); + boolean z2 = AnimatableValueParser.k1(this.channel) && PermissionUtils.can(1, this.channelPermissions); + StageInstance stageInstanceForChannel = StoreStream.Companion.getStageInstances().getStageInstanceForChannel(this.channel.g()); + return r1 || z2 || ((stageInstanceForChannel != null ? stageInstanceForChannel.d() : null) != null); } public final boolean canRequestToSpeak() { diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java index 528c0f04e6..5c8c473f95 100644 --- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$binding$2.java @@ -60,29 +60,29 @@ public final /* synthetic */ class WidgetVoiceChannelSettings$binding$2 extends i = 2131362826; TextView textView6 = (TextView) view.findViewById(2131362826); if (textView6 != null) { - i = 2131364399; - View findViewById2 = view.findViewById(2131364399); + i = 2131364402; + View findViewById2 = view.findViewById(2131364402); if (findViewById2 != null) { - i = 2131364804; - LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364804); + i = 2131364807; + LinearLayout linearLayout3 = (LinearLayout) view.findViewById(2131364807); if (linearLayout3 != null) { - i = 2131364805; - TextView textView7 = (TextView) view.findViewById(2131364805); + i = 2131364808; + TextView textView7 = (TextView) view.findViewById(2131364808); if (textView7 != null) { - i = 2131364891; - LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364891); + i = 2131364894; + LinearLayout linearLayout4 = (LinearLayout) view.findViewById(2131364894); if (linearLayout4 != null) { - i = 2131364892; - TextView textView8 = (TextView) view.findViewById(2131364892); + i = 2131364895; + TextView textView8 = (TextView) view.findViewById(2131364895); if (textView8 != null) { - i = 2131365364; - View findViewById3 = view.findViewById(2131365364); + i = 2131365369; + View findViewById3 = view.findViewById(2131365369); if (findViewById3 != null) { - i = 2131365365; - SeekBar seekBar2 = (SeekBar) view.findViewById(2131365365); + i = 2131365370; + SeekBar seekBar2 = (SeekBar) view.findViewById(2131365370); if (seekBar2 != null) { - i = 2131365366; - TextView textView9 = (TextView) view.findViewById(2131365366); + i = 2131365371; + TextView textView9 = (TextView) view.findViewById(2131365371); if (textView9 != null) { return new WidgetVoiceChannelSettingsBinding((CoordinatorLayout) view, findViewById, seekBar, textView, textInputLayout, textInputLayout2, textView2, textView3, linearLayout, textView4, floatingActionButton, linearLayout2, textView5, textView6, findViewById2, linearLayout3, textView7, linearLayout4, textView8, findViewById3, seekBar2, textView9); } diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java index 1bba0715f9..f577a5d8d7 100644 --- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$1.java @@ -17,7 +17,7 @@ public final class WidgetVoiceChannelSettings$configureUI$1 implements A public final void call(MenuItem menuItem, Context context) { m.checkNotNullExpressionValue(menuItem, "menuItem"); - if (menuItem.getItemId() == 2131363866) { + if (menuItem.getItemId() == 2131363868) { WidgetVoiceChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel()); } } diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java index 041d2e39af..cc9f5476df 100644 --- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java +++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$configureUI$6.java @@ -24,7 +24,7 @@ public final class WidgetVoiceChannelSettings$configureUI$6 implements View.OnCl WidgetVoiceChannelSettings widgetVoiceChannelSettings = this.this$0; long g = this.$this_configureUI.getChannel().g(); StatefulViews access$getState$p = WidgetVoiceChannelSettings.access$getState$p(this.this$0); - TextInputLayout textInputLayout = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2000c; + TextInputLayout textInputLayout = WidgetVoiceChannelSettings.access$getBinding$p(this.this$0).f2002c; m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName"); String str = (String) access$getState$p.get(textInputLayout.getId(), AnimatableValueParser.y0(this.$this_configureUI.getChannel())); StatefulViews access$getState$p2 = WidgetVoiceChannelSettings.access$getState$p(this.this$0); diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java index 711ea058bb..d813c5e5ad 100644 --- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java +++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.java @@ -23,6 +23,6 @@ public final class WidgetVoiceChannelSettings$saveChannel$1 extends o implements } public final void invoke(Channel channel) { - c.a.d.o.g(this.this$0.getContext(), 2131887325, 0, null, 12); + c.a.d.o.g(this.this$0.getContext(), 2131887327, 0, null, 12); } } diff --git a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java index 92169107ec..ffb43f56af 100644 --- a/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java +++ b/app/src/main/java/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.java @@ -257,7 +257,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { } public WidgetVoiceChannelSettings() { - super(2131559279); + super(2131559280); } public static final /* synthetic */ void access$configureUI(WidgetVoiceChannelSettings widgetVoiceChannelSettings, Model model) { @@ -323,7 +323,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { this.state.clear(true); int i = 0; AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - setActionBarTitle(2131887324); + setActionBarTitle(2131887326); setActionBarSubtitle(AnimatableValueParser.A0(model.getChannel(), requireContext(), false, 2)); AppFragment.setActionBarOptionsMenu$default(this, 2131623968, new WidgetVoiceChannelSettings$configureUI$1(this, model), null, 4, null); TextView textView = getBinding().l; @@ -334,7 +334,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { textView.setText((CharSequence) statefulViews.get(textView2.getId(), getUserLimitDisplayString(model.getChannel().A()))); TextView textView3 = getBinding().p; m.checkNotNullExpressionValue(textView3, "binding.settingsUserLimitHelp"); - c.a.l.b.n(textView3, 2131888590, new Object[0], null, 4); + c.a.l.b.n(textView3, 2131888600, new Object[0], null, 4); SeekBar seekBar = getBinding().r; m.checkNotNullExpressionValue(seekBar, "binding.userLimitSeekbar"); seekBar.setProgress(model.getChannel().A()); @@ -349,7 +349,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { textView4.setText((CharSequence) statefulViews2.get(textView5.getId(), getBitrateDisplayString(c2))); TextView textView6 = getBinding().n; m.checkNotNullExpressionValue(textView6, "binding.settingsBitrateHelp"); - c.a.l.b.n(textView6, 2131888560, new Object[]{"64"}, null, 4); + c.a.l.b.n(textView6, 2131888570, new Object[]{"64"}, null, 4); SeekBar seekBar2 = getBinding().b; m.checkNotNullExpressionValue(seekBar2, "binding.bitrateSeekbar"); int maxBitrate = model.getMaxBitrate(); @@ -384,16 +384,16 @@ public final class WidgetVoiceChannelSettings extends AppFragment { textView8.setText(str); TextView textView9 = getBinding().h; m.checkNotNullExpressionValue(textView9, "binding.channelSettingsRegionOverrideHelp"); - c.a.l.b.n(textView9, 2131888580, new Object[0], null, 4); + c.a.l.b.n(textView9, 2131888590, new Object[0], null, 4); getBinding().g.setOnClickListener(new WidgetVoiceChannelSettings$configureUI$4(this, model)); if (!model.getCanManageChannel() || !model.getShouldShowRtcRegionOption()) { z2 = false; } configureRegionOverrideVisibility(z2); - TextInputLayout textInputLayout = getBinding().f2000c; + TextInputLayout textInputLayout = getBinding().f2002c; m.checkNotNullExpressionValue(textInputLayout, "binding.channelSettingsEditName"); StatefulViews statefulViews4 = this.state; - TextInputLayout textInputLayout2 = getBinding().f2000c; + TextInputLayout textInputLayout2 = getBinding().f2002c; m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName"); ViewExtensions.setText(textInputLayout, (CharSequence) statefulViews4.get(textInputLayout2.getId(), AnimatableValueParser.y0(model.getChannel()))); TextInputLayout textInputLayout3 = getBinding().d; @@ -426,7 +426,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { m.checkNotNullExpressionValue(view, "binding.userLimitDivider"); int i = 0; view.setVisibility(z2 ? 0 : 8); - TextView textView = getBinding().f2001s; + TextView textView = getBinding().f2003s; m.checkNotNullExpressionValue(textView, "binding.userLimitTitle"); textView.setVisibility(z2 ? 0 : 8); LinearLayout linearLayout = getBinding().o; @@ -455,7 +455,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { m.checkNotNullExpressionValue(linearLayout2, "binding.root"); Context context = linearLayout2.getContext(); m.checkNotNullExpressionValue(context, "binding.root.context"); - c.a.l.b.n(textView, 2131888060, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4); + c.a.l.b.n(textView, 2131888061, new Object[]{AnimatableValueParser.A0(channel, context, false, 2)}, null, 4); create.show(); } @@ -471,11 +471,11 @@ public final class WidgetVoiceChannelSettings extends AppFragment { if (i == 0) { Resources resources = getResources(); m.checkNotNullExpressionValue(resources, "resources"); - return c.a.l.b.h(resources, 2131891392, new Object[0], null, 4); + return c.a.l.b.h(resources, 2131891425, new Object[0], null, 4); } Resources resources2 = getResources(); m.checkNotNullExpressionValue(resources2, "resources"); - return StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755230, i, Integer.valueOf(i)); + return StringResourceUtilsKt.getQuantityString(resources2, requireContext(), 2131755231, i, Integer.valueOf(i)); } public static final void launch(long j, Context context) { @@ -490,7 +490,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { m.a aVar = c.a.a.m.j; FragmentManager parentFragmentManager = getParentFragmentManager(); d0.z.d.m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - CharSequence j = c.a.l.b.j(this, 2131888712, new Object[0], null, 4); + CharSequence j = c.a.l.b.j(this, 2131888722, new Object[0], null, 4); List listOf = d0.t.m.listOf(c.a.l.b.j(this, 2131886797, new Object[0], null, 4)); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(list, 10)); for (ModelVoiceRegion modelVoiceRegion : list) { @@ -517,7 +517,7 @@ public final class WidgetVoiceChannelSettings extends AppFragment { statefulViews2.addOptionalFields(textView); StatefulViews statefulViews3 = this.state; FloatingActionButton floatingActionButton = getBinding().i; - TextInputLayout textInputLayout2 = getBinding().f2000c; + TextInputLayout textInputLayout2 = getBinding().f2002c; d0.z.d.m.checkNotNullExpressionValue(textInputLayout2, "binding.channelSettingsEditName"); TextInputLayout textInputLayout3 = getBinding().d; d0.z.d.m.checkNotNullExpressionValue(textInputLayout3, "binding.channelSettingsEditTopic"); diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java index 634a6db11c..9cf612d98d 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/CallParticipantsAdapter.java @@ -368,7 +368,7 @@ public final class CallParticipantsAdapter extends MGRecyclerAdapterSimple publishSubject = this.eventSubject; - publishSubject.j.onNext(new Event.ShowToast(2131891398)); + publishSubject.j.onNext(new Event.ShowToast(2131891431)); } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java index 1d53946371..451340f77b 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$binding$2.java @@ -27,68 +27,68 @@ public final /* synthetic */ class WidgetVoiceBottomSheet$binding$2 extends k im public final WidgetVoiceBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131363024; - View findViewById = view.findViewById(2131363024); + int i = 2131363026; + View findViewById = view.findViewById(2131363026); if (findViewById != null) { k0 k0Var = new k0((LinearLayout) findViewById); - i = 2131363503; - View findViewById2 = view.findViewById(2131363503); + i = 2131363505; + View findViewById2 = view.findViewById(2131363505); if (findViewById2 != null) { - int i2 = 2131365284; - Barrier barrier = (Barrier) findViewById2.findViewById(2131365284); + int i2 = 2131365289; + Barrier barrier = (Barrier) findViewById2.findViewById(2131365289); if (barrier != null) { - i2 = 2131365520; - ImageView imageView = (ImageView) findViewById2.findViewById(2131365520); + i2 = 2131365526; + ImageView imageView = (ImageView) findViewById2.findViewById(2131365526); if (imageView != null) { - i2 = 2131365521; - ImageView imageView2 = (ImageView) findViewById2.findViewById(2131365521); + i2 = 2131365527; + ImageView imageView2 = (ImageView) findViewById2.findViewById(2131365527); if (imageView2 != null) { - i2 = 2131365522; - ImageView imageView3 = (ImageView) findViewById2.findViewById(2131365522); + i2 = 2131365528; + ImageView imageView3 = (ImageView) findViewById2.findViewById(2131365528); if (imageView3 != null) { - i2 = 2131365523; - ImageView imageView4 = (ImageView) findViewById2.findViewById(2131365523); + i2 = 2131365529; + ImageView imageView4 = (ImageView) findViewById2.findViewById(2131365529); if (imageView4 != null) { - i2 = 2131365524; - ImageView imageView5 = (ImageView) findViewById2.findViewById(2131365524); + i2 = 2131365530; + ImageView imageView5 = (ImageView) findViewById2.findViewById(2131365530); if (imageView5 != null) { - i2 = 2131365525; - TextView textView = (TextView) findViewById2.findViewById(2131365525); + i2 = 2131365531; + TextView textView = (TextView) findViewById2.findViewById(2131365531); if (textView != null) { - i2 = 2131365526; - TextView textView2 = (TextView) findViewById2.findViewById(2131365526); + i2 = 2131365532; + TextView textView2 = (TextView) findViewById2.findViewById(2131365532); if (textView2 != null) { l0 l0Var = new l0((ConstraintLayout) findViewById2, barrier, imageView, imageView2, imageView3, imageView4, imageView5, textView, textView2); - ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365516); + ConstraintLayout constraintLayout = (ConstraintLayout) view.findViewById(2131365522); if (constraintLayout != null) { - MaterialButton materialButton = (MaterialButton) view.findViewById(2131365517); + MaterialButton materialButton = (MaterialButton) view.findViewById(2131365523); if (materialButton != null) { - RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365518); + RelativeLayout relativeLayout = (RelativeLayout) view.findViewById(2131365524); if (relativeLayout != null) { - AnchoredVoiceControlsView anchoredVoiceControlsView = (AnchoredVoiceControlsView) view.findViewById(2131365519); + AnchoredVoiceControlsView anchoredVoiceControlsView = (AnchoredVoiceControlsView) view.findViewById(2131365525); if (anchoredVoiceControlsView != null) { - MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365527); + MaterialButton materialButton2 = (MaterialButton) view.findViewById(2131365533); if (materialButton2 != null) { - MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365528); + MaxHeightRecyclerView maxHeightRecyclerView = (MaxHeightRecyclerView) view.findViewById(2131365534); if (maxHeightRecyclerView != null) { CoordinatorLayout coordinatorLayout = (CoordinatorLayout) view; return new WidgetVoiceBottomSheetBinding(coordinatorLayout, k0Var, l0Var, constraintLayout, materialButton, relativeLayout, anchoredVoiceControlsView, materialButton2, maxHeightRecyclerView, coordinatorLayout); } - i = 2131365528; + i = 2131365534; } else { - i = 2131365527; + i = 2131365533; } } else { - i = 2131365519; + i = 2131365525; } } else { - i = 2131365518; + i = 2131365524; } } else { - i = 2131365517; + i = 2131365523; } } else { - i = 2131365516; + i = 2131365522; } } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java index 32e2fdd927..853587129f 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet.java @@ -525,12 +525,12 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { relativeLayout3.setVisibility(0); BottomContent.Connect connect = (BottomContent.Connect) bottomContent; if (connect.isConnectEnabled()) { - getBinding().d.setText(2131890639); + getBinding().d.setText(2131890669); MaterialButton materialButton = getBinding().d; m.checkNotNullExpressionValue(materialButton, "binding.voiceBottomSheetConnect"); materialButton.setEnabled(true); } else { - getBinding().d.setText(2131887273); + getBinding().d.setText(2131887274); MaterialButton materialButton2 = getBinding().d; m.checkNotNullExpressionValue(materialButton2, "binding.voiceBottomSheetConnect"); materialButton2.setEnabled(false); @@ -602,36 +602,36 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { } private final void configureUI(WidgetVoiceBottomSheetViewModel.ViewState viewState) { - TextView textView = getBinding().f1997c.g; + TextView textView = getBinding().f1999c.g; m.checkNotNullExpressionValue(textView, "binding.header.voiceBottomSheetHeaderTitle"); textView.setText(viewState.getTitle()); - TextView textView2 = getBinding().f1997c.f; + TextView textView2 = getBinding().f1999c.f; m.checkNotNullExpressionValue(textView2, "binding.header.voiceBottomSheetHeaderSubtitle"); ViewExtensions.setTextAndVisibilityBy(textView2, viewState.getSubtitle()); - ImageView imageView = getBinding().f1997c.b; + ImageView imageView = getBinding().f1999c.b; m.checkNotNullExpressionValue(imageView, "binding.header.voiceBottomSheetHeaderDeafen"); imageView.setActivated(viewState.isDeafened()); - ImageView imageView2 = getBinding().f1997c.b; + ImageView imageView2 = getBinding().f1999c.b; m.checkNotNullExpressionValue(imageView2, "binding.header.voiceBottomSheetHeaderDeafen"); - imageView2.setContentDescription(viewState.isDeafened() ? getString(2131894016) : getString(2131888040)); - getBinding().f1997c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this)); - ImageView imageView3 = getBinding().f1997c.f121c; + imageView2.setContentDescription(viewState.isDeafened() ? getString(2131894055) : getString(2131888041)); + getBinding().f1999c.b.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$1(this)); + ImageView imageView3 = getBinding().f1999c.f121c; m.checkNotNullExpressionValue(imageView3, "binding.header.voiceBottomSheetHeaderInvite"); imageView3.setVisibility(viewState.getShowInviteOption() ? 0 : 8); - getBinding().f1997c.f121c.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$2(this, viewState)); - getBinding().f1997c.e.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$3(this)); - getBinding().f1997c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this)); + getBinding().f1999c.f121c.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$2(this, viewState)); + getBinding().f1999c.e.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$3(this)); + getBinding().f1999c.d.setOnClickListener(new WidgetVoiceBottomSheet$configureUI$4(this)); if (viewState.isNoiseCancellationActive() != null) { if (m.areEqual(viewState.isNoiseCancellationActive(), Boolean.TRUE)) { - getBinding().f1997c.d.setImageResource(2131231786); + getBinding().f1999c.d.setImageResource(2131231789); } else { - getBinding().f1997c.d.setImageResource(2131231787); + getBinding().f1999c.d.setImageResource(2131231790); } - ImageView imageView4 = getBinding().f1997c.d; + ImageView imageView4 = getBinding().f1999c.d; m.checkNotNullExpressionValue(imageView4, "binding.header.voiceBott…etHeaderNoiseCancellation"); imageView4.setVisibility(0); } else { - ImageView imageView5 = getBinding().f1997c.d; + ImageView imageView5 = getBinding().f1999c.d; m.checkNotNullExpressionValue(imageView5, "binding.header.voiceBott…etHeaderNoiseCancellation"); imageView5.setVisibility(8); } @@ -753,14 +753,14 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131891395); - String string2 = requireContext.getString(2131891382); + String string = requireContext.getString(2131891428); + String string2 = requireContext.getString(2131891415); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…e_permission_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showNoVideoDevicesToast() { - o.i(this, 2131891393, 0, 4); + o.i(this, 2131891426, 0, 4); } private final void showNoVideoPermissionDialog() { @@ -771,10 +771,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131891395); - String string2 = requireContext.getString(2131891394); + String string = requireContext.getString(2131891428); + String string2 = requireContext.getString(2131891427); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…o_permission_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showServerDeafenedDialog() { @@ -785,10 +785,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131893126); - String string2 = requireContext.getString(2131893125); + String string = requireContext.getString(2131893168); + String string2 = requireContext.getString(2131893167); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ver_deafened_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showServerMutedDialog() { @@ -799,10 +799,10 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131893137); - String string2 = requireContext.getString(2131893136); + String string = requireContext.getString(2131893179); + String string2 = requireContext.getString(2131893178); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…server_muted_dialog_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } private final void showSuppressedDialog() { @@ -813,15 +813,15 @@ public final class WidgetVoiceBottomSheet extends AppBottomSheet { m.checkNotNullParameter(parentFragmentManager, "fragmentManager"); m.checkNotNullParameter(requireContext, "context"); WidgetNoticeDialog.Companion companion = WidgetNoticeDialog.Companion; - String string = requireContext.getString(2131893651); - String string2 = requireContext.getString(2131893654); + String string = requireContext.getString(2131893691); + String string2 = requireContext.getString(2131893694); m.checkNotNullExpressionValue(string2, "context.getString(R.stri…ppressed_permission_body)"); - WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891633), null, null, null, null, null, null, null, null, 0, null, 16368, null); + WidgetNoticeDialog.Companion.show$default(companion, parentFragmentManager, string, string2, requireContext.getString(2131891666), null, null, null, null, null, null, null, null, 0, null, 16368, null); } @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559276; + return 2131559277; } /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1 */ diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java index f09d6462c9..e2f72d0161 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java @@ -1,35 +1,79 @@ package com.discord.widgets.voice.sheet; +import com.discord.stores.StoreMediaEngine; import com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel; -import d0.z.d.o; +import d0.l; +import d0.w.g.c; +import d0.w.h.a.e; +import d0.w.h.a.k; +import d0.z.d.m; import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import kotlin.coroutines.Continuation; +import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineScope; import rx.subjects.PublishSubject; /* compiled from: WidgetVoiceBottomSheetViewModel.kt */ -public final class WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1 extends o implements Function1 { +@e(c = "com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1", f = "WidgetVoiceBottomSheetViewModel.kt", l = {153, 161}, m = "invokeSuspend") +public final class WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1 extends k implements Function2, Object> { + public final /* synthetic */ StoreMediaEngine $mediaEngine; + public int label; public final /* synthetic */ WidgetVoiceBottomSheetViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1(WidgetVoiceBottomSheetViewModel widgetVoiceBottomSheetViewModel) { - super(1); + public WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1(WidgetVoiceBottomSheetViewModel widgetVoiceBottomSheetViewModel, StoreMediaEngine storeMediaEngine, Continuation continuation) { + super(2, continuation); this.this$0 = widgetVoiceBottomSheetViewModel; + this.$mediaEngine = storeMediaEngine; } - /* 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(String str) { - invoke(str); - return Unit.a; + @Override // d0.w.h.a.a + public final Continuation create(Object obj, Continuation continuation) { + m.checkNotNullParameter(continuation, "completion"); + return new WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1(this.this$0, this.$mediaEngine, continuation); } - public final void invoke(String str) { - if (str != null) { + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public final Object invoke(CoroutineScope coroutineScope, Continuation continuation) { + return ((WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1) create(coroutineScope, continuation)).invokeSuspend(Unit.a); + } + + @Override // d0.w.h.a.a + public final Object invokeSuspend(Object obj) { + Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + int i = this.label; + boolean z2 = true; + if (i == 0) { + l.throwOnFailure(obj); + StoreMediaEngine storeMediaEngine = this.$mediaEngine; + this.label = 1; + obj = storeMediaEngine.getDefaultVideoDeviceGUID(this); + if (obj == coroutine_suspended) { + return coroutine_suspended; + } + } else if (i == 1) { + l.throwOnFailure(obj); + } else if (i == 2) { + l.throwOnFailure(obj); + return Unit.a; + } else { + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); + } + if (obj == null) { + z2 = false; + } + if (z2) { WidgetVoiceBottomSheetViewModel widgetVoiceBottomSheetViewModel = this.this$0; WidgetVoiceBottomSheetViewModel.access$joinVoiceChannel(widgetVoiceBottomSheetViewModel, WidgetVoiceBottomSheetViewModel.access$getChannelId$p(widgetVoiceBottomSheetViewModel)); - return; + StoreMediaEngine storeMediaEngine2 = this.$mediaEngine; + this.label = 2; + if (storeMediaEngine2.selectDefaultVideoDeviceAsync(this) == coroutine_suspended) { + return coroutine_suspended; + } + } else { + PublishSubject access$getEventSubject$p = WidgetVoiceBottomSheetViewModel.access$getEventSubject$p(this.this$0); + access$getEventSubject$p.j.onNext(WidgetVoiceBottomSheetViewModel.Event.ShowNoVideoDevicesAvailableToast.INSTANCE); } - PublishSubject access$getEventSubject$p = WidgetVoiceBottomSheetViewModel.access$getEventSubject$p(this.this$0); - access$getEventSubject$p.j.onNext(WidgetVoiceBottomSheetViewModel.Event.ShowNoVideoDevicesAvailableToast.INSTANCE); + return Unit.a; } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java index 155f954250..d1471903be 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import androidx.annotation.MainThread; import androidx.annotation.StringRes; +import androidx.lifecycle.ViewModelKt; import c.a.j.a; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; @@ -1169,7 +1170,7 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel publishSubject2 = this.eventSubject; - publishSubject2.j.onNext(new Event.ShowToast(2131891397)); + publishSubject2.j.onNext(new Event.ShowToast(2131891430)); return; } PublishSubject publishSubject3 = this.eventSubject; - publishSubject3.j.onNext(new Event.ShowToast(2131891398)); + publishSubject3.j.onNext(new Event.ShowToast(2131891431)); } } @@ -1321,20 +1322,18 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel publishSubject = this.eventSubject; - publishSubject.j.onNext(Event.ShowGuildVideoAtCapacityDialog.INSTANCE); + this.eventSubject.j.onNext(Event.ShowGuildVideoAtCapacityDialog.INSTANCE); return; } if (!this.userSettingsStore.getIsMobileOverlayEnabled()) { - PublishSubject publishSubject2 = this.eventSubject; - publishSubject2.j.onNext(Event.ShowOverlayNux.INSTANCE); + this.eventSubject.j.onNext(Event.ShowOverlayNux.INSTANCE); } if (!z2) { joinVoiceChannel(this.channelId); } else if (!hasVideoPermission()) { emitShowNoVideoPermissionDialogEvent(); } else { - StoreStream.Companion.getMediaEngine().selectDefaultVideoDevice(new WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1(this)); + c.q.a.k.a.G(ViewModelKt.getViewModelScope(this), null, null, new WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1(this, StoreStream.Companion.getMediaEngine(), null), 3, null); } } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java index b825057341..261c234d74 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet$binding$2.java @@ -18,24 +18,24 @@ public final /* synthetic */ class WidgetVoiceSettingsBottomSheet$binding$2 exte public final WidgetVoiceSettingsBottomSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); - int i = 2131365540; - TextView textView = (TextView) view.findViewById(2131365540); + int i = 2131365546; + TextView textView = (TextView) view.findViewById(2131365546); if (textView != null) { - i = 2131365541; - SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365541); + i = 2131365547; + SwitchMaterial switchMaterial = (SwitchMaterial) view.findViewById(2131365547); if (switchMaterial != null) { - i = 2131365542; - TextView textView2 = (TextView) view.findViewById(2131365542); + i = 2131365548; + TextView textView2 = (TextView) view.findViewById(2131365548); if (textView2 != null) { NestedScrollView nestedScrollView = (NestedScrollView) view; - i = 2131365544; - TextView textView3 = (TextView) view.findViewById(2131365544); + i = 2131365550; + TextView textView3 = (TextView) view.findViewById(2131365550); if (textView3 != null) { - i = 2131365545; - SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131365545); + i = 2131365551; + SwitchMaterial switchMaterial2 = (SwitchMaterial) view.findViewById(2131365551); if (switchMaterial2 != null) { - i = 2131365547; - TextView textView4 = (TextView) view.findViewById(2131365547); + i = 2131365553; + TextView textView4 = (TextView) view.findViewById(2131365553); if (textView4 != null) { return new WidgetVoiceSettingsBottomSheetBinding(nestedScrollView, textView, switchMaterial, textView2, nestedScrollView, textView3, switchMaterial2, textView4); } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java index 737f52ed10..d6ca0d74ab 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceSettingsBottomSheet.java @@ -121,8 +121,8 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet { textView2.setVisibility(viewState.getShowStageSettings() ? 0 : 8); getBinding().e.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$3(this)); getBinding().g.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$4(this)); - getBinding().f2003c.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$5(this)); - SwitchMaterial switchMaterial3 = getBinding().f2003c; + getBinding().f2005c.setOnClickListener(new WidgetVoiceSettingsBottomSheet$configureUI$5(this)); + SwitchMaterial switchMaterial3 = getBinding().f2005c; m.checkNotNullExpressionValue(switchMaterial3, "binding.voiceSettingsNoiseSuppression"); switchMaterial3.setChecked(viewState.getNoiseCancellationEnabled()); TextView textView3 = getBinding().d; @@ -148,7 +148,7 @@ public final class WidgetVoiceSettingsBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return 2131559281; + return 2131559282; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/discord/workers/MessageSendWorker.java b/app/src/main/java/com/discord/workers/MessageSendWorker.java index 841ce74d12..108c86040d 100644 --- a/app/src/main/java/com/discord/workers/MessageSendWorker.java +++ b/app/src/main/java/com/discord/workers/MessageSendWorker.java @@ -5,8 +5,8 @@ import androidx.work.Data; import androidx.work.ListenableWorker; import androidx.work.Worker; import androidx.work.WorkerParameters; +import com.discord.api.message.Message; import com.discord.app.AppLog; -import com.discord.models.domain.ModelMessage; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreStream; import com.discord.utilities.fcm.NotificationCache; @@ -109,13 +109,13 @@ public final class MessageSendWorker extends Worker { try { Observable takeSingleUntilTimeout$default = ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.restSubscribeOn(RestAPI.Companion.getApi().sendMessage(j, new RestAPIParams.Message(string2, string3, null, null, j2 != -1 ? d0.t.m.listOf(Long.valueOf(j2)) : null, null, null, 108, null)), false), 0, false, 3, null); Objects.requireNonNull(takeSingleUntilTimeout$default); - ModelMessage modelMessage = (ModelMessage) new j0.m.b(takeSingleUntilTimeout$default).a(); + Message message = (Message) new j0.m.b(takeSingleUntilTimeout$default).a(); NotificationData.DisplayPayload displayPayload = NotificationCache.INSTANCE.get(j); if (displayPayload != null) { NotificationData notificationData = (NotificationData) u.lastOrNull((List) displayPayload.getExtras()); if (notificationData != null) { - m.checkNotNullExpressionValue(modelMessage, "message"); - NotificationData copyForDirectReply = notificationData.copyForDirectReply(modelMessage); + m.checkNotNullExpressionValue(message, "message"); + NotificationData copyForDirectReply = notificationData.copyForDirectReply(message); NotificationRenderer notificationRenderer = NotificationRenderer.INSTANCE; Context applicationContext2 = getApplicationContext(); m.checkNotNullExpressionValue(applicationContext2, "applicationContext"); @@ -124,7 +124,7 @@ public final class MessageSendWorker extends Worker { m.checkNotNullExpressionValue(simpleName3, "javaClass.simpleName"); z2 = false; try { - Logger.d$default(appLog, simpleName3, "Direct reply: " + j + '-' + modelMessage.getId(), null, 4, null); + Logger.d$default(appLog, simpleName3, "Direct reply: " + j + '-' + message.r(), null, 4, null); StoreStream.Companion.getAnalytics().ackMessage(j); ListenableWorker.Result success = ListenableWorker.Result.success(); m.checkNotNullExpressionValue(success, "Result.success()"); diff --git a/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java b/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java index b3f83fd2eb..7af0b1ad2f 100644 --- a/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java +++ b/app/src/main/java/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.java @@ -42,8 +42,8 @@ public class SerializableCookie implements Serializable { } String str3 = (String) objectInputStream.readObject(); m.checkParameterIsNotNull(str3, "domain"); - String b02 = a.b0(str3); - if (b02 != null) { + String c02 = a.c0(str3); + if (c02 != null) { String str4 = (String) objectInputStream.readObject(); m.checkParameterIsNotNull(str4, "path"); if (t.startsWith$default(str4, "/", false, 2, null)) { @@ -51,9 +51,9 @@ public class SerializableCookie implements Serializable { boolean z5 = objectInputStream.readBoolean(); if (objectInputStream.readBoolean()) { m.checkParameterIsNotNull(str3, "domain"); - String b03 = a.b0(str3); - if (b03 != null) { - b02 = b03; + String c03 = a.c0(str3); + if (c03 != null) { + c02 = c03; z3 = true; } else { throw new IllegalArgumentException(c.d.b.a.a.u("unexpected domain: ", str3)); @@ -63,8 +63,8 @@ public class SerializableCookie implements Serializable { } Objects.requireNonNull(str, "builder.name == null"); Objects.requireNonNull(str2, "builder.value == null"); - Objects.requireNonNull(b02, "builder.domain == null"); - this.j = new n(str, str2, j, b02, str4, z4, z5, z2, z3, null); + Objects.requireNonNull(c02, "builder.domain == null"); + this.j = new n(str, str2, j, c02, str4, z4, z5, z2, z3, null); return; } throw new IllegalArgumentException("path must start with '/'".toString()); diff --git a/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java b/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java index ece5ee1a14..af814ac0fe 100644 --- a/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java +++ b/app/src/main/java/com/lytefast/flexinput/adapters/AttachmentPreviewAdapter.java @@ -73,6 +73,7 @@ public final class AttachmentPreviewAdapter { j jVar = new j(flexInputFragment); c.b.a.a.k kVar = new c.b.a.a.k(flexInputFragment); l lVar = new l(flexInputFragment); - if (flexInputFragment.n()) { + if (flexInputFragment.l()) { FlexEditText flexEditText = flexInputFragment.l; if (flexEditText == null) { m.throwUninitializedPropertyAccessException("inputEt"); @@ -277,10 +277,10 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { m.checkNotNullExpressionValue(appCompatImageButton, "binding.expandBtn"); int i = 8; appCompatImageButton.setVisibility(!z3 ? 0 : 8); - AppCompatImageButton appCompatImageButton2 = flexInputFragment.j().n; + AppCompatImageButton appCompatImageButton2 = flexInputFragment.j().m; m.checkNotNullExpressionValue(appCompatImageButton2, "binding.giftBtn"); appCompatImageButton2.setVisibility(z3 ? 0 : 8); - AppCompatImageButton appCompatImageButton3 = flexInputFragment.j().m; + AppCompatImageButton appCompatImageButton3 = flexInputFragment.j().l; m.checkNotNullExpressionValue(appCompatImageButton3, "binding.galleryBtn"); appCompatImageButton3.setVisibility(z3 ? 0 : 8); if (flexInputState2.e) { @@ -288,23 +288,23 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { Objects.requireNonNull(str, "null cannot be cast to non-null type kotlin.CharSequence"); if ((w.trim(str).toString().length() > 0) || flexInputState2.f2384c.size() > 0) { z2 = true; - ImageView imageView = flexInputFragment.j().q; + ImageView imageView = flexInputFragment.j().p; m.checkNotNullExpressionValue(imageView, "binding.sendBtnImage"); imageView.setEnabled(z2); - FrameLayout frameLayout = flexInputFragment.j().p; + FrameLayout frameLayout = flexInputFragment.j().o; m.checkNotNullExpressionValue(frameLayout, "binding.sendBtnContainer"); frameLayout.setEnabled(z2); boolean z4 = !(flexInputState2.a.length() <= 0) || flexInputState2.f2384c.size() > 0; - FrameLayout frameLayout2 = flexInputFragment.j().p; + FrameLayout frameLayout2 = flexInputFragment.j().o; m.checkNotNullExpressionValue(frameLayout2, "binding.sendBtnContainer"); frameLayout2.setVisibility(!z4 ? 0 : 8); - LinearLayout linearLayout = flexInputFragment.j().o; + LinearLayout linearLayout = flexInputFragment.j().n; m.checkNotNullExpressionValue(linearLayout, "binding.mainInputContainer"); ViewGroup.LayoutParams layoutParams = linearLayout.getLayoutParams(); Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.widget.RelativeLayout.LayoutParams"); RelativeLayout.LayoutParams layoutParams2 = (RelativeLayout.LayoutParams) layoutParams; layoutParams2.rightMargin = z4 ? DimenUtils.dpToPixels(8) : 0; - LinearLayout linearLayout2 = flexInputFragment.j().o; + LinearLayout linearLayout2 = flexInputFragment.j().n; m.checkNotNullExpressionValue(linearLayout2, "binding.mainInputContainer"); linearLayout2.setLayoutParams(layoutParams2); if (flexInputState2.f2384c.isEmpty()) { @@ -318,7 +318,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { LinearLayout linearLayout3 = flexInputFragment.j().f243c; m.checkNotNullExpressionValue(linearLayout3, "binding.attachmentPreviewContainer"); linearLayout3.setVisibility((flexInputState2.f2384c.size() > 0 || !flexInputState2.e) ? 8 : 0); - AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().m; + AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().l; m.checkNotNullExpressionValue(appCompatImageButton4, "binding.galleryBtn"); ViewExtensions.setEnabledAlpha$default(appCompatImageButton4, !flexInputState2.e && flexInputState2.f, 0.0f, 2, null); c.b.a.a.a aVar = (c.b.a.a.a) flexInputFragment.getChildFragmentManager().findFragmentByTag("Add Content"); @@ -354,24 +354,24 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { } } z2 = false; - ImageView imageView = flexInputFragment.j().q; + ImageView imageView = flexInputFragment.j().p; m.checkNotNullExpressionValue(imageView, "binding.sendBtnImage"); imageView.setEnabled(z2); - FrameLayout frameLayout = flexInputFragment.j().p; + FrameLayout frameLayout = flexInputFragment.j().o; m.checkNotNullExpressionValue(frameLayout, "binding.sendBtnContainer"); frameLayout.setEnabled(z2); if (!(flexInputState2.a.length() <= 0)) { } - FrameLayout frameLayout2 = flexInputFragment.j().p; + FrameLayout frameLayout2 = flexInputFragment.j().o; m.checkNotNullExpressionValue(frameLayout2, "binding.sendBtnContainer"); frameLayout2.setVisibility(!z4 ? 0 : 8); - LinearLayout linearLayout = flexInputFragment.j().o; + LinearLayout linearLayout = flexInputFragment.j().n; m.checkNotNullExpressionValue(linearLayout, "binding.mainInputContainer"); ViewGroup.LayoutParams layoutParams = linearLayout.getLayoutParams(); Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.widget.RelativeLayout.LayoutParams"); RelativeLayout.LayoutParams layoutParams2 = (RelativeLayout.LayoutParams) layoutParams; layoutParams2.rightMargin = z4 ? DimenUtils.dpToPixels(8) : 0; - LinearLayout linearLayout2 = flexInputFragment.j().o; + LinearLayout linearLayout2 = flexInputFragment.j().n; m.checkNotNullExpressionValue(linearLayout2, "binding.mainInputContainer"); linearLayout2.setLayoutParams(layoutParams2); if (flexInputState2.f2384c.isEmpty()) { @@ -379,7 +379,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { LinearLayout linearLayout3 = flexInputFragment.j().f243c; m.checkNotNullExpressionValue(linearLayout3, "binding.attachmentPreviewContainer"); linearLayout3.setVisibility((flexInputState2.f2384c.size() > 0 || !flexInputState2.e) ? 8 : 0); - AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().m; + AppCompatImageButton appCompatImageButton4 = flexInputFragment.j().l; m.checkNotNullExpressionValue(appCompatImageButton4, "binding.galleryBtn"); ViewExtensions.setEnabledAlpha$default(appCompatImageButton4, !flexInputState2.e && flexInputState2.f, 0.0f, 2, null); c.b.a.a.a aVar = (c.b.a.a.a) flexInputFragment.getChildFragmentManager().findFragmentByTag("Add Content"); @@ -432,7 +432,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { aVar4.requestHide(); } } else if (aVar2 instanceof a.C0048a) { - flexInputFragment.j().r.performClick(); + flexInputFragment.j().q.performClick(); } return Unit.a; } @@ -568,19 +568,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { return (c.b.a.e.a) this.k.getValue((Fragment) this, i[0]); } - public final View k() { - AppCompatImageButton appCompatImageButton = j().i; - m.checkNotNullExpressionValue(appCompatImageButton, "binding.expressionBtn"); - return appCompatImageButton; - } - - public final FrameLayout l() { - FrameLayout frameLayout = j().k; - m.checkNotNullExpressionValue(frameLayout, "binding.expressionBtnContainer"); - return frameLayout; - } - - public final FlexEditText m() { + public final FlexEditText k() { FlexEditText flexEditText = this.l; if (flexEditText == null) { m.throwUninitializedPropertyAccessException("inputEt"); @@ -588,7 +576,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { return flexEditText; } - public final boolean n() { + public final boolean l() { View view; if (!isAdded() || isHidden() || (view = getView()) == null) { return false; @@ -678,36 +666,36 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { j().b.setOnClickListener(new a(1, this)); c.b.a.e.a j2 = j(); j().i.setOnClickListener(new g(0, this)); - j().p.setOnClickListener(new g(1, this)); - j2.m.setOnClickListener(new g(2, this)); - j2.n.setOnClickListener(new g(3, this)); + j().o.setOnClickListener(new g(1, this)); + j2.l.setOnClickListener(new g(2, this)); + j2.m.setOnClickListener(new g(3, this)); j2.h.setOnClickListener(new g(4, this)); AppCompatImageButton appCompatImageButton = j2.b; m.checkNotNullExpressionValue(appCompatImageButton, "attachmentClearBtn"); - AppCompatImageButton appCompatImageButton2 = j2.m; + AppCompatImageButton appCompatImageButton2 = j2.l; m.checkNotNullExpressionValue(appCompatImageButton2, "galleryBtn"); - AppCompatImageButton appCompatImageButton3 = j2.n; + AppCompatImageButton appCompatImageButton3 = j2.m; m.checkNotNullExpressionValue(appCompatImageButton3, "giftBtn"); AppCompatImageButton appCompatImageButton4 = j2.i; m.checkNotNullExpressionValue(appCompatImageButton4, "expressionBtn"); - FrameLayout frameLayout = j2.p; + FrameLayout frameLayout = j2.o; m.checkNotNullExpressionValue(frameLayout, "sendBtnContainer"); AppCompatImageButton appCompatImageButton5 = j2.h; m.checkNotNullExpressionValue(appCompatImageButton5, "expandBtn"); for (View view2 : n.listOf((Object[]) new View[]{appCompatImageButton, appCompatImageButton2, appCompatImageButton3, appCompatImageButton4, frameLayout, appCompatImageButton5})) { view2.setOnLongClickListener(new i(this)); } - FrameLayout frameLayout2 = j().l; + FrameLayout frameLayout2 = j().k; m.checkNotNullExpressionValue(frameLayout2, "binding.expressionTrayContainer"); ViewGroup.LayoutParams layoutParams = frameLayout2.getLayoutParams(); Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.widget.LinearLayout.LayoutParams"); LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) layoutParams; - FrameLayout frameLayout3 = j().l; + FrameLayout frameLayout3 = j().k; m.checkNotNullExpressionValue(frameLayout3, "binding.expressionTrayContainer"); Context context = frameLayout3.getContext(); m.checkNotNullExpressionValue(context, "binding.expressionTrayContainer.context"); layoutParams2.height = (int) (((float) DisplayUtils.getScreenSize(context).height()) * 0.5f); - FrameLayout frameLayout4 = j().l; + FrameLayout frameLayout4 = j().k; m.checkNotNullExpressionValue(frameLayout4, "binding.expressionTrayContainer"); frameLayout4.setLayoutParams(layoutParams2); if (bundle != null) { @@ -724,7 +712,7 @@ public class FlexInputFragment extends Fragment implements c.b.a.b { flexInputViewModel.onInputTextChanged(string, null); } } - FrameLayout frameLayout5 = j().l; + FrameLayout frameLayout5 = j().k; m.checkNotNullExpressionValue(frameLayout5, "binding.expressionTrayContainer"); ViewExtensions.setForwardingWindowInsetsListener(frameLayout5); ViewCompat.setOnApplyWindowInsetsListener(j().g, c.b.a.a.o.a); diff --git a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java index 1ed624ef25..67eb0cd1b9 100644 --- a/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java +++ b/app/src/main/java/com/lytefast/flexinput/viewmodel/FlexInputState.java @@ -19,15 +19,14 @@ public final class FlexInputState { public final boolean g; public final boolean h; public final boolean i; - public final boolean j; public FlexInputState() { - this(null, false, null, null, false, false, false, false, false, false, 1023); + this(null, false, null, null, false, false, false, false, false, 511); } /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.util.List> */ /* JADX WARN: Multi-variable type inference failed */ - public FlexInputState(String str, boolean z2, List> list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, boolean z8) { + public FlexInputState(String str, boolean z2, List> list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7) { m.checkNotNullParameter(str, "inputText"); m.checkNotNullParameter(list, "attachments"); this.a = str; @@ -39,30 +38,28 @@ public final class FlexInputState { this.g = z5; this.h = z6; this.i = z7; - this.j = z8; } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ FlexInputState(String str, boolean z2, List list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, boolean z8, int i) { - this((i & 1) != 0 ? "" : null, (i & 2) != 0 ? true : z2, (i & 4) != 0 ? n.emptyList() : null, null, (i & 16) != 0 ? true : z3, (i & 32) != 0 ? true : z4, (i & 64) != 0 ? false : z5, (i & 128) == 0 ? z6 : false, (i & 256) != 0 ? true : z7, (i & 512) == 0 ? z8 : true); + public /* synthetic */ FlexInputState(String str, boolean z2, List list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, int i) { + this((i & 1) != 0 ? "" : null, (i & 2) != 0 ? true : z2, (i & 4) != 0 ? n.emptyList() : null, null, (i & 16) != 0 ? true : z3, (i & 32) != 0 ? true : z4, (i & 64) != 0 ? false : z5, (i & 128) == 0 ? z6 : false, (i & 256) == 0 ? z7 : true); int i2 = i & 8; } - public static FlexInputState a(FlexInputState flexInputState, String str, boolean z2, List list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, boolean z8, int i) { + public static FlexInputState a(FlexInputState flexInputState, String str, boolean z2, List list, Integer num, boolean z3, boolean z4, boolean z5, boolean z6, boolean z7, int i) { String str2 = (i & 1) != 0 ? flexInputState.a : str; - boolean z9 = (i & 2) != 0 ? flexInputState.b : z2; + boolean z8 = (i & 2) != 0 ? flexInputState.b : z2; List list2 = (i & 4) != 0 ? flexInputState.f2384c : list; Integer num2 = (i & 8) != 0 ? flexInputState.d : num; - boolean z10 = (i & 16) != 0 ? flexInputState.e : z3; - boolean z11 = (i & 32) != 0 ? flexInputState.f : z4; - boolean z12 = (i & 64) != 0 ? flexInputState.g : z5; - boolean z13 = (i & 128) != 0 ? flexInputState.h : z6; - boolean z14 = (i & 256) != 0 ? flexInputState.i : z7; - boolean z15 = (i & 512) != 0 ? flexInputState.j : z8; + boolean z9 = (i & 16) != 0 ? flexInputState.e : z3; + boolean z10 = (i & 32) != 0 ? flexInputState.f : z4; + boolean z11 = (i & 64) != 0 ? flexInputState.g : z5; + boolean z12 = (i & 128) != 0 ? flexInputState.h : z6; + boolean z13 = (i & 256) != 0 ? flexInputState.i : z7; Objects.requireNonNull(flexInputState); m.checkNotNullParameter(str2, "inputText"); m.checkNotNullParameter(list2, "attachments"); - return new FlexInputState(str2, z9, list2, num2, z10, z11, z12, z13, z14, z15); + return new FlexInputState(str2, z8, list2, num2, z9, z10, z11, z12, z13); } public boolean equals(Object obj) { @@ -73,7 +70,7 @@ public final class FlexInputState { return false; } FlexInputState flexInputState = (FlexInputState) obj; - return m.areEqual(this.a, flexInputState.a) && this.b == flexInputState.b && m.areEqual(this.f2384c, flexInputState.f2384c) && m.areEqual(this.d, flexInputState.d) && this.e == flexInputState.e && this.f == flexInputState.f && this.g == flexInputState.g && this.h == flexInputState.h && this.i == flexInputState.i && this.j == flexInputState.j; + return m.areEqual(this.a, flexInputState.a) && this.b == flexInputState.b && m.areEqual(this.f2384c, flexInputState.f2384c) && m.areEqual(this.d, flexInputState.d) && this.e == flexInputState.e && this.f == flexInputState.f && this.g == flexInputState.g && this.h == flexInputState.h && this.i == flexInputState.i; } public int hashCode() { @@ -129,18 +126,10 @@ public final class FlexInputState { int i22 = z6 ? 1 : 0; int i23 = (i19 + i20) * 31; boolean z7 = this.i; - if (z7) { - z7 = true; + if (!z7) { + i2 = z7 ? 1 : 0; } - int i24 = z7 ? 1 : 0; - int i25 = z7 ? 1 : 0; - int i26 = z7 ? 1 : 0; - int i27 = (i23 + i24) * 31; - boolean z8 = this.j; - if (!z8) { - i2 = z8 ? 1 : 0; - } - return i27 + i2; + return i23 + i2; } public String toString() { @@ -161,8 +150,6 @@ public final class FlexInputState { L.append(", showExpressionTrayButtonBadge="); L.append(this.h); L.append(", expressionSuggestionsEnabled="); - L.append(this.i); - L.append(", stickerNudgeEnabled="); - return a.G(L, this.j, ")"); + return a.G(L, this.i, ")"); } } diff --git a/app/src/main/java/com/yalantis/ucrop/UCropActivity.java b/app/src/main/java/com/yalantis/ucrop/UCropActivity.java index 1c36243b49..e63e0da706 100644 --- a/app/src/main/java/com/yalantis/ucrop/UCropActivity.java +++ b/app/src/main/java/com/yalantis/ucrop/UCropActivity.java @@ -423,7 +423,7 @@ public class UCropActivity extends AppCompatActivity { g gVar = new g(this); gestureCropImageView.i(); gestureCropImageView.setImageToWrapCropBounds(false); - new c.q.a.j.a(gestureCropImageView.getContext(), gestureCropImageView.getViewBitmap(), new c.q.a.i.c(gestureCropImageView.f1534x, c.q.a.k.a.f0(gestureCropImageView.i), gestureCropImageView.getCurrentScale(), gestureCropImageView.getCurrentAngle()), new c.q.a.i.a(gestureCropImageView.G, gestureCropImageView.H, compressFormat, i2, gestureCropImageView.getImageInputPath(), gestureCropImageView.getImageOutputPath(), gestureCropImageView.getExifInfo()), gVar).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]); + new c.q.a.j.a(gestureCropImageView.getContext(), gestureCropImageView.getViewBitmap(), new c.q.a.i.c(gestureCropImageView.f1534x, c.q.a.k.a.g0(gestureCropImageView.i), gestureCropImageView.getCurrentScale(), gestureCropImageView.getCurrentAngle()), new c.q.a.i.a(gestureCropImageView.G, gestureCropImageView.H, compressFormat, i2, gestureCropImageView.getImageInputPath(), gestureCropImageView.getImageOutputPath(), gestureCropImageView.getExifInfo()), gVar).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]); return true; } else if (menuItem.getItemId() != 16908332) { return super.onOptionsItemSelected(menuItem); diff --git a/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java b/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java index 1947dfaa82..ac3a590f01 100644 --- a/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java +++ b/app/src/main/java/com/yalantis/ucrop/view/OverlayView.java @@ -58,8 +58,8 @@ public class OverlayView extends View { } public final void a() { - this.m = a.r(this.i); - a.p(this.i); + this.m = a.s(this.i); + a.q(this.i); this.q = null; this.v.reset(); this.v.addCircle(this.i.centerX(), this.i.centerY(), Math.min(this.i.width(), this.i.height()) / 2.0f, Path.Direction.CW); diff --git a/app/src/main/java/defpackage/e.java b/app/src/main/java/defpackage/e.java index a71478a0cd..3060ae8833 100644 --- a/app/src/main/java/defpackage/e.java +++ b/app/src/main/java/defpackage/e.java @@ -38,7 +38,7 @@ public final class e implements View.OnClickListener { if (valueOf != null) { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreInviteSettings.generateInvite$default(StoreStream.Companion.getInviteSettings(), valueOf.longValue(), null, 2, null), overlayMenuView, null, 2, null), OverlayMenuView.class, (Context) null, (Function1) null, new r(overlayMenuView), (Function0) null, (Function0) null, new s(overlayMenuView), 54, (Object) null); } else { - o.g(overlayMenuView.getContext(), 2131890334, 0, null, 12); + o.g(overlayMenuView.getContext(), 2131890364, 0, null, 12); } } else if (i == 1) { OverlayMenuView overlayMenuView2 = (OverlayMenuView) this.j; diff --git a/app/src/main/java/defpackage/h.java b/app/src/main/java/defpackage/h.java index a912afc3ad..17692dc8bd 100644 --- a/app/src/main/java/defpackage/h.java +++ b/app/src/main/java/defpackage/h.java @@ -50,15 +50,15 @@ public final class h implements View.OnClickListener { throw null; } else if (((OverlayMenuView.a) this.j).f2114c.isSuppressed()) { m.checkNotNullExpressionValue(view, "view"); - o.g(view.getContext(), 2131893654, 0, null, 12); + o.g(view.getContext(), 2131893694, 0, null, 12); } else if (((OverlayMenuView.a) this.j).f2114c.isMuted()) { m.checkNotNullExpressionValue(view, "view"); - o.g(view.getContext(), 2131893136, 0, null, 12); + o.g(view.getContext(), 2131893178, 0, null, 12); } else { StoreMediaSettings.SelfMuteFailure selfMuteFailure = StoreStream.Companion.getMediaSettings().toggleSelfMuted(); if (selfMuteFailure != null && selfMuteFailure.ordinal() == 0) { m.checkNotNullExpressionValue(view, "view"); - o.g(view.getContext(), 2131894368, 0, null, 12); + o.g(view.getContext(), 2131894415, 0, null, 12); } } } else { diff --git a/app/src/main/java/defpackage/l.java b/app/src/main/java/defpackage/l.java index ae5f0ef9cf..01ca0875f7 100644 --- a/app/src/main/java/defpackage/l.java +++ b/app/src/main/java/defpackage/l.java @@ -1,6 +1,6 @@ package defpackage; -import c.a.r.i0.c.e; +import c.a.r.j0.c.e; import com.discord.rtcconnection.mediaengine.MediaEngineConnection; import d0.g0.w; import d0.z.d.m; diff --git a/app/src/main/java/e0/a/a/a/a.java b/app/src/main/java/e0/a/a/a/a.java index b558233415..1956282b08 100644 --- a/app/src/main/java/e0/a/a/a/a.java +++ b/app/src/main/java/e0/a/a/a/a.java @@ -97,7 +97,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback { public boolean getFlash() { e eVar = this.i; - return eVar != null && c.q.a.k.a.C(eVar.a) && this.i.a.getParameters().getFlashMode().equals("torch"); + return eVar != null && c.q.a.k.a.D(eVar.a) && this.i.a.getParameters().getFlashMode().equals("torch"); } public int getRotationCount() { @@ -159,7 +159,7 @@ public abstract class a extends FrameLayout implements Camera.PreviewCallback { public void setFlash(boolean z2) { this.n = Boolean.valueOf(z2); e eVar = this.i; - if (eVar != null && c.q.a.k.a.C(eVar.a)) { + if (eVar != null && c.q.a.k.a.D(eVar.a)) { Camera.Parameters parameters = this.i.a.getParameters(); if (z2) { if (!parameters.getFlashMode().equals("torch")) { diff --git a/app/src/main/java/e0/a/a/a/d.java b/app/src/main/java/e0/a/a/a/d.java index d3eaa6347e..dc77e36879 100644 --- a/app/src/main/java/e0/a/a/a/d.java +++ b/app/src/main/java/e0/a/a/a/d.java @@ -67,7 +67,7 @@ public class d extends SurfaceView implements SurfaceHolder.Callback { List supportedPreviewSizes = eVar.a.getParameters().getSupportedPreviewSizes(); int width = getWidth(); int height = getHeight(); - if (c.q.a.k.a.v(getContext()) == 1) { + if (c.q.a.k.a.w(getContext()) == 1) { height = width; width = height; } diff --git a/app/src/main/java/e0/a/a/a/g.java b/app/src/main/java/e0/a/a/a/g.java index 87575d88ea..00d025c054 100644 --- a/app/src/main/java/e0/a/a/a/g.java +++ b/app/src/main/java/e0/a/a/a/g.java @@ -62,11 +62,11 @@ public class g extends View implements f { int i2; int i3; Point point = new Point(getWidth(), getHeight()); - int v = a.v(getContext()); + int w = a.w(getContext()); if (this.u) { - i3 = (int) (((float) (v != 1 ? getHeight() : getWidth())) * 0.625f); + i3 = (int) (((float) (w != 1 ? getHeight() : getWidth())) * 0.625f); i2 = i3; - } else if (v != 1) { + } else if (w != 1) { int height = (int) (((float) getHeight()) * 0.625f); i2 = height; i3 = (int) (((float) height) * 1.4f); diff --git a/app/src/main/java/f0/a.java b/app/src/main/java/f0/a.java index 25fafa88b1..cb640a3e45 100644 --- a/app/src/main/java/f0/a.java +++ b/app/src/main/java/f0/a.java @@ -55,9 +55,9 @@ public final class a { throw new IllegalArgumentException(c.d.b.a.a.u("unexpected scheme: ", str2)); } m.checkParameterIsNotNull(str, "host"); - String b02 = c.q.a.k.a.b0(w.b.d(w.b, str, 0, 0, false, 7)); - if (b02 != null) { - aVar.e = b02; + String c02 = c.q.a.k.a.c0(w.b.d(w.b, str, 0, 0, false, 7)); + if (c02 != null) { + aVar.e = c02; if ((1 > i || 65535 < i) ? false : z2) { aVar.f = i; this.a = aVar.b(); diff --git a/app/src/main/java/f0/f0/f/c.java b/app/src/main/java/f0/f0/f/c.java index 40713db928..1e4d5bbc3b 100644 --- a/app/src/main/java/f0/f0/f/c.java +++ b/app/src/main/java/f0/f0/f/c.java @@ -121,11 +121,11 @@ public final class c { if (d.b.isLoggable(Level.FINE)) { if (z2) { StringBuilder L = c.d.b.a.a.L("run again after "); - L.append(a.n(j2 - c2)); + L.append(a.o(j2 - c2)); str = L.toString(); } else { StringBuilder L2 = c.d.b.a.a.L("scheduled after "); - L2.append(a.n(j2 - c2)); + L2.append(a.o(j2 - c2)); str = L2.toString(); } a.c(aVar, this, str); diff --git a/app/src/main/java/f0/f0/f/d.java b/app/src/main/java/f0/f0/f/d.java index a5d819ab93..33fe97295c 100644 --- a/app/src/main/java/f0/f0/f/d.java +++ b/app/src/main/java/f0/f0/f/d.java @@ -114,14 +114,14 @@ public final class d { if (isLoggable) { long c3 = cVar.e.j.c() - j; StringBuilder L = c.d.b.a.a.L("finished run in "); - L.append(c.q.a.k.a.n(c3)); + L.append(c.q.a.k.a.o(c3)); c.q.a.k.a.c(c2, cVar, L.toString()); } } catch (Throwable th) { if (isLoggable) { long c4 = cVar.e.j.c() - j; StringBuilder L2 = c.d.b.a.a.L("failed a run in "); - L2.append(c.q.a.k.a.n(c4)); + L2.append(c.q.a.k.a.o(c4)); c.q.a.k.a.c(c2, cVar, L2.toString()); } throw th; diff --git a/app/src/main/java/f0/f0/g/j.java b/app/src/main/java/f0/f0/g/j.java index d7430e184e..07a68799f1 100644 --- a/app/src/main/java/f0/f0/g/j.java +++ b/app/src/main/java/f0/f0/g/j.java @@ -284,12 +284,12 @@ public final class j extends e.c implements k { h.a aVar2 = h.f2731c; h.a.e(socket, this.q.f2697c, i); try { - g0.x P = c.q.a.k.a.P(socket); + g0.x Q = c.q.a.k.a.Q(socket); + m.checkParameterIsNotNull(Q, "$this$buffer"); + this.g = new r(Q); + g0.v P = c.q.a.k.a.P(socket); m.checkParameterIsNotNull(P, "$this$buffer"); - this.g = new r(P); - g0.v O = c.q.a.k.a.O(socket); - m.checkParameterIsNotNull(O, "$this$buffer"); - this.h = new q(O); + this.h = new q(P); } catch (NullPointerException e) { if (m.areEqual(e.getMessage(), "throw with null exception")) { throw new IOException(e); @@ -517,12 +517,12 @@ public final class j extends e.c implements k { str = null; } this.f2709c = sSLSocket; - g0.x P = c.q.a.k.a.P(sSLSocket); + g0.x Q = c.q.a.k.a.Q(sSLSocket); + m.checkParameterIsNotNull(Q, "$this$buffer"); + this.g = new r(Q); + g0.v P = c.q.a.k.a.P(sSLSocket); m.checkParameterIsNotNull(P, "$this$buffer"); - this.g = new r(P); - g0.v O = c.q.a.k.a.O(sSLSocket); - m.checkParameterIsNotNull(O, "$this$buffer"); - this.h = new q(O); + this.h = new q(P); if (str != null) { yVar = y.p.a(str); } diff --git a/app/src/main/java/f0/f0/h/e.java b/app/src/main/java/f0/f0/h/e.java index aaa3d45988..c4d6b24b74 100644 --- a/app/src/main/java/f0/f0/h/e.java +++ b/app/src/main/java/f0/f0/h/e.java @@ -286,9 +286,9 @@ public final class e { i3 = length; if (t.equals(B3, "domain", true)) { if (!t.endsWith$default(B4, ".", false, 2, null)) { - String b02 = c.q.a.k.a.b0(d0.g0.w.removePrefix(B4, ".")); - if (b02 != null) { - str5 = b02; + String c02 = c.q.a.k.a.c0(d0.g0.w.removePrefix(B4, ".")); + if (c02 != null) { + str5 = c02; z5 = false; } else { throw new IllegalArgumentException(); diff --git a/app/src/main/java/f0/f0/m/d.java b/app/src/main/java/f0/f0/m/d.java index eb6299bcdc..65c7e99046 100644 --- a/app/src/main/java/f0/f0/m/d.java +++ b/app/src/main/java/f0/f0/m/d.java @@ -55,11 +55,11 @@ public final class d implements HostnameVerifier { byte[] bArr = c.a; m.checkParameterIsNotNull(str, "$this$canParseAsIpAddress"); if (c.f.matches(str)) { - String b02 = a.b0(str); + String c02 = a.c0(str); List a2 = a(x509Certificate, 7); if (!(a2 instanceof Collection) || !a2.isEmpty()) { for (String str2 : a2) { - if (m.areEqual(b02, a.b0(str2))) { + if (m.areEqual(c02, a.c0(str2))) { return true; } } diff --git a/app/src/main/java/f0/g0/a.java b/app/src/main/java/f0/g0/a.java index d795fbf469..c236152f60 100644 --- a/app/src/main/java/f0/g0/a.java +++ b/app/src/main/java/f0/g0/a.java @@ -156,7 +156,7 @@ public final class a implements Interceptor { m.checkExpressionValueIsNotNull(charset2, "UTF_8"); } this.d.log(""); - if (c.q.a.k.a.D(eVar)) { + if (c.q.a.k.a.E(eVar)) { this.d.log(eVar.L(charset2)); b bVar6 = this.d; StringBuilder L8 = c.d.b.a.a.L("--> END "); @@ -237,7 +237,7 @@ public final class a implements Interceptor { charset = StandardCharsets.UTF_8; m.checkExpressionValueIsNotNull(charset, "UTF_8"); } - if (!c.q.a.k.a.D(g)) { + if (!c.q.a.k.a.E(g)) { this.d.log(""); b bVar9 = this.d; StringBuilder L11 = c.d.b.a.a.L("<-- END HTTP (binary "); diff --git a/app/src/main/java/f0/w.java b/app/src/main/java/f0/w.java index e72057911e..5d793284f0 100644 --- a/app/src/main/java/f0/w.java +++ b/app/src/main/java/f0/w.java @@ -334,7 +334,7 @@ public final class w { char c10 = '\"'; if (i24 < g) { b bVar2 = w.b; - this.e = c.q.a.k.a.b0(b.d(bVar2, str, i22, i14, false, 4)); + this.e = c.q.a.k.a.c0(b.d(bVar2, str, i22, i14, false, 4)); i15 = i22; try { i17 = Integer.parseInt(b.a(bVar2, str, i24, g, "", false, false, false, false, null, 248)); @@ -363,7 +363,7 @@ public final class w { } else { i15 = i22; b bVar3 = w.b; - this.e = c.q.a.k.a.b0(b.d(bVar3, str, i15, i14, false, 4)); + this.e = c.q.a.k.a.c0(b.d(bVar3, str, i15, i14, false, 4)); String str10 = this.b; if (str10 == null) { m.throwNpe(); diff --git a/app/src/main/java/g0/c.java b/app/src/main/java/g0/c.java index 06413da51d..e1b5085dad 100644 --- a/app/src/main/java/g0/c.java +++ b/app/src/main/java/g0/c.java @@ -67,7 +67,7 @@ public final class c implements v { @Override // g0.v public void write(e eVar, long j) { m.checkParameterIsNotNull(eVar, "source"); - c.q.a.k.a.k(eVar.j, 0, j); + c.q.a.k.a.l(eVar.j, 0, j); while (true) { long j2 = 0; if (j > 0) { diff --git a/app/src/main/java/g0/e.java b/app/src/main/java/g0/e.java index 1176aa461f..2f87545dc6 100644 --- a/app/src/main/java/g0/e.java +++ b/app/src/main/java/g0/e.java @@ -390,7 +390,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { StringBuilder M = c.d.b.a.a.M("size < ", i2, ": "); M.append(this.j); M.append(" (to read code point prefixed 0x"); - M.append(c.q.a.k.a.d0(r)); + M.append(c.q.a.k.a.e0(r)); M.append(')'); throw new EOFException(M.toString()); } @@ -413,7 +413,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { if (i == 0) { return ByteString.i; } - c.q.a.k.a.k(this.j, 0, (long) i); + c.q.a.k.a.l(this.j, 0, (long) i); s sVar = this.i; int i2 = 0; int i3 = 0; @@ -510,7 +510,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { public e S(byte[] bArr, int i, int i2) { m.checkParameterIsNotNull(bArr, "source"); long j = (long) i2; - c.q.a.k.a.k((long) bArr.length, (long) i, j); + c.q.a.k.a.l((long) bArr.length, (long) i, j); int i3 = i2 + i; while (i < i3) { s N = N(1); @@ -1002,7 +1002,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { public final e p(e eVar, long j, long j2) { m.checkParameterIsNotNull(eVar, "out"); - c.q.a.k.a.k(this.j, j, j2); + c.q.a.k.a.l(this.j, j, j2); if (j2 != 0) { eVar.j += j2; s sVar = this.i; @@ -1050,7 +1050,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { } public final byte r(long j) { - c.q.a.k.a.k(this.j, j, 1); + c.q.a.k.a.l(this.j, j, 1); s sVar = this.i; if (sVar != null) { long j2 = this.j; @@ -1141,7 +1141,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { } } else { StringBuilder L2 = c.d.b.a.a.L("Expected leading [0-9a-fA-F] character but was 0x"); - L2.append(c.q.a.k.a.d0(b2)); + L2.append(c.q.a.k.a.e0(b2)); throw new NumberFormatException(L2.toString()); } } while (this.i != null); @@ -1172,7 +1172,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { public int read(byte[] bArr, int i, int i2) { m.checkParameterIsNotNull(bArr, "sink"); - c.q.a.k.a.k((long) bArr.length, (long) i, (long) i2); + c.q.a.k.a.l((long) bArr.length, (long) i, (long) i2); s sVar = this.i; if (sVar == null) { return -1; @@ -1633,7 +1633,7 @@ public final class e implements g, BufferedSink, Cloneable, ByteChannel { s sVar2; m.checkParameterIsNotNull(eVar, "source"); if (eVar != this) { - c.q.a.k.a.k(eVar.j, 0, j); + c.q.a.k.a.l(eVar.j, 0, j); long j2 = j; while (j2 > 0) { s sVar3 = eVar.i; diff --git a/app/src/main/java/g0/h.java b/app/src/main/java/g0/h.java index 055881553c..9dd52a0814 100644 --- a/app/src/main/java/g0/h.java +++ b/app/src/main/java/g0/h.java @@ -108,7 +108,7 @@ public final class h implements v { @Override // g0.v public void write(e eVar, long j) throws IOException { m.checkParameterIsNotNull(eVar, "source"); - c.q.a.k.a.k(eVar.j, 0, j); + c.q.a.k.a.l(eVar.j, 0, j); while (j > 0) { s sVar = eVar.i; if (sVar == null) { diff --git a/app/src/main/java/g0/n.java b/app/src/main/java/g0/n.java index acab2d9cee..ad6869812c 100644 --- a/app/src/main/java/g0/n.java +++ b/app/src/main/java/g0/n.java @@ -46,7 +46,7 @@ public final class n implements x { return -1; } } catch (AssertionError e) { - if (a.A(e)) { + if (a.B(e)) { throw new IOException(e); } throw e; diff --git a/app/src/main/java/g0/p.java b/app/src/main/java/g0/p.java index 6c24212f7e..6aefa03618 100644 --- a/app/src/main/java/g0/p.java +++ b/app/src/main/java/g0/p.java @@ -41,7 +41,7 @@ public final class p implements v { @Override // g0.v public void write(e eVar, long j) { m.checkParameterIsNotNull(eVar, "source"); - c.q.a.k.a.k(eVar.j, 0, j); + c.q.a.k.a.l(eVar.j, 0, j); while (j > 0) { this.j.f(); s sVar = eVar.i; diff --git a/app/src/main/java/g0/r.java b/app/src/main/java/g0/r.java index a45f647d88..5fa62a42f4 100644 --- a/app/src/main/java/g0/r.java +++ b/app/src/main/java/g0/r.java @@ -52,7 +52,7 @@ public final class r implements g { public int read(byte[] bArr, int i, int i2) { m.checkParameterIsNotNull(bArr, "data"); if (!this.i.j) { - c.q.a.k.a.k((long) bArr.length, (long) i, (long) i2); + c.q.a.k.a.l((long) bArr.length, (long) i, (long) i2); r rVar = this.i; e eVar = rVar.i; if (eVar.j == 0 && rVar.k.h0(eVar, (long) 8192) == -1) { diff --git a/app/src/main/java/g0/u.java b/app/src/main/java/g0/u.java index 41e3fd6f92..607821b086 100644 --- a/app/src/main/java/g0/u.java +++ b/app/src/main/java/g0/u.java @@ -108,12 +108,12 @@ public final class u extends ByteString { @Override // okio.ByteString public byte m(int i) { - a.k((long) this.n[this.m.length - 1], (long) i, 1); - int N = a.N(this, i); - int i2 = N == 0 ? 0 : this.n[N - 1]; + a.l((long) this.n[this.m.length - 1], (long) i, 1); + int O = a.O(this, i); + int i2 = O == 0 ? 0 : this.n[O - 1]; int[] iArr = this.n; byte[][] bArr = this.m; - return bArr[N][(i - i2) + iArr[bArr.length + N]]; + return bArr[O][(i - i2) + iArr[bArr.length + O]]; } @Override // okio.ByteString @@ -123,18 +123,18 @@ public final class u extends ByteString { return false; } int i4 = i3 + i; - int N = a.N(this, i); + int O = a.O(this, i); while (i < i4) { - int i5 = N == 0 ? 0 : this.n[N - 1]; + int i5 = O == 0 ? 0 : this.n[O - 1]; int[] iArr = this.n; - int i6 = iArr[this.m.length + N]; - int min = Math.min(i4, (iArr[N] - i5) + i5) - i; - if (!byteString.o(i2, this.m[N], (i - i5) + i6, min)) { + int i6 = iArr[this.m.length + O]; + int min = Math.min(i4, (iArr[O] - i5) + i5) - i; + if (!byteString.o(i2, this.m[O], (i - i5) + i6, min)) { return false; } i2 += min; i += min; - N++; + O++; } return true; } @@ -146,18 +146,18 @@ public final class u extends ByteString { return false; } int i4 = i3 + i; - int N = a.N(this, i); + int O = a.O(this, i); while (i < i4) { - int i5 = N == 0 ? 0 : this.n[N - 1]; + int i5 = O == 0 ? 0 : this.n[O - 1]; int[] iArr = this.n; - int i6 = iArr[this.m.length + N]; - int min = Math.min(i4, (iArr[N] - i5) + i5) - i; - if (!a.e(this.m[N], (i - i5) + i6, bArr, i2, min)) { + int i6 = iArr[this.m.length + O]; + int min = Math.min(i4, (iArr[O] - i5) + i5) - i; + if (!a.e(this.m[O], (i - i5) + i6, bArr, i2, min)) { return false; } i2 += min; i += min; - N++; + O++; } return true; } @@ -187,14 +187,14 @@ public final class u extends ByteString { public void s(e eVar, int i, int i2) { m.checkParameterIsNotNull(eVar, "buffer"); int i3 = i2 + i; - int N = a.N(this, i); + int O = a.O(this, i); while (i < i3) { - int i4 = N == 0 ? 0 : this.n[N - 1]; + int i4 = O == 0 ? 0 : this.n[O - 1]; int[] iArr = this.n; - int i5 = iArr[this.m.length + N]; - int min = Math.min(i3, (iArr[N] - i4) + i4) - i; + int i5 = iArr[this.m.length + O]; + int min = Math.min(i3, (iArr[O] - i4) + i4) - i; int i6 = (i - i4) + i5; - s sVar = new s(this.m[N], i6, i6 + min, true, false); + s sVar = new s(this.m[O], i6, i6 + min, true, false); s sVar2 = eVar.i; if (sVar2 == null) { sVar.g = sVar; @@ -208,7 +208,7 @@ public final class u extends ByteString { sVar3.b(sVar); } i += min; - N++; + O++; } eVar.j += (long) j(); } diff --git a/app/src/main/java/g0/w.java b/app/src/main/java/g0/w.java index 95d05f6a8b..02817ddf5d 100644 --- a/app/src/main/java/g0/w.java +++ b/app/src/main/java/g0/w.java @@ -37,7 +37,7 @@ public final class w extends b { L.append(this.m); logger.log(level, L.toString(), (Throwable) e); } catch (AssertionError e2) { - if (c.q.a.k.a.A(e2)) { + if (c.q.a.k.a.B(e2)) { Logger logger2 = this.l; Level level2 = Level.WARNING; StringBuilder L2 = a.L("Failed to close timed out socket "); diff --git a/app/src/main/java/h0/a/a/d.java b/app/src/main/java/h0/a/a/d.java index 7907d9e9a6..a64236895c 100644 --- a/app/src/main/java/h0/a/a/d.java +++ b/app/src/main/java/h0/a/a/d.java @@ -2745,7 +2745,7 @@ public class d { r rVar = (r) qVar; Objects.requireNonNull(rVar); c cVar = new c(); - c.q.a.k.a.J(l & -256, cVar); + c.q.a.k.a.K(l & -256, cVar); x.a(xVar, cVar); cVar.j(rVar.d.l(t)); cVar.j(0); diff --git a/app/src/main/java/h0/a/a/f.java b/app/src/main/java/h0/a/a/f.java index db8092a991..e153998e8d 100644 --- a/app/src/main/java/h0/a/a/f.java +++ b/app/src/main/java/h0/a/a/f.java @@ -1948,7 +1948,7 @@ public class f extends e { public final a f(int i, x xVar, String str, boolean z2) { c cVar = new c(); - c.q.a.k.a.J(i, cVar); + c.q.a.k.a.K(i, cVar); x.a(xVar, cVar); cVar.j(this.b.l(str)); cVar.j(0); diff --git a/app/src/main/java/h0/a/a/l.java b/app/src/main/java/h0/a/a/l.java index 78d7fa2a69..c23075a764 100644 --- a/app/src/main/java/h0/a/a/l.java +++ b/app/src/main/java/h0/a/a/l.java @@ -47,7 +47,7 @@ public final class l extends k { public a b(int i, x xVar, String str, boolean z2) { c cVar = new c(); - a.J(i, cVar); + a.K(i, cVar); x.a(xVar, cVar); cVar.j(this.b.l(str)); cVar.j(0); diff --git a/app/src/main/java/h0/a/a/r.java b/app/src/main/java/h0/a/a/r.java index 20e29353ee..24e5ef4189 100644 --- a/app/src/main/java/h0/a/a/r.java +++ b/app/src/main/java/h0/a/a/r.java @@ -420,7 +420,7 @@ public final class r extends q { @Override // h0.a.a.q public a f(int i, x xVar, String str, boolean z2) { c cVar = new c(); - a.J((i & -16776961) | (this.Z << 8), cVar); + a.K((i & -16776961) | (this.Z << 8), cVar); x.a(xVar, cVar); cVar.j(this.d.l(str)); cVar.j(0); @@ -899,7 +899,7 @@ public final class r extends q { @Override // h0.a.a.q public a r(int i, x xVar, String str, boolean z2) { c cVar = new c(); - a.J(i, cVar); + a.K(i, cVar); x.a(xVar, cVar); cVar.j(this.d.l(str)); cVar.j(0); diff --git a/app/src/main/java/i0/e0/a/a.java b/app/src/main/java/i0/e0/a/a.java index 21b47e13b9..e1e992e73c 100644 --- a/app/src/main/java/i0/e0/a/a.java +++ b/app/src/main/java/i0/e0/a/a.java @@ -56,7 +56,7 @@ public final class a implements Observable.a { } catch (OnCompletedFailedException | OnErrorFailedException | OnErrorNotImplementedException unused) { Objects.requireNonNull(o.a.b()); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); new CompositeException(httpException, th); Objects.requireNonNull(o.a.b()); } diff --git a/app/src/main/java/i0/e0/a/b.java b/app/src/main/java/i0/e0/a/b.java index 8f8eb2e802..6735326574 100644 --- a/app/src/main/java/i0/e0/a/b.java +++ b/app/src/main/java/i0/e0/a/b.java @@ -38,19 +38,19 @@ public final class b extends AtomicInteger implements Subscription, Producer } catch (OnCompletedFailedException | OnErrorFailedException | OnErrorNotImplementedException unused) { Objects.requireNonNull(o.a.b()); } catch (Throwable th) { - a.Z(th); + a.a0(th); Objects.requireNonNull(o.a.b()); } } catch (OnCompletedFailedException | OnErrorFailedException | OnErrorNotImplementedException unused2) { Objects.requireNonNull(o.a.b()); } catch (Throwable th2) { - a.Z(th2); + a.a0(th2); try { this.subscriber.onError(th2); } catch (OnCompletedFailedException | OnErrorFailedException | OnErrorNotImplementedException unused3) { Objects.requireNonNull(o.a.b()); } catch (Throwable th3) { - a.Z(th3); + a.a0(th3); new CompositeException(th2, th3); Objects.requireNonNull(o.a.b()); } @@ -65,7 +65,7 @@ public final class b extends AtomicInteger implements Subscription, Producer } catch (OnCompletedFailedException | OnErrorFailedException | OnErrorNotImplementedException unused) { Objects.requireNonNull(o.a.b()); } catch (Throwable th2) { - a.Z(th2); + a.a0(th2); new CompositeException(th, th2); Objects.requireNonNull(o.a.b()); } diff --git a/app/src/main/java/i0/e0/a/c.java b/app/src/main/java/i0/e0/a/c.java index f35e6e33ef..c8a9308da2 100644 --- a/app/src/main/java/i0/e0/a/c.java +++ b/app/src/main/java/i0/e0/a/c.java @@ -23,7 +23,7 @@ public final class c implements Observable.a> { try { bVar.c(K.execute()); } catch (Throwable th) { - a.Z(th); + a.a0(th); bVar.b(th); } } diff --git a/app/src/main/java/i0/e0/a/e.java b/app/src/main/java/i0/e0/a/e.java index 6e5343a0a5..45a175f61f 100644 --- a/app/src/main/java/i0/e0/a/e.java +++ b/app/src/main/java/i0/e0/a/e.java @@ -40,7 +40,7 @@ public final class e implements Observable.a> { } catch (OnCompletedFailedException | OnErrorFailedException | OnErrorNotImplementedException unused) { Objects.requireNonNull(o.a.b()); } catch (Throwable th3) { - c.q.a.k.a.Z(th3); + c.q.a.k.a.a0(th3); new CompositeException(th2, th3); Objects.requireNonNull(o.a.b()); } diff --git a/app/src/main/java/i0/j.java b/app/src/main/java/i0/j.java index 07c121e072..f81db60859 100644 --- a/app/src/main/java/i0/j.java +++ b/app/src/main/java/i0/j.java @@ -4,6 +4,7 @@ import d0.w.h.a.g; import f0.e; import kotlin.coroutines.Continuation; import okhttp3.ResponseBody; +import s.a.k; /* compiled from: HttpServiceMethod */ public abstract class j extends a0 { public final w a; @@ -41,16 +42,16 @@ public abstract class j extends a0 { d b = this.d.b(dVar); Continuation continuation = (Continuation) objArr[objArr.length - 1]; try { - s.a.j jVar = new s.a.j(d0.w.g.b.intercepted(continuation), 1); - jVar.e(new l(b)); - b.B(new m(jVar)); - Object u = jVar.u(); + k kVar = new k(d0.w.g.b.intercepted(continuation), 1); + kVar.e(new l(b)); + b.B(new m(kVar)); + Object u = kVar.u(); if (u == d0.w.g.c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } return u; } catch (Exception e) { - return c.q.a.k.a.T(e, continuation); + return c.q.a.k.a.U(e, continuation); } } } @@ -69,16 +70,16 @@ public abstract class j extends a0 { d b = this.d.b(dVar); Continuation continuation = (Continuation) objArr[objArr.length - 1]; try { - s.a.j jVar = new s.a.j(d0.w.g.b.intercepted(continuation), 1); - jVar.e(new n(b)); - b.B(new o(jVar)); - Object u = jVar.u(); + k kVar = new k(d0.w.g.b.intercepted(continuation), 1); + kVar.e(new n(b)); + b.B(new o(kVar)); + Object u = kVar.u(); if (u == d0.w.g.c.getCOROUTINE_SUSPENDED()) { g.probeCoroutineSuspended(continuation); } return u; } catch (Exception e) { - return c.q.a.k.a.T(e, continuation); + return c.q.a.k.a.U(e, continuation); } } } diff --git a/app/src/main/java/j0/l/a/a1.java b/app/src/main/java/j0/l/a/a1.java index 9395c18bd5..a495121573 100644 --- a/app/src/main/java/j0/l/a/a1.java +++ b/app/src/main/java/j0/l/a/a1.java @@ -77,7 +77,7 @@ public class a1 implements Observable.b { try { action0.call(); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); c cVar = this.m; if (!cVar.terminated) { cVar.exception = th; diff --git a/app/src/main/java/j0/l/a/e1.java b/app/src/main/java/j0/l/a/e1.java index 9cd0ab8273..803c2695bb 100644 --- a/app/src/main/java/j0/l/a/e1.java +++ b/app/src/main/java/j0/l/a/e1.java @@ -58,7 +58,7 @@ public class e1 extends Subscriber { @Override // j0.g public void onError(Throwable th) { if (this.i) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); l.b(th); return; } @@ -74,7 +74,7 @@ public class e1 extends Subscriber { ((Observable) this.n.i.call(th)).j0(aVar); } catch (Throwable th2) { Subscriber subscriber = this.k; - c.q.a.k.a.Z(th2); + c.q.a.k.a.a0(th2); subscriber.onError(th2); } } diff --git a/app/src/main/java/j0/l/a/f.java b/app/src/main/java/j0/l/a/f.java index 85450462bf..c0981f0f5d 100644 --- a/app/src/main/java/j0/l/a/f.java +++ b/app/src/main/java/j0/l/a/f.java @@ -237,7 +237,7 @@ public final class f implements Observable.a { } } if (!(j == 0 || j2 == Long.MAX_VALUE)) { - c.q.a.k.a.H(atomicLong, j); + c.q.a.k.a.I(atomicLong, j); } i2 = addAndGet(-i2); if (i2 == 0) { @@ -258,7 +258,7 @@ public final class f implements Observable.a { if (i2 < 0) { throw new IllegalArgumentException(c.d.b.a.a.q("n >= required but it was ", j)); } else if (i2 != 0) { - c.q.a.k.a.o(this.requested, j); + c.q.a.k.a.p(this.requested, j); d(); } } diff --git a/app/src/main/java/j0/l/a/h.java b/app/src/main/java/j0/l/a/h.java index 1f968fb22a..2ad8962611 100644 --- a/app/src/main/java/j0/l/a/h.java +++ b/app/src/main/java/j0/l/a/h.java @@ -163,7 +163,7 @@ public final class h implements Observable.a { request(1); } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); b(th); return; } diff --git a/app/src/main/java/j0/l/a/h0.java b/app/src/main/java/j0/l/a/h0.java index 5fcda5a5f9..2a86d8a395 100644 --- a/app/src/main/java/j0/l/a/h0.java +++ b/app/src/main/java/j0/l/a/h0.java @@ -18,7 +18,7 @@ public class h0 implements Action0 { this.i.onCompleted(); } catch (Throwable th) { Subscriber subscriber = this.i; - a.Z(th); + a.a0(th); subscriber.onError(th); } } diff --git a/app/src/main/java/j0/l/a/h1.java b/app/src/main/java/j0/l/a/h1.java index 0bca6a6f60..8a7b691fd1 100644 --- a/app/src/main/java/j0/l/a/h1.java +++ b/app/src/main/java/j0/l/a/h1.java @@ -241,7 +241,7 @@ public final class h1 extends c { aVar2.a(1); } catch (Throwable th2) { aVar2.unsubscribe(); - c.q.a.k.a.a0(th2, aVar2.child, b); + c.q.a.k.a.b0(th2, aVar2.child, b); } } } diff --git a/app/src/main/java/j0/l/a/h2.java b/app/src/main/java/j0/l/a/h2.java index 28c267d90e..b23156f926 100644 --- a/app/src/main/java/j0/l/a/h2.java +++ b/app/src/main/java/j0/l/a/h2.java @@ -41,7 +41,7 @@ public final class h2 implements Observable.b { } } catch (Throwable th) { this.j = true; - c.q.a.k.a.a0(th, this.i, t); + c.q.a.k.a.b0(th, this.i, t); unsubscribe(); } } diff --git a/app/src/main/java/j0/l/a/i.java b/app/src/main/java/j0/l/a/i.java index cabce29342..45fc445aff 100644 --- a/app/src/main/java/j0/l/a/i.java +++ b/app/src/main/java/j0/l/a/i.java @@ -44,8 +44,8 @@ public final class i implements Observable.a { @Override // rx.Producer public final void j(long j) { - if (c.q.a.k.a.g0(j)) { - c.q.a.k.a.o(this, j); + if (c.q.a.k.a.h0(j)) { + c.q.a.k.a.p(this, j); a(); } } @@ -161,7 +161,7 @@ public final class i implements Observable.a { } } if (j2 != 0) { - c.q.a.k.a.H(this, j2); + c.q.a.k.a.I(this, j2); } i2 = this.wip.addAndGet(-i2); } while (i2 != 0); @@ -329,7 +329,7 @@ public final class i implements Observable.a { } } if (j2 != 0) { - c.q.a.k.a.H(this, j2); + c.q.a.k.a.I(this, j2); } i2 = this.wip.addAndGet(-i2); } while (i2 != 0); @@ -375,7 +375,7 @@ public final class i implements Observable.a { if (!this.actual.isUnsubscribed()) { if (get() != 0) { this.actual.onNext(t); - c.q.a.k.a.H(this, 1); + c.q.a.k.a.I(this, 1); return; } c(); diff --git a/app/src/main/java/j0/l/a/j.java b/app/src/main/java/j0/l/a/j.java index 67ef6769c2..43b6e0d0f2 100644 --- a/app/src/main/java/j0/l/a/j.java +++ b/app/src/main/java/j0/l/a/j.java @@ -19,7 +19,7 @@ public final class j implements Observable.a { try { ((Observable) this.i.call()).j0(new e(subscriber, subscriber)); } catch (Throwable th) { - a.Z(th); + a.a0(th); subscriber.onError(th); } } diff --git a/app/src/main/java/j0/l/a/j0.java b/app/src/main/java/j0/l/a/j0.java index 6811b4df11..7881d09352 100644 --- a/app/src/main/java/j0/l/a/j0.java +++ b/app/src/main/java/j0/l/a/j0.java @@ -24,7 +24,7 @@ public class j0 implements Action0 { subscriber.onNext(Long.valueOf(j)); } catch (Throwable th) { Subscriber subscriber2 = this.j; - a.Z(th); + a.a0(th); subscriber2.onError(th); throw th; } diff --git a/app/src/main/java/j0/l/a/j1.java b/app/src/main/java/j0/l/a/j1.java index 1bbd8a715e..d1dc077e32 100644 --- a/app/src/main/java/j0/l/a/j1.java +++ b/app/src/main/java/j0/l/a/j1.java @@ -105,7 +105,7 @@ public final class j1 extends j0.m.c implements Subscription { } } catch (Throwable th) { cVar.index = null; - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); cVar.unsubscribe(); if (!(obj instanceof e.c) && !e.c(obj)) { subscriber.onError(OnErrorThrowable.a(th, e.b(obj))); @@ -570,7 +570,7 @@ public final class j1 extends j0.m.c implements Subscription { return; } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); cVar.unsubscribe(); if (!(obj instanceof e.c) && !e.c(obj)) { subscriber.onError(OnErrorThrowable.a(th, e.b(obj))); diff --git a/app/src/main/java/j0/l/a/j2.java b/app/src/main/java/j0/l/a/j2.java index dc762f1015..cd3bee9b70 100644 --- a/app/src/main/java/j0/l/a/j2.java +++ b/app/src/main/java/j0/l/a/j2.java @@ -46,7 +46,7 @@ public class j2 extends Subscriber { unsubscribe(); } catch (Throwable th) { this.j = true; - a.a0(th, this.k, t); + a.b0(th, this.k, t); unsubscribe(); } } diff --git a/app/src/main/java/j0/l/a/k.java b/app/src/main/java/j0/l/a/k.java index d6eede7480..dd6b2a386b 100644 --- a/app/src/main/java/j0/l/a/k.java +++ b/app/src/main/java/j0/l/a/k.java @@ -31,7 +31,7 @@ public class k implements Observable.a { this.k = true; this.i.onCompleted(); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); onError(th); } } @@ -48,7 +48,7 @@ public class k implements Observable.a { this.j.onError(th); this.i.onError(th); } catch (Throwable th2) { - c.q.a.k.a.Z(th2); + c.q.a.k.a.a0(th2); this.i.onError(new CompositeException(Arrays.asList(th, th2))); } } @@ -60,7 +60,7 @@ public class k implements Observable.a { this.j.onNext(t); this.i.onNext(t); } catch (Throwable th) { - c.q.a.k.a.a0(th, this, t); + c.q.a.k.a.b0(th, this, t); } } } diff --git a/app/src/main/java/j0/l/a/l.java b/app/src/main/java/j0/l/a/l.java index ad13e36766..869750e377 100644 --- a/app/src/main/java/j0/l/a/l.java +++ b/app/src/main/java/j0/l/a/l.java @@ -48,7 +48,7 @@ public final class l implements Observable.a { request(1); } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); unsubscribe(); onError(OnErrorThrowable.a(th, t)); } diff --git a/app/src/main/java/j0/l/a/l0.java b/app/src/main/java/j0/l/a/l0.java index bad6056e6f..77b46b4321 100644 --- a/app/src/main/java/j0/l/a/l0.java +++ b/app/src/main/java/j0/l/a/l0.java @@ -37,7 +37,7 @@ public final class l0 implements Observable.a>, Func0 implements Observable.a>, Func0 0 ? 1 : (j == 0 ? 0 : -1)); if (i > 0) { - a.o(aVar.n, j); + a.p(aVar.n, j); aVar.b(); } else if (i < 0) { throw new IllegalStateException(c.d.b.a.a.q("n >= 0 required but it was ", j)); diff --git a/app/src/main/java/j0/l/a/m0.java b/app/src/main/java/j0/l/a/m0.java index 29b677b561..cd62aa4e9d 100644 --- a/app/src/main/java/j0/l/a/m0.java +++ b/app/src/main/java/j0/l/a/m0.java @@ -23,7 +23,7 @@ public class m0 implements Action0 { try { aVar.i.onNext(collection); } catch (Throwable th) { - a.Z(th); + a.a0(th); aVar.onError(th); } } diff --git a/app/src/main/java/j0/l/a/m2.java b/app/src/main/java/j0/l/a/m2.java index 482fa17dda..28c56b1b05 100644 --- a/app/src/main/java/j0/l/a/m2.java +++ b/app/src/main/java/j0/l/a/m2.java @@ -27,7 +27,7 @@ public class m2 extends Subscriber { this.j = null; this.k.b(arrayList); } catch (Throwable th) { - a.Z(th); + a.a0(th); onError(th); } } diff --git a/app/src/main/java/j0/l/a/n.java b/app/src/main/java/j0/l/a/n.java index b8843e3fa1..78791cc826 100644 --- a/app/src/main/java/j0/l/a/n.java +++ b/app/src/main/java/j0/l/a/n.java @@ -132,7 +132,7 @@ public final class n implements Observable.a { break; } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); this.r = null; onError(th); } @@ -140,7 +140,7 @@ public final class n implements Observable.a { return; } } catch (Throwable th2) { - c.q.a.k.a.Z(th2); + c.q.a.k.a.a0(th2); this.r = null; onError(th2); } @@ -158,7 +158,7 @@ public final class n implements Observable.a { } } if (j2 != 0) { - c.q.a.k.a.H(this.n, j2); + c.q.a.k.a.I(this.n, j2); } if (it != null) { i2 = i; @@ -170,7 +170,7 @@ public final class n implements Observable.a { } } } catch (Throwable th3) { - c.q.a.k.a.Z(th3); + c.q.a.k.a.a0(th3); onError(th3); } } @@ -249,7 +249,7 @@ public final class n implements Observable.a { subscriber.setProducer(new q.a(subscriber, it)); } } catch (Throwable th) { - c.q.a.k.a.a0(th, subscriber, this.i); + c.q.a.k.a.b0(th, subscriber, this.i); } } } diff --git a/app/src/main/java/j0/l/a/n0.java b/app/src/main/java/j0/l/a/n0.java index 9c2d971936..ed1fbd6a25 100644 --- a/app/src/main/java/j0/l/a/n0.java +++ b/app/src/main/java/j0/l/a/n0.java @@ -46,7 +46,7 @@ public final class n0 implements Observable.b, T> { } } catch (Throwable th) { Subscriber> subscriber = this.i; - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); subscriber.onError(th); } } @@ -128,7 +128,7 @@ public final class n0 implements Observable.b, T> { try { bVar.i.onNext(list); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); bVar.onError(th); } } @@ -173,7 +173,7 @@ public final class n0 implements Observable.b, T> { unsubscribe(); } catch (Throwable th) { Subscriber> subscriber = this.i; - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); subscriber.onError(th); } } diff --git a/app/src/main/java/j0/l/a/n1.java b/app/src/main/java/j0/l/a/n1.java index ee81ef952a..542e5370cf 100644 --- a/app/src/main/java/j0/l/a/n1.java +++ b/app/src/main/java/j0/l/a/n1.java @@ -31,7 +31,7 @@ public final class n1 implements Observable.b { try { this.j.onNext(andSet); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); onError(th); } } diff --git a/app/src/main/java/j0/l/a/o.java b/app/src/main/java/j0/l/a/o.java index 36ebf87442..5f67a0cfec 100644 --- a/app/src/main/java/j0/l/a/o.java +++ b/app/src/main/java/j0/l/a/o.java @@ -26,7 +26,7 @@ public final class o implements Observable.a { if (i < 0) { throw new IllegalArgumentException(c.d.b.a.a.q("n >= 0 required but it was ", j)); } else if (j == Long.MAX_VALUE) { - if (c.q.a.k.a.o(this, j) == 0) { + if (c.q.a.k.a.p(this, j) == 0) { Subscriber subscriber = this.child; T[] tArr = this.array; for (T t : tArr) { @@ -40,7 +40,7 @@ public final class o implements Observable.a { subscriber.onCompleted(); } } - } else if (i != 0 && c.q.a.k.a.o(this, j) == 0) { + } else if (i != 0 && c.q.a.k.a.p(this, j) == 0) { Subscriber subscriber2 = this.child; T[] tArr2 = this.array; int length = tArr2.length; diff --git a/app/src/main/java/j0/l/a/o1.java b/app/src/main/java/j0/l/a/o1.java index 394c7c8860..78eb0288ec 100644 --- a/app/src/main/java/j0/l/a/o1.java +++ b/app/src/main/java/j0/l/a/o1.java @@ -97,7 +97,7 @@ public final class o1 implements Observable.b { subscriber.onNext(obj); j2++; } catch (Throwable th) { - c.q.a.k.a.a0(th, subscriber, obj); + c.q.a.k.a.b0(th, subscriber, obj); return; } } else { @@ -105,7 +105,7 @@ public final class o1 implements Observable.b { } } if (!(j2 == 0 || j == Long.MAX_VALUE)) { - j = c.q.a.k.a.H(atomicLong, j2); + j = c.q.a.k.a.I(atomicLong, j2); } synchronized (this) { if (!this.l) { @@ -123,7 +123,7 @@ public final class o1 implements Observable.b { if (i < 0) { throw new IllegalArgumentException(c.d.b.a.a.q("n >= required but it was ", j)); } else if (i != 0) { - c.q.a.k.a.o(this.n, j); + c.q.a.k.a.p(this.n, j); Producer producer = this.o; if (producer == null) { synchronized (this.n) { diff --git a/app/src/main/java/j0/l/a/p.java b/app/src/main/java/j0/l/a/p.java index 865b69968e..7c7029eb49 100644 --- a/app/src/main/java/j0/l/a/p.java +++ b/app/src/main/java/j0/l/a/p.java @@ -23,7 +23,7 @@ public final class p implements Observable.a { try { bVar.b(this.i.call()); } catch (Throwable th) { - a.Z(th); + a.a0(th); subscriber.onError(th); } } diff --git a/app/src/main/java/j0/l/a/p0.java b/app/src/main/java/j0/l/a/p0.java index accf5dea45..b691118e75 100644 --- a/app/src/main/java/j0/l/a/p0.java +++ b/app/src/main/java/j0/l/a/p0.java @@ -52,7 +52,7 @@ public class p0 extends Subscriber { } } } catch (Throwable th) { - c.q.a.k.a.a0(th, subscriber, t); + c.q.a.k.a.b0(th, subscriber, t); } } } @@ -87,7 +87,7 @@ public class p0 extends Subscriber { try { serializedSubscriber.onNext(t); } catch (Throwable th) { - c.q.a.k.a.a0(th, this, t); + c.q.a.k.a.b0(th, this, t); return; } } diff --git a/app/src/main/java/j0/l/a/p1.java b/app/src/main/java/j0/l/a/p1.java index 540028a8ee..daf9bf6229 100644 --- a/app/src/main/java/j0/l/a/p1.java +++ b/app/src/main/java/j0/l/a/p1.java @@ -41,7 +41,7 @@ public class p1 extends Subscriber { try { r = this.l.k.call(this.j, t); } catch (Throwable th) { - a.a0(th, this.k, t); + a.b0(th, this.k, t); return; } } diff --git a/app/src/main/java/j0/l/a/p2.java b/app/src/main/java/j0/l/a/p2.java index 4286615eba..d5e0046e01 100644 --- a/app/src/main/java/j0/l/a/p2.java +++ b/app/src/main/java/j0/l/a/p2.java @@ -30,7 +30,7 @@ public class p2 extends Subscriber { Collections.sort(list, this.m.i); this.k.b(list); } catch (Throwable th) { - a.Z(th); + a.a0(th); onError(th); } } diff --git a/app/src/main/java/j0/l/a/q.java b/app/src/main/java/j0/l/a/q.java index c6631acf59..d0da863fba 100644 --- a/app/src/main/java/j0/l/a/q.java +++ b/app/src/main/java/j0/l/a/q.java @@ -40,7 +40,7 @@ public final class q implements Observable.a { return; } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); subscriber.onError(th); return; } @@ -48,12 +48,12 @@ public final class q implements Observable.a { return; } } catch (Throwable th2) { - c.q.a.k.a.Z(th2); + c.q.a.k.a.a0(th2); subscriber.onError(th2); return; } } - } else if (j > 0 && c.q.a.k.a.o(this, j) == 0) { + } else if (j > 0 && c.q.a.k.a.p(this, j) == 0) { Subscriber subscriber2 = this.o; Iterator it2 = this.it; do { @@ -62,7 +62,7 @@ public final class q implements Observable.a { if (j2 == j) { j = get(); if (j2 == j) { - j = c.q.a.k.a.H(this, j2); + j = c.q.a.k.a.I(this, j2); } } else if (!subscriber2.isUnsubscribed()) { try { @@ -78,7 +78,7 @@ public final class q implements Observable.a { return; } } catch (Throwable th3) { - c.q.a.k.a.Z(th3); + c.q.a.k.a.a0(th3); subscriber2.onError(th3); return; } @@ -86,7 +86,7 @@ public final class q implements Observable.a { return; } } catch (Throwable th4) { - c.q.a.k.a.Z(th4); + c.q.a.k.a.a0(th4); subscriber2.onError(th4); return; } @@ -120,7 +120,7 @@ public final class q implements Observable.a { subscriber.setProducer(new a(subscriber, it)); } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); subscriber.onError(th); } } diff --git a/app/src/main/java/j0/l/a/q1.java b/app/src/main/java/j0/l/a/q1.java index 319d336b3c..232e9b7b5e 100644 --- a/app/src/main/java/j0/l/a/q1.java +++ b/app/src/main/java/j0/l/a/q1.java @@ -42,7 +42,7 @@ public class q1 extends Subscriber { this.i = call; this.k.onNext(call); } catch (Throwable th) { - a.a0(th, this, t); + a.b0(th, this, t); } } diff --git a/app/src/main/java/j0/l/a/q2.java b/app/src/main/java/j0/l/a/q2.java index 8ad6f21c54..9a7c5e08a3 100644 --- a/app/src/main/java/j0/l/a/q2.java +++ b/app/src/main/java/j0/l/a/q2.java @@ -70,7 +70,7 @@ public final class q2 implements Observable.a { try { this.j.onNext(this.k.call(objArr)); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); onError(th); } } else { diff --git a/app/src/main/java/j0/l/a/r.java b/app/src/main/java/j0/l/a/r.java index 53113745f5..00ee4d311b 100644 --- a/app/src/main/java/j0/l/a/r.java +++ b/app/src/main/java/j0/l/a/r.java @@ -31,11 +31,11 @@ public final class r implements Observable.a { subscriber2.onStart(); this.i.call(subscriber2); } catch (Throwable th) { - a.Z(th); + a.a0(th); subscriber2.onError(th); } } catch (Throwable th2) { - a.Z(th2); + a.a0(th2); subscriber.onError(th2); } } diff --git a/app/src/main/java/j0/l/a/r2.java b/app/src/main/java/j0/l/a/r2.java index 955e2fb97c..7422fe5d80 100644 --- a/app/src/main/java/j0/l/a/r2.java +++ b/app/src/main/java/j0/l/a/r2.java @@ -131,7 +131,7 @@ public final class r2 implements Observable.b[]> { this.emitted = 0; } } catch (Throwable th) { - c.q.a.k.a.a0(th, gVar, objArr2); + c.q.a.k.a.b0(th, gVar, objArr2); return; } } else if (decrementAndGet() <= 0) { @@ -153,7 +153,7 @@ public final class r2 implements Observable.b[]> { @Override // rx.Producer public void j(long j) { - c.q.a.k.a.o(this, j); + c.q.a.k.a.p(this, j); this.zipper.b(); } } diff --git a/app/src/main/java/j0/l/a/s.java b/app/src/main/java/j0/l/a/s.java index 32f365eb6a..16b0260c98 100644 --- a/app/src/main/java/j0/l/a/s.java +++ b/app/src/main/java/j0/l/a/s.java @@ -44,7 +44,7 @@ public final class s implements Observable.a { try { this.i.onNext(this.j.call(t)); } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); unsubscribe(); onError(OnErrorThrowable.a(th, t)); } diff --git a/app/src/main/java/j0/l/a/t0.java b/app/src/main/java/j0/l/a/t0.java index f1042eff13..e67b0d7416 100644 --- a/app/src/main/java/j0/l/a/t0.java +++ b/app/src/main/java/j0/l/a/t0.java @@ -42,14 +42,14 @@ public class t0 extends Subscriber { request(1); } } catch (Throwable th) { - a.a0(th, this.k, obj); + a.b0(th, this.k, obj); } } else { this.j = true; this.k.onNext(t); } } catch (Throwable th2) { - a.a0(th2, this.k, t); + a.b0(th2, this.k, t); } } } diff --git a/app/src/main/java/j0/l/a/u1.java b/app/src/main/java/j0/l/a/u1.java index 711065d01f..4e98ef64e9 100644 --- a/app/src/main/java/j0/l/a/u1.java +++ b/app/src/main/java/j0/l/a/u1.java @@ -44,7 +44,7 @@ public class u1 extends Subscriber { } request(1); } catch (Throwable th) { - a.a0(th, this.k, t); + a.b0(th, this.k, t); } } } diff --git a/app/src/main/java/j0/l/a/x.java b/app/src/main/java/j0/l/a/x.java index 24bdf5eb76..523702a193 100644 --- a/app/src/main/java/j0/l/a/x.java +++ b/app/src/main/java/j0/l/a/x.java @@ -25,7 +25,7 @@ public class x implements Producer { @Override // rx.Producer public void j(long j) { if (j > 0) { - c.q.a.k.a.o(this.i, j); + c.q.a.k.a.p(this.i, j); this.j.j(j); if (this.k.compareAndSet(true, false)) { this.l.a(this.m); diff --git a/app/src/main/java/j0/l/a/x0.java b/app/src/main/java/j0/l/a/x0.java index 1bba1d19b6..6e393485b1 100644 --- a/app/src/main/java/j0/l/a/x0.java +++ b/app/src/main/java/j0/l/a/x0.java @@ -157,7 +157,7 @@ public final class x0 implements Observable.b> { int i = (j > 0 ? 1 : (j == 0 ? 0 : -1)); if (i > 0) { if (get() != Long.MAX_VALUE) { - c.q.a.k.a.o(this, j); + c.q.a.k.a.p(this, j); this.subscriber.b(); } } else if (i < 0) { diff --git a/app/src/main/java/j0/l/a/y0.java b/app/src/main/java/j0/l/a/y0.java index e9df9c93de..ea47b9c418 100644 --- a/app/src/main/java/j0/l/a/y0.java +++ b/app/src/main/java/j0/l/a/y0.java @@ -14,7 +14,7 @@ public class y0 implements Producer { @Override // rx.Producer public void j(long j) { if (j > 0) { - a.o(this.i.o, j); + a.p(this.i.o, j); this.i.b(); } } diff --git a/app/src/main/java/j0/l/a/z0.java b/app/src/main/java/j0/l/a/z0.java index 546371c943..732ac83a6a 100644 --- a/app/src/main/java/j0/l/a/z0.java +++ b/app/src/main/java/j0/l/a/z0.java @@ -123,7 +123,7 @@ public final class z0 implements Observable.b { subscriber.onNext((Object) e.b(poll)); j++; if (j == ((long) this.m)) { - j3 = c.q.a.k.a.H(this.o, j); + j3 = c.q.a.k.a.I(this.o, j); request(j); j = 0; } diff --git a/app/src/main/java/j0/l/b/b.java b/app/src/main/java/j0/l/b/b.java index d6f13e20f1..e8965f9643 100644 --- a/app/src/main/java/j0/l/b/b.java +++ b/app/src/main/java/j0/l/b/b.java @@ -22,7 +22,7 @@ public final class b extends AtomicInteger implements Producer { subscriber.onCompleted(); } } catch (Throwable th) { - a.a0(th, subscriber, t); + a.b0(th, subscriber, t); } } } diff --git a/app/src/main/java/j0/l/b/c.java b/app/src/main/java/j0/l/b/c.java index bba3e283ee..091b5123de 100644 --- a/app/src/main/java/j0/l/b/c.java +++ b/app/src/main/java/j0/l/b/c.java @@ -30,7 +30,7 @@ public final class c extends AtomicBoolean implements Producer { subscriber.onCompleted(); } } catch (Throwable th) { - a.a0(th, subscriber, t); + a.b0(th, subscriber, t); } } } diff --git a/app/src/main/java/j0/l/c/g.java b/app/src/main/java/j0/l/c/g.java index ad80730f87..b5041d9c06 100644 --- a/app/src/main/java/j0/l/c/g.java +++ b/app/src/main/java/j0/l/c/g.java @@ -42,7 +42,7 @@ public class g extends Scheduler.Worker implements Subscription { } } } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); l.b(th); } } diff --git a/app/src/main/java/j0/l/c/l.java b/app/src/main/java/j0/l/c/l.java index 7b647424f3..e038f128d2 100644 --- a/app/src/main/java/j0/l/c/l.java +++ b/app/src/main/java/j0/l/c/l.java @@ -27,7 +27,7 @@ public class l implements Action0 { Thread.sleep(currentTimeMillis); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - a.I(e); + a.J(e); throw null; } } diff --git a/app/src/main/java/j0/l/e/f.java b/app/src/main/java/j0/l/e/f.java index 72326fc7cf..620609610e 100644 --- a/app/src/main/java/j0/l/e/f.java +++ b/app/src/main/java/j0/l/e/f.java @@ -11,10 +11,10 @@ public final class f { public T[] d; public f() { - int M = a.M(16); - this.a = M - 1; - this.f2843c = (int) (((float) M) * 0.75f); - this.d = (T[]) new Object[M]; + int N = a.N(16); + this.a = N - 1; + this.f2843c = (int) (((float) N) * 0.75f); + this.d = (T[]) new Object[N]; } public static int b(int i) { diff --git a/app/src/main/java/j0/l/e/j.java b/app/src/main/java/j0/l/e/j.java index 65a03c2384..8820c9d308 100644 --- a/app/src/main/java/j0/l/e/j.java +++ b/app/src/main/java/j0/l/e/j.java @@ -126,7 +126,7 @@ public final class j extends Observable { subscriber.onCompleted(); } } catch (Throwable th) { - c.q.a.k.a.a0(th, subscriber, t); + c.q.a.k.a.b0(th, subscriber, t); } } } @@ -180,7 +180,7 @@ public final class j extends Observable { subscriber.onCompleted(); } } catch (Throwable th) { - c.q.a.k.a.a0(th, subscriber, t); + c.q.a.k.a.b0(th, subscriber, t); } } } diff --git a/app/src/main/java/j0/l/e/m/a.java b/app/src/main/java/j0/l/e/m/a.java index 1d5a803d93..716b02256e 100644 --- a/app/src/main/java/j0/l/e/m/a.java +++ b/app/src/main/java/j0/l/e/m/a.java @@ -9,9 +9,9 @@ public abstract class a extends AbstractQueue { public final int j; public a(int i) { - int M = c.q.a.k.a.M(i); - this.j = M - 1; - this.i = new AtomicReferenceArray<>(M); + int N = c.q.a.k.a.N(i); + this.j = N - 1; + this.i = new AtomicReferenceArray<>(N); } @Override // java.util.AbstractQueue, java.util.AbstractCollection, java.util.Collection diff --git a/app/src/main/java/j0/l/e/m/d.java b/app/src/main/java/j0/l/e/m/d.java index efd4aead11..74ae5f999c 100644 --- a/app/src/main/java/j0/l/e/m/d.java +++ b/app/src/main/java/j0/l/e/m/d.java @@ -16,7 +16,7 @@ public final class d extends AtomicReferenceArray implements Queue { public final AtomicLong producerIndex = new AtomicLong(); public d(int i) { - super(a.M(i)); + super(a.N(i)); int length = length(); this.mask = length - 1; this.capacitySkip = length - i; diff --git a/app/src/main/java/j0/l/e/m/e.java b/app/src/main/java/j0/l/e/m/e.java index 590176a0e7..7b6e0bde3b 100644 --- a/app/src/main/java/j0/l/e/m/e.java +++ b/app/src/main/java/j0/l/e/m/e.java @@ -20,12 +20,12 @@ public final class e implements Queue { public final AtomicLong r = new AtomicLong(); public e(int i2) { - int M = a.M(i2); - int i3 = M - 1; - AtomicReferenceArray atomicReferenceArray = new AtomicReferenceArray<>(M + 1); + int N = a.N(i2); + int i3 = N - 1; + AtomicReferenceArray atomicReferenceArray = new AtomicReferenceArray<>(N + 1); this.o = atomicReferenceArray; this.n = i3; - this.l = Math.min(M / 4, i); + this.l = Math.min(N / 4, i); this.q = atomicReferenceArray; this.p = i3; this.m = (long) (i3 - 1); diff --git a/app/src/main/java/j0/l/e/m/g.java b/app/src/main/java/j0/l/e/m/g.java index f426d8fb48..4eacff49a8 100644 --- a/app/src/main/java/j0/l/e/m/g.java +++ b/app/src/main/java/j0/l/e/m/g.java @@ -21,14 +21,14 @@ public final class g implements Queue { public final AtomicLong r = new AtomicLong(); public g(int i2) { - int M = a.M(Math.max(8, i2)); - int i3 = M - 1; + int N = a.N(Math.max(8, i2)); + int i3 = N - 1; AtomicLong atomicLong = new AtomicLong(); this.k = atomicLong; - AtomicReferenceArray atomicReferenceArray = new AtomicReferenceArray<>(M + 1); + AtomicReferenceArray atomicReferenceArray = new AtomicReferenceArray<>(N + 1); this.o = atomicReferenceArray; this.n = i3; - this.l = Math.min(M / 4, i); + this.l = Math.min(N / 4, i); this.q = atomicReferenceArray; this.p = i3; this.m = (long) (i3 - 1); diff --git a/app/src/main/java/j0/l/e/n/e.java b/app/src/main/java/j0/l/e/n/e.java index 98c6622050..ea4a55d9ad 100644 --- a/app/src/main/java/j0/l/e/n/e.java +++ b/app/src/main/java/j0/l/e/n/e.java @@ -27,9 +27,9 @@ public abstract class e extends f { } public e(int i2) { - int M = a.M(i2); - this.l = (long) (M - 1); - this.m = (E[]) new Object[((M << i) + 64)]; + int N = a.N(i2); + this.l = (long) (N - 1); + this.m = (E[]) new Object[((N << i) + 64)]; } public final long c(long j2) { diff --git a/app/src/main/java/j0/l/e/n/t.java b/app/src/main/java/j0/l/e/n/t.java index 0e74884c85..0ec920f8c9 100644 --- a/app/src/main/java/j0/l/e/n/t.java +++ b/app/src/main/java/j0/l/e/n/t.java @@ -43,12 +43,12 @@ public class t extends v { } public t(int i) { - int M = a.M(i); - long j = (long) (M - 1); - E[] eArr = (E[]) new Object[(M + 1)]; + int N = a.N(i); + long j = (long) (N - 1); + E[] eArr = (E[]) new Object[(N + 1)]; this.l = eArr; this.k = j; - this.i = Math.min(M / 4, o); + this.i = Math.min(N / 4, o); this.n = eArr; this.m = j; this.j = j - 1; diff --git a/app/src/main/java/j0/m/b.java b/app/src/main/java/j0/m/b.java index cf3a500319..0e3502159b 100644 --- a/app/src/main/java/j0/m/b.java +++ b/app/src/main/java/j0/m/b.java @@ -31,7 +31,7 @@ public final class b { if (atomicReference2.get() == null) { return (T) atomicReference.get(); } - a.I((Throwable) atomicReference2.get()); + a.J((Throwable) atomicReference2.get()); throw null; } } diff --git a/app/src/main/java/j0/n/b.java b/app/src/main/java/j0/n/b.java index 948cf8614b..63ff5f2efb 100644 --- a/app/src/main/java/j0/n/b.java +++ b/app/src/main/java/j0/n/b.java @@ -46,7 +46,7 @@ public class b extends Subscriber { @Override // j0.g public void onError(Throwable th) { - a.Z(th); + a.a0(th); if (!this.j) { this.j = true; Objects.requireNonNull(o.a.b()); @@ -75,7 +75,7 @@ public class b extends Subscriber { this.i.onNext(t); } } catch (Throwable th) { - a.Z(th); + a.a0(th); onError(th); } } diff --git a/app/src/main/java/j0/n/c.java b/app/src/main/java/j0/n/c.java index 35e1bdc9a6..d39a4eb523 100644 --- a/app/src/main/java/j0/n/c.java +++ b/app/src/main/java/j0/n/c.java @@ -60,7 +60,7 @@ public class c implements g { @Override // j0.g public void onError(Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); if (!this.k) { synchronized (this) { if (!this.k) { @@ -129,7 +129,7 @@ public class c implements g { } } catch (Throwable th) { this.k = true; - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); this.i.onError(OnErrorThrowable.a(th, t)); return; } @@ -137,7 +137,7 @@ public class c implements g { } } catch (Throwable th2) { this.k = true; - c.q.a.k.a.a0(th2, this.i, t); + c.q.a.k.a.b0(th2, this.i, t); } } } diff --git a/app/src/main/java/j0/q/a.java b/app/src/main/java/j0/q/a.java index 0c74ba234f..bfc7063a36 100644 --- a/app/src/main/java/j0/q/a.java +++ b/app/src/main/java/j0/q/a.java @@ -45,7 +45,7 @@ public final class a extends Subject { public void j(long j) { int i = (j > 0 ? 1 : (j == 0 ? 0 : -1)); if (i > 0) { - c.q.a.k.a.o(this.requested, j); + c.q.a.k.a.p(this.requested, j); ((c) this.state.buffer).a(this); } else if (i < 0) { throw new IllegalArgumentException(c.d.b.a.a.q("n >= required but it was ", j)); @@ -153,7 +153,7 @@ public final class a extends Subject { } } if (!(j2 == 0 || j == Long.MAX_VALUE)) { - c.q.a.k.a.H(bVar.requested, j2); + c.q.a.k.a.I(bVar.requested, j2); } bVar.node = aVar; i2 = bVar.addAndGet(-i2); @@ -266,7 +266,7 @@ public final class a extends Subject { arrayList.add(th2); } } - c.q.a.k.a.Y(arrayList); + c.q.a.k.a.Z(arrayList); } @Override // j0.g diff --git a/app/src/main/java/kotlinx/coroutines/CancellableContinuation.java b/app/src/main/java/kotlinx/coroutines/CancellableContinuation.java index ff7fd4bcae..7356789c77 100644 --- a/app/src/main/java/kotlinx/coroutines/CancellableContinuation.java +++ b/app/src/main/java/kotlinx/coroutines/CancellableContinuation.java @@ -3,7 +3,6 @@ package kotlinx.coroutines; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function1; -import s.a.z; /* compiled from: CancellableContinuation.kt */ public interface CancellableContinuation extends Continuation { boolean a(); @@ -16,7 +15,7 @@ public interface CancellableContinuation extends Continuation { Object h(T t, Object obj, Function1 function1); - void i(z zVar, T t); + void i(CoroutineDispatcher coroutineDispatcher, T t); boolean j(Throwable th); diff --git a/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java b/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java new file mode 100644 index 0000000000..d65a52de4e --- /dev/null +++ b/app/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java @@ -0,0 +1,75 @@ +package kotlinx.coroutines; + +import d0.w.b; +import d0.w.d; +import java.util.Objects; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.internal.DefaultConstructorMarker; +import s.a.a.g; +import s.a.k; +import s.a.z; +/* compiled from: CoroutineDispatcher.kt */ +public abstract class CoroutineDispatcher extends d0.w.a implements d { + public static final a Key = new a(null); + + /* compiled from: CoroutineDispatcher.kt */ + public static final class a extends b { + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public a(DefaultConstructorMarker defaultConstructorMarker) { + super(d.b.a, z.i); + int i = d.e; + } + } + + public CoroutineDispatcher() { + super(d.b.a); + } + + public abstract void dispatch(CoroutineContext coroutineContext, Runnable runnable); + + public void dispatchYield(CoroutineContext coroutineContext, Runnable runnable) { + dispatch(coroutineContext, runnable); + } + + @Override // d0.w.a, kotlin.coroutines.CoroutineContext.Element, kotlin.coroutines.CoroutineContext + public E get(CoroutineContext.Key key) { + return (E) d.a.get(this, key); + } + + @Override // d0.w.d + public final Continuation interceptContinuation(Continuation continuation) { + return new g(this, continuation); + } + + public boolean isDispatchNeeded(CoroutineContext coroutineContext) { + return true; + } + + @Override // d0.w.a, kotlin.coroutines.CoroutineContext + public CoroutineContext minusKey(CoroutineContext.Key key) { + return d.a.minusKey(this, key); + } + + public final CoroutineDispatcher plus(CoroutineDispatcher coroutineDispatcher) { + return coroutineDispatcher; + } + + @Override // d0.w.d + public void releaseInterceptedContinuation(Continuation continuation) { + Objects.requireNonNull(continuation, "null cannot be cast to non-null type kotlinx.coroutines.internal.DispatchedContinuation<*>"); + Object obj = ((g) continuation)._reusableCancellableContinuation; + if (!(obj instanceof k)) { + obj = null; + } + k kVar = (k) obj; + if (kVar != null) { + kVar.r(); + } + } + + @Override // java.lang.Object + public String toString() { + return getClass().getSimpleName() + '@' + c.q.a.k.a.u(this); + } +} diff --git a/app/src/main/java/kotlinx/coroutines/ExecutorCoroutineDispatcher.java b/app/src/main/java/kotlinx/coroutines/ExecutorCoroutineDispatcher.java new file mode 100644 index 0000000000..599ac28fc0 --- /dev/null +++ b/app/src/main/java/kotlinx/coroutines/ExecutorCoroutineDispatcher.java @@ -0,0 +1,23 @@ +package kotlinx.coroutines; + +import d0.w.b; +import java.io.Closeable; +import java.util.concurrent.Executor; +import kotlin.jvm.internal.DefaultConstructorMarker; +import s.a.t0; +/* compiled from: Executors.kt */ +public abstract class ExecutorCoroutineDispatcher extends CoroutineDispatcher implements Closeable { + + /* compiled from: Executors.kt */ + public static final class a extends b { + public a(DefaultConstructorMarker defaultConstructorMarker) { + super(CoroutineDispatcher.Key, t0.i); + } + } + + static { + new a(null); + } + + public abstract Executor H(); +} diff --git a/app/src/main/java/kotlinx/coroutines/Job.java b/app/src/main/java/kotlinx/coroutines/Job.java index 69f49057a6..3a7bd1b8fe 100644 --- a/app/src/main/java/kotlinx/coroutines/Job.java +++ b/app/src/main/java/kotlinx/coroutines/Job.java @@ -5,9 +5,9 @@ import kotlin.Unit; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function1; import kotlin.sequences.Sequence; -import s.a.k0; -import s.a.n; -import s.a.p; +import s.a.l0; +import s.a.o; +import s.a.q; /* compiled from: Job.kt */ public interface Job extends CoroutineContext.Element { public static final a h = a.a; @@ -23,17 +23,17 @@ public interface Job extends CoroutineContext.Element { void B(CancellationException cancellationException); - n G(p pVar); + o G(q qVar); boolean a(); Sequence d(); - k0 f(boolean z2, boolean z3, Function1 function1); + l0 f(boolean z2, boolean z3, Function1 function1); CancellationException p(); boolean start(); - k0 t(Function1 function1); + l0 t(Function1 function1); } diff --git a/app/src/main/java/kotlinx/coroutines/android/AndroidDispatcherFactory.java b/app/src/main/java/kotlinx/coroutines/android/AndroidDispatcherFactory.java index 60fa9d7a54..dd6672948f 100644 --- a/app/src/main/java/kotlinx/coroutines/android/AndroidDispatcherFactory.java +++ b/app/src/main/java/kotlinx/coroutines/android/AndroidDispatcherFactory.java @@ -3,8 +3,8 @@ package kotlinx.coroutines.android; import android.os.Looper; import java.util.List; import kotlinx.coroutines.internal.MainDispatcherFactory; -import s.a.v1.a; -import s.a.v1.c; +import s.a.y1.a; +import s.a.y1.c; /* compiled from: HandlerDispatcher.kt */ public final class AndroidDispatcherFactory implements MainDispatcherFactory { @Override // kotlinx.coroutines.internal.MainDispatcherFactory diff --git a/app/src/main/java/kotlinx/coroutines/flow/internal/AbortFlowException.java b/app/src/main/java/kotlinx/coroutines/flow/internal/AbortFlowException.java index 2c1845425a..a76de2a39e 100644 --- a/app/src/main/java/kotlinx/coroutines/flow/internal/AbortFlowException.java +++ b/app/src/main/java/kotlinx/coroutines/flow/internal/AbortFlowException.java @@ -1,7 +1,7 @@ package kotlinx.coroutines.flow.internal; import java.util.concurrent.CancellationException; -import s.a.x1.c; +import s.a.a2.c; /* compiled from: FlowExceptions.kt */ public final class AbortFlowException extends CancellationException { private final c owner; diff --git a/app/src/main/java/kotlinx/coroutines/internal/MainDispatcherFactory.java b/app/src/main/java/kotlinx/coroutines/internal/MainDispatcherFactory.java index c1e7da4189..39f4d67e7a 100644 --- a/app/src/main/java/kotlinx/coroutines/internal/MainDispatcherFactory.java +++ b/app/src/main/java/kotlinx/coroutines/internal/MainDispatcherFactory.java @@ -1,10 +1,10 @@ package kotlinx.coroutines.internal; import java.util.List; -import s.a.i1; +import s.a.k1; /* compiled from: MainDispatcherFactory.kt */ public interface MainDispatcherFactory { - i1 createDispatcher(List list); + k1 createDispatcher(List list); int getLoadPriority(); diff --git a/app/src/main/java/me/dm7/barcodescanner/zxing/ZXingScannerView.java b/app/src/main/java/me/dm7/barcodescanner/zxing/ZXingScannerView.java index 43cf1d7eaa..64f9902dc4 100644 --- a/app/src/main/java/me/dm7/barcodescanner/zxing/ZXingScannerView.java +++ b/app/src/main/java/me/dm7/barcodescanner/zxing/ZXingScannerView.java @@ -141,7 +141,7 @@ public class ZXingScannerView extends e0.a.a.a.a { Camera.Size previewSize = camera.getParameters().getPreviewSize(); int i = previewSize.width; int i2 = previewSize.height; - if (c.q.a.k.a.v(getContext()) == 1) { + if (c.q.a.k.a.w(getContext()) == 1) { int rotationCount = getRotationCount(); if (rotationCount != 1) { if (rotationCount != 3) { diff --git a/app/src/main/java/okio/ByteString.java b/app/src/main/java/okio/ByteString.java index 326574a771..51c92c49c5 100644 --- a/app/src/main/java/okio/ByteString.java +++ b/app/src/main/java/okio/ByteString.java @@ -38,7 +38,7 @@ public class ByteString implements Serializable, Comparable { i2 = bArr.length; } m.checkParameterIsNotNull(bArr, "$this$toByteString"); - c.q.a.k.a.k((long) bArr.length, (long) i, (long) i2); + c.q.a.k.a.l((long) bArr.length, (long) i, (long) i2); return new ByteString(j.copyOfRange(bArr, i, i2 + i)); } diff --git a/app/src/main/java/rx/Observable.java b/app/src/main/java/rx/Observable.java index df872e5356..d732f8efac 100644 --- a/app/src/main/java/rx/Observable.java +++ b/app/src/main/java/rx/Observable.java @@ -291,7 +291,7 @@ public class Observable { j0.k.b bVar = j0.o.l.g; return bVar != null ? bVar.call(subscriber) : subscriber; } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); StringBuilder L = c.d.b.a.a.L("Error occurred attempting to subscribe ["); L.append(th.getMessage()); L.append("] and then again while trying to pass to onError."); @@ -369,7 +369,7 @@ public class Observable { j0.k.b bVar = j0.o.l.g; return bVar != null ? bVar.call(subscriber) : subscriber; } catch (Throwable th) { - c.q.a.k.a.Z(th); + c.q.a.k.a.a0(th); StringBuilder L = c.d.b.a.a.L("Error occurred attempting to subscribe ["); L.append(th.getMessage()); L.append("] and then again while trying to pass to onError."); diff --git a/app/src/main/java/rx/internal/util/SubscriptionList.java b/app/src/main/java/rx/internal/util/SubscriptionList.java index 7dc7086183..e272497a82 100644 --- a/app/src/main/java/rx/internal/util/SubscriptionList.java +++ b/app/src/main/java/rx/internal/util/SubscriptionList.java @@ -73,7 +73,7 @@ public final class SubscriptionList implements Subscription { arrayList.add(th); } } - a.Y(arrayList); + a.Z(arrayList); } } } diff --git a/app/src/main/java/rx/subjects/BehaviorSubject.java b/app/src/main/java/rx/subjects/BehaviorSubject.java index 04cca39755..eb2493a246 100644 --- a/app/src/main/java/rx/subjects/BehaviorSubject.java +++ b/app/src/main/java/rx/subjects/BehaviorSubject.java @@ -147,7 +147,7 @@ public final class BehaviorSubject extends Subject { arrayList.add(th2); } } - c.q.a.k.a.Y(arrayList); + c.q.a.k.a.Z(arrayList); } } diff --git a/app/src/main/java/rx/subjects/PublishSubject.java b/app/src/main/java/rx/subjects/PublishSubject.java index 6864ccb047..1b7c855cdb 100644 --- a/app/src/main/java/rx/subjects/PublishSubject.java +++ b/app/src/main/java/rx/subjects/PublishSubject.java @@ -31,7 +31,7 @@ public final class PublishSubject extends Subject { @Override // rx.Producer public void j(long j) { long j2; - if (c.q.a.k.a.g0(j)) { + if (c.q.a.k.a.h0(j)) { do { j2 = get(); if (j2 == Long.MIN_VALUE) { @@ -180,7 +180,7 @@ public final class PublishSubject extends Subject { arrayList.add(th2); } } - c.q.a.k.a.Y(arrayList); + c.q.a.k.a.Z(arrayList); } @Override // j0.g diff --git a/app/src/main/java/rx/subscriptions/CompositeSubscription.java b/app/src/main/java/rx/subscriptions/CompositeSubscription.java index 13958e9a3b..0d0536c01d 100644 --- a/app/src/main/java/rx/subscriptions/CompositeSubscription.java +++ b/app/src/main/java/rx/subscriptions/CompositeSubscription.java @@ -23,7 +23,7 @@ public final class CompositeSubscription implements Subscription { arrayList.add(th); } } - a.Y(arrayList); + a.Z(arrayList); } } diff --git a/app/src/main/java/s/a/a/a.java b/app/src/main/java/s/a/a/a.java index 191cd6bcb8..6c5de0ed98 100644 --- a/app/src/main/java/s/a/a/a.java +++ b/app/src/main/java/s/a/a/a.java @@ -5,20 +5,20 @@ import d0.z.d.o; import java.util.Objects; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function2; -import s.a.p1; +import s.a.s1; /* compiled from: ThreadContext.kt */ public final class a { - public static final s a = new s("ZERO"); + public static final t a = new t("ZERO"); public static final Function2 b = b.i; /* renamed from: c reason: collision with root package name */ - public static final Function2, CoroutineContext.Element, p1> f2863c = c.i; - public static final Function2 d = C0338a.j; - public static final Function2 e = C0338a.i; + public static final Function2, CoroutineContext.Element, s1> f2863c = c.i; + public static final Function2 d = C0338a.j; + public static final Function2 e = C0338a.i; /* compiled from: kotlin-style lambda group */ /* renamed from: s.a.a.a$a reason: collision with other inner class name */ - public static final class C0338a extends o implements Function2 { + public static final class C0338a extends o implements Function2 { public static final C0338a i = new C0338a(0); public static final C0338a j = new C0338a(1); public final /* synthetic */ int k; @@ -32,30 +32,30 @@ public final class a { /* 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, java.lang.Object] */ @Override // kotlin.jvm.functions.Function2 - public final w invoke(w wVar, CoroutineContext.Element element) { + public final x invoke(x xVar, CoroutineContext.Element element) { int i2 = this.k; if (i2 == 0) { - w wVar2 = wVar; + x xVar2 = xVar; CoroutineContext.Element element2 = element; - if (element2 instanceof p1) { - CoroutineContext coroutineContext = wVar2.f2867c; - Object[] objArr = wVar2.a; - int i3 = wVar2.b; - wVar2.b = i3 + 1; - ((p1) element2).x(coroutineContext, objArr[i3]); + if (element2 instanceof s1) { + CoroutineContext coroutineContext = xVar2.f2867c; + Object[] objArr = xVar2.a; + int i3 = xVar2.b; + xVar2.b = i3 + 1; + ((s1) element2).x(coroutineContext, objArr[i3]); } - return wVar2; + return xVar2; } else if (i2 == 1) { - w wVar3 = wVar; + x xVar3 = xVar; CoroutineContext.Element element3 = element; - if (element3 instanceof p1) { - Object C = ((p1) element3).C(wVar3.f2867c); - Object[] objArr2 = wVar3.a; - int i4 = wVar3.b; - wVar3.b = i4 + 1; + if (element3 instanceof s1) { + Object C = ((s1) element3).C(xVar3.f2867c); + Object[] objArr2 = xVar3.a; + int i4 = xVar3.b; + xVar3.b = i4 + 1; objArr2[i4] = C; } - return wVar3; + return xVar3; } else { throw null; } @@ -74,7 +74,7 @@ public final class a { @Override // kotlin.jvm.functions.Function2 public Object invoke(Object obj, CoroutineContext.Element element) { CoroutineContext.Element element2 = element; - if (!(element2 instanceof p1)) { + if (!(element2 instanceof s1)) { return obj; } if (!(obj instanceof Integer)) { @@ -87,7 +87,7 @@ public final class a { } /* compiled from: ThreadContext.kt */ - public static final class c extends o implements Function2, CoroutineContext.Element, p1> { + public static final class c extends o implements Function2, CoroutineContext.Element, s1> { public static final c i = new c(); public c() { @@ -97,29 +97,29 @@ public final class a { /* 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, java.lang.Object] */ @Override // kotlin.jvm.functions.Function2 - public p1 invoke(p1 p1Var, CoroutineContext.Element element) { - p1 p1Var2 = p1Var; + public s1 invoke(s1 s1Var, CoroutineContext.Element element) { + s1 s1Var2 = s1Var; CoroutineContext.Element element2 = element; - if (p1Var2 != null) { - return p1Var2; + if (s1Var2 != null) { + return s1Var2; } - if (!(element2 instanceof p1)) { + if (!(element2 instanceof s1)) { element2 = null; } - return (p1) element2; + return (s1) element2; } } public static final void a(CoroutineContext coroutineContext, Object obj) { if (obj != a) { - if (obj instanceof w) { - ((w) obj).b = 0; + if (obj instanceof x) { + ((x) obj).b = 0; coroutineContext.fold(obj, e); return; } Object fold = coroutineContext.fold(null, f2863c); Objects.requireNonNull(fold, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement"); - ((p1) fold).x(coroutineContext, obj); + ((s1) fold).x(coroutineContext, obj); } } @@ -132,9 +132,9 @@ public final class a { return a; } if (obj instanceof Integer) { - return coroutineContext.fold(new w(coroutineContext, ((Number) obj).intValue()), d); + return coroutineContext.fold(new x(coroutineContext, ((Number) obj).intValue()), d); } Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.ThreadContextElement"); - return ((p1) obj).C(coroutineContext); + return ((s1) obj).C(coroutineContext); } } diff --git a/app/src/main/java/s/a/a/c.java b/app/src/main/java/s/a/a/c.java index a858425e86..d8467410c7 100644 --- a/app/src/main/java/s/a/a/c.java +++ b/app/src/main/java/s/a/a/c.java @@ -1,5 +1,5 @@ package s.a.a; /* compiled from: Atomic.kt */ public final class c { - public static final Object a = new s("NO_DECISION"); + public static final Object a = new t("NO_DECISION"); } diff --git a/app/src/main/java/s/a/a/d.java b/app/src/main/java/s/a/a/d.java index 9a12619ae3..cfdc27d38d 100644 --- a/app/src/main/java/s/a/a/d.java +++ b/app/src/main/java/s/a/a/d.java @@ -2,13 +2,13 @@ package s.a.a; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; /* compiled from: Atomic.kt */ -public abstract class d extends o { +public abstract class d extends p { public static final AtomicReferenceFieldUpdater a = AtomicReferenceFieldUpdater.newUpdater(d.class, Object.class, "_consensus"); public volatile Object _consensus = c.a; /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: java.lang.Object */ /* JADX WARN: Multi-variable type inference failed */ - @Override // s.a.a.o + @Override // s.a.a.p public final Object a(Object obj) { Object obj2 = this._consensus; Object obj3 = c.a; diff --git a/app/src/main/java/s/a/a/e.java b/app/src/main/java/s/a/a/e.java index b6eec47a96..51bd9cf3a4 100644 --- a/app/src/main/java/s/a/a/e.java +++ b/app/src/main/java/s/a/a/e.java @@ -1,25 +1,18 @@ package s.a.a; -import c.d.b.a.a; -import kotlin.coroutines.CoroutineContext; -import kotlinx.coroutines.CoroutineScope; -/* compiled from: Scopes.kt */ -public final class e implements CoroutineScope { - public final CoroutineContext i; +import java.lang.reflect.Method; +import java.util.concurrent.ScheduledThreadPoolExecutor; +/* compiled from: Concurrent.kt */ +public final class e { + public static final Method a; - public e(CoroutineContext coroutineContext) { - this.i = coroutineContext; - } - - @Override // kotlinx.coroutines.CoroutineScope - public CoroutineContext getCoroutineContext() { - return this.i; - } - - public String toString() { - StringBuilder L = a.L("CoroutineScope(coroutineContext="); - L.append(this.i); - L.append(')'); - return L.toString(); + static { + Method method; + try { + method = ScheduledThreadPoolExecutor.class.getMethod("setRemoveOnCancelPolicy", Boolean.TYPE); + } catch (Throwable unused) { + method = null; + } + a = method; } } diff --git a/app/src/main/java/s/a/a/f.java b/app/src/main/java/s/a/a/f.java index e3ada8153f..ee4d282ede 100644 --- a/app/src/main/java/s/a/a/f.java +++ b/app/src/main/java/s/a/a/f.java @@ -1,106 +1,25 @@ package s.a.a; -import c.q.a.k.a; -import d0.z.d.m; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import kotlin.coroutines.Continuation; +import c.d.b.a.a; import kotlin.coroutines.CoroutineContext; -import kotlin.coroutines.jvm.internal.CoroutineStackFrame; -import s.a.i0; -import s.a.o0; -import s.a.q1; -import s.a.v; -import s.a.z; -/* compiled from: DispatchedContinuation.kt */ -public final class f extends i0 implements CoroutineStackFrame, Continuation { - public static final AtomicReferenceFieldUpdater l = AtomicReferenceFieldUpdater.newUpdater(f.class, Object.class, "_reusableCancellableContinuation"); - public volatile Object _reusableCancellableContinuation; - public Object m = g.a; - public final CoroutineStackFrame n; - public final Object o; - public final z p; - public final Continuation q; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: Scopes.kt */ +public final class f implements CoroutineScope { + public final CoroutineContext i; - /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: kotlin.coroutines.Continuation */ - /* JADX WARN: Multi-variable type inference failed */ - public f(z zVar, Continuation continuation) { - super(-1); - this.p = zVar; - this.q = continuation; - this.n = (CoroutineStackFrame) (!(continuation instanceof CoroutineStackFrame) ? null : continuation); - Object fold = getContext().fold(0, a.b); - m.checkNotNull(fold); - this.o = fold; - this._reusableCancellableContinuation = null; + public f(CoroutineContext coroutineContext) { + this.i = coroutineContext; } - @Override // s.a.i0 - public void c(Object obj, Throwable th) { - if (obj instanceof v) { - ((v) obj).b.invoke(th); - } + @Override // kotlinx.coroutines.CoroutineScope + public CoroutineContext getCoroutineContext() { + return this.i; } - @Override // s.a.i0 - public Continuation d() { - return this; - } - - @Override // kotlin.coroutines.Continuation - public CoroutineContext getContext() { - return this.q.getContext(); - } - - @Override // s.a.i0 - public Object n() { - Object obj = this.m; - this.m = g.a; - return obj; - } - - @Override // kotlin.coroutines.Continuation - public void resumeWith(Object obj) { - CoroutineContext context = this.q.getContext(); - Object e02 = a.e0(obj, null); - if (this.p.isDispatchNeeded(context)) { - this.m = e02; - this.k = 0; - this.p.dispatch(context, this); - return; - } - q1 q1Var = q1.b; - o0 a = q1.a(); - if (a.N()) { - this.m = e02; - this.k = 0; - a.K(this); - return; - } - a.M(true); - try { - CoroutineContext context2 = getContext(); - Object b = a.b(context2, this.o); - try { - this.q.resumeWith(obj); - do { - } while (a.Q()); - a.H(true); - } finally { - a.a(context2, b); - } - } catch (Throwable th) { - a.H(true); - throw th; - } - } - - @Override // java.lang.Object public String toString() { - StringBuilder L = c.d.b.a.a.L("DispatchedContinuation["); - L.append(this.p); - L.append(", "); - L.append(a.c0(this.q)); - L.append(']'); + StringBuilder L = a.L("CoroutineScope(coroutineContext="); + L.append(this.i); + L.append(')'); return L.toString(); } } diff --git a/app/src/main/java/s/a/a/g.java b/app/src/main/java/s/a/a/g.java index e67cddc167..c34e6081d1 100644 --- a/app/src/main/java/s/a/a/g.java +++ b/app/src/main/java/s/a/a/g.java @@ -1,78 +1,106 @@ package s.a.a; import c.q.a.k.a; -import d0.k; -import d0.l; -import java.util.concurrent.CancellationException; -import kotlin.Unit; +import d0.z.d.m; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function1; -import kotlinx.coroutines.Job; -import s.a.o0; -import s.a.q1; -import s.a.v; +import kotlin.coroutines.jvm.internal.CoroutineStackFrame; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.i0; +import s.a.p0; +import s.a.t1; +import s.a.w; /* compiled from: DispatchedContinuation.kt */ -public final class g { - public static final s a = new s("UNDEFINED"); - public static final s b = new s("REUSABLE_CLAIMED"); +public final class g extends i0 implements CoroutineStackFrame, Continuation { + public static final AtomicReferenceFieldUpdater l = AtomicReferenceFieldUpdater.newUpdater(g.class, Object.class, "_reusableCancellableContinuation"); + public volatile Object _reusableCancellableContinuation; + public Object m = h.a; + public final CoroutineStackFrame n; + public final Object o; + public final CoroutineDispatcher p; + public final Continuation q; - public static final void a(Continuation continuation, Object obj, Function1 function1) { - boolean z2; - if (continuation instanceof f) { - f fVar = (f) continuation; - Object e02 = a.e0(obj, function1); - if (fVar.p.isDispatchNeeded(fVar.getContext())) { - fVar.m = e02; - fVar.k = 1; - fVar.p.dispatch(fVar.getContext(), fVar); - return; - } - q1 q1Var = q1.b; - o0 a2 = q1.a(); - if (a2.N()) { - fVar.m = e02; - fVar.k = 1; - a2.K(fVar); - return; - } - a2.M(true); - try { - Job job = (Job) fVar.getContext().get(Job.h); - if (job == null || job.a()) { - z2 = false; - } else { - CancellationException p = job.p(); - if (e02 instanceof v) { - ((v) e02).b.invoke(p); - } - k.a aVar = k.i; - fVar.resumeWith(k.m78constructorimpl(l.createFailure(p))); - z2 = true; - } - if (!z2) { - CoroutineContext context = fVar.getContext(); - Object b2 = a.b(context, fVar.o); - try { - fVar.q.resumeWith(obj); - } finally { - a.a(context, b2); - } - } - do { - } while (a2.Q()); - } catch (Throwable th) { - a2.H(true); - throw th; - } - a2.H(true); + /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: kotlin.coroutines.Continuation */ + /* JADX WARN: Multi-variable type inference failed */ + public g(CoroutineDispatcher coroutineDispatcher, Continuation continuation) { + super(-1); + this.p = coroutineDispatcher; + this.q = continuation; + this.n = (CoroutineStackFrame) (!(continuation instanceof CoroutineStackFrame) ? null : continuation); + Object fold = getContext().fold(0, a.b); + m.checkNotNull(fold); + this.o = fold; + this._reusableCancellableContinuation = null; + } + + @Override // s.a.i0 + public void c(Object obj, Throwable th) { + if (obj instanceof w) { + ((w) obj).b.invoke(th); + } + } + + @Override // s.a.i0 + public Continuation d() { + return this; + } + + @Override // kotlin.coroutines.Continuation + public CoroutineContext getContext() { + return this.q.getContext(); + } + + @Override // s.a.i0 + public Object n() { + Object obj = this.m; + this.m = h.a; + return obj; + } + + @Override // kotlin.coroutines.Continuation + public void resumeWith(Object obj) { + CoroutineContext context = this.q.getContext(); + Object f02 = a.f0(obj, null); + if (this.p.isDispatchNeeded(context)) { + this.m = f02; + this.k = 0; + this.p.dispatch(context, this); return; } - continuation.resumeWith(obj); + t1 t1Var = t1.b; + p0 a = t1.a(); + if (a.N()) { + this.m = f02; + this.k = 0; + a.K(this); + return; + } + a.M(true); + try { + CoroutineContext context2 = getContext(); + Object b = a.b(context2, this.o); + try { + this.q.resumeWith(obj); + do { + } while (a.Q()); + a.H(true); + } finally { + a.a(context2, b); + } + } catch (Throwable th) { + a.H(true); + throw th; + } } - public static /* synthetic */ void b(Continuation continuation, Object obj, Function1 function1, int i) { - int i2 = i & 2; - a(continuation, obj, null); + @Override // java.lang.Object + public String toString() { + StringBuilder L = c.d.b.a.a.L("DispatchedContinuation["); + L.append(this.p); + L.append(", "); + L.append(a.d0(this.q)); + L.append(']'); + return L.toString(); } } diff --git a/app/src/main/java/s/a/a/h.java b/app/src/main/java/s/a/a/h.java index 4772159076..d8c26af5db 100644 --- a/app/src/main/java/s/a/a/h.java +++ b/app/src/main/java/s/a/a/h.java @@ -1,8 +1,78 @@ package s.a.a; -/* compiled from: LockFreeLinkedList.kt */ -public class h extends j { - @Override // s.a.a.j - public boolean m() { - return false; + +import c.q.a.k.a; +import d0.k; +import d0.l; +import java.util.concurrent.CancellationException; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.Job; +import s.a.p0; +import s.a.t1; +import s.a.w; +/* compiled from: DispatchedContinuation.kt */ +public final class h { + public static final t a = new t("UNDEFINED"); + public static final t b = new t("REUSABLE_CLAIMED"); + + public static final void a(Continuation continuation, Object obj, Function1 function1) { + boolean z2; + if (continuation instanceof g) { + g gVar = (g) continuation; + Object f02 = a.f0(obj, function1); + if (gVar.p.isDispatchNeeded(gVar.getContext())) { + gVar.m = f02; + gVar.k = 1; + gVar.p.dispatch(gVar.getContext(), gVar); + return; + } + t1 t1Var = t1.b; + p0 a2 = t1.a(); + if (a2.N()) { + gVar.m = f02; + gVar.k = 1; + a2.K(gVar); + return; + } + a2.M(true); + try { + Job job = (Job) gVar.getContext().get(Job.h); + if (job == null || job.a()) { + z2 = false; + } else { + CancellationException p = job.p(); + if (f02 instanceof w) { + ((w) f02).b.invoke(p); + } + k.a aVar = k.i; + gVar.resumeWith(k.m78constructorimpl(l.createFailure(p))); + z2 = true; + } + if (!z2) { + CoroutineContext context = gVar.getContext(); + Object b2 = a.b(context, gVar.o); + try { + gVar.q.resumeWith(obj); + } finally { + a.a(context, b2); + } + } + do { + } while (a2.Q()); + } catch (Throwable th) { + a2.H(true); + throw th; + } + a2.H(true); + return; + } + continuation.resumeWith(obj); + } + + public static /* synthetic */ void b(Continuation continuation, Object obj, Function1 function1, int i) { + int i2 = i & 2; + a(continuation, obj, null); } } diff --git a/app/src/main/java/s/a/a/i.java b/app/src/main/java/s/a/a/i.java index 2ad5b05f5c..4b31d9d1c5 100644 --- a/app/src/main/java/s/a/a/i.java +++ b/app/src/main/java/s/a/a/i.java @@ -1,5 +1,8 @@ package s.a.a; /* compiled from: LockFreeLinkedList.kt */ -public final class i { - public static final Object a = new s("CONDITION_FALSE"); +public class i extends k { + @Override // s.a.a.k + public boolean m() { + return false; + } } diff --git a/app/src/main/java/s/a/a/j.java b/app/src/main/java/s/a/a/j.java index a38cbd80c3..8e04a69a97 100644 --- a/app/src/main/java/s/a/a/j.java +++ b/app/src/main/java/s/a/a/j.java @@ -1,203 +1,5 @@ package s.a.a; - -import d0.z.d.m; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; /* compiled from: LockFreeLinkedList.kt */ -public class j { - public static final AtomicReferenceFieldUpdater i = AtomicReferenceFieldUpdater.newUpdater(j.class, Object.class, "_next"); - public static final AtomicReferenceFieldUpdater j = AtomicReferenceFieldUpdater.newUpdater(j.class, Object.class, "_prev"); - public static final AtomicReferenceFieldUpdater k = AtomicReferenceFieldUpdater.newUpdater(j.class, Object.class, "_removedRef"); - public volatile Object _next = this; - public volatile Object _prev = this; - public volatile Object _removedRef = null; - - /* compiled from: LockFreeLinkedList.kt */ - public static abstract class a extends d { - public j b; - - /* renamed from: c reason: collision with root package name */ - public final j f2865c; - - public a(j jVar) { - this.f2865c = jVar; - } - - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ - @Override // s.a.a.d - public void b(j jVar, Object obj) { - j jVar2 = jVar; - boolean z2 = obj == null; - j jVar3 = z2 ? this.f2865c : this.b; - if (jVar3 != null && j.i.compareAndSet(jVar2, this, jVar3) && z2) { - j jVar4 = this.f2865c; - j jVar5 = this.b; - m.checkNotNull(jVar5); - jVar4.g(jVar5); - } - } - } - - /* compiled from: LockFreeLinkedList.kt */ - public static final class b extends o { - } - - public final boolean e(j jVar, j jVar2) { - j.lazySet(jVar, this); - AtomicReferenceFieldUpdater atomicReferenceFieldUpdater = i; - atomicReferenceFieldUpdater.lazySet(jVar, jVar2); - if (!atomicReferenceFieldUpdater.compareAndSet(this, jVar2, jVar)) { - return false; - } - jVar.g(jVar2); - return true; - } - - /* JADX WARNING: Code restructure failed: missing block: B:21:0x003c, code lost: - if (s.a.a.j.i.compareAndSet(r2, r1, ((s.a.a.p) r3).a) != false) goto L_0x003f; - */ - public final j f(o oVar) { - while (true) { - j jVar = (j) this._prev; - j jVar2 = jVar; - while (true) { - j jVar3 = null; - while (true) { - Object obj = jVar2._next; - if (obj == this) { - if (jVar == jVar2 || j.compareAndSet(this, jVar, jVar2)) { - return jVar2; - } - } else if (m()) { - return null; - } else { - if (obj == null) { - return jVar2; - } - if (obj instanceof o) { - ((o) obj).a(jVar2); - break; - } else if (!(obj instanceof p)) { - Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - jVar3 = jVar2; - jVar2 = (j) obj; - } else if (jVar3 != null) { - break; - } else { - jVar2 = (j) jVar2._prev; - } - } - } - jVar2 = jVar3; - } - } - } - - public final void g(j jVar) { - j jVar2; - do { - jVar2 = (j) jVar._prev; - if (i() != jVar) { - return; - } - } while (!j.compareAndSet(jVar, jVar2, this)); - if (m()) { - jVar.f(null); - } - } - - public final Object i() { - while (true) { - Object obj = this._next; - if (!(obj instanceof o)) { - return obj; - } - ((o) obj).a(this); - } - } - - public final j j() { - j jVar; - Object i2 = i(); - p pVar = (p) (!(i2 instanceof p) ? null : i2); - if (pVar != null && (jVar = pVar.a) != null) { - return jVar; - } - Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - return (j) i2; - } - - public final j k() { - j f = f(null); - if (f == null) { - Object obj = this._prev; - while (true) { - f = (j) obj; - if (!f.m()) { - break; - } - obj = f._prev; - } - } - return f; - } - - public final void l() { - j jVar = this; - while (true) { - Object i2 = jVar.i(); - if (!(i2 instanceof p)) { - jVar.f(null); - return; - } - jVar = ((p) i2).a; - } - } - - public boolean m() { - return i() instanceof p; - } - - public boolean n() { - return o() == null; - } - - public final j o() { - Object i2; - j jVar; - p pVar; - do { - i2 = i(); - if (i2 instanceof p) { - return ((p) i2).a; - } - if (i2 == this) { - return (j) i2; - } - Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - jVar = (j) i2; - pVar = (p) jVar._removedRef; - if (pVar == null) { - pVar = new p(jVar); - k.lazySet(jVar, pVar); - } - } while (!i.compareAndSet(this, i2, pVar)); - jVar.f(null); - return null; - } - - public final int p(j jVar, j jVar2, a aVar) { - j.lazySet(jVar, this); - AtomicReferenceFieldUpdater atomicReferenceFieldUpdater = i; - atomicReferenceFieldUpdater.lazySet(jVar, jVar2); - aVar.b = jVar2; - if (!atomicReferenceFieldUpdater.compareAndSet(this, jVar2, aVar)) { - return 0; - } - return aVar.a(this) == null ? 1 : 2; - } - - public String toString() { - return getClass().getSimpleName() + '@' + Integer.toHexString(System.identityHashCode(this)); - } +public final class j { + public static final Object a = new t("CONDITION_FALSE"); } diff --git a/app/src/main/java/s/a/a/k.java b/app/src/main/java/s/a/a/k.java index 3773e64b79..81c18ba3e6 100644 --- a/app/src/main/java/s/a/a/k.java +++ b/app/src/main/java/s/a/a/k.java @@ -1,54 +1,203 @@ package s.a.a; +import d0.z.d.m; +import java.util.Objects; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -/* compiled from: LockFreeTaskQueue.kt */ -public class k { - public static final AtomicReferenceFieldUpdater a = AtomicReferenceFieldUpdater.newUpdater(k.class, Object.class, "_cur"); - public volatile Object _cur; +/* compiled from: LockFreeLinkedList.kt */ +public class k { + public static final AtomicReferenceFieldUpdater i = AtomicReferenceFieldUpdater.newUpdater(k.class, Object.class, "_next"); + public static final AtomicReferenceFieldUpdater j = AtomicReferenceFieldUpdater.newUpdater(k.class, Object.class, "_prev"); + public static final AtomicReferenceFieldUpdater k = AtomicReferenceFieldUpdater.newUpdater(k.class, Object.class, "_removedRef"); + public volatile Object _next = this; + public volatile Object _prev = this; + public volatile Object _removedRef = null; - public k(boolean z2) { - this._cur = new l(8, z2); - } + /* compiled from: LockFreeLinkedList.kt */ + public static abstract class a extends d { + public k b; - public final boolean a(E e) { - while (true) { - l lVar = (l) this._cur; - int a2 = lVar.a(e); - if (a2 == 0) { - return true; - } - if (a2 == 1) { - a.compareAndSet(this, lVar, lVar.d()); - } else if (a2 == 2) { - return false; + /* renamed from: c reason: collision with root package name */ + public final k f2865c; + + public a(k kVar) { + this.f2865c = kVar; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // s.a.a.d + public void b(k kVar, Object obj) { + k kVar2 = kVar; + boolean z2 = obj == null; + k kVar3 = z2 ? this.f2865c : this.b; + if (kVar3 != null && k.i.compareAndSet(kVar2, this, kVar3) && z2) { + k kVar4 = this.f2865c; + k kVar5 = this.b; + m.checkNotNull(kVar5); + kVar4.g(kVar5); } } } - public final void b() { + /* compiled from: LockFreeLinkedList.kt */ + public static final class b extends p { + } + + public final boolean e(k kVar, k kVar2) { + j.lazySet(kVar, this); + AtomicReferenceFieldUpdater atomicReferenceFieldUpdater = i; + atomicReferenceFieldUpdater.lazySet(kVar, kVar2); + if (!atomicReferenceFieldUpdater.compareAndSet(this, kVar2, kVar)) { + return false; + } + kVar.g(kVar2); + return true; + } + + /* JADX WARNING: Code restructure failed: missing block: B:21:0x003c, code lost: + if (s.a.a.k.i.compareAndSet(r2, r1, ((s.a.a.q) r3).a) != false) goto L_0x003f; + */ + public final k f(p pVar) { while (true) { - l lVar = (l) this._cur; - if (!lVar.b()) { - a.compareAndSet(this, lVar, lVar.d()); - } else { + k kVar = (k) this._prev; + k kVar2 = kVar; + while (true) { + k kVar3 = null; + while (true) { + Object obj = kVar2._next; + if (obj == this) { + if (kVar == kVar2 || j.compareAndSet(this, kVar, kVar2)) { + return kVar2; + } + } else if (m()) { + return null; + } else { + if (obj == null) { + return kVar2; + } + if (obj instanceof p) { + ((p) obj).a(kVar2); + break; + } else if (!(obj instanceof q)) { + Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); + kVar3 = kVar2; + kVar2 = (k) obj; + } else if (kVar3 != null) { + break; + } else { + kVar2 = (k) kVar2._prev; + } + } + } + kVar2 = kVar3; + } + } + } + + public final void g(k kVar) { + k kVar2; + do { + kVar2 = (k) kVar._prev; + if (i() != kVar) { return; } + } while (!j.compareAndSet(kVar, kVar2, this)); + if (m()) { + kVar.f(null); } } - public final int c() { - long j = ((l) this._cur)._state; - return 1073741823 & (((int) ((j & 1152921503533105152L) >> 30)) - ((int) ((1073741823 & j) >> 0))); - } - - public final E d() { + public final Object i() { while (true) { - l lVar = (l) this._cur; - E e = (E) lVar.e(); - if (e != l.f2866c) { - return e; + Object obj = this._next; + if (!(obj instanceof p)) { + return obj; } - a.compareAndSet(this, lVar, lVar.d()); + ((p) obj).a(this); } } + + public final k j() { + k kVar; + Object i2 = i(); + q qVar = (q) (!(i2 instanceof q) ? null : i2); + if (qVar != null && (kVar = qVar.a) != null) { + return kVar; + } + Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); + return (k) i2; + } + + public final k k() { + k f = f(null); + if (f == null) { + Object obj = this._prev; + while (true) { + f = (k) obj; + if (!f.m()) { + break; + } + obj = f._prev; + } + } + return f; + } + + public final void l() { + k kVar = this; + while (true) { + Object i2 = kVar.i(); + if (!(i2 instanceof q)) { + kVar.f(null); + return; + } + kVar = ((q) i2).a; + } + } + + public boolean m() { + return i() instanceof q; + } + + public boolean n() { + return o() == null; + } + + public final k o() { + Object i2; + k kVar; + q qVar; + do { + i2 = i(); + if (i2 instanceof q) { + return ((q) i2).a; + } + if (i2 == this) { + return (k) i2; + } + Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); + kVar = (k) i2; + qVar = (q) kVar._removedRef; + if (qVar == null) { + qVar = new q(kVar); + k.lazySet(kVar, qVar); + } + } while (!i.compareAndSet(this, i2, qVar)); + kVar.f(null); + return null; + } + + public final int p(k kVar, k kVar2, a aVar) { + j.lazySet(kVar, this); + AtomicReferenceFieldUpdater atomicReferenceFieldUpdater = i; + atomicReferenceFieldUpdater.lazySet(kVar, kVar2); + aVar.b = kVar2; + if (!atomicReferenceFieldUpdater.compareAndSet(this, kVar2, aVar)) { + return 0; + } + return aVar.a(this) == null ? 1 : 2; + } + + public String toString() { + return getClass().getSimpleName() + '@' + Integer.toHexString(System.identityHashCode(this)); + } } diff --git a/app/src/main/java/s/a/a/l.java b/app/src/main/java/s/a/a/l.java index 15ec0223d2..4bec2bef85 100644 --- a/app/src/main/java/s/a/a/l.java +++ b/app/src/main/java/s/a/a/l.java @@ -1,201 +1,54 @@ package s.a.a; -import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: LockFreeTaskQueue.kt */ -public final class l { - public static final AtomicReferenceFieldUpdater a = AtomicReferenceFieldUpdater.newUpdater(l.class, Object.class, "_next"); - public static final AtomicLongFieldUpdater b = AtomicLongFieldUpdater.newUpdater(l.class, "_state"); +public class l { + public static final AtomicReferenceFieldUpdater a = AtomicReferenceFieldUpdater.newUpdater(l.class, Object.class, "_cur"); + public volatile Object _cur; - /* renamed from: c reason: collision with root package name */ - public static final s f2866c = new s("REMOVE_FROZEN"); - public static final a d = new a(null); - public volatile Object _next = null; - public volatile long _state = 0; - public final int e; - public AtomicReferenceArray f; - public final int g; - public final boolean h; - - /* compiled from: LockFreeTaskQueue.kt */ - public static final class a { - public a(DefaultConstructorMarker defaultConstructorMarker) { - } + public l(boolean z2) { + this._cur = new m(8, z2); } - /* compiled from: LockFreeTaskQueue.kt */ - public static final class b { - public final int a; - - public b(int i) { - this.a = i; - } - } - - public l(int i, boolean z2) { - this.g = i; - this.h = z2; - int i2 = i - 1; - this.e = i2; - this.f = new AtomicReferenceArray(i); - boolean z3 = false; - if (i2 <= 1073741823) { - if (!((i & i2) == 0 ? true : z3)) { - throw new IllegalStateException("Check failed.".toString()); - } - return; - } - throw new IllegalStateException("Check failed.".toString()); - } - - public final int a(E e) { + public final boolean a(E e) { while (true) { - long j = this._state; - if ((3458764513820540928L & j) != 0) { - return (2305843009213693952L & j) != 0 ? 2 : 1; - } - int i = (int) ((1073741823 & j) >> 0); - int i2 = (int) ((1152921503533105152L & j) >> 30); - int i3 = this.e; - if (((i2 + 2) & i3) == (i & i3)) { - return 1; - } - if (!this.h && this.f.get(i2 & i3) != null) { - int i4 = this.g; - if (i4 < 1024 || ((i2 - i) & 1073741823) > (i4 >> 1)) { - break; - } - } else if (b.compareAndSet(this, j, (-1152921503533105153L & j) | (((long) ((i2 + 1) & 1073741823)) << 30))) { - this.f.set(i2 & i3, e); - l lVar = this; - while ((lVar._state & 1152921504606846976L) != 0) { - lVar = lVar.d(); - Object obj = lVar.f.get(lVar.e & i2); - if (!(obj instanceof b) || ((b) obj).a != i2) { - lVar = null; - continue; - } else { - lVar.f.set(lVar.e & i2, e); - continue; - } - if (lVar == null) { - break; - } - } - return 0; - } - } - return 1; - } - - public final boolean b() { - long j; - do { - j = this._state; - if ((j & 2305843009213693952L) != 0) { + m mVar = (m) this._cur; + int a2 = mVar.a(e); + if (a2 == 0) { return true; } - if ((1152921504606846976L & j) != 0) { + if (a2 == 1) { + a.compareAndSet(this, mVar, mVar.d()); + } else if (a2 == 2) { return false; } - } while (!b.compareAndSet(this, j, j | 2305843009213693952L)); - return true; - } - - public final boolean c() { - long j = this._state; - return ((int) ((1073741823 & j) >> 0)) == ((int) ((j & 1152921503533105152L) >> 30)); - } - - /* JADX DEBUG: Multi-variable search result rejected for r8v2, resolved type: java.util.concurrent.atomic.AtomicReferenceArray */ - /* JADX WARN: Multi-variable type inference failed */ - public final l d() { - long j; - while (true) { - j = this._state; - if ((j & 1152921504606846976L) == 0) { - long j2 = j | 1152921504606846976L; - if (b.compareAndSet(this, j, j2)) { - j = j2; - break; - } - } else { - break; - } - } - while (true) { - l lVar = (l) this._next; - if (lVar != null) { - return lVar; - } - AtomicReferenceFieldUpdater atomicReferenceFieldUpdater = a; - l lVar2 = new l(this.g * 2, this.h); - int i = (int) ((1073741823 & j) >> 0); - int i2 = (int) ((1152921503533105152L & j) >> 30); - while (true) { - int i3 = this.e; - int i4 = i & i3; - if (i4 == (i3 & i2)) { - break; - } - Object obj = this.f.get(i4); - if (obj == null) { - obj = new b(i); - } - lVar2.f.set(lVar2.e & i, obj); - i++; - } - lVar2._state = -1152921504606846977L & j; - atomicReferenceFieldUpdater.compareAndSet(this, null, lVar2); } } - public final Object e() { + public final void b() { while (true) { - long j = this._state; - if ((j & 1152921504606846976L) != 0) { - return f2866c; - } - int i = (int) ((j & 1073741823) >> 0); - int i2 = this.e; - int i3 = ((int) ((1152921503533105152L & j) >> 30)) & i2; - int i4 = i2 & i; - if (i3 == i4) { - return null; - } - Object obj = this.f.get(i4); - if (obj == null) { - if (this.h) { - return null; - } - } else if (obj instanceof b) { - return null; + m mVar = (m) this._cur; + if (!mVar.b()) { + a.compareAndSet(this, mVar, mVar.d()); } else { - long j2 = ((long) ((i + 1) & 1073741823)) << 0; - if (b.compareAndSet(this, j, (j & -1073741824) | j2)) { - this.f.set(this.e & i, null); - return obj; - } else if (this.h) { - l lVar = this; - while (true) { - long j3 = lVar._state; - int i5 = (int) ((j3 & 1073741823) >> 0); - if ((j3 & 1152921504606846976L) != 0) { - lVar = lVar.d(); - } else if (b.compareAndSet(lVar, j3, (j3 & -1073741824) | j2)) { - lVar.f.set(lVar.e & i5, null); - lVar = null; - } else { - continue; - } - if (lVar == null) { - return obj; - } - } - } + return; } } } + + public final int c() { + long j = ((m) this._cur)._state; + return 1073741823 & (((int) ((j & 1152921503533105152L) >> 30)) - ((int) ((1073741823 & j) >> 0))); + } + + public final E d() { + while (true) { + m mVar = (m) this._cur; + E e = (E) mVar.e(); + if (e != m.f2866c) { + return e; + } + a.compareAndSet(this, mVar, mVar.d()); + } + } } diff --git a/app/src/main/java/s/a/a/m.java b/app/src/main/java/s/a/a/m.java index c8808eb606..33f64f3469 100644 --- a/app/src/main/java/s/a/a/m.java +++ b/app/src/main/java/s/a/a/m.java @@ -1,58 +1,201 @@ package s.a.a; -import c.q.a.k.a; -import d0.f0.n; -import d0.f0.q; -import java.util.Iterator; -import java.util.List; -import kotlinx.coroutines.internal.MainDispatcherFactory; -import s.a.i1; -/* compiled from: MainDispatchers.kt */ -public final class m { - public static final boolean a; - public static final i1 b; +import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import java.util.concurrent.atomic.AtomicReferenceArray; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: LockFreeTaskQueue.kt */ +public final class m { + public static final AtomicReferenceFieldUpdater a = AtomicReferenceFieldUpdater.newUpdater(m.class, Object.class, "_next"); + public static final AtomicLongFieldUpdater b = AtomicLongFieldUpdater.newUpdater(m.class, "_state"); - static { - m mVar = new m(); - String V = a.V("kotlinx.coroutines.fast.service.loader"); - a = V != null ? Boolean.parseBoolean(V) : true; - b = mVar.a(); + /* renamed from: c reason: collision with root package name */ + public static final t f2866c = new t("REMOVE_FROZEN"); + public static final a d = new a(null); + public volatile Object _next = null; + public volatile long _state = 0; + public final int e; + public AtomicReferenceArray f; + public final int g; + public final boolean h; + + /* compiled from: LockFreeTaskQueue.kt */ + public static final class a { + public a(DefaultConstructorMarker defaultConstructorMarker) { + } } - /* JADX WARN: Multi-variable type inference failed */ - public final i1 a() { - MainDispatcherFactory mainDispatcherFactory; - List list = q.toList(n.asSequence(a.a())); - Iterator it = list.iterator(); - if (!it.hasNext()) { - mainDispatcherFactory = null; - } else { - Object next = it.next(); - if (it.hasNext()) { - int loadPriority = ((MainDispatcherFactory) next).getLoadPriority(); - do { - Object next2 = it.next(); - int loadPriority2 = ((MainDispatcherFactory) next2).getLoadPriority(); - if (loadPriority < loadPriority2) { - next = next2; - loadPriority = loadPriority2; - } - } while (it.hasNext()); - } - mainDispatcherFactory = next; + /* compiled from: LockFreeTaskQueue.kt */ + public static final class b { + public final int a; + + public b(int i) { + this.a = i; } - MainDispatcherFactory mainDispatcherFactory2 = mainDispatcherFactory; - if (mainDispatcherFactory2 != null) { - try { - i1 createDispatcher = mainDispatcherFactory2.createDispatcher(list); - if (createDispatcher != null) { - return createDispatcher; + } + + public m(int i, boolean z2) { + this.g = i; + this.h = z2; + int i2 = i - 1; + this.e = i2; + this.f = new AtomicReferenceArray(i); + boolean z3 = false; + if (i2 <= 1073741823) { + if (!((i & i2) == 0 ? true : z3)) { + throw new IllegalStateException("Check failed.".toString()); + } + return; + } + throw new IllegalStateException("Check failed.".toString()); + } + + public final int a(E e) { + while (true) { + long j = this._state; + if ((3458764513820540928L & j) != 0) { + return (2305843009213693952L & j) != 0 ? 2 : 1; + } + int i = (int) ((1073741823 & j) >> 0); + int i2 = (int) ((1152921503533105152L & j) >> 30); + int i3 = this.e; + if (((i2 + 2) & i3) == (i & i3)) { + return 1; + } + if (!this.h && this.f.get(i2 & i3) != null) { + int i4 = this.g; + if (i4 < 1024 || ((i2 - i) & 1073741823) > (i4 >> 1)) { + break; + } + } else if (b.compareAndSet(this, j, (-1152921503533105153L & j) | (((long) ((i2 + 1) & 1073741823)) << 30))) { + this.f.set(i2 & i3, e); + m mVar = this; + while ((mVar._state & 1152921504606846976L) != 0) { + mVar = mVar.d(); + Object obj = mVar.f.get(mVar.e & i2); + if (!(obj instanceof b) || ((b) obj).a != i2) { + mVar = null; + continue; + } else { + mVar.f.set(mVar.e & i2, e); + continue; + } + if (mVar == null) { + break; + } + } + return 0; + } + } + return 1; + } + + public final boolean b() { + long j; + do { + j = this._state; + if ((j & 2305843009213693952L) != 0) { + return true; + } + if ((1152921504606846976L & j) != 0) { + return false; + } + } while (!b.compareAndSet(this, j, j | 2305843009213693952L)); + return true; + } + + public final boolean c() { + long j = this._state; + return ((int) ((1073741823 & j) >> 0)) == ((int) ((j & 1152921503533105152L) >> 30)); + } + + /* JADX DEBUG: Multi-variable search result rejected for r8v2, resolved type: java.util.concurrent.atomic.AtomicReferenceArray */ + /* JADX WARN: Multi-variable type inference failed */ + public final m d() { + long j; + while (true) { + j = this._state; + if ((j & 1152921504606846976L) == 0) { + long j2 = j | 1152921504606846976L; + if (b.compareAndSet(this, j, j2)) { + j = j2; + break; + } + } else { + break; + } + } + while (true) { + m mVar = (m) this._next; + if (mVar != null) { + return mVar; + } + AtomicReferenceFieldUpdater atomicReferenceFieldUpdater = a; + m mVar2 = new m(this.g * 2, this.h); + int i = (int) ((1073741823 & j) >> 0); + int i2 = (int) ((1152921503533105152L & j) >> 30); + while (true) { + int i3 = this.e; + int i4 = i & i3; + if (i4 == (i3 & i2)) { + break; + } + Object obj = this.f.get(i4); + if (obj == null) { + obj = new b(i); + } + mVar2.f.set(mVar2.e & i, obj); + i++; + } + mVar2._state = -1152921504606846977L & j; + atomicReferenceFieldUpdater.compareAndSet(this, null, mVar2); + } + } + + public final Object e() { + while (true) { + long j = this._state; + if ((j & 1152921504606846976L) != 0) { + return f2866c; + } + int i = (int) ((j & 1073741823) >> 0); + int i2 = this.e; + int i3 = ((int) ((1152921503533105152L & j) >> 30)) & i2; + int i4 = i2 & i; + if (i3 == i4) { + return null; + } + Object obj = this.f.get(i4); + if (obj == null) { + if (this.h) { + return null; + } + } else if (obj instanceof b) { + return null; + } else { + long j2 = ((long) ((i + 1) & 1073741823)) << 0; + if (b.compareAndSet(this, j, (j & -1073741824) | j2)) { + this.f.set(this.e & i, null); + return obj; + } else if (this.h) { + m mVar = this; + while (true) { + long j3 = mVar._state; + int i5 = (int) ((j3 & 1073741823) >> 0); + if ((j3 & 1152921504606846976L) != 0) { + mVar = mVar.d(); + } else if (b.compareAndSet(mVar, j3, (j3 & -1073741824) | j2)) { + mVar.f.set(mVar.e & i5, null); + mVar = null; + } else { + continue; + } + if (mVar == null) { + return obj; + } + } } - } catch (Throwable th) { - mainDispatcherFactory2.hintOnError(); - throw th; } } - throw new IllegalStateException("Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. 'kotlinx-coroutines-android' and ensure it has the same version as 'kotlinx-coroutines-core'"); } } diff --git a/app/src/main/java/s/a/a/n.java b/app/src/main/java/s/a/a/n.java index a5d25e3915..ef69755058 100644 --- a/app/src/main/java/s/a/a/n.java +++ b/app/src/main/java/s/a/a/n.java @@ -1,36 +1,57 @@ package s.a.a; import c.q.a.k.a; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function1; -import kotlinx.coroutines.internal.UndeliveredElementException; -/* compiled from: OnUndeliveredElement.kt */ -public final class n extends o implements Function1 { - public final /* synthetic */ CoroutineContext $context; - public final /* synthetic */ Object $element; - public final /* synthetic */ Function1 $this_bindCancellationFun; +import d0.f0.q; +import java.util.Iterator; +import java.util.List; +import kotlinx.coroutines.internal.MainDispatcherFactory; +import s.a.k1; +/* compiled from: MainDispatchers.kt */ +public final class n { + public static final boolean a; + public static final k1 b; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public n(Function1 function1, Object obj, CoroutineContext coroutineContext) { - super(1); - this.$this_bindCancellationFun = function1; - this.$element = obj; - this.$context = coroutineContext; + static { + n nVar = new n(); + String W = a.W("kotlinx.coroutines.fast.service.loader"); + a = W != null ? Boolean.parseBoolean(W) : true; + b = nVar.a(); } - /* 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 Unit invoke(Throwable th) { - Function1 function1 = this.$this_bindCancellationFun; - Object obj = this.$element; - CoroutineContext coroutineContext = this.$context; - UndeliveredElementException h = a.h(function1, obj, null); - if (h != null) { - a.w(coroutineContext, h); + /* JADX WARN: Multi-variable type inference failed */ + public final k1 a() { + MainDispatcherFactory mainDispatcherFactory; + List list = q.toList(d0.f0.n.asSequence(a.a())); + Iterator it = list.iterator(); + if (!it.hasNext()) { + mainDispatcherFactory = null; + } else { + Object next = it.next(); + if (it.hasNext()) { + int loadPriority = ((MainDispatcherFactory) next).getLoadPriority(); + do { + Object next2 = it.next(); + int loadPriority2 = ((MainDispatcherFactory) next2).getLoadPriority(); + if (loadPriority < loadPriority2) { + next = next2; + loadPriority = loadPriority2; + } + } while (it.hasNext()); + } + mainDispatcherFactory = next; } - return Unit.a; + MainDispatcherFactory mainDispatcherFactory2 = mainDispatcherFactory; + if (mainDispatcherFactory2 != null) { + try { + k1 createDispatcher = mainDispatcherFactory2.createDispatcher(list); + if (createDispatcher != null) { + return createDispatcher; + } + } catch (Throwable th) { + mainDispatcherFactory2.hintOnError(); + throw th; + } + } + throw new IllegalStateException("Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. 'kotlinx-coroutines-android' and ensure it has the same version as 'kotlinx-coroutines-core'"); } } diff --git a/app/src/main/java/s/a/a/o.java b/app/src/main/java/s/a/a/o.java index 782ec02a4f..7ab7a78c09 100644 --- a/app/src/main/java/s/a/a/o.java +++ b/app/src/main/java/s/a/a/o.java @@ -1,11 +1,35 @@ package s.a.a; import c.q.a.k.a; -/* compiled from: Atomic.kt */ -public abstract class o { - public abstract Object a(Object obj); +import kotlin.Unit; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.internal.UndeliveredElementException; +/* compiled from: OnUndeliveredElement.kt */ +public final class o extends d0.z.d.o implements Function1 { + public final /* synthetic */ CoroutineContext $context; + public final /* synthetic */ Object $element; + public final /* synthetic */ Function1 $this_bindCancellationFun; - public String toString() { - return getClass().getSimpleName() + '@' + a.t(this); + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public o(Function1 function1, Object obj, CoroutineContext coroutineContext) { + super(1); + this.$this_bindCancellationFun = function1; + this.$element = obj; + this.$context = coroutineContext; + } + + /* 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 Unit invoke(Throwable th) { + Function1 function1 = this.$this_bindCancellationFun; + Object obj = this.$element; + CoroutineContext coroutineContext = this.$context; + UndeliveredElementException h = a.h(function1, obj, null); + if (h != null) { + a.x(coroutineContext, h); + } + return Unit.a; } } diff --git a/app/src/main/java/s/a/a/p.java b/app/src/main/java/s/a/a/p.java index dc1be9301d..4a73315a9f 100644 --- a/app/src/main/java/s/a/a/p.java +++ b/app/src/main/java/s/a/a/p.java @@ -1,18 +1,11 @@ package s.a.a; -import c.d.b.a.a; -/* compiled from: LockFreeLinkedList.kt */ -public final class p { - public final j a; - - public p(j jVar) { - this.a = jVar; - } +import c.q.a.k.a; +/* compiled from: Atomic.kt */ +public abstract class p { + public abstract Object a(Object obj); public String toString() { - StringBuilder L = a.L("Removed["); - L.append(this.a); - L.append(']'); - return L.toString(); + return getClass().getSimpleName() + '@' + a.u(this); } } diff --git a/app/src/main/java/s/a/a/q.java b/app/src/main/java/s/a/a/q.java index 98f1b4f756..80076f1c56 100644 --- a/app/src/main/java/s/a/a/q.java +++ b/app/src/main/java/s/a/a/q.java @@ -1,34 +1,18 @@ package s.a.a; -import c.q.a.k.a; -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; -import kotlin.coroutines.jvm.internal.CoroutineStackFrame; -import s.a.b; -/* compiled from: Scopes.kt */ -public class q extends b implements CoroutineStackFrame { - public final Continuation l; +import c.d.b.a.a; +/* compiled from: LockFreeLinkedList.kt */ +public final class q { + public final k a; - /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.coroutines.Continuation */ - /* JADX WARN: Multi-variable type inference failed */ - public q(CoroutineContext coroutineContext, Continuation continuation) { - super(coroutineContext, true); - this.l = continuation; + public q(k kVar) { + this.a = kVar; } - @Override // s.a.e1 - public final boolean K() { - return true; - } - - @Override // s.a.b - public void X(Object obj) { - Continuation continuation = this.l; - continuation.resumeWith(a.K(obj, continuation)); - } - - @Override // s.a.e1 - public void m(Object obj) { - g.b(d0.w.g.b.intercepted(this.l), a.K(obj, this.l), null, 2); + public String toString() { + StringBuilder L = a.L("Removed["); + L.append(this.a); + L.append(']'); + return L.toString(); } } diff --git a/app/src/main/java/s/a/a/r.java b/app/src/main/java/s/a/a/r.java index b8d319394a..6bd6323fe0 100644 --- a/app/src/main/java/s/a/a/r.java +++ b/app/src/main/java/s/a/a/r.java @@ -1,36 +1,34 @@ package s.a.a; -import d0.k; -import d0.l; -/* compiled from: StackTraceRecovery.kt */ -public final class r { - public static final String a; - public static final String b; +import c.q.a.k.a; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import kotlin.coroutines.jvm.internal.CoroutineStackFrame; +import s.a.b; +/* compiled from: Scopes.kt */ +public class r extends b implements CoroutineStackFrame { + public final Continuation l; - static { - Object obj; - Object obj2; - try { - k.a aVar = k.i; - obj = k.m78constructorimpl(Class.forName("d0.w.h.a.a").getCanonicalName()); - } catch (Throwable th) { - k.a aVar2 = k.i; - obj = k.m78constructorimpl(l.createFailure(th)); - } - if (k.m80exceptionOrNullimpl(obj) != null) { - obj = "kotlin.coroutines.jvm.internal.BaseContinuationImpl"; - } - a = (String) obj; - try { - k.a aVar3 = k.i; - obj2 = k.m78constructorimpl(Class.forName("s.a.a.r").getCanonicalName()); - } catch (Throwable th2) { - k.a aVar4 = k.i; - obj2 = k.m78constructorimpl(l.createFailure(th2)); - } - if (k.m80exceptionOrNullimpl(obj2) != null) { - obj2 = "kotlinx.coroutines.internal.StackTraceRecoveryKt"; - } - b = (String) obj2; + /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.coroutines.Continuation */ + /* JADX WARN: Multi-variable type inference failed */ + public r(CoroutineContext coroutineContext, Continuation continuation) { + super(coroutineContext, true); + this.l = continuation; + } + + @Override // s.a.g1 + public final boolean K() { + return true; + } + + @Override // s.a.b + public void X(Object obj) { + Continuation continuation = this.l; + continuation.resumeWith(a.L(obj, continuation)); + } + + @Override // s.a.g1 + public void m(Object obj) { + h.b(d0.w.g.b.intercepted(this.l), a.L(obj, this.l), null, 2); } } diff --git a/app/src/main/java/s/a/a/s.java b/app/src/main/java/s/a/a/s.java index 619b6438e9..9d47e80fcf 100644 --- a/app/src/main/java/s/a/a/s.java +++ b/app/src/main/java/s/a/a/s.java @@ -1,13 +1,36 @@ package s.a.a; -/* compiled from: Symbol.kt */ + +import d0.k; +import d0.l; +/* compiled from: StackTraceRecovery.kt */ public final class s { - public final String a; + public static final String a; + public static final String b; - public s(String str) { - this.a = str; - } - - public String toString() { - return this.a; + static { + Object obj; + Object obj2; + try { + k.a aVar = k.i; + obj = k.m78constructorimpl(Class.forName("d0.w.h.a.a").getCanonicalName()); + } catch (Throwable th) { + k.a aVar2 = k.i; + obj = k.m78constructorimpl(l.createFailure(th)); + } + if (k.m80exceptionOrNullimpl(obj) != null) { + obj = "kotlin.coroutines.jvm.internal.BaseContinuationImpl"; + } + a = (String) obj; + try { + k.a aVar3 = k.i; + obj2 = k.m78constructorimpl(Class.forName("s.a.a.s").getCanonicalName()); + } catch (Throwable th2) { + k.a aVar4 = k.i; + obj2 = k.m78constructorimpl(l.createFailure(th2)); + } + if (k.m80exceptionOrNullimpl(obj2) != null) { + obj2 = "kotlinx.coroutines.internal.StackTraceRecoveryKt"; + } + b = (String) obj2; } } diff --git a/app/src/main/java/s/a/a/t.java b/app/src/main/java/s/a/a/t.java index 83ab4d44f6..716d0645cf 100644 --- a/app/src/main/java/s/a/a/t.java +++ b/app/src/main/java/s/a/a/t.java @@ -1,5 +1,13 @@ package s.a.a; -/* compiled from: SystemProps.kt */ -public final /* synthetic */ class t { - public static final int a = Runtime.getRuntime().availableProcessors(); +/* compiled from: Symbol.kt */ +public final class t { + public final String a; + + public t(String str) { + this.a = str; + } + + public String toString() { + return this.a; + } } diff --git a/app/src/main/java/s/a/a/u.java b/app/src/main/java/s/a/a/u.java index f37bacd479..8095efdc2c 100644 --- a/app/src/main/java/s/a/a/u.java +++ b/app/src/main/java/s/a/a/u.java @@ -1,124 +1,5 @@ package s.a.a; - -import d0.z.d.m; -import java.lang.Comparable; -import java.util.Arrays; -import s.a.a.v; -import s.a.p0; -/* compiled from: ThreadSafeHeap.kt */ -public class u> { - public volatile int _size = 0; - public T[] a; - - public final void a(T t) { - p0.c cVar = (p0.c) t; - cVar.g(this); - T[] tArr = this.a; - if (tArr == null) { - tArr = (T[]) new v[4]; - this.a = tArr; - } else if (this._size >= tArr.length) { - Object[] copyOf = Arrays.copyOf(tArr, this._size * 2); - m.checkNotNullExpressionValue(copyOf, "java.util.Arrays.copyOf(this, newSize)"); - tArr = (T[]) ((v[]) copyOf); - this.a = tArr; - } - int i = this._size; - this._size = i + 1; - tArr[i] = t; - cVar.j = i; - d(i); - } - - public final T b() { - T[] tArr = this.a; - if (tArr != null) { - return tArr[0]; - } - return null; - } - - public final T c(int i) { - T[] tArr = this.a; - m.checkNotNull(tArr); - this._size--; - if (i < this._size) { - e(i, this._size); - int i2 = (i - 1) / 2; - if (i > 0) { - T t = tArr[i]; - m.checkNotNull(t); - T t2 = tArr[i2]; - m.checkNotNull(t2); - if (((Comparable) t).compareTo(t2) < 0) { - e(i, i2); - d(i2); - } - } - while (true) { - int i3 = (i * 2) + 1; - if (i3 >= this._size) { - break; - } - T[] tArr2 = this.a; - m.checkNotNull(tArr2); - int i4 = i3 + 1; - if (i4 < this._size) { - T t3 = tArr2[i4]; - m.checkNotNull(t3); - T t4 = tArr2[i3]; - m.checkNotNull(t4); - if (((Comparable) t3).compareTo(t4) < 0) { - i3 = i4; - } - } - T t5 = tArr2[i]; - m.checkNotNull(t5); - T t6 = tArr2[i3]; - m.checkNotNull(t6); - if (((Comparable) t5).compareTo(t6) <= 0) { - break; - } - e(i, i3); - i = i3; - } - } - T t7 = tArr[this._size]; - m.checkNotNull(t7); - t7.g(null); - t7.f(-1); - tArr[this._size] = null; - return t7; - } - - public final void d(int i) { - while (i > 0) { - T[] tArr = this.a; - m.checkNotNull(tArr); - int i2 = (i - 1) / 2; - T t = tArr[i2]; - m.checkNotNull(t); - T t2 = tArr[i]; - m.checkNotNull(t2); - if (((Comparable) t).compareTo(t2) > 0) { - e(i, i2); - i = i2; - } else { - return; - } - } - } - - public final void e(int i, int i2) { - T[] tArr = this.a; - m.checkNotNull(tArr); - T t = tArr[i2]; - m.checkNotNull(t); - T t2 = tArr[i]; - m.checkNotNull(t2); - tArr[i] = t; - tArr[i2] = t2; - t.f(i); - t2.f(i2); - } +/* compiled from: SystemProps.kt */ +public final /* synthetic */ class u { + public static final int a = Runtime.getRuntime().availableProcessors(); } diff --git a/app/src/main/java/s/a/a/v.java b/app/src/main/java/s/a/a/v.java index 31fbbb00f1..a97c5fe45f 100644 --- a/app/src/main/java/s/a/a/v.java +++ b/app/src/main/java/s/a/a/v.java @@ -1,11 +1,124 @@ package s.a.a; + +import d0.z.d.m; +import java.lang.Comparable; +import java.util.Arrays; +import s.a.a.w; +import s.a.q0; /* compiled from: ThreadSafeHeap.kt */ -public interface v { - void f(int i); +public class v> { + public volatile int _size = 0; + public T[] a; - void g(u uVar); + public final void a(T t) { + q0.c cVar = (q0.c) t; + cVar.g(this); + T[] tArr = this.a; + if (tArr == null) { + tArr = (T[]) new w[4]; + this.a = tArr; + } else if (this._size >= tArr.length) { + Object[] copyOf = Arrays.copyOf(tArr, this._size * 2); + m.checkNotNullExpressionValue(copyOf, "java.util.Arrays.copyOf(this, newSize)"); + tArr = (T[]) ((w[]) copyOf); + this.a = tArr; + } + int i = this._size; + this._size = i + 1; + tArr[i] = t; + cVar.j = i; + d(i); + } - int getIndex(); + public final T b() { + T[] tArr = this.a; + if (tArr != null) { + return tArr[0]; + } + return null; + } - u i(); + public final T c(int i) { + T[] tArr = this.a; + m.checkNotNull(tArr); + this._size--; + if (i < this._size) { + e(i, this._size); + int i2 = (i - 1) / 2; + if (i > 0) { + T t = tArr[i]; + m.checkNotNull(t); + T t2 = tArr[i2]; + m.checkNotNull(t2); + if (((Comparable) t).compareTo(t2) < 0) { + e(i, i2); + d(i2); + } + } + while (true) { + int i3 = (i * 2) + 1; + if (i3 >= this._size) { + break; + } + T[] tArr2 = this.a; + m.checkNotNull(tArr2); + int i4 = i3 + 1; + if (i4 < this._size) { + T t3 = tArr2[i4]; + m.checkNotNull(t3); + T t4 = tArr2[i3]; + m.checkNotNull(t4); + if (((Comparable) t3).compareTo(t4) < 0) { + i3 = i4; + } + } + T t5 = tArr2[i]; + m.checkNotNull(t5); + T t6 = tArr2[i3]; + m.checkNotNull(t6); + if (((Comparable) t5).compareTo(t6) <= 0) { + break; + } + e(i, i3); + i = i3; + } + } + T t7 = tArr[this._size]; + m.checkNotNull(t7); + t7.g(null); + t7.f(-1); + tArr[this._size] = null; + return t7; + } + + public final void d(int i) { + while (i > 0) { + T[] tArr = this.a; + m.checkNotNull(tArr); + int i2 = (i - 1) / 2; + T t = tArr[i2]; + m.checkNotNull(t); + T t2 = tArr[i]; + m.checkNotNull(t2); + if (((Comparable) t).compareTo(t2) > 0) { + e(i, i2); + i = i2; + } else { + return; + } + } + } + + public final void e(int i, int i2) { + T[] tArr = this.a; + m.checkNotNull(tArr); + T t = tArr[i2]; + m.checkNotNull(t); + T t2 = tArr[i]; + m.checkNotNull(t2); + tArr[i] = t; + tArr[i2] = t2; + t.f(i); + t2.f(i2); + } } diff --git a/app/src/main/java/s/a/a/w.java b/app/src/main/java/s/a/a/w.java index 9bdc9e51c2..121089b121 100644 --- a/app/src/main/java/s/a/a/w.java +++ b/app/src/main/java/s/a/a/w.java @@ -1,16 +1,11 @@ package s.a.a; +/* compiled from: ThreadSafeHeap.kt */ +public interface w { + void f(int i); -import kotlin.coroutines.CoroutineContext; -/* compiled from: ThreadContext.kt */ -public final class w { - public Object[] a; - public int b; + void g(v vVar); - /* renamed from: c reason: collision with root package name */ - public final CoroutineContext f2867c; + int getIndex(); - public w(CoroutineContext coroutineContext, int i) { - this.f2867c = coroutineContext; - this.a = new Object[i]; - } + v i(); } diff --git a/app/src/main/java/s/a/a/x.java b/app/src/main/java/s/a/a/x.java new file mode 100644 index 0000000000..d34c423e1d --- /dev/null +++ b/app/src/main/java/s/a/a/x.java @@ -0,0 +1,16 @@ +package s.a.a; + +import kotlin.coroutines.CoroutineContext; +/* compiled from: ThreadContext.kt */ +public final class x { + public Object[] a; + public int b; + + /* renamed from: c reason: collision with root package name */ + public final CoroutineContext f2867c; + + public x(CoroutineContext coroutineContext, int i) { + this.f2867c = coroutineContext; + this.a = new Object[i]; + } +} diff --git a/app/src/main/java/s/a/a1.java b/app/src/main/java/s/a/a1.java index 84a4d7840a..d3a4337f5f 100644 --- a/app/src/main/java/s/a/a1.java +++ b/app/src/main/java/s/a/a1.java @@ -3,37 +3,34 @@ package s.a; import c.d.b.a.a; import kotlin.Unit; import kotlin.jvm.functions.Function1; -import kotlinx.coroutines.Job; -/* compiled from: JobSupport.kt */ -public final class a1 extends d1 { - public final Function1 m; +/* compiled from: CancellableContinuationImpl.kt */ +public final class a1 extends i { + public final Function1 i; - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ + /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: kotlin.jvm.functions.Function1 */ /* JADX WARN: Multi-variable type inference failed */ - public a1(Job job, Function1 function1) { - super(job); - this.m = function1; + public a1(Function1 function1) { + this.i = function1; + } + + @Override // s.a.j + public void a(Throwable th) { + this.i.invoke(th); } /* 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 Unit invoke(Throwable th) { - this.m.invoke(th); + this.i.invoke(th); return Unit.a; } - @Override // s.a.w - public void q(Throwable th) { - this.m.invoke(th); - } - - @Override // s.a.a.j public String toString() { - StringBuilder L = a.L("InvokeOnCompletion["); - L.append(a1.class.getSimpleName()); + StringBuilder L = a.L("InvokeOnCancel["); + L.append(c.q.a.k.a.r(this.i)); L.append('@'); - L.append(c.q.a.k.a.t(this)); + L.append(c.q.a.k.a.u(this)); L.append(']'); return L.toString(); } diff --git a/app/src/main/java/s/a/x1/a.java b/app/src/main/java/s/a/a2/a.java similarity index 89% rename from app/src/main/java/s/a/x1/a.java rename to app/src/main/java/s/a/a2/a.java index bcfbb70479..3658b4c96d 100644 --- a/app/src/main/java/s/a/x1/a.java +++ b/app/src/main/java/s/a/a2/a.java @@ -1,18 +1,18 @@ -package s.a.x1; +package s.a.a2; import d0.l; import d0.w.h.a.d; import d0.w.h.a.e; import kotlin.Unit; import kotlin.coroutines.Continuation; -import s.a.x1.e.c; +import s.a.a2.e.c; /* compiled from: Flow.kt */ public abstract class a implements b { /* compiled from: Flow.kt */ @e(c = "kotlinx.coroutines.flow.AbstractFlow", f = "Flow.kt", l = {212}, m = "collect") - /* renamed from: s.a.x1.a$a reason: collision with other inner class name */ - public static final class C0341a extends d { + /* renamed from: s.a.a2.a$a reason: collision with other inner class name */ + public static final class C0339a extends d { public Object L$0; public Object L$1; public Object L$2; @@ -21,7 +21,7 @@ public abstract class a implements b { public final /* synthetic */ a this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public C0341a(a aVar, Continuation continuation) { + public C0339a(a aVar, Continuation continuation) { super(continuation); this.this$0 = aVar; } @@ -36,14 +36,14 @@ public abstract class a implements b { /* JADX WARNING: Removed duplicated region for block: B:15:0x003f */ /* JADX WARNING: Removed duplicated region for block: B:8:0x0023 */ - @Override // s.a.x1.b + @Override // s.a.a2.b public final Object a(c cVar, Continuation continuation) { - C0341a aVar; + C0339a aVar; int i; Throwable th; c cVar2; - if (continuation instanceof C0341a) { - aVar = (C0341a) continuation; + if (continuation instanceof C0339a) { + aVar = (C0339a) continuation; int i2 = aVar.label; if ((i2 & Integer.MIN_VALUE) != 0) { aVar.label = i2 - Integer.MIN_VALUE; @@ -84,7 +84,7 @@ public abstract class a implements b { return Unit.a; } } - aVar = new C0341a(this, continuation); + aVar = new C0339a(this, continuation); Object obj = aVar.result; Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); i = aVar.label; diff --git a/app/src/main/java/s/a/x1/b.java b/app/src/main/java/s/a/a2/b.java similarity index 92% rename from app/src/main/java/s/a/x1/b.java rename to app/src/main/java/s/a/a2/b.java index 96685d14ce..22bb643fcc 100644 --- a/app/src/main/java/s/a/x1/b.java +++ b/app/src/main/java/s/a/a2/b.java @@ -1,4 +1,4 @@ -package s.a.x1; +package s.a.a2; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/app/src/main/java/s/a/x1/c.java b/app/src/main/java/s/a/a2/c.java similarity index 92% rename from app/src/main/java/s/a/x1/c.java rename to app/src/main/java/s/a/a2/c.java index 40cdb1a5a5..19ef9d69c8 100644 --- a/app/src/main/java/s/a/x1/c.java +++ b/app/src/main/java/s/a/a2/c.java @@ -1,4 +1,4 @@ -package s.a.x1; +package s.a.a2; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/app/src/main/java/s/a/x1/d.java b/app/src/main/java/s/a/a2/d.java similarity index 89% rename from app/src/main/java/s/a/x1/d.java rename to app/src/main/java/s/a/a2/d.java index 1ba8c7426b..d6f0ce619b 100644 --- a/app/src/main/java/s/a/x1/d.java +++ b/app/src/main/java/s/a/a2/d.java @@ -1,4 +1,4 @@ -package s.a.x1; +package s.a.a2; import d0.w.g.c; import kotlin.Unit; @@ -8,13 +8,13 @@ import kotlin.jvm.functions.Function2; public final class d extends a { public final Function2, Continuation, Object> a; - /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: kotlin.jvm.functions.Function2, ? super kotlin.coroutines.Continuation, ? extends java.lang.Object> */ + /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: kotlin.jvm.functions.Function2, ? super kotlin.coroutines.Continuation, ? extends java.lang.Object> */ /* JADX WARN: Multi-variable type inference failed */ public d(Function2, ? super Continuation, ? extends Object> function2) { this.a = function2; } - @Override // s.a.x1.a + @Override // s.a.a2.a public Object b(c cVar, Continuation continuation) { Object invoke = this.a.invoke(cVar, continuation); return invoke == c.getCOROUTINE_SUSPENDED() ? invoke : Unit.a; diff --git a/app/src/main/java/s/a/x1/e/a.java b/app/src/main/java/s/a/a2/e/a.java similarity index 84% rename from app/src/main/java/s/a/x1/e/a.java rename to app/src/main/java/s/a/a2/e/a.java index eaaef70709..d63e8d0cc0 100644 --- a/app/src/main/java/s/a/x1/e/a.java +++ b/app/src/main/java/s/a/a2/e/a.java @@ -1,17 +1,17 @@ -package s.a.x1.e; +package s.a.a2.e; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: SafeCollector.kt */ public final class a implements CoroutineContext.Element { - public static final C0342a i = new C0342a(null); + public static final C0340a i = new C0340a(null); public final Throwable j; /* compiled from: SafeCollector.kt */ - /* renamed from: s.a.x1.e.a$a reason: collision with other inner class name */ - public static final class C0342a implements CoroutineContext.Key { - public C0342a(DefaultConstructorMarker defaultConstructorMarker) { + /* renamed from: s.a.a2.e.a$a reason: collision with other inner class name */ + public static final class C0340a implements CoroutineContext.Key { + public C0340a(DefaultConstructorMarker defaultConstructorMarker) { } } diff --git a/app/src/main/java/s/a/x1/e/b.java b/app/src/main/java/s/a/a2/e/b.java similarity index 96% rename from app/src/main/java/s/a/x1/e/b.java rename to app/src/main/java/s/a/a2/e/b.java index aaf4f4ad4e..7a41ad4181 100644 --- a/app/src/main/java/s/a/x1/e/b.java +++ b/app/src/main/java/s/a/a2/e/b.java @@ -1,4 +1,4 @@ -package s.a.x1.e; +package s.a.a2.e; import d0.w.f; import kotlin.coroutines.Continuation; diff --git a/app/src/main/java/s/a/x1/e/c.java b/app/src/main/java/s/a/a2/e/c.java similarity index 93% rename from app/src/main/java/s/a/x1/e/c.java rename to app/src/main/java/s/a/a2/e/c.java index 74548cad90..d012759006 100644 --- a/app/src/main/java/s/a/x1/e/c.java +++ b/app/src/main/java/s/a/a2/e/c.java @@ -1,4 +1,4 @@ -package s.a.x1.e; +package s.a.a2.e; import d0.g0.m; import d0.k; @@ -15,10 +15,10 @@ import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; import kotlinx.coroutines.Job; /* compiled from: SafeCollector.kt */ -public final class c extends d implements s.a.x1.c, CoroutineStackFrame { +public final class c extends d implements s.a.a2.c, CoroutineStackFrame { public final CoroutineContext collectContext; public final int collectContextSize; - public final s.a.x1.c collector; + public final s.a.a2.c collector; private Continuation completion; private CoroutineContext lastEmissionContext; @@ -38,9 +38,9 @@ public final class c extends d implements s.a.x1.c, CoroutineStackFrame { } } - /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: s.a.x1.c */ + /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: s.a.a2.c */ /* JADX WARN: Multi-variable type inference failed */ - public c(s.a.x1.c cVar, CoroutineContext coroutineContext) { + public c(s.a.a2.c cVar, CoroutineContext coroutineContext) { super(b.i, f.i); this.collector = cVar; this.collectContext = coroutineContext; @@ -72,15 +72,15 @@ public final class c extends d implements s.a.x1.c, CoroutineStackFrame { } } this.completion = continuation; - Function3, Object, Continuation, Object> function3 = d.a; - s.a.x1.c cVar = this.collector; + Function3, Object, Continuation, Object> function3 = d.a; + s.a.a2.c cVar = this.collector; Objects.requireNonNull(cVar, "null cannot be cast to non-null type kotlinx.coroutines.flow.FlowCollector"); return function3.invoke(cVar, t, this); } throw job.p(); } - @Override // s.a.x1.c + @Override // s.a.a2.c public Object emit(T t, Continuation continuation) { try { Object c2 = c(continuation, t); diff --git a/app/src/main/java/s/a/x1/e/d.java b/app/src/main/java/s/a/a2/e/d.java similarity index 97% rename from app/src/main/java/s/a/x1/e/d.java rename to app/src/main/java/s/a/a2/e/d.java index 55b750f9b5..c16cfbf261 100644 --- a/app/src/main/java/s/a/x1/e/d.java +++ b/app/src/main/java/s/a/a2/e/d.java @@ -1,4 +1,4 @@ -package s.a.x1.e; +package s.a.a2.e; import d0.z.d.e0; import d0.z.d.k; @@ -6,7 +6,7 @@ import d0.z.d.l; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function3; -import s.a.x1.c; +import s.a.a2.c; /* compiled from: SafeCollector.kt */ public final class d { public static final Function3, Object, Continuation, Object> a = ((Function3) e0.beforeCheckcastToFunctionOfArity(new a(), 3)); diff --git a/app/src/main/java/s/a/x1/e/e.java b/app/src/main/java/s/a/a2/e/e.java similarity index 93% rename from app/src/main/java/s/a/x1/e/e.java rename to app/src/main/java/s/a/a2/e/e.java index 46d377e4c9..6032a4efee 100644 --- a/app/src/main/java/s/a/x1/e/e.java +++ b/app/src/main/java/s/a/a2/e/e.java @@ -1,10 +1,10 @@ -package s.a.x1.e; +package s.a.a2.e; import d0.z.d.o; import kotlin.coroutines.CoroutineContext; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.Job; -import s.a.a.q; +import s.a.a.r; /* compiled from: SafeCollector.common.kt */ public final class e extends o implements Function2 { public final /* synthetic */ c $this_checkContext; @@ -31,10 +31,10 @@ public final class e extends o implements Function2 extends e1 implements Job, Continuation, CoroutineScope { +public abstract class b extends g1 implements Job, Continuation, CoroutineScope { public final CoroutineContext j; public final CoroutineContext k; @@ -25,27 +25,27 @@ public abstract class b extends e1 implements Job, Continuation, Coroutine this.j = coroutineContext.plus(this); } - @Override // s.a.e1 + @Override // s.a.g1 public final void I(Throwable th) { - a.w(this.j, th); + a.x(this.j, th); } - @Override // s.a.e1 + @Override // s.a.g1 public String N() { - boolean z2 = x.a; + boolean z2 = y.a; return super.N(); } - @Override // s.a.e1 + @Override // s.a.g1 public final void Q(Object obj) { - if (obj instanceof u) { - u uVar = (u) obj; - Throwable th = uVar.b; - int i = uVar._handled; + if (obj instanceof v) { + v vVar = (v) obj; + Throwable th = vVar.b; + int i = vVar._handled; } } - @Override // s.a.e1 + @Override // s.a.g1 public final void R() { Z(); } @@ -61,7 +61,7 @@ public abstract class b extends e1 implements Job, Continuation, Coroutine public void Z() { } - @Override // s.a.e1, kotlinx.coroutines.Job + @Override // s.a.g1, kotlinx.coroutines.Job public boolean a() { return super.a(); } @@ -71,7 +71,7 @@ public abstract class b extends e1 implements Job, Continuation, Coroutine Y(); int ordinal = coroutineStart.ordinal(); if (ordinal == 0) { - a.R(function2, r, this, null, 4); + a.S(function2, r, this, null, 4); } else if (ordinal == 1) { } else { if (ordinal == 2) { @@ -116,15 +116,15 @@ public abstract class b extends e1 implements Job, Continuation, Coroutine return this.j; } - @Override // s.a.e1 + @Override // s.a.g1 public String q() { return getClass().getSimpleName() + " was cancelled"; } @Override // kotlin.coroutines.Continuation public final void resumeWith(Object obj) { - Object L = L(a.e0(obj, null)); - if (L != f1.b) { + Object L = L(a.f0(obj, null)); + if (L != h1.b) { X(L); } } diff --git a/app/src/main/java/s/a/b1.java b/app/src/main/java/s/a/b1.java index 757bdbf59c..f7a8d640ce 100644 --- a/app/src/main/java/s/a/b1.java +++ b/app/src/main/java/s/a/b1.java @@ -1,9 +1,45 @@ package s.a; +import c.d.b.a.a; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; import kotlinx.coroutines.Job; /* compiled from: JobSupport.kt */ -public abstract class b1 extends d1 { - public b1(J j) { - super(j); +public final class b1 extends d1 { + public static final AtomicIntegerFieldUpdater m = AtomicIntegerFieldUpdater.newUpdater(b1.class, "_invoked"); + public volatile int _invoked = 0; + public final Function1 n; + + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ + /* JADX WARN: Multi-variable type inference failed */ + public b1(Job job, Function1 function1) { + super(job); + this.n = function1; + } + + /* 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(Throwable th) { + q(th); + return Unit.a; + } + + @Override // s.a.x + public void q(Throwable th) { + if (m.compareAndSet(this, 0, 1)) { + this.n.invoke(th); + } + } + + @Override // s.a.a.k + public String toString() { + StringBuilder L = a.L("InvokeOnCancelling["); + L.append(b1.class.getSimpleName()); + L.append('@'); + L.append(c.q.a.k.a.u(this)); + L.append(']'); + return L.toString(); } } diff --git a/app/src/main/java/s/a/b2/a.java b/app/src/main/java/s/a/b2/a.java new file mode 100644 index 0000000000..c6a7f97318 --- /dev/null +++ b/app/src/main/java/s/a/b2/a.java @@ -0,0 +1,639 @@ +package s.a.b2; + +import c.c.a.y.b; +import d0.c0.c; +import d0.d0.f; +import d0.z.d.m; +import java.io.Closeable; +import java.util.ArrayList; +import java.util.Objects; +import java.util.concurrent.Executor; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.concurrent.atomic.AtomicLongFieldUpdater; +import java.util.concurrent.atomic.AtomicReferenceArray; +import java.util.concurrent.locks.LockSupport; +import s.a.a.t; +/* compiled from: CoroutineScheduler.kt */ +public final class a implements Executor, Closeable { + public static final AtomicLongFieldUpdater i = AtomicLongFieldUpdater.newUpdater(a.class, "parkedWorkersStack"); + public static final AtomicLongFieldUpdater j = AtomicLongFieldUpdater.newUpdater(a.class, "controlState"); + public static final AtomicIntegerFieldUpdater k = AtomicIntegerFieldUpdater.newUpdater(a.class, "_isTerminated"); + public static final t l = new t("NOT_IN_STACK"); + public volatile int _isTerminated; + public volatile long controlState; + public final d m; + public final d n; + public final AtomicReferenceArray o; + public final int p; + public volatile long parkedWorkersStack; + public final int q; + public final long r; + + /* renamed from: s reason: collision with root package name */ + public final String f2868s; + + /* compiled from: CoroutineScheduler.kt */ + /* renamed from: s.a.b2.a$a reason: collision with other inner class name */ + public final class C0341a extends Thread { + public static final AtomicIntegerFieldUpdater i = AtomicIntegerFieldUpdater.newUpdater(C0341a.class, "workerCtl"); + public volatile int indexInArray; + public final m j = new m(); + public int k = 4; + public long l; + public long m; + public int n = c.b.nextInt(); + public volatile Object nextParkedWorker = a.l; + public boolean o; + public volatile int workerCtl = 0; + + public C0341a(int i2) { + setDaemon(true); + d(i2); + } + + /* JADX WARNING: Removed duplicated region for block: B:14:0x0033 */ + /* JADX WARNING: Removed duplicated region for block: B:29:0x006a */ + public final h a(boolean z2) { + boolean z3; + h hVar; + h c2; + h c3; + boolean z4; + boolean z5 = true; + if (this.k != 1) { + a aVar = a.this; + while (true) { + long j = aVar.controlState; + if (((int) ((9223367638808264704L & j) >> 42)) != 0) { + if (a.j.compareAndSet(aVar, j, j - 4398046511104L)) { + z4 = true; + break; + } + } else { + z4 = false; + break; + } + } + if (z4) { + this.k = 1; + } else { + z3 = false; + if (!z3) { + if (z2) { + if (b(a.this.p * 2) != 0) { + z5 = false; + } + if (z5 && (c3 = c()) != null) { + return c3; + } + h e = this.j.e(); + if (e != null) { + return e; + } + if (!z5 && (c2 = c()) != null) { + return c2; + } + } else { + h c4 = c(); + if (c4 != null) { + return c4; + } + } + return f(false); + } + if (z2) { + hVar = this.j.e(); + if (hVar == null) { + hVar = a.this.n.d(); + } + } else { + hVar = a.this.n.d(); + } + return hVar != null ? hVar : f(true); + } + } + z3 = true; + if (!z3) { + } + } + + public final int b(int i2) { + int i3 = this.n; + int i4 = i3 ^ (i3 << 13); + int i5 = i4 ^ (i4 >> 17); + int i6 = i5 ^ (i5 << 5); + this.n = i6; + int i7 = i2 - 1; + return (i7 & i2) == 0 ? i6 & i7 : (i6 & Integer.MAX_VALUE) % i2; + } + + public final h c() { + if (b(2) == 0) { + h d = a.this.m.d(); + return d != null ? d : a.this.n.d(); + } + h d2 = a.this.n.d(); + return d2 != null ? d2 : a.this.m.d(); + } + + public final void d(int i2) { + StringBuilder sb = new StringBuilder(); + sb.append(a.this.f2868s); + sb.append("-worker-"); + sb.append(i2 == 0 ? "TERMINATED" : String.valueOf(i2)); + setName(sb.toString()); + this.indexInArray = i2; + } + + public final boolean e(int i2) { + int i3 = this.k; + boolean z2 = true; + if (i3 != 1) { + z2 = false; + } + if (z2) { + a.j.addAndGet(a.this, 4398046511104L); + } + if (i3 != i2) { + this.k = i2; + } + return z2; + } + + public final h f(boolean z2) { + long j; + int i2 = (int) (a.this.controlState & 2097151); + if (i2 < 2) { + return null; + } + int b = b(i2); + long j2 = Long.MAX_VALUE; + for (int i3 = 0; i3 < i2; i3++) { + b++; + if (b > i2) { + b = 1; + } + C0341a aVar = a.this.o.get(b); + if (aVar != null && aVar != this) { + if (z2) { + m mVar = this.j; + m mVar2 = aVar.j; + Objects.requireNonNull(mVar); + int i4 = mVar2.consumerIndex; + int i5 = mVar2.producerIndex; + AtomicReferenceArray atomicReferenceArray = mVar2.e; + while (true) { + if (i4 == i5) { + break; + } + int i6 = i4 & 127; + if (mVar2.blockingTasksInBuffer == 0) { + break; + } + h hVar = atomicReferenceArray.get(i6); + if (hVar != null) { + if ((hVar.j.s() == 1) && atomicReferenceArray.compareAndSet(i6, hVar, null)) { + m.d.decrementAndGet(mVar2); + mVar.a(hVar, false); + j = -1; + break; + } + } + i4++; + } + j = mVar.g(mVar2, true); + } else { + m mVar3 = this.j; + m mVar4 = aVar.j; + Objects.requireNonNull(mVar3); + h f = mVar4.f(); + if (f != null) { + mVar3.a(f, false); + j = -1; + } else { + j = mVar3.g(mVar4, false); + } + } + if (j == -1) { + return this.j.e(); + } + if (j > 0) { + j2 = Math.min(j2, j); + } + } + } + if (j2 == Long.MAX_VALUE) { + j2 = 0; + } + this.m = j2; + return null; + } + + @Override // java.lang.Thread, java.lang.Runnable + public void run() { + long j; + int i2; + loop0: + while (true) { + boolean z2 = false; + while (a.this._isTerminated == 0 && this.k != 5) { + h a = a(this.o); + if (a == null) { + this.o = false; + if (this.m == 0) { + Object obj = this.nextParkedWorker; + t tVar = a.l; + if (obj != tVar) { + this.workerCtl = -1; + while (true) { + if (!(this.nextParkedWorker != a.l) || a.this._isTerminated != 0 || this.k == 5) { + break; + } + e(3); + Thread.interrupted(); + if (this.l == 0) { + this.l = System.nanoTime() + a.this.r; + } + LockSupport.parkNanos(a.this.r); + if (System.nanoTime() - this.l >= 0) { + this.l = 0; + synchronized (a.this.o) { + if (a.this._isTerminated == 0) { + if (((int) (a.this.controlState & 2097151)) > a.this.p) { + if (i.compareAndSet(this, -1, 1)) { + int i3 = this.indexInArray; + d(0); + a.this.p(this, i3, 0); + int andDecrement = (int) (a.j.getAndDecrement(a.this) & 2097151); + if (andDecrement != i3) { + C0341a aVar = a.this.o.get(andDecrement); + m.checkNotNull(aVar); + C0341a aVar2 = aVar; + a.this.o.set(i3, aVar2); + aVar2.d(i3); + a.this.p(aVar2, andDecrement, i3); + } + a.this.o.set(andDecrement, null); + this.k = 5; + } + } + } + } + } + } + } else { + a aVar3 = a.this; + Objects.requireNonNull(aVar3); + if (this.nextParkedWorker == tVar) { + do { + j = aVar3.parkedWorkersStack; + i2 = this.indexInArray; + this.nextParkedWorker = aVar3.o.get((int) (j & 2097151)); + } while (!a.i.compareAndSet(aVar3, j, ((long) i2) | ((2097152 + j) & -2097152))); + } + } + } else if (!z2) { + z2 = true; + } else { + e(3); + Thread.interrupted(); + LockSupport.parkNanos(this.m); + this.m = 0; + } + } else { + this.m = 0; + int s2 = a.j.s(); + this.l = 0; + if (this.k == 3) { + this.k = 2; + } + if (s2 != 0 && e(2)) { + a.this.s(); + } + a.this.r(a); + if (s2 != 0) { + a.j.addAndGet(a.this, -2097152); + if (this.k != 5) { + this.k = 4; + } + } + } + } + } + e(5); + } + } + + public a(int i2, int i3, long j2, String str) { + this.p = i2; + this.q = i3; + this.r = j2; + this.f2868s = str; + if (i2 >= 1) { + if (i3 >= i2) { + if (i3 <= 2097150) { + if (j2 > 0) { + this.m = new d(); + this.n = new d(); + this.parkedWorkersStack = 0; + this.o = new AtomicReferenceArray<>(i3 + 1); + this.controlState = ((long) i2) << 42; + this._isTerminated = 0; + return; + } + throw new IllegalArgumentException(c.d.b.a.a.r("Idle worker keep alive time ", j2, " must be positive").toString()); + } + throw new IllegalArgumentException(c.d.b.a.a.n("Max pool size ", i3, " should not exceed maximal supported number of threads 2097150").toString()); + } + throw new IllegalArgumentException(c.d.b.a.a.o("Max pool size ", i3, " should be greater than or equals to core pool size ", i2).toString()); + } + throw new IllegalArgumentException(c.d.b.a.a.n("Core pool size ", i2, " should be at least 1").toString()); + } + + public static /* synthetic */ void e(a aVar, Runnable runnable, i iVar, boolean z2, int i2) { + g gVar = (i2 & 2) != 0 ? g.i : null; + if ((i2 & 4) != 0) { + z2 = false; + } + aVar.d(runnable, gVar, z2); + } + + public final int a() { + synchronized (this.o) { + if (this._isTerminated != 0) { + return -1; + } + long j2 = this.controlState; + int i2 = (int) (j2 & 2097151); + boolean z2 = false; + int coerceAtLeast = f.coerceAtLeast(i2 - ((int) ((j2 & 4398044413952L) >> 21)), 0); + if (coerceAtLeast >= this.p) { + return 0; + } + if (i2 >= this.q) { + return 0; + } + int i3 = ((int) (this.controlState & 2097151)) + 1; + if (i3 > 0 && this.o.get(i3) == null) { + C0341a aVar = new C0341a(i3); + this.o.set(i3, aVar); + if (i3 == ((int) (2097151 & j.incrementAndGet(this)))) { + z2 = true; + } + if (z2) { + aVar.start(); + return coerceAtLeast + 1; + } + throw new IllegalArgumentException("Failed requirement.".toString()); + } + throw new IllegalArgumentException("Failed requirement.".toString()); + } + } + + public final h b(Runnable runnable, i iVar) { + long a = k.e.a(); + if (!(runnable instanceof h)) { + return new j(runnable, a, iVar); + } + h hVar = (h) runnable; + hVar.i = a; + hVar.j = iVar; + return hVar; + } + + public final C0341a c() { + Thread currentThread = Thread.currentThread(); + if (!(currentThread instanceof C0341a)) { + currentThread = null; + } + C0341a aVar = (C0341a) currentThread; + if (aVar == null || !m.areEqual(a.this, this)) { + return null; + } + return aVar; + } + + /* JADX WARNING: Code restructure failed: missing block: B:28:0x0073, code lost: + if (r1 != null) goto L_0x007e; + */ + @Override // java.io.Closeable, java.lang.AutoCloseable + public void close() { + int i2; + h hVar; + boolean z2; + if (k.compareAndSet(this, 0, 1)) { + C0341a c2 = c(); + synchronized (this.o) { + i2 = (int) (this.controlState & 2097151); + } + if (1 <= i2) { + int i3 = 1; + while (true) { + C0341a aVar = this.o.get(i3); + m.checkNotNull(aVar); + C0341a aVar2 = aVar; + if (aVar2 != c2) { + while (aVar2.isAlive()) { + LockSupport.unpark(aVar2); + aVar2.join(10000); + } + m mVar = aVar2.j; + d dVar = this.n; + Objects.requireNonNull(mVar); + h hVar2 = (h) m.a.getAndSet(mVar, null); + if (hVar2 != null) { + dVar.a(hVar2); + } + do { + h f = mVar.f(); + if (f != null) { + dVar.a(f); + z2 = true; + continue; + } else { + z2 = false; + continue; + } + } while (z2); + } + if (i3 == i2) { + break; + } + i3++; + } + } + this.n.b(); + this.m.b(); + while (true) { + if (c2 != null) { + hVar = c2.a(true); + } + hVar = this.m.d(); + if (hVar == null) { + hVar = this.n.d(); + } + if (hVar == null) { + break; + } + r(hVar); + } + if (c2 != null) { + c2.e(5); + } + this.parkedWorkersStack = 0; + this.controlState = 0; + } + } + + public final void d(Runnable runnable, i iVar, boolean z2) { + h hVar; + h b = b(runnable, iVar); + C0341a c2 = c(); + boolean z3 = true; + if (c2 == null || c2.k == 5 || (b.j.s() == 0 && c2.k == 2)) { + hVar = b; + } else { + c2.o = true; + hVar = c2.j.a(b, z2); + } + if (hVar != null) { + if (!(hVar.j.s() == 1 ? this.n.a(hVar) : this.m.a(hVar))) { + throw new RejectedExecutionException(c.d.b.a.a.D(new StringBuilder(), this.f2868s, " was terminated")); + } + } + if (!z2 || c2 == null) { + z3 = false; + } + if (b.j.s() != 0) { + long addAndGet = j.addAndGet(this, 2097152); + if (!z3 && !w() && !t(addAndGet)) { + w(); + } + } else if (!z3) { + s(); + } + } + + @Override // java.util.concurrent.Executor + public void execute(Runnable runnable) { + e(this, runnable, null, false, 6); + } + + public final int f(C0341a aVar) { + Object obj = aVar.nextParkedWorker; + while (obj != l) { + if (obj == null) { + return 0; + } + C0341a aVar2 = (C0341a) obj; + int i2 = aVar2.indexInArray; + if (i2 != 0) { + return i2; + } + obj = aVar2.nextParkedWorker; + } + return -1; + } + + public final void p(C0341a aVar, int i2, int i3) { + while (true) { + long j2 = this.parkedWorkersStack; + int i4 = (int) (2097151 & j2); + long j3 = (2097152 + j2) & -2097152; + if (i4 == i2) { + i4 = i3 == 0 ? f(aVar) : i3; + } + if (i4 >= 0 && i.compareAndSet(this, j2, j3 | ((long) i4))) { + return; + } + } + } + + public final void r(h hVar) { + try { + hVar.run(); + } catch (Throwable th) { + Thread currentThread = Thread.currentThread(); + currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, th); + } + } + + public final void s() { + if (!w() && !t(this.controlState)) { + w(); + } + } + + public final boolean t(long j2) { + if (f.coerceAtLeast(((int) (2097151 & j2)) - ((int) ((j2 & 4398044413952L) >> 21)), 0) < this.p) { + int a = a(); + if (a == 1 && this.p > 1) { + a(); + } + if (a > 0) { + return true; + } + } + return false; + } + + @Override // java.lang.Object + public String toString() { + ArrayList arrayList = new ArrayList(); + int length = this.o.length(); + int i2 = 0; + int i3 = 0; + int i4 = 0; + int i5 = 0; + int i6 = 0; + for (int i7 = 1; i7 < length; i7++) { + C0341a aVar = this.o.get(i7); + if (aVar != null) { + int d = aVar.j.d(); + int h = b.h(aVar.k); + if (h == 0) { + i2++; + arrayList.add(String.valueOf(d) + "c"); + } else if (h == 1) { + i3++; + arrayList.add(String.valueOf(d) + "b"); + } else if (h == 2) { + i4++; + } else if (h == 3) { + i5++; + if (d > 0) { + arrayList.add(String.valueOf(d) + "d"); + } + } else if (h == 4) { + i6++; + } + } + } + long j2 = this.controlState; + return this.f2868s + '@' + c.q.a.k.a.u(this) + "[Pool Size {core = " + this.p + ", max = " + this.q + "}, Worker States {CPU = " + i2 + ", blocking = " + i3 + ", parked = " + i4 + ", dormant = " + i5 + ", terminated = " + i6 + "}, running workers queues = " + arrayList + ", global CPU queue size = " + this.m.c() + ", global blocking queue size = " + this.n.c() + ", Control State {created workers= " + ((int) (2097151 & j2)) + ", blocking tasks = " + ((int) ((4398044413952L & j2) >> 21)) + ", CPUs acquired = " + (this.p - ((int) ((9223367638808264704L & j2) >> 42))) + "}]"; + } + + public final boolean w() { + while (true) { + long j2 = this.parkedWorkersStack; + C0341a aVar = this.o.get((int) (2097151 & j2)); + if (aVar != null) { + long j3 = (2097152 + j2) & -2097152; + int f = f(aVar); + if (f >= 0 && i.compareAndSet(this, j2, ((long) f) | j3)) { + aVar.nextParkedWorker = l; + } + } else { + aVar = null; + } + if (aVar == null) { + return false; + } + if (C0341a.i.compareAndSet(aVar, -1, 0)) { + LockSupport.unpark(aVar); + return true; + } + } + } +} diff --git a/app/src/main/java/s/a/b2/b.java b/app/src/main/java/s/a/b2/b.java new file mode 100644 index 0000000000..67550ed49e --- /dev/null +++ b/app/src/main/java/s/a/b2/b.java @@ -0,0 +1,31 @@ +package s.a.b2; + +import c.q.a.k.a; +import d0.d0.f; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.u; +/* compiled from: Dispatcher.kt */ +public final class b extends c { + public static final CoroutineDispatcher n; + public static final b o; + + static { + b bVar = new b(); + o = bVar; + n = new e(bVar, a.X("kotlinx.coroutines.io.parallelism", f.coerceAtLeast(64, u.a), 0, 0, 12, null), "Dispatchers.IO", 1); + } + + public b() { + super(0, 0, null, 7); + } + + @Override // java.io.Closeable, java.lang.AutoCloseable + public void close() { + throw new UnsupportedOperationException("Dispatchers.Default cannot be closed"); + } + + @Override // kotlinx.coroutines.CoroutineDispatcher, java.lang.Object + public String toString() { + return "Dispatchers.Default"; + } +} diff --git a/app/src/main/java/s/a/b2/c.java b/app/src/main/java/s/a/b2/c.java new file mode 100644 index 0000000000..e11d17984f --- /dev/null +++ b/app/src/main/java/s/a/b2/c.java @@ -0,0 +1,44 @@ +package s.a.b2; + +import java.util.concurrent.RejectedExecutionException; +import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.ExecutorCoroutineDispatcher; +import s.a.c0; +/* compiled from: Dispatcher.kt */ +public class c extends ExecutorCoroutineDispatcher { + public a i; + public final int j; + public final int k; + public final long l; + public final String m; + + public c(int i, int i2, String str, int i3) { + i = (i3 & 1) != 0 ? k.b : i; + i2 = (i3 & 2) != 0 ? k.f2869c : i2; + String str2 = (i3 & 4) != 0 ? "DefaultDispatcher" : null; + long j = k.d; + this.j = i; + this.k = i2; + this.l = j; + this.m = str2; + this.i = new a(i, i2, j, str2); + } + + @Override // kotlinx.coroutines.CoroutineDispatcher + public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { + try { + a.e(this.i, runnable, null, false, 6); + } catch (RejectedExecutionException unused) { + c0.o.S(runnable); + } + } + + @Override // kotlinx.coroutines.CoroutineDispatcher + public void dispatchYield(CoroutineContext coroutineContext, Runnable runnable) { + try { + a.e(this.i, runnable, null, true, 2); + } catch (RejectedExecutionException unused) { + c0.o.dispatchYield(coroutineContext, runnable); + } + } +} diff --git a/app/src/main/java/s/a/y1/d.java b/app/src/main/java/s/a/b2/d.java similarity index 53% rename from app/src/main/java/s/a/y1/d.java rename to app/src/main/java/s/a/b2/d.java index c36f01439a..50c865143f 100644 --- a/app/src/main/java/s/a/y1/d.java +++ b/app/src/main/java/s/a/b2/d.java @@ -1,8 +1,8 @@ -package s.a.y1; +package s.a.b2; -import s.a.a.k; +import s.a.a.l; /* compiled from: Tasks.kt */ -public final class d extends k { +public final class d extends l { public d() { super(false); } diff --git a/app/src/main/java/s/a/y1/e.java b/app/src/main/java/s/a/b2/e.java similarity index 83% rename from app/src/main/java/s/a/y1/e.java rename to app/src/main/java/s/a/b2/e.java index 52e31ea6a2..9368f79251 100644 --- a/app/src/main/java/s/a/y1/e.java +++ b/app/src/main/java/s/a/b2/e.java @@ -1,4 +1,4 @@ -package s.a.y1; +package s.a.b2; import java.util.Objects; import java.util.concurrent.ConcurrentLinkedQueue; @@ -6,10 +6,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.ExecutorCoroutineDispatcher; import s.a.c0; -import s.a.t0; /* compiled from: Dispatcher.kt */ -public final class e extends t0 implements i, Executor { +public final class e extends ExecutorCoroutineDispatcher implements i, Executor { public static final AtomicIntegerFieldUpdater i = AtomicIntegerFieldUpdater.newUpdater(e.class, "inFlightTasks"); public volatile int inFlightTasks = 0; public final ConcurrentLinkedQueue j = new ConcurrentLinkedQueue<>(); @@ -25,7 +25,7 @@ public final class e extends t0 implements i, Executor { this.n = i3; } - public final void H(Runnable runnable, boolean z2) { + public final void I(Runnable runnable, boolean z2) { do { AtomicIntegerFieldUpdater atomicIntegerFieldUpdater = i; if (atomicIntegerFieldUpdater.incrementAndGet(this) <= this.l) { @@ -54,17 +54,17 @@ public final class e extends t0 implements i, Executor { throw new IllegalStateException("Close cannot be invoked on LimitingBlockingDispatcher".toString()); } - @Override // s.a.z + @Override // kotlinx.coroutines.CoroutineDispatcher public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { - H(runnable, false); + I(runnable, false); } - @Override // s.a.z + @Override // kotlinx.coroutines.CoroutineDispatcher public void dispatchYield(CoroutineContext coroutineContext, Runnable runnable) { - H(runnable, true); + I(runnable, true); } - @Override // s.a.y1.i + @Override // s.a.b2.i public void e() { Runnable poll = this.j.poll(); if (poll != null) { @@ -79,22 +79,22 @@ public final class e extends t0 implements i, Executor { i.decrementAndGet(this); Runnable poll2 = this.j.poll(); if (poll2 != null) { - H(poll2, true); + I(poll2, true); } } } @Override // java.util.concurrent.Executor public void execute(Runnable runnable) { - H(runnable, false); + I(runnable, false); } - @Override // s.a.y1.i + @Override // s.a.b2.i public int s() { return this.n; } - @Override // s.a.z + @Override // kotlinx.coroutines.CoroutineDispatcher, java.lang.Object public String toString() { String str = this.m; if (str != null) { diff --git a/app/src/main/java/s/a/y1/f.java b/app/src/main/java/s/a/b2/f.java similarity index 79% rename from app/src/main/java/s/a/y1/f.java rename to app/src/main/java/s/a/b2/f.java index f15b72f067..4224b32550 100644 --- a/app/src/main/java/s/a/y1/f.java +++ b/app/src/main/java/s/a/b2/f.java @@ -1,9 +1,9 @@ -package s.a.y1; +package s.a.b2; /* compiled from: Tasks.kt */ public final class f extends l { public static final f a = new f(); - @Override // s.a.y1.l + @Override // s.a.b2.l public long a() { return System.nanoTime(); } diff --git a/app/src/main/java/s/a/y1/g.java b/app/src/main/java/s/a/b2/g.java similarity index 72% rename from app/src/main/java/s/a/y1/g.java rename to app/src/main/java/s/a/b2/g.java index 8fe8c74d15..62b919af69 100644 --- a/app/src/main/java/s/a/y1/g.java +++ b/app/src/main/java/s/a/b2/g.java @@ -1,13 +1,13 @@ -package s.a.y1; +package s.a.b2; /* compiled from: Tasks.kt */ public final class g implements i { public static final g i = new g(); - @Override // s.a.y1.i + @Override // s.a.b2.i public void e() { } - @Override // s.a.y1.i + @Override // s.a.b2.i public int s() { return 0; } diff --git a/app/src/main/java/s/a/y1/h.java b/app/src/main/java/s/a/b2/h.java similarity index 94% rename from app/src/main/java/s/a/y1/h.java rename to app/src/main/java/s/a/b2/h.java index 95ec9265bc..5baa3523bd 100644 --- a/app/src/main/java/s/a/y1/h.java +++ b/app/src/main/java/s/a/b2/h.java @@ -1,4 +1,4 @@ -package s.a.y1; +package s.a.b2; /* compiled from: Tasks.kt */ public abstract class h implements Runnable { public long i; diff --git a/app/src/main/java/s/a/y1/i.java b/app/src/main/java/s/a/b2/i.java similarity index 83% rename from app/src/main/java/s/a/y1/i.java rename to app/src/main/java/s/a/b2/i.java index d5c47230fa..c9b147539d 100644 --- a/app/src/main/java/s/a/y1/i.java +++ b/app/src/main/java/s/a/b2/i.java @@ -1,4 +1,4 @@ -package s.a.y1; +package s.a.b2; /* compiled from: Tasks.kt */ public interface i { void e(); diff --git a/app/src/main/java/s/a/y1/j.java b/app/src/main/java/s/a/b2/j.java similarity index 87% rename from app/src/main/java/s/a/y1/j.java rename to app/src/main/java/s/a/b2/j.java index 6bb86a45cb..fd4b5160a1 100644 --- a/app/src/main/java/s/a/y1/j.java +++ b/app/src/main/java/s/a/b2/j.java @@ -1,4 +1,4 @@ -package s.a.y1; +package s.a.b2; import c.d.b.a.a; /* compiled from: Tasks.kt */ @@ -22,9 +22,9 @@ public final class j extends h { @Override // java.lang.Object public String toString() { StringBuilder L = a.L("Task["); - L.append(c.q.a.k.a.q(this.k)); + L.append(c.q.a.k.a.r(this.k)); L.append('@'); - L.append(c.q.a.k.a.t(this.k)); + L.append(c.q.a.k.a.u(this.k)); L.append(", "); L.append(this.i); L.append(", "); diff --git a/app/src/main/java/s/a/b2/k.java b/app/src/main/java/s/a/b2/k.java new file mode 100644 index 0000000000..6106357400 --- /dev/null +++ b/app/src/main/java/s/a/b2/k.java @@ -0,0 +1,24 @@ +package s.a.b2; + +import c.q.a.k.a; +import d0.d0.f; +import java.util.concurrent.TimeUnit; +import s.a.a.u; +/* compiled from: Tasks.kt */ +public final class k { + public static final long a = a.Y("kotlinx.coroutines.scheduler.resolution.ns", 100000, 0, 0, 12, null); + public static final int b; + + /* renamed from: c reason: collision with root package name */ + public static final int f2869c; + public static final long d = TimeUnit.SECONDS.toNanos(a.Y("kotlinx.coroutines.scheduler.keep.alive.sec", 60, 0, 0, 12, null)); + public static l e = f.a; + + static { + a.X("kotlinx.coroutines.scheduler.blocking.parallelism", 16, 0, 0, 12, null); + int i = u.a; + int X = a.X("kotlinx.coroutines.scheduler.core.pool.size", f.coerceAtLeast(i, 2), 1, 0, 8, null); + b = X; + f2869c = a.X("kotlinx.coroutines.scheduler.max.pool.size", f.coerceIn(i * 128, X, 2097150), 0, 2097150, 4, null); + } +} diff --git a/app/src/main/java/s/a/y1/l.java b/app/src/main/java/s/a/b2/l.java similarity index 84% rename from app/src/main/java/s/a/y1/l.java rename to app/src/main/java/s/a/b2/l.java index 7e466163c9..7324a284f2 100644 --- a/app/src/main/java/s/a/y1/l.java +++ b/app/src/main/java/s/a/b2/l.java @@ -1,4 +1,4 @@ -package s.a.y1; +package s.a.b2; /* compiled from: Tasks.kt */ public abstract class l { public abstract long a(); diff --git a/app/src/main/java/s/a/y1/m.java b/app/src/main/java/s/a/b2/m.java similarity index 95% rename from app/src/main/java/s/a/y1/m.java rename to app/src/main/java/s/a/b2/m.java index 2b309df699..ea2d982d19 100644 --- a/app/src/main/java/s/a/y1/m.java +++ b/app/src/main/java/s/a/b2/m.java @@ -1,4 +1,4 @@ -package s.a.y1; +package s.a.b2; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicReferenceArray; @@ -9,7 +9,7 @@ public final class m { public static final AtomicIntegerFieldUpdater b = AtomicIntegerFieldUpdater.newUpdater(m.class, "producerIndex"); /* renamed from: c reason: collision with root package name */ - public static final AtomicIntegerFieldUpdater f2875c = AtomicIntegerFieldUpdater.newUpdater(m.class, "consumerIndex"); + public static final AtomicIntegerFieldUpdater f2870c = AtomicIntegerFieldUpdater.newUpdater(m.class, "consumerIndex"); public static final AtomicIntegerFieldUpdater d = AtomicIntegerFieldUpdater.newUpdater(m.class, "blockingTasksInBuffer"); public volatile int blockingTasksInBuffer = 0; public volatile int consumerIndex = 0; @@ -69,7 +69,7 @@ public final class m { return null; } int i2 = i & 127; - if (f2875c.compareAndSet(this, i, i + 1) && (andSet = this.e.getAndSet(i2, null)) != null) { + if (f2870c.compareAndSet(this, i, i + 1) && (andSet = this.e.getAndSet(i2, null)) != null) { boolean z2 = true; if (andSet.j.s() != 1) { z2 = false; diff --git a/app/src/main/java/s/a/c.java b/app/src/main/java/s/a/c.java index 5efbab1262..cb9e6f323d 100644 --- a/app/src/main/java/s/a/c.java +++ b/app/src/main/java/s/a/c.java @@ -1,6 +1,6 @@ package s.a; /* compiled from: CancellableContinuationImpl.kt */ -public final class c implements l1 { +public final class c implements n1 { public static final c i = new c(); public String toString() { diff --git a/app/src/main/java/s/a/c0.java b/app/src/main/java/s/a/c0.java index 7f7a9d31f8..c99031b8da 100644 --- a/app/src/main/java/s/a/c0.java +++ b/app/src/main/java/s/a/c0.java @@ -4,9 +4,9 @@ import d0.d0.f; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.LockSupport; import kotlin.coroutines.CoroutineContext; -import s.a.p0; +import s.a.q0; /* compiled from: DefaultExecutor.kt */ -public final class c0 extends p0 implements Runnable { +public final class c0 extends q0 implements Runnable { public static volatile Thread _thread; public static volatile int debugStatus; public static final long n; @@ -26,7 +26,7 @@ public final class c0 extends p0 implements Runnable { n = timeUnit.toNanos(l.longValue()); } - @Override // s.a.q0 + @Override // s.a.r0 public Thread R() { Thread thread = _thread; if (thread == null) { @@ -60,8 +60,8 @@ public final class c0 extends p0 implements Runnable { @Override // java.lang.Runnable public void run() { boolean z2; - q1 q1Var = q1.b; - q1.a.set(this); + t1 t1Var = t1.b; + t1.a.set(this); Thread thread = null; try { synchronized (this) { @@ -120,14 +120,14 @@ public final class c0 extends p0 implements Runnable { } } - @Override // s.a.p0, s.a.g0 - public k0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { - long a = r0.a(j); + @Override // s.a.q0, s.a.g0 + public l0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { + long a = s0.a(j); if (a >= 4611686018427387903L) { - return k1.i; + return m1.i; } long nanoTime = System.nanoTime(); - p0.b bVar = new p0.b(a + nanoTime, runnable); + q0.b bVar = new q0.b(a + nanoTime, runnable); W(nanoTime, bVar); return bVar; } diff --git a/app/src/main/java/s/a/c1.java b/app/src/main/java/s/a/c1.java index 369aedb62f..35ac0f2d2a 100644 --- a/app/src/main/java/s/a/c1.java +++ b/app/src/main/java/s/a/c1.java @@ -1,48 +1,40 @@ package s.a; +import c.d.b.a.a; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; import kotlinx.coroutines.Job; /* compiled from: JobSupport.kt */ -public class c1 extends e1 implements s { - public final boolean j; +public final class c1 extends f1 { + public final Function1 m; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public c1(Job job) { - super(true); - e1 e1Var; - boolean z2 = true; - J(job); - n nVar = (n) this._parentHandle; - o oVar = (o) (!(nVar instanceof o) ? null : nVar); - if (oVar != null && (e1Var = (e1) oVar.l) != null) { - while (true) { - if (!e1Var.A()) { - n nVar2 = (n) e1Var._parentHandle; - o oVar2 = (o) (!(nVar2 instanceof o) ? null : nVar2); - if (oVar2 != null) { - e1Var = (e1) oVar2.l; - if (e1Var == null) { - break; - } - } else { - break; - } - } else { - break; - } - } - this.j = z2; - } - z2 = false; - this.j = z2; + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ + /* JADX WARN: Multi-variable type inference failed */ + public c1(Job job, Function1 function1) { + super(job); + this.m = function1; } - @Override // s.a.e1 - public boolean A() { - return this.j; + /* 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 Unit invoke(Throwable th) { + this.m.invoke(th); + return Unit.a; } - @Override // s.a.e1 - public boolean D() { - return true; + @Override // s.a.x + public void q(Throwable th) { + this.m.invoke(th); + } + + @Override // s.a.a.k + public String toString() { + StringBuilder L = a.L("InvokeOnCompletion["); + L.append(c1.class.getSimpleName()); + L.append('@'); + L.append(c.q.a.k.a.u(this)); + L.append(']'); + return L.toString(); } } diff --git a/app/src/main/java/s/a/d.java b/app/src/main/java/s/a/d.java index b52752c615..fa515b6672 100644 --- a/app/src/main/java/s/a/d.java +++ b/app/src/main/java/s/a/d.java @@ -15,9 +15,9 @@ public final class d { public volatile int notCompletedCount; /* compiled from: Await.kt */ - public final class a extends d1 { + public final class a extends f1 { public volatile Object _disposer = null; - public k0 m; + public l0 m; public final CancellableContinuation> n; /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlinx.coroutines.CancellableContinuation> */ @@ -37,7 +37,7 @@ public final class d { /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: java.util.concurrent.atomic.AtomicIntegerFieldUpdater */ /* JADX WARN: Multi-variable type inference failed */ - @Override // s.a.w + @Override // s.a.x public void q(Throwable th) { if (th != null) { Object g = this.n.g(th); @@ -66,25 +66,25 @@ public final class d { } /* compiled from: Await.kt */ - public final class b extends h { + public final class b extends i { public final d.a[] i; public b(d dVar, d.a[] aVarArr) { this.i = aVarArr; } - @Override // s.a.i + @Override // s.a.j public void a(Throwable th) { b(); } public final void b() { for (d.a aVar : this.i) { - k0 k0Var = aVar.m; - if (k0Var == null) { + l0 l0Var = aVar.m; + if (l0Var == null) { m.throwUninitializedPropertyAccessException("handle"); } - k0Var.dispose(); + l0Var.dispose(); } } diff --git a/app/src/main/java/s/a/d1.java b/app/src/main/java/s/a/d1.java index eddcc12535..52698595f3 100644 --- a/app/src/main/java/s/a/d1.java +++ b/app/src/main/java/s/a/d1.java @@ -1,43 +1,9 @@ package s.a; -import java.util.Objects; import kotlinx.coroutines.Job; /* compiled from: JobSupport.kt */ -public abstract class d1 extends w implements k0, w0 { - public final J l; - +public abstract class d1 extends f1 { public d1(J j) { - this.l = j; - } - - @Override // s.a.w0 - public boolean a() { - return true; - } - - @Override // s.a.k0 - public void dispose() { - Object F; - J j = this.l; - Objects.requireNonNull(j, "null cannot be cast to non-null type kotlinx.coroutines.JobSupport"); - e1 e1Var = (e1) j; - do { - F = e1Var.F(); - if (F instanceof d1) { - if (F != this) { - return; - } - } else if ((F instanceof w0) && ((w0) F).getList() != null) { - n(); - return; - } else { - return; - } - } while (!e1.i.compareAndSet(e1Var, F, f1.g)); - } - - @Override // s.a.w0 - public j1 getList() { - return null; + super(j); } } diff --git a/app/src/main/java/s/a/e.java b/app/src/main/java/s/a/e.java index 32b6b922ff..913098fe4e 100644 --- a/app/src/main/java/s/a/e.java +++ b/app/src/main/java/s/a/e.java @@ -1,4 +1,4 @@ package s.a; /* compiled from: CancellableContinuationImpl.kt */ -public abstract class e extends h { +public abstract class e extends i { } diff --git a/app/src/main/java/s/a/e1.java b/app/src/main/java/s/a/e1.java index 7e1572edb1..bea1488e71 100644 --- a/app/src/main/java/s/a/e1.java +++ b/app/src/main/java/s/a/e1.java @@ -1,1080 +1,48 @@ package s.a; -import d0.f0.k; -import d0.l; -import d0.w.h.a.e; -import d0.z.d.m; -import java.util.ArrayList; -import java.util.Collections; -import java.util.IdentityHashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.CancellationException; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import kotlin.Unit; -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function1; -import kotlin.jvm.functions.Function2; -import kotlin.sequences.Sequence; -import kotlinx.coroutines.CompletionHandlerException; import kotlinx.coroutines.Job; -import kotlinx.coroutines.JobCancellationException; -import kotlinx.coroutines.TimeoutCancellationException; -import s.a.a.h; -import s.a.a.i; -import s.a.a.j; -import s.a.a.o; -import s.a.a.s; /* compiled from: JobSupport.kt */ -public class e1 implements Job, p, m1 { - public static final AtomicReferenceFieldUpdater i = AtomicReferenceFieldUpdater.newUpdater(e1.class, Object.class, "_state"); - public volatile Object _parentHandle; - public volatile Object _state; +public class e1 extends g1 implements t { + public final boolean j; - /* compiled from: JobSupport.kt */ - public static final class a extends d1 { - public final e1 m; - public final b n; - public final o o; - public final Object p; - - public a(e1 e1Var, b bVar, o oVar, Object obj) { - super(oVar.m); - this.m = e1Var; - this.n = bVar; - this.o = oVar; - this.p = obj; - } - - /* 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(Throwable th) { - q(th); - return Unit.a; - } - - @Override // s.a.w - public void q(Throwable th) { - e1 e1Var = this.m; - b bVar = this.n; - o oVar = this.o; - Object obj = this.p; - o O = e1Var.O(oVar); - if (O == null || !e1Var.W(bVar, O, obj)) { - e1Var.m(e1Var.w(bVar, obj)); - } - } - - @Override // s.a.a.j - public String toString() { - StringBuilder L = c.d.b.a.a.L("ChildCompletion["); - L.append(this.o); - L.append(", "); - L.append(this.p); - L.append(']'); - return L.toString(); - } - } - - /* compiled from: JobSupport.kt */ - public static final class b implements w0 { - public volatile Object _exceptionsHolder = null; - public volatile int _isCompleting; - public volatile Object _rootCause; - public final j1 i; - - public b(j1 j1Var, boolean z2, Throwable th) { - this.i = j1Var; - this._isCompleting = z2 ? 1 : 0; - this._rootCause = th; - } - - @Override // s.a.w0 - public boolean a() { - return ((Throwable) this._rootCause) == null; - } - - /* JADX WARNING: Unknown variable types count: 1 */ - public final void b(Throwable th) { - Throwable th2 = (Throwable) this._rootCause; - if (th2 == null) { - this._rootCause = th; - } else if (th != th2) { - ?? r0 = this._exceptionsHolder; - if (r0 == 0) { - this._exceptionsHolder = th; - } else if (r0 instanceof Throwable) { - if (th != r0) { - ArrayList c2 = c(); - c2.add(r0); - c2.add(th); - this._exceptionsHolder = c2; - } - } else if (r0 instanceof ArrayList) { - ((ArrayList) r0).add(th); - } else { - throw new IllegalStateException(c.d.b.a.a.t("State is ", r0).toString()); - } - } - } - - public final ArrayList c() { - return new ArrayList<>(4); - } - - public final boolean d() { - return ((Throwable) this._rootCause) != null; - } - - public final boolean e() { - return this._exceptionsHolder == f1.e; - } - - /* JADX WARNING: Unknown variable types count: 1 */ - public final List f(Throwable th) { - ArrayList arrayList; - ?? r0 = this._exceptionsHolder; - if (r0 == 0) { - arrayList = c(); - } else if (r0 instanceof Throwable) { - ArrayList c2 = c(); - c2.add(r0); - arrayList = c2; - } else if (r0 instanceof ArrayList) { - arrayList = (ArrayList) r0; - } else { - throw new IllegalStateException(c.d.b.a.a.t("State is ", r0).toString()); - } - Throwable th2 = (Throwable) this._rootCause; - if (th2 != null) { - arrayList.add(0, th2); - } - if (th != null && (!m.areEqual(th, th2))) { - arrayList.add(th); - } - this._exceptionsHolder = f1.e; - return arrayList; - } - - @Override // s.a.w0 - public j1 getList() { - return this.i; - } - - /* JADX DEBUG: Multi-variable search result rejected for r0v1, resolved type: java.lang.StringBuilder */ - /* JADX WARN: Multi-variable type inference failed */ - /* JADX WARNING: Unknown variable types count: 1 */ - public String toString() { - StringBuilder L = c.d.b.a.a.L("Finishing[cancelling="); - L.append(d()); - L.append(", completing="); - L.append((boolean) this._isCompleting); - L.append(", rootCause="); - L.append((Throwable) this._rootCause); - L.append(", exceptions="); - L.append(this._exceptionsHolder); - L.append(", list="); - L.append(this.i); - L.append(']'); - return L.toString(); - } - } - - /* compiled from: LockFreeLinkedList.kt */ - public static final class c extends j.a { - public final /* synthetic */ e1 d; - public final /* synthetic */ Object e; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public c(j jVar, j jVar2, e1 e1Var, Object obj) { - super(jVar2); - this.d = e1Var; - this.e = obj; - } - - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // s.a.a.d - public Object c(j jVar) { - if (this.d.F() == this.e) { - return null; - } - return i.a; - } - } - - /* compiled from: JobSupport.kt */ - @e(c = "kotlinx.coroutines.JobSupport$children$1", f = "JobSupport.kt", l = {949, 951}, m = "invokeSuspend") - public static final class d extends d0.w.h.a.j implements Function2, Continuation, Object> { - public Object L$0; - public Object L$1; - public Object L$2; - public Object L$3; - public Object L$4; - public Object L$5; - public int label; - private k p$; - public final /* synthetic */ e1 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public d(e1 e1Var, Continuation continuation) { - super(2, continuation); - this.this$0 = e1Var; - } - - @Override // d0.w.h.a.a - public final Continuation create(Object obj, Continuation continuation) { - d dVar = new d(this.this$0, continuation); - dVar.p$ = (k) obj; - return dVar; - } - - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function2 - public final Object invoke(k kVar, Continuation continuation) { - d dVar = new d(this.this$0, continuation); - dVar.p$ = kVar; - return dVar.invokeSuspend(Unit.a); - } - - /* JADX WARNING: Removed duplicated region for block: B:20:0x007f */ - @Override // d0.w.h.a.a - public final Object invokeSuspend(Object obj) { - d dVar; - k kVar; - Object obj2; - h hVar; - h hVar2; - j jVar; - Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); - int i = this.label; - if (i == 0) { - l.throwOnFailure(obj); - k kVar2 = this.p$; - Object F = this.this$0.F(); - if (F instanceof o) { - p pVar = ((o) F).m; - this.L$0 = kVar2; - this.L$1 = F; - this.label = 1; - if (kVar2.yield(pVar, this) == coroutine_suspended) { - return coroutine_suspended; - } - } else if ((F instanceof w0) && (hVar2 = ((w0) F).getList()) != null) { - Object i2 = hVar2.i(); - Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - kVar = kVar2; - obj2 = F; - jVar = (j) i2; - dVar = this; - hVar = hVar2; - } - return Unit.a; - } else if (i == 1) { - k kVar3 = (k) this.L$0; - l.throwOnFailure(obj); - return Unit.a; - } else if (i == 2) { - o oVar = (o) this.L$5; - jVar = (j) this.L$4; - hVar2 = (h) this.L$3; - hVar = (j1) this.L$2; - obj2 = this.L$1; - kVar = (k) this.L$0; - l.throwOnFailure(obj); - dVar = this; - jVar = jVar.j(); - } else { - throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); - } - if (!m.areEqual(jVar, hVar2)) { - if (jVar instanceof o) { - o oVar2 = (o) jVar; - p pVar2 = oVar2.m; - dVar.L$0 = kVar; - dVar.L$1 = obj2; - dVar.L$2 = hVar; - dVar.L$3 = hVar2; - dVar.L$4 = jVar; - dVar.L$5 = oVar2; - dVar.label = 2; - if (kVar.yield(pVar2, dVar) == coroutine_suspended) { - return coroutine_suspended; - } - } - jVar = jVar.j(); - if (!m.areEqual(jVar, hVar2)) { - } - } - return Unit.a; - } - } - - public e1(boolean z2) { - this._state = z2 ? f1.g : f1.f; - this._parentHandle = null; - } - - public boolean A() { - return true; - } - - @Override // kotlinx.coroutines.Job - public void B(CancellationException cancellationException) { - if (cancellationException == null) { - cancellationException = new JobCancellationException(q(), null, this); - } - n(cancellationException); - } - - public boolean D() { - return false; - } - - public final j1 E(w0 w0Var) { - j1 list = w0Var.getList(); - if (list != null) { - return list; - } - if (w0Var instanceof n0) { - return new j1(); - } - if (w0Var instanceof d1) { - S((d1) w0Var); - return null; - } - throw new IllegalStateException(("State should have list: " + w0Var).toString()); - } - - public final Object F() { - while (true) { - Object obj = this._state; - if (!(obj instanceof o)) { - return obj; - } - ((o) obj).a(this); - } - } - - @Override // kotlinx.coroutines.Job - public final n G(p pVar) { - k0 x2 = c.q.a.k.a.x(this, true, false, new o(this, pVar), 2, null); - Objects.requireNonNull(x2, "null cannot be cast to non-null type kotlinx.coroutines.ChildHandle"); - return (n) x2; - } - - public boolean H(Throwable th) { - return false; - } - - public void I(Throwable th) { - throw th; - } - - public final void J(Job job) { - if (job == null) { - this._parentHandle = k1.i; - return; - } - job.start(); - n G = job.G(this); - this._parentHandle = G; - if (!(F() instanceof w0)) { - G.dispose(); - this._parentHandle = k1.i; - } - } - - public boolean K() { - return false; - } - - public final Object L(Object obj) { - Object V; - do { - V = V(F(), obj); - if (V == f1.a) { - String str = "Job " + this + " is already complete or completing, but is being completed with " + obj; - Throwable th = null; - if (!(obj instanceof u)) { - obj = null; - } - u uVar = (u) obj; - if (uVar != null) { - th = uVar.b; - } - throw new IllegalStateException(str, th); - } - } while (V == f1.f2868c); - return V; - } - - public final d1 M(Function1 function1, boolean z2) { - b1 b1Var = null; - if (z2) { - if (function1 instanceof b1) { - b1Var = function1; - } - b1 b1Var2 = b1Var; - return b1Var2 != null ? b1Var2 : new z0(this, function1); - } - if (function1 instanceof d1) { - b1Var = function1; - } - d1 d1Var = b1Var; - return d1Var != null ? d1Var : new a1(this, function1); - } - - public String N() { - return getClass().getSimpleName(); - } - - public final o O(j jVar) { - while (jVar.m()) { - jVar = jVar.k(); - } - while (true) { - jVar = jVar.j(); - if (!jVar.m()) { - if (jVar instanceof o) { - return (o) jVar; - } - if (jVar instanceof j1) { - return null; - } - } - } - } - - public final void P(j1 j1Var, Throwable th) { - CompletionHandlerException completionHandlerException = null; - Object i2 = j1Var.i(); - Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - for (j jVar = (j) i2; !m.areEqual(jVar, j1Var); jVar = jVar.j()) { - if (jVar instanceof b1) { - d1 d1Var = (d1) jVar; - try { - d1Var.q(th); - } catch (Throwable th2) { - if (completionHandlerException != null) { - d0.b.addSuppressed(completionHandlerException, th2); - } else { - completionHandlerException = new CompletionHandlerException("Exception in completion handler " + d1Var + " for " + this, th2); - } - } - } - } - if (completionHandlerException != null) { - I(completionHandlerException); - } - o(th); - } - - public void Q(Object obj) { - } - - public void R() { - } - - public final void S(d1 d1Var) { - j1 j1Var = new j1(); - j.j.lazySet(j1Var, d1Var); - j.i.lazySet(j1Var, d1Var); - while (true) { - if (d1Var.i() == d1Var) { - if (j.i.compareAndSet(d1Var, d1Var, j1Var)) { - j1Var.g(d1Var); - break; - } - } else { - break; - } - } - i.compareAndSet(this, d1Var, d1Var.j()); - } - - public final String T(Object obj) { - if (!(obj instanceof b)) { - return obj instanceof w0 ? ((w0) obj).a() ? "Active" : "New" : obj instanceof u ? "Cancelled" : "Completed"; - } - b bVar = (b) obj; - return bVar.d() ? "Cancelling" : bVar._isCompleting != 0 ? "Completing" : "Active"; - } - - public final CancellationException U(Throwable th, String str) { - CancellationException cancellationException = (CancellationException) (!(th instanceof CancellationException) ? null : th); - if (cancellationException == null) { - if (str == null) { - str = q(); - } - cancellationException = new JobCancellationException(str, th, this); - } - return cancellationException; - } - - public final Object V(Object obj, Object obj2) { - Throwable th; - if (!(obj instanceof w0)) { - return f1.a; - } + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public e1(Job job) { + super(true); + g1 g1Var; boolean z2 = true; - if (((obj instanceof n0) || (obj instanceof d1)) && !(obj instanceof o) && !(obj2 instanceof u)) { - w0 w0Var = (w0) obj; - if (!i.compareAndSet(this, w0Var, obj2 instanceof w0 ? new x0((w0) obj2) : obj2)) { - z2 = false; - } else { - Q(obj2); - u(w0Var, obj2); - } - return z2 ? obj2 : f1.f2868c; - } - w0 w0Var2 = (w0) obj; - j1 E = E(w0Var2); - if (E == null) { - return f1.f2868c; - } - o oVar = null; - b bVar = (b) (!(w0Var2 instanceof b) ? null : w0Var2); - if (bVar == null) { - bVar = new b(E, false, null); - } - synchronized (bVar) { - if (bVar._isCompleting != 0) { - return f1.a; - } - bVar._isCompleting = 1; - if (bVar == w0Var2 || i.compareAndSet(this, w0Var2, bVar)) { - boolean d2 = bVar.d(); - u uVar = (u) (!(obj2 instanceof u) ? null : obj2); - if (uVar != null) { - bVar.b(uVar.b); - } - th = (Throwable) bVar._rootCause; - if (!(true ^ d2)) { - th = null; - } - } else { - return f1.f2868c; - } - } - if (th != null) { - P(E, th); - } - o oVar2 = (o) (!(w0Var2 instanceof o) ? null : w0Var2); - if (oVar2 != null) { - oVar = oVar2; - } else { - j1 list = w0Var2.getList(); - if (list != null) { - oVar = O(list); - } - } - return (oVar == null || !W(bVar, oVar, obj2)) ? w(bVar, obj2) : f1.b; - } - - public final boolean W(b bVar, o oVar, Object obj) { - while (c.q.a.k.a.x(oVar.m, false, false, new a(this, bVar, oVar, obj), 1, null) == k1.i) { - oVar = O(oVar); - if (oVar == null) { - return false; - } - } - return true; - } - - @Override // kotlinx.coroutines.Job - public boolean a() { - Object F = F(); - return (F instanceof w0) && ((w0) F).a(); - } - - @Override // kotlinx.coroutines.Job - public final Sequence d() { - return d0.f0.l.sequence(new d(this, null)); - } - - /* JADX WARN: Multi-variable type inference failed */ - /* JADX WARNING: Unknown variable types count: 1 */ - @Override // kotlinx.coroutines.Job - public final k0 f(boolean z2, boolean z3, Function1 function1) { - Throwable th; - Throwable th2 = null; - d1 d1Var = null; - while (true) { - Object F = F(); - if (F instanceof n0) { - n0 n0Var = (n0) F; - if (n0Var.i) { - if (d1Var == null) { - d1Var = M(function1, z2); - } - if (i.compareAndSet(this, F, d1Var)) { - return d1Var; - } - } else { - j1 j1Var = new j1(); - if (!n0Var.i) { - j1Var = new v0(j1Var); - } - i.compareAndSet(this, n0Var, j1Var); - } - } else if (F instanceof w0) { - j1 list = ((w0) F).getList(); - if (list == null) { - Objects.requireNonNull(F, "null cannot be cast to non-null type kotlinx.coroutines.JobNode<*>"); - S((d1) F); - } else { - k0 k0Var = k1.i; - if (!z2 || !(F instanceof b)) { - th = null; - } else { - synchronized (F) { - th = (Throwable) ((b) F)._rootCause; - if (th == null || ((function1 instanceof o) && ((b) F)._isCompleting == 0)) { - if (d1Var == null) { - d1Var = M(function1, z2); - } - if (l(F, list, d1Var)) { - if (th == null) { - return d1Var; - } - k0Var = d1Var; - } - } - } - } - if (th != null) { - if (z3) { - function1.invoke(th); - } - return k0Var; - } - if (d1Var == null) { - d1Var = M(function1, z2); - } - if (l(F, list, d1Var)) { - return d1Var; - } - } - } else { - if (z3) { - if (!(F instanceof u)) { - F = null; - } - u uVar = (u) F; - if (uVar != null) { - th2 = uVar.b; - } - function1.invoke(th2); - } - return k1.i; - } - } - } - - @Override // kotlin.coroutines.CoroutineContext - public R fold(R r, Function2 function2) { - return (R) CoroutineContext.Element.a.fold(this, r, function2); - } - - @Override // kotlin.coroutines.CoroutineContext.Element, kotlin.coroutines.CoroutineContext - public E get(CoroutineContext.Key key) { - return (E) CoroutineContext.Element.a.get(this, key); - } - - @Override // kotlin.coroutines.CoroutineContext.Element - public final CoroutineContext.Key getKey() { - return Job.h; - } - - public final boolean l(Object obj, j1 j1Var, d1 d1Var) { - int p; - c cVar = new c(d1Var, d1Var, this, obj); - do { - p = j1Var.k().p(d1Var, j1Var, cVar); - if (p == 1) { - return true; - } - } while (p != 2); - return false; - } - - public void m(Object obj) { - } - - @Override // kotlin.coroutines.CoroutineContext - public CoroutineContext minusKey(CoroutineContext.Key key) { - return CoroutineContext.Element.a.minusKey(this, key); - } - - /* JADX WARNING: Code restructure failed: missing block: B:10:0x0031, code lost: - r0 = s.a.f1.a; - */ - /* JADX WARNING: Removed duplicated region for block: B:78:0x00b9 A[SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:84:0x003e A[SYNTHETIC] */ - public final boolean n(Object obj) { - s sVar; - boolean z2; - s sVar2 = f1.a; - if (D()) { + J(job); + o oVar = (o) this._parentHandle; + p pVar = (p) (!(oVar instanceof p) ? null : oVar); + if (pVar != null && (g1Var = (g1) pVar.l) != null) { while (true) { - Object F = F(); - if ((F instanceof w0) && (!(F instanceof b) || ((b) F)._isCompleting == 0)) { - sVar2 = V(F, new u(v(obj), false, 2)); - if (sVar2 != f1.f2868c) { + if (!g1Var.A()) { + o oVar2 = (o) g1Var._parentHandle; + p pVar2 = (p) (!(oVar2 instanceof p) ? null : oVar2); + if (pVar2 != null) { + g1Var = (g1) pVar2.l; + if (g1Var == null) { + break; + } + } else { break; } } else { break; } } - if (sVar2 == f1.b) { - return true; - } - } - if (sVar2 == f1.a) { - Throwable th = null; - Throwable th2 = null; - while (true) { - Object F2 = F(); - if (!(F2 instanceof b)) { - if (!(F2 instanceof w0)) { - sVar = f1.d; - break; - } - if (th2 == null) { - th2 = v(obj); - } - w0 w0Var = (w0) F2; - if (w0Var.a()) { - j1 E = E(w0Var); - if (E != null) { - if (i.compareAndSet(this, w0Var, new b(E, false, th2))) { - P(E, th2); - z2 = true; - if (!z2) { - sVar = f1.a; - break; - } - } - } - z2 = false; - if (!z2) { - } - } else { - Object V = V(F2, new u(th2, false, 2)); - if (V != f1.a) { - if (V != f1.f2868c) { - sVar2 = V; - break; - } - } else { - throw new IllegalStateException(c.d.b.a.a.t("Cannot happen in ", F2).toString()); - } - } - } else { - synchronized (F2) { - if (((b) F2).e()) { - sVar = f1.d; - } else { - boolean d2 = ((b) F2).d(); - if (obj != null || !d2) { - if (th2 == null) { - th2 = v(obj); - } - ((b) F2).b(th2); - } - Throwable th3 = (Throwable) ((b) F2)._rootCause; - if (!d2) { - th = th3; - } - if (th != null) { - P(((b) F2).i, th); - } - sVar = f1.a; - } - } - } - } - sVar2 = sVar; - } - if (!(sVar2 == f1.a || sVar2 == f1.b)) { - if (sVar2 == f1.d) { - return false; - } - m(sVar2); + this.j = z2; } + z2 = false; + this.j = z2; + } + + @Override // s.a.g1 + public boolean A() { + return this.j; + } + + @Override // s.a.g1 + public boolean D() { return true; } - - public final boolean o(Throwable th) { - if (K()) { - return true; - } - boolean z2 = th instanceof CancellationException; - n nVar = (n) this._parentHandle; - return (nVar == null || nVar == k1.i) ? z2 : nVar.h(th) || z2; - } - - @Override // kotlinx.coroutines.Job - public final CancellationException p() { - Object F = F(); - if (F instanceof b) { - Throwable th = (Throwable) ((b) F)._rootCause; - if (th != null) { - return U(th, getClass().getSimpleName() + " is cancelling"); - } - throw new IllegalStateException(("Job is still new or active: " + this).toString()); - } else if (F instanceof w0) { - throw new IllegalStateException(("Job is still new or active: " + this).toString()); - } else if (F instanceof u) { - return U(((u) F).b, null); - } else { - return new JobCancellationException(getClass().getSimpleName() + " has completed normally", null, this); - } - } - - @Override // kotlin.coroutines.CoroutineContext - public CoroutineContext plus(CoroutineContext coroutineContext) { - return CoroutineContext.Element.a.plus(this, coroutineContext); - } - - public String q() { - return "Job was cancelled"; - } - - @Override // s.a.p - public final void r(m1 m1Var) { - n(m1Var); - } - - public boolean s(Throwable th) { - if (th instanceof CancellationException) { - return true; - } - return n(th) && A(); - } - - /* JADX WARNING: Removed duplicated region for block: B:18:0x0040 A[SYNTHETIC] */ - @Override // kotlinx.coroutines.Job - public final boolean start() { - char c2; - do { - Object F = F(); - c2 = 65535; - if (F instanceof n0) { - if (!((n0) F).i) { - if (i.compareAndSet(this, F, f1.g)) { - R(); - } - if (c2 == 0) { - return false; - } - } - c2 = 0; - if (c2 == 0) { - } - } else { - if (F instanceof v0) { - if (i.compareAndSet(this, F, ((v0) F).i)) { - R(); - } - if (c2 == 0) { - } - } - c2 = 0; - if (c2 == 0) { - } - } - c2 = 1; - if (c2 == 0) { - } - } while (c2 != 1); - return true; - } - - @Override // kotlinx.coroutines.Job - public final k0 t(Function1 function1) { - return f(false, true, function1); - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(N() + '{' + T(F()) + '}'); - sb.append('@'); - sb.append(c.q.a.k.a.t(this)); - return sb.toString(); - } - - public final void u(w0 w0Var, Object obj) { - n nVar = (n) this._parentHandle; - if (nVar != null) { - nVar.dispose(); - this._parentHandle = k1.i; - } - CompletionHandlerException completionHandlerException = null; - if (!(obj instanceof u)) { - obj = null; - } - u uVar = (u) obj; - Throwable th = uVar != null ? uVar.b : null; - if (w0Var instanceof d1) { - try { - ((d1) w0Var).q(th); - } catch (Throwable th2) { - I(new CompletionHandlerException("Exception in completion handler " + w0Var + " for " + this, th2)); - } - } else { - j1 list = w0Var.getList(); - if (list != null) { - Object i2 = list.i(); - Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - for (j jVar = (j) i2; !m.areEqual(jVar, list); jVar = jVar.j()) { - if (jVar instanceof d1) { - d1 d1Var = (d1) jVar; - try { - d1Var.q(th); - } catch (Throwable th3) { - if (completionHandlerException != null) { - d0.b.addSuppressed(completionHandlerException, th3); - } else { - completionHandlerException = new CompletionHandlerException("Exception in completion handler " + d1Var + " for " + this, th3); - } - } - } - } - if (completionHandlerException != null) { - I(completionHandlerException); - } - } - } - } - - public final Throwable v(Object obj) { - if (obj != null ? obj instanceof Throwable : true) { - return obj != null ? (Throwable) obj : new JobCancellationException(q(), null, this); - } - Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.ParentJob"); - return ((m1) obj).z(); - } - - public final Object w(b bVar, Object obj) { - Throwable y2; - Throwable th = null; - u uVar = (u) (!(obj instanceof u) ? null : obj); - if (uVar != null) { - th = uVar.b; - } - synchronized (bVar) { - bVar.d(); - List f = bVar.f(th); - y2 = y(bVar, f); - if (y2 != null) { - if (f.size() > 1) { - Set newSetFromMap = Collections.newSetFromMap(new IdentityHashMap(f.size())); - for (Throwable th2 : f) { - if (th2 != y2 && th2 != y2 && !(th2 instanceof CancellationException) && newSetFromMap.add(th2)) { - d0.b.addSuppressed(y2, th2); - } - } - } - } - } - if (!(y2 == null || y2 == th)) { - obj = new u(y2, false, 2); - } - if (y2 != null) { - if (o(y2) || H(y2)) { - Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.CompletedExceptionally"); - u.a.compareAndSet((u) obj, 0, 1); - } - } - Q(obj); - i.compareAndSet(this, bVar, obj instanceof w0 ? new x0((w0) obj) : obj); - u(bVar, obj); - return obj; - } - - public final Throwable y(b bVar, List list) { - Object obj; - boolean z2; - Object obj2 = null; - if (!list.isEmpty()) { - Iterator it = list.iterator(); - while (true) { - if (!it.hasNext()) { - obj = null; - break; - } - obj = it.next(); - if (!(((Throwable) obj) instanceof CancellationException)) { - break; - } - } - Throwable th = (Throwable) obj; - if (th != null) { - return th; - } - Throwable th2 = (Throwable) list.get(0); - if (th2 instanceof TimeoutCancellationException) { - Iterator it2 = list.iterator(); - while (true) { - if (!it2.hasNext()) { - break; - } - Object next = it2.next(); - Throwable th3 = (Throwable) next; - if (th3 == th2 || !(th3 instanceof TimeoutCancellationException)) { - z2 = false; - continue; - } else { - z2 = true; - continue; - } - if (z2) { - obj2 = next; - break; - } - } - Throwable th4 = (Throwable) obj2; - if (th4 != null) { - return th4; - } - } - return th2; - } else if (bVar.d()) { - return new JobCancellationException(q(), null, this); - } else { - return null; - } - } - - @Override // s.a.m1 - public CancellationException z() { - Throwable th; - Object F = F(); - CancellationException cancellationException = null; - if (F instanceof b) { - th = (Throwable) ((b) F)._rootCause; - } else if (F instanceof u) { - th = ((u) F).b; - } else if (!(F instanceof w0)) { - th = null; - } else { - throw new IllegalStateException(c.d.b.a.a.t("Cannot be cancelling child in this state: ", F).toString()); - } - if (th instanceof CancellationException) { - cancellationException = th; - } - CancellationException cancellationException2 = cancellationException; - if (cancellationException2 != null) { - return cancellationException2; - } - StringBuilder L = c.d.b.a.a.L("Parent job is "); - L.append(T(F)); - return new JobCancellationException(L.toString(), th, this); - } } diff --git a/app/src/main/java/s/a/f.java b/app/src/main/java/s/a/f.java index bad83ef6b5..291fc7795f 100644 --- a/app/src/main/java/s/a/f.java +++ b/app/src/main/java/s/a/f.java @@ -1,13 +1,13 @@ package s.a; /* compiled from: EventLoop.kt */ -public final class f extends p0 { +public final class f extends q0 { public final Thread n; public f(Thread thread) { this.n = thread; } - @Override // s.a.q0 + @Override // s.a.r0 public Thread R() { return this.n; } diff --git a/app/src/main/java/s/a/f0.java b/app/src/main/java/s/a/f0.java index cd26c68f35..3544b6c5c2 100644 --- a/app/src/main/java/s/a/f0.java +++ b/app/src/main/java/s/a/f0.java @@ -10,12 +10,12 @@ public class f0 extends b implements e0 { @Override // s.a.e0 public T c() { Object F = F(); - if (!(!(F instanceof w0))) { + if (!(!(F instanceof y0))) { throw new IllegalStateException("This job has not completed yet".toString()); - } else if (!(F instanceof u)) { - return (T) f1.a(F); + } else if (!(F instanceof v)) { + return (T) h1.a(F); } else { - throw ((u) F).b; + throw ((v) F).b; } } } diff --git a/app/src/main/java/s/a/f1.java b/app/src/main/java/s/a/f1.java index 80f3895647..535997d045 100644 --- a/app/src/main/java/s/a/f1.java +++ b/app/src/main/java/s/a/f1.java @@ -1,21 +1,43 @@ package s.a; -import s.a.a.s; +import java.util.Objects; +import kotlinx.coroutines.Job; /* compiled from: JobSupport.kt */ -public final class f1 { - public static final s a = new s("COMPLETING_ALREADY"); - public static final s b = new s("COMPLETING_WAITING_CHILDREN"); +public abstract class f1 extends x implements l0, y0 { + public final J l; - /* renamed from: c reason: collision with root package name */ - public static final s f2868c = new s("COMPLETING_RETRY"); - public static final s d = new s("TOO_LATE_TO_CANCEL"); - public static final s e = new s("SEALED"); - public static final n0 f = new n0(false); - public static final n0 g = new n0(true); + public f1(J j) { + this.l = j; + } - public static final Object a(Object obj) { - w0 w0Var; - x0 x0Var = (x0) (!(obj instanceof x0) ? null : obj); - return (x0Var == null || (w0Var = x0Var.a) == null) ? obj : w0Var; + @Override // s.a.y0 + public boolean a() { + return true; + } + + @Override // s.a.l0 + public void dispose() { + Object F; + J j = this.l; + Objects.requireNonNull(j, "null cannot be cast to non-null type kotlinx.coroutines.JobSupport"); + g1 g1Var = (g1) j; + do { + F = g1Var.F(); + if (F instanceof f1) { + if (F != this) { + return; + } + } else if ((F instanceof y0) && ((y0) F).getList() != null) { + n(); + return; + } else { + return; + } + } while (!g1.i.compareAndSet(g1Var, F, h1.g)); + } + + @Override // s.a.y0 + public l1 getList() { + return null; } } diff --git a/app/src/main/java/s/a/g.java b/app/src/main/java/s/a/g.java index 35f3aed3a0..63ada87f98 100644 --- a/app/src/main/java/s/a/g.java +++ b/app/src/main/java/s/a/g.java @@ -34,37 +34,37 @@ public final /* synthetic */ class g { } } - public static final Object a(r1 r1Var, Function2, ? extends Object> function2) { + public static final Object a(u1 u1Var, Function2, ? extends Object> function2) { Object obj; boolean z2 = false; - r1Var.f(false, true, new m0(r1Var, c.q.a.k.a.s(r1Var.l.getContext()).w(r1Var.m, r1Var, r1Var.j))); - r1Var.Y(); + u1Var.f(false, true, new n0(u1Var, c.q.a.k.a.t(u1Var.l.getContext()).w(u1Var.m, u1Var, u1Var.j))); + u1Var.Y(); if (function2 != null) { try { - obj = ((Function2) e0.beforeCheckcastToFunctionOfArity(function2, 2)).invoke(r1Var, r1Var); + obj = ((Function2) e0.beforeCheckcastToFunctionOfArity(function2, 2)).invoke(u1Var, u1Var); } catch (Throwable th) { - obj = new u(th, false, 2); + obj = new v(th, false, 2); } if (obj == c.getCOROUTINE_SUSPENDED()) { return c.getCOROUTINE_SUSPENDED(); } - Object L = r1Var.L(obj); - if (L == f1.b) { + Object L = u1Var.L(obj); + if (L == h1.b) { return c.getCOROUTINE_SUSPENDED(); } - if (!(L instanceof u)) { - return f1.a(L); + if (!(L instanceof v)) { + return h1.a(L); } - Throwable th2 = ((u) L).b; - if (!(th2 instanceof TimeoutCancellationException) || ((TimeoutCancellationException) th2).coroutine != r1Var) { + Throwable th2 = ((v) L).b; + if (!(th2 instanceof TimeoutCancellationException) || ((TimeoutCancellationException) th2).coroutine != u1Var) { z2 = true; } if (z2) { throw th2; - } else if (!(obj instanceof u)) { + } else if (!(obj instanceof v)) { return obj; } else { - throw ((u) obj).b; + throw ((v) obj).b; } } else { throw new NullPointerException("null cannot be cast to non-null type (R, kotlin.coroutines.Continuation) -> kotlin.Any?"); @@ -98,7 +98,7 @@ public final /* synthetic */ class g { aVar.L$0 = function2; aVar.L$1 = ref$ObjectRef2; aVar.label = 1; - T t = (T) new r1(j, aVar); + T t = (T) new u1(j, aVar); ref$ObjectRef2.element = t; Object a2 = a(t, function2); if (a2 == c.getCOROUTINE_SUSPENDED()) { diff --git a/app/src/main/java/s/a/g0.java b/app/src/main/java/s/a/g0.java index 587512f3bf..4f6b53f72b 100644 --- a/app/src/main/java/s/a/g0.java +++ b/app/src/main/java/s/a/g0.java @@ -7,5 +7,5 @@ import kotlinx.coroutines.CancellableContinuation; public interface g0 { void b(long j, CancellableContinuation cancellableContinuation); - k0 w(long j, Runnable runnable, CoroutineContext coroutineContext); + l0 w(long j, Runnable runnable, CoroutineContext coroutineContext); } diff --git a/app/src/main/java/s/a/g1.java b/app/src/main/java/s/a/g1.java index 47ae0449ed..af4f390d25 100644 --- a/app/src/main/java/s/a/g1.java +++ b/app/src/main/java/s/a/g1.java @@ -1,23 +1,1079 @@ package s.a; -import c.q.a.k.a; -import d0.w.g.b; +import d0.l; +import d0.w.h.a.e; +import d0.z.d.m; +import java.util.ArrayList; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.CancellationException; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; -import kotlinx.coroutines.CoroutineScope; -/* compiled from: Builders.common.kt */ -public final class g1 extends f0 { - public final Continuation l; +import kotlin.sequences.Sequence; +import kotlinx.coroutines.CompletionHandlerException; +import kotlinx.coroutines.Job; +import kotlinx.coroutines.JobCancellationException; +import kotlinx.coroutines.TimeoutCancellationException; +import s.a.a.i; +import s.a.a.j; +import s.a.a.k; +import s.a.a.p; +import s.a.a.t; +/* compiled from: JobSupport.kt */ +public class g1 implements Job, q, o1 { + public static final AtomicReferenceFieldUpdater i = AtomicReferenceFieldUpdater.newUpdater(g1.class, Object.class, "_state"); + public volatile Object _parentHandle; + public volatile Object _state; - public g1(CoroutineContext coroutineContext, Function2, ? extends Object> function2) { - super(coroutineContext, false); - this.l = b.createCoroutineUnintercepted(function2, this, this); + /* compiled from: JobSupport.kt */ + public static final class a extends f1 { + public final g1 m; + public final b n; + public final p o; + public final Object p; + + public a(g1 g1Var, b bVar, p pVar, Object obj) { + super(pVar.m); + this.m = g1Var; + this.n = bVar; + this.o = pVar; + this.p = obj; + } + + /* 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(Throwable th) { + q(th); + return Unit.a; + } + + @Override // s.a.x + public void q(Throwable th) { + g1 g1Var = this.m; + b bVar = this.n; + p pVar = this.o; + Object obj = this.p; + p O = g1Var.O(pVar); + if (O == null || !g1Var.W(bVar, O, obj)) { + g1Var.m(g1Var.w(bVar, obj)); + } + } + + @Override // s.a.a.k + public String toString() { + StringBuilder L = c.d.b.a.a.L("ChildCompletion["); + L.append(this.o); + L.append(", "); + L.append(this.p); + L.append(']'); + return L.toString(); + } } - @Override // s.a.b - public void Z() { - a.Q(this.l, this); + /* compiled from: JobSupport.kt */ + public static final class b implements y0 { + public volatile Object _exceptionsHolder = null; + public volatile int _isCompleting; + public volatile Object _rootCause; + public final l1 i; + + public b(l1 l1Var, boolean z2, Throwable th) { + this.i = l1Var; + this._isCompleting = z2 ? 1 : 0; + this._rootCause = th; + } + + @Override // s.a.y0 + public boolean a() { + return ((Throwable) this._rootCause) == null; + } + + /* JADX WARNING: Unknown variable types count: 1 */ + public final void b(Throwable th) { + Throwable th2 = (Throwable) this._rootCause; + if (th2 == null) { + this._rootCause = th; + } else if (th != th2) { + ?? r0 = this._exceptionsHolder; + if (r0 == 0) { + this._exceptionsHolder = th; + } else if (r0 instanceof Throwable) { + if (th != r0) { + ArrayList c2 = c(); + c2.add(r0); + c2.add(th); + this._exceptionsHolder = c2; + } + } else if (r0 instanceof ArrayList) { + ((ArrayList) r0).add(th); + } else { + throw new IllegalStateException(c.d.b.a.a.t("State is ", r0).toString()); + } + } + } + + public final ArrayList c() { + return new ArrayList<>(4); + } + + public final boolean d() { + return ((Throwable) this._rootCause) != null; + } + + public final boolean e() { + return this._exceptionsHolder == h1.e; + } + + /* JADX WARNING: Unknown variable types count: 1 */ + public final List f(Throwable th) { + ArrayList arrayList; + ?? r0 = this._exceptionsHolder; + if (r0 == 0) { + arrayList = c(); + } else if (r0 instanceof Throwable) { + ArrayList c2 = c(); + c2.add(r0); + arrayList = c2; + } else if (r0 instanceof ArrayList) { + arrayList = (ArrayList) r0; + } else { + throw new IllegalStateException(c.d.b.a.a.t("State is ", r0).toString()); + } + Throwable th2 = (Throwable) this._rootCause; + if (th2 != null) { + arrayList.add(0, th2); + } + if (th != null && (!m.areEqual(th, th2))) { + arrayList.add(th); + } + this._exceptionsHolder = h1.e; + return arrayList; + } + + @Override // s.a.y0 + public l1 getList() { + return this.i; + } + + /* JADX DEBUG: Multi-variable search result rejected for r0v1, resolved type: java.lang.StringBuilder */ + /* JADX WARN: Multi-variable type inference failed */ + /* JADX WARNING: Unknown variable types count: 1 */ + public String toString() { + StringBuilder L = c.d.b.a.a.L("Finishing[cancelling="); + L.append(d()); + L.append(", completing="); + L.append((boolean) this._isCompleting); + L.append(", rootCause="); + L.append((Throwable) this._rootCause); + L.append(", exceptions="); + L.append(this._exceptionsHolder); + L.append(", list="); + L.append(this.i); + L.append(']'); + return L.toString(); + } + } + + /* compiled from: LockFreeLinkedList.kt */ + public static final class c extends k.a { + public final /* synthetic */ g1 d; + public final /* synthetic */ Object e; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public c(k kVar, k kVar2, g1 g1Var, Object obj) { + super(kVar2); + this.d = g1Var; + this.e = obj; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // s.a.a.d + public Object c(k kVar) { + if (this.d.F() == this.e) { + return null; + } + return j.a; + } + } + + /* compiled from: JobSupport.kt */ + @e(c = "kotlinx.coroutines.JobSupport$children$1", f = "JobSupport.kt", l = {949, 951}, m = "invokeSuspend") + public static final class d extends d0.w.h.a.j implements Function2, Continuation, Object> { + public Object L$0; + public Object L$1; + public Object L$2; + public Object L$3; + public Object L$4; + public Object L$5; + public int label; + private d0.f0.k p$; + public final /* synthetic */ g1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public d(g1 g1Var, Continuation continuation) { + super(2, continuation); + this.this$0 = g1Var; + } + + @Override // d0.w.h.a.a + public final Continuation create(Object obj, Continuation continuation) { + d dVar = new d(this.this$0, continuation); + dVar.p$ = (d0.f0.k) obj; + return dVar; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public final Object invoke(d0.f0.k kVar, Continuation continuation) { + d dVar = new d(this.this$0, continuation); + dVar.p$ = kVar; + return dVar.invokeSuspend(Unit.a); + } + + /* JADX WARNING: Removed duplicated region for block: B:20:0x007f */ + @Override // d0.w.h.a.a + public final Object invokeSuspend(Object obj) { + d dVar; + d0.f0.k kVar; + Object obj2; + i iVar; + i iVar2; + k kVar2; + Object coroutine_suspended = d0.w.g.c.getCOROUTINE_SUSPENDED(); + int i = this.label; + if (i == 0) { + l.throwOnFailure(obj); + d0.f0.k kVar3 = this.p$; + Object F = this.this$0.F(); + if (F instanceof p) { + q qVar = ((p) F).m; + this.L$0 = kVar3; + this.L$1 = F; + this.label = 1; + if (kVar3.yield(qVar, this) == coroutine_suspended) { + return coroutine_suspended; + } + } else if ((F instanceof y0) && (iVar2 = ((y0) F).getList()) != null) { + Object i2 = iVar2.i(); + Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); + kVar = kVar3; + obj2 = F; + kVar2 = (k) i2; + dVar = this; + iVar = iVar2; + } + return Unit.a; + } else if (i == 1) { + d0.f0.k kVar4 = (d0.f0.k) this.L$0; + l.throwOnFailure(obj); + return Unit.a; + } else if (i == 2) { + p pVar = (p) this.L$5; + kVar2 = (k) this.L$4; + iVar2 = (i) this.L$3; + iVar = (l1) this.L$2; + obj2 = this.L$1; + kVar = (d0.f0.k) this.L$0; + l.throwOnFailure(obj); + dVar = this; + kVar2 = kVar2.j(); + } else { + throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); + } + if (!m.areEqual(kVar2, iVar2)) { + if (kVar2 instanceof p) { + p pVar2 = (p) kVar2; + q qVar2 = pVar2.m; + dVar.L$0 = kVar; + dVar.L$1 = obj2; + dVar.L$2 = iVar; + dVar.L$3 = iVar2; + dVar.L$4 = kVar2; + dVar.L$5 = pVar2; + dVar.label = 2; + if (kVar.yield(qVar2, dVar) == coroutine_suspended) { + return coroutine_suspended; + } + } + kVar2 = kVar2.j(); + if (!m.areEqual(kVar2, iVar2)) { + } + } + return Unit.a; + } + } + + public g1(boolean z2) { + this._state = z2 ? h1.g : h1.f; + this._parentHandle = null; + } + + public boolean A() { + return true; + } + + @Override // kotlinx.coroutines.Job + public void B(CancellationException cancellationException) { + if (cancellationException == null) { + cancellationException = new JobCancellationException(q(), null, this); + } + n(cancellationException); + } + + public boolean D() { + return false; + } + + public final l1 E(y0 y0Var) { + l1 list = y0Var.getList(); + if (list != null) { + return list; + } + if (y0Var instanceof o0) { + return new l1(); + } + if (y0Var instanceof f1) { + S((f1) y0Var); + return null; + } + throw new IllegalStateException(("State should have list: " + y0Var).toString()); + } + + public final Object F() { + while (true) { + Object obj = this._state; + if (!(obj instanceof p)) { + return obj; + } + ((p) obj).a(this); + } + } + + @Override // kotlinx.coroutines.Job + public final o G(q qVar) { + l0 y2 = c.q.a.k.a.y(this, true, false, new p(this, qVar), 2, null); + Objects.requireNonNull(y2, "null cannot be cast to non-null type kotlinx.coroutines.ChildHandle"); + return (o) y2; + } + + public boolean H(Throwable th) { + return false; + } + + public void I(Throwable th) { + throw th; + } + + public final void J(Job job) { + if (job == null) { + this._parentHandle = m1.i; + return; + } + job.start(); + o G = job.G(this); + this._parentHandle = G; + if (!(F() instanceof y0)) { + G.dispose(); + this._parentHandle = m1.i; + } + } + + public boolean K() { + return false; + } + + public final Object L(Object obj) { + Object V; + do { + V = V(F(), obj); + if (V == h1.a) { + String str = "Job " + this + " is already complete or completing, but is being completed with " + obj; + Throwable th = null; + if (!(obj instanceof v)) { + obj = null; + } + v vVar = (v) obj; + if (vVar != null) { + th = vVar.b; + } + throw new IllegalStateException(str, th); + } + } while (V == h1.f2871c); + return V; + } + + public final f1 M(Function1 function1, boolean z2) { + d1 d1Var = null; + if (z2) { + if (function1 instanceof d1) { + d1Var = function1; + } + d1 d1Var2 = d1Var; + return d1Var2 != null ? d1Var2 : new b1(this, function1); + } + if (function1 instanceof f1) { + d1Var = function1; + } + f1 f1Var = d1Var; + return f1Var != null ? f1Var : new c1(this, function1); + } + + public String N() { + return getClass().getSimpleName(); + } + + public final p O(k kVar) { + while (kVar.m()) { + kVar = kVar.k(); + } + while (true) { + kVar = kVar.j(); + if (!kVar.m()) { + if (kVar instanceof p) { + return (p) kVar; + } + if (kVar instanceof l1) { + return null; + } + } + } + } + + public final void P(l1 l1Var, Throwable th) { + CompletionHandlerException completionHandlerException = null; + Object i2 = l1Var.i(); + Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); + for (k kVar = (k) i2; !m.areEqual(kVar, l1Var); kVar = kVar.j()) { + if (kVar instanceof d1) { + f1 f1Var = (f1) kVar; + try { + f1Var.q(th); + } catch (Throwable th2) { + if (completionHandlerException != null) { + d0.b.addSuppressed(completionHandlerException, th2); + } else { + completionHandlerException = new CompletionHandlerException("Exception in completion handler " + f1Var + " for " + this, th2); + } + } + } + } + if (completionHandlerException != null) { + I(completionHandlerException); + } + o(th); + } + + public void Q(Object obj) { + } + + public void R() { + } + + public final void S(f1 f1Var) { + l1 l1Var = new l1(); + k.j.lazySet(l1Var, f1Var); + k.i.lazySet(l1Var, f1Var); + while (true) { + if (f1Var.i() == f1Var) { + if (k.i.compareAndSet(f1Var, f1Var, l1Var)) { + l1Var.g(f1Var); + break; + } + } else { + break; + } + } + i.compareAndSet(this, f1Var, f1Var.j()); + } + + public final String T(Object obj) { + if (!(obj instanceof b)) { + return obj instanceof y0 ? ((y0) obj).a() ? "Active" : "New" : obj instanceof v ? "Cancelled" : "Completed"; + } + b bVar = (b) obj; + return bVar.d() ? "Cancelling" : bVar._isCompleting != 0 ? "Completing" : "Active"; + } + + public final CancellationException U(Throwable th, String str) { + CancellationException cancellationException = (CancellationException) (!(th instanceof CancellationException) ? null : th); + if (cancellationException == null) { + if (str == null) { + str = q(); + } + cancellationException = new JobCancellationException(str, th, this); + } + return cancellationException; + } + + public final Object V(Object obj, Object obj2) { + Throwable th; + if (!(obj instanceof y0)) { + return h1.a; + } + boolean z2 = true; + if (((obj instanceof o0) || (obj instanceof f1)) && !(obj instanceof p) && !(obj2 instanceof v)) { + y0 y0Var = (y0) obj; + if (!i.compareAndSet(this, y0Var, obj2 instanceof y0 ? new z0((y0) obj2) : obj2)) { + z2 = false; + } else { + Q(obj2); + u(y0Var, obj2); + } + return z2 ? obj2 : h1.f2871c; + } + y0 y0Var2 = (y0) obj; + l1 E = E(y0Var2); + if (E == null) { + return h1.f2871c; + } + p pVar = null; + b bVar = (b) (!(y0Var2 instanceof b) ? null : y0Var2); + if (bVar == null) { + bVar = new b(E, false, null); + } + synchronized (bVar) { + if (bVar._isCompleting != 0) { + return h1.a; + } + bVar._isCompleting = 1; + if (bVar == y0Var2 || i.compareAndSet(this, y0Var2, bVar)) { + boolean d2 = bVar.d(); + v vVar = (v) (!(obj2 instanceof v) ? null : obj2); + if (vVar != null) { + bVar.b(vVar.b); + } + th = (Throwable) bVar._rootCause; + if (!(true ^ d2)) { + th = null; + } + } else { + return h1.f2871c; + } + } + if (th != null) { + P(E, th); + } + p pVar2 = (p) (!(y0Var2 instanceof p) ? null : y0Var2); + if (pVar2 != null) { + pVar = pVar2; + } else { + l1 list = y0Var2.getList(); + if (list != null) { + pVar = O(list); + } + } + return (pVar == null || !W(bVar, pVar, obj2)) ? w(bVar, obj2) : h1.b; + } + + public final boolean W(b bVar, p pVar, Object obj) { + while (c.q.a.k.a.y(pVar.m, false, false, new a(this, bVar, pVar, obj), 1, null) == m1.i) { + pVar = O(pVar); + if (pVar == null) { + return false; + } + } + return true; + } + + @Override // kotlinx.coroutines.Job + public boolean a() { + Object F = F(); + return (F instanceof y0) && ((y0) F).a(); + } + + @Override // kotlinx.coroutines.Job + public final Sequence d() { + return d0.f0.l.sequence(new d(this, null)); + } + + /* JADX WARN: Multi-variable type inference failed */ + /* JADX WARNING: Unknown variable types count: 1 */ + @Override // kotlinx.coroutines.Job + public final l0 f(boolean z2, boolean z3, Function1 function1) { + Throwable th; + Throwable th2 = null; + f1 f1Var = null; + while (true) { + Object F = F(); + if (F instanceof o0) { + o0 o0Var = (o0) F; + if (o0Var.i) { + if (f1Var == null) { + f1Var = M(function1, z2); + } + if (i.compareAndSet(this, F, f1Var)) { + return f1Var; + } + } else { + l1 l1Var = new l1(); + if (!o0Var.i) { + l1Var = new x0(l1Var); + } + i.compareAndSet(this, o0Var, l1Var); + } + } else if (F instanceof y0) { + l1 list = ((y0) F).getList(); + if (list == null) { + Objects.requireNonNull(F, "null cannot be cast to non-null type kotlinx.coroutines.JobNode<*>"); + S((f1) F); + } else { + l0 l0Var = m1.i; + if (!z2 || !(F instanceof b)) { + th = null; + } else { + synchronized (F) { + th = (Throwable) ((b) F)._rootCause; + if (th == null || ((function1 instanceof p) && ((b) F)._isCompleting == 0)) { + if (f1Var == null) { + f1Var = M(function1, z2); + } + if (l(F, list, f1Var)) { + if (th == null) { + return f1Var; + } + l0Var = f1Var; + } + } + } + } + if (th != null) { + if (z3) { + function1.invoke(th); + } + return l0Var; + } + if (f1Var == null) { + f1Var = M(function1, z2); + } + if (l(F, list, f1Var)) { + return f1Var; + } + } + } else { + if (z3) { + if (!(F instanceof v)) { + F = null; + } + v vVar = (v) F; + if (vVar != null) { + th2 = vVar.b; + } + function1.invoke(th2); + } + return m1.i; + } + } + } + + @Override // kotlin.coroutines.CoroutineContext + public R fold(R r, Function2 function2) { + return (R) CoroutineContext.Element.a.fold(this, r, function2); + } + + @Override // kotlin.coroutines.CoroutineContext.Element, kotlin.coroutines.CoroutineContext + public E get(CoroutineContext.Key key) { + return (E) CoroutineContext.Element.a.get(this, key); + } + + @Override // kotlin.coroutines.CoroutineContext.Element + public final CoroutineContext.Key getKey() { + return Job.h; + } + + public final boolean l(Object obj, l1 l1Var, f1 f1Var) { + int p; + c cVar = new c(f1Var, f1Var, this, obj); + do { + p = l1Var.k().p(f1Var, l1Var, cVar); + if (p == 1) { + return true; + } + } while (p != 2); + return false; + } + + public void m(Object obj) { + } + + @Override // kotlin.coroutines.CoroutineContext + public CoroutineContext minusKey(CoroutineContext.Key key) { + return CoroutineContext.Element.a.minusKey(this, key); + } + + /* JADX WARNING: Code restructure failed: missing block: B:10:0x0031, code lost: + r0 = s.a.h1.a; + */ + /* JADX WARNING: Removed duplicated region for block: B:78:0x00b9 A[SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:84:0x003e A[SYNTHETIC] */ + public final boolean n(Object obj) { + t tVar; + boolean z2; + t tVar2 = h1.a; + if (D()) { + while (true) { + Object F = F(); + if ((F instanceof y0) && (!(F instanceof b) || ((b) F)._isCompleting == 0)) { + tVar2 = V(F, new v(v(obj), false, 2)); + if (tVar2 != h1.f2871c) { + break; + } + } else { + break; + } + } + if (tVar2 == h1.b) { + return true; + } + } + if (tVar2 == h1.a) { + Throwable th = null; + Throwable th2 = null; + while (true) { + Object F2 = F(); + if (!(F2 instanceof b)) { + if (!(F2 instanceof y0)) { + tVar = h1.d; + break; + } + if (th2 == null) { + th2 = v(obj); + } + y0 y0Var = (y0) F2; + if (y0Var.a()) { + l1 E = E(y0Var); + if (E != null) { + if (i.compareAndSet(this, y0Var, new b(E, false, th2))) { + P(E, th2); + z2 = true; + if (!z2) { + tVar = h1.a; + break; + } + } + } + z2 = false; + if (!z2) { + } + } else { + Object V = V(F2, new v(th2, false, 2)); + if (V != h1.a) { + if (V != h1.f2871c) { + tVar2 = V; + break; + } + } else { + throw new IllegalStateException(c.d.b.a.a.t("Cannot happen in ", F2).toString()); + } + } + } else { + synchronized (F2) { + if (((b) F2).e()) { + tVar = h1.d; + } else { + boolean d2 = ((b) F2).d(); + if (obj != null || !d2) { + if (th2 == null) { + th2 = v(obj); + } + ((b) F2).b(th2); + } + Throwable th3 = (Throwable) ((b) F2)._rootCause; + if (!d2) { + th = th3; + } + if (th != null) { + P(((b) F2).i, th); + } + tVar = h1.a; + } + } + } + } + tVar2 = tVar; + } + if (!(tVar2 == h1.a || tVar2 == h1.b)) { + if (tVar2 == h1.d) { + return false; + } + m(tVar2); + } + return true; + } + + public final boolean o(Throwable th) { + if (K()) { + return true; + } + boolean z2 = th instanceof CancellationException; + o oVar = (o) this._parentHandle; + return (oVar == null || oVar == m1.i) ? z2 : oVar.h(th) || z2; + } + + @Override // kotlinx.coroutines.Job + public final CancellationException p() { + Object F = F(); + if (F instanceof b) { + Throwable th = (Throwable) ((b) F)._rootCause; + if (th != null) { + return U(th, getClass().getSimpleName() + " is cancelling"); + } + throw new IllegalStateException(("Job is still new or active: " + this).toString()); + } else if (F instanceof y0) { + throw new IllegalStateException(("Job is still new or active: " + this).toString()); + } else if (F instanceof v) { + return U(((v) F).b, null); + } else { + return new JobCancellationException(getClass().getSimpleName() + " has completed normally", null, this); + } + } + + @Override // kotlin.coroutines.CoroutineContext + public CoroutineContext plus(CoroutineContext coroutineContext) { + return CoroutineContext.Element.a.plus(this, coroutineContext); + } + + public String q() { + return "Job was cancelled"; + } + + @Override // s.a.q + public final void r(o1 o1Var) { + n(o1Var); + } + + public boolean s(Throwable th) { + if (th instanceof CancellationException) { + return true; + } + return n(th) && A(); + } + + /* JADX WARNING: Removed duplicated region for block: B:18:0x0040 A[SYNTHETIC] */ + @Override // kotlinx.coroutines.Job + public final boolean start() { + char c2; + do { + Object F = F(); + c2 = 65535; + if (F instanceof o0) { + if (!((o0) F).i) { + if (i.compareAndSet(this, F, h1.g)) { + R(); + } + if (c2 == 0) { + return false; + } + } + c2 = 0; + if (c2 == 0) { + } + } else { + if (F instanceof x0) { + if (i.compareAndSet(this, F, ((x0) F).i)) { + R(); + } + if (c2 == 0) { + } + } + c2 = 0; + if (c2 == 0) { + } + } + c2 = 1; + if (c2 == 0) { + } + } while (c2 != 1); + return true; + } + + @Override // kotlinx.coroutines.Job + public final l0 t(Function1 function1) { + return f(false, true, function1); + } + + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(N() + '{' + T(F()) + '}'); + sb.append('@'); + sb.append(c.q.a.k.a.u(this)); + return sb.toString(); + } + + public final void u(y0 y0Var, Object obj) { + o oVar = (o) this._parentHandle; + if (oVar != null) { + oVar.dispose(); + this._parentHandle = m1.i; + } + CompletionHandlerException completionHandlerException = null; + if (!(obj instanceof v)) { + obj = null; + } + v vVar = (v) obj; + Throwable th = vVar != null ? vVar.b : null; + if (y0Var instanceof f1) { + try { + ((f1) y0Var).q(th); + } catch (Throwable th2) { + I(new CompletionHandlerException("Exception in completion handler " + y0Var + " for " + this, th2)); + } + } else { + l1 list = y0Var.getList(); + if (list != null) { + Object i2 = list.i(); + Objects.requireNonNull(i2, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); + for (k kVar = (k) i2; !m.areEqual(kVar, list); kVar = kVar.j()) { + if (kVar instanceof f1) { + f1 f1Var = (f1) kVar; + try { + f1Var.q(th); + } catch (Throwable th3) { + if (completionHandlerException != null) { + d0.b.addSuppressed(completionHandlerException, th3); + } else { + completionHandlerException = new CompletionHandlerException("Exception in completion handler " + f1Var + " for " + this, th3); + } + } + } + } + if (completionHandlerException != null) { + I(completionHandlerException); + } + } + } + } + + public final Throwable v(Object obj) { + if (obj != null ? obj instanceof Throwable : true) { + return obj != null ? (Throwable) obj : new JobCancellationException(q(), null, this); + } + Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.ParentJob"); + return ((o1) obj).z(); + } + + public final Object w(b bVar, Object obj) { + Throwable y2; + Throwable th = null; + v vVar = (v) (!(obj instanceof v) ? null : obj); + if (vVar != null) { + th = vVar.b; + } + synchronized (bVar) { + bVar.d(); + List f = bVar.f(th); + y2 = y(bVar, f); + if (y2 != null) { + if (f.size() > 1) { + Set newSetFromMap = Collections.newSetFromMap(new IdentityHashMap(f.size())); + for (Throwable th2 : f) { + if (th2 != y2 && th2 != y2 && !(th2 instanceof CancellationException) && newSetFromMap.add(th2)) { + d0.b.addSuppressed(y2, th2); + } + } + } + } + } + if (!(y2 == null || y2 == th)) { + obj = new v(y2, false, 2); + } + if (y2 != null) { + if (o(y2) || H(y2)) { + Objects.requireNonNull(obj, "null cannot be cast to non-null type kotlinx.coroutines.CompletedExceptionally"); + v.a.compareAndSet((v) obj, 0, 1); + } + } + Q(obj); + i.compareAndSet(this, bVar, obj instanceof y0 ? new z0((y0) obj) : obj); + u(bVar, obj); + return obj; + } + + public final Throwable y(b bVar, List list) { + Object obj; + boolean z2; + Object obj2 = null; + if (!list.isEmpty()) { + Iterator it = list.iterator(); + while (true) { + if (!it.hasNext()) { + obj = null; + break; + } + obj = it.next(); + if (!(((Throwable) obj) instanceof CancellationException)) { + break; + } + } + Throwable th = (Throwable) obj; + if (th != null) { + return th; + } + Throwable th2 = (Throwable) list.get(0); + if (th2 instanceof TimeoutCancellationException) { + Iterator it2 = list.iterator(); + while (true) { + if (!it2.hasNext()) { + break; + } + Object next = it2.next(); + Throwable th3 = (Throwable) next; + if (th3 == th2 || !(th3 instanceof TimeoutCancellationException)) { + z2 = false; + continue; + } else { + z2 = true; + continue; + } + if (z2) { + obj2 = next; + break; + } + } + Throwable th4 = (Throwable) obj2; + if (th4 != null) { + return th4; + } + } + return th2; + } else if (bVar.d()) { + return new JobCancellationException(q(), null, this); + } else { + return null; + } + } + + @Override // s.a.o1 + public CancellationException z() { + Throwable th; + Object F = F(); + CancellationException cancellationException = null; + if (F instanceof b) { + th = (Throwable) ((b) F)._rootCause; + } else if (F instanceof v) { + th = ((v) F).b; + } else if (!(F instanceof y0)) { + th = null; + } else { + throw new IllegalStateException(c.d.b.a.a.t("Cannot be cancelling child in this state: ", F).toString()); + } + if (th instanceof CancellationException) { + cancellationException = th; + } + CancellationException cancellationException2 = cancellationException; + if (cancellationException2 != null) { + return cancellationException2; + } + StringBuilder L = c.d.b.a.a.L("Parent job is "); + L.append(T(F)); + return new JobCancellationException(L.toString(), th, this); } } diff --git a/app/src/main/java/s/a/h.java b/app/src/main/java/s/a/h.java index 0415b003fb..90f521b8e5 100644 --- a/app/src/main/java/s/a/h.java +++ b/app/src/main/java/s/a/h.java @@ -1,4 +1,33 @@ package s.a; -/* compiled from: CancellableContinuationImpl.kt */ -public abstract class h extends i implements l1 { + +import c.d.b.a.a; +import java.util.concurrent.Future; +import kotlin.Unit; +/* compiled from: Future.kt */ +public final class h extends i { + public final Future i; + + public h(Future future) { + this.i = future; + } + + @Override // s.a.j + public void a(Throwable th) { + this.i.cancel(false); + } + + /* 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 Unit invoke(Throwable th) { + this.i.cancel(false); + return Unit.a; + } + + public String toString() { + StringBuilder L = a.L("CancelFutureOnCancel["); + L.append(this.i); + L.append(']'); + return L.toString(); + } } diff --git a/app/src/main/java/s/a/h0.java b/app/src/main/java/s/a/h0.java index 5e043421fc..7eda6bddc1 100644 --- a/app/src/main/java/s/a/h0.java +++ b/app/src/main/java/s/a/h0.java @@ -5,10 +5,10 @@ import d0.w.g.b; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; -import s.a.a.g; -import s.a.a.q; +import s.a.a.h; +import s.a.a.r; /* compiled from: Builders.common.kt */ -public final class h0 extends q { +public final class h0 extends r { public static final AtomicIntegerFieldUpdater m = AtomicIntegerFieldUpdater.newUpdater(h0.class, "_decision"); public volatile int _decision = 0; @@ -16,7 +16,7 @@ public final class h0 extends q { super(coroutineContext, continuation); } - @Override // s.a.a.q, s.a.b + @Override // s.a.a.r, s.a.b public void X(Object obj) { boolean z2; while (true) { @@ -32,11 +32,11 @@ public final class h0 extends q { } } if (!z2) { - g.b(b.intercepted(this.l), a.K(obj, this.l), null, 2); + h.b(b.intercepted(this.l), a.L(obj, this.l), null, 2); } } - @Override // s.a.a.q, s.a.e1 + @Override // s.a.a.r, s.a.g1 public void m(Object obj) { X(obj); } diff --git a/app/src/main/java/s/a/h1.java b/app/src/main/java/s/a/h1.java index 5972c2121f..25ae27cdb9 100644 --- a/app/src/main/java/s/a/h1.java +++ b/app/src/main/java/s/a/h1.java @@ -1,23 +1,21 @@ package s.a; -import c.q.a.k.a; -import d0.w.g.b; -import kotlin.Unit; -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function2; -import kotlinx.coroutines.CoroutineScope; -/* compiled from: Builders.common.kt */ -public final class h1 extends n1 { - public final Continuation l; +import s.a.a.t; +/* compiled from: JobSupport.kt */ +public final class h1 { + public static final t a = new t("COMPLETING_ALREADY"); + public static final t b = new t("COMPLETING_WAITING_CHILDREN"); - public h1(CoroutineContext coroutineContext, Function2, ? extends Object> function2) { - super(coroutineContext, false); - this.l = b.createCoroutineUnintercepted(function2, this, this); - } + /* renamed from: c reason: collision with root package name */ + public static final t f2871c = new t("COMPLETING_RETRY"); + public static final t d = new t("TOO_LATE_TO_CANCEL"); + public static final t e = new t("SEALED"); + public static final o0 f = new o0(false); + public static final o0 g = new o0(true); - @Override // s.a.b - public void Z() { - a.Q(this.l, this); + public static final Object a(Object obj) { + y0 y0Var; + z0 z0Var = (z0) (!(obj instanceof z0) ? null : obj); + return (z0Var == null || (y0Var = z0Var.a) == null) ? obj : y0Var; } } diff --git a/app/src/main/java/s/a/i.java b/app/src/main/java/s/a/i.java index e306590228..453d898ef6 100644 --- a/app/src/main/java/s/a/i.java +++ b/app/src/main/java/s/a/i.java @@ -1,8 +1,4 @@ package s.a; - -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: CompletionHandler.kt */ -public abstract class i implements Function1 { - public abstract void a(Throwable th); +/* compiled from: CancellableContinuationImpl.kt */ +public abstract class i extends j implements n1 { } diff --git a/app/src/main/java/s/a/i0.java b/app/src/main/java/s/a/i0.java index daa8b21578..f5feb920f1 100644 --- a/app/src/main/java/s/a/i0.java +++ b/app/src/main/java/s/a/i0.java @@ -10,9 +10,9 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; import kotlinx.coroutines.Job; -import s.a.a.f; -import s.a.y1.h; -import s.a.y1.i; +import s.a.a.g; +import s.a.b2.h; +import s.a.b2.i; /* compiled from: DispatchedTask.kt */ public abstract class i0 extends h { public int k; @@ -27,12 +27,12 @@ public abstract class i0 extends h { public abstract Continuation d(); public Throwable f(Object obj) { - if (!(obj instanceof u)) { + if (!(obj instanceof v)) { obj = null; } - u uVar = (u) obj; - if (uVar != null) { - return uVar.b; + v vVar = (v) obj; + if (vVar != null) { + return vVar.b; } return null; } @@ -52,7 +52,7 @@ public abstract class i0 extends h { th = th2; } m.checkNotNull(th); - a.w(d().getContext(), new b0("Fatal exception in coroutines machinery for " + this + ". Please read KDoc to 'handleFatalException' method and report this incident to maintainers", th)); + a.x(d().getContext(), new b0("Fatal exception in coroutines machinery for " + this + ". Please read KDoc to 'handleFatalException' method and report this incident to maintainers", th)); } } @@ -66,14 +66,14 @@ public abstract class i0 extends h { try { Continuation d = d(); if (d != null) { - f fVar = (f) d; - Continuation continuation = fVar.q; + g gVar = (g) d; + Continuation continuation = gVar.q; CoroutineContext context = continuation.getContext(); Object n = n(); - Object b = s.a.a.a.b(context, fVar.o); + Object b = s.a.a.a.b(context, gVar.o); try { Throwable f = f(n); - Job job = (f != null || !a.B(this.k)) ? null : (Job) context.get(Job.h); + Job job = (f != null || !a.C(this.k)) ? null : (Job) context.get(Job.h); if (job != null && !job.a()) { CancellationException p = job.p(); c(n, p); diff --git a/app/src/main/java/s/a/i1.java b/app/src/main/java/s/a/i1.java index c064a05a30..a69bdc6923 100644 --- a/app/src/main/java/s/a/i1.java +++ b/app/src/main/java/s/a/i1.java @@ -1,35 +1,23 @@ package s.a; import c.q.a.k.a; -import s.a.a.m; -/* compiled from: MainCoroutineDispatcher.kt */ -public abstract class i1 extends z { - public abstract i1 H(); +import d0.w.g.b; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: Builders.common.kt */ +public final class i1 extends f0 { + public final Continuation l; - public final String I() { - i1 i1Var; - z zVar = j0.a; - i1 i1Var2 = m.b; - if (this == i1Var2) { - return "Dispatchers.Main"; - } - try { - i1Var = i1Var2.H(); - } catch (UnsupportedOperationException unused) { - i1Var = null; - } - if (this == i1Var) { - return "Dispatchers.Main.immediate"; - } - return null; + public i1(CoroutineContext coroutineContext, Function2, ? extends Object> function2) { + super(coroutineContext, false); + this.l = b.createCoroutineUnintercepted(function2, this, this); } - @Override // s.a.z - public String toString() { - String I = I(); - if (I != null) { - return I; - } - return getClass().getSimpleName() + '@' + a.t(this); + @Override // s.a.b + public void Z() { + a.R(this.l, this); } } diff --git a/app/src/main/java/s/a/j.java b/app/src/main/java/s/a/j.java index 09909767dc..f26174ffda 100644 --- a/app/src/main/java/s/a/j.java +++ b/app/src/main/java/s/a/j.java @@ -1,490 +1,8 @@ package s.a; -import c.d.b.a.a; -import d0.k; -import d0.w.g.c; -import java.util.Objects; -import java.util.concurrent.CancellationException; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import kotlin.Unit; -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; -import kotlin.coroutines.jvm.internal.CoroutineStackFrame; import kotlin.jvm.functions.Function1; -import kotlinx.coroutines.CancellableContinuation; -import kotlinx.coroutines.CompletionHandlerException; -import kotlinx.coroutines.Job; -import s.a.a.f; -import s.a.a.g; -import s.a.a.s; -/* compiled from: CancellableContinuationImpl.kt */ -public class j extends i0 implements CancellableContinuation, CoroutineStackFrame { - public static final AtomicIntegerFieldUpdater l = AtomicIntegerFieldUpdater.newUpdater(j.class, "_decision"); - public static final AtomicReferenceFieldUpdater m = AtomicReferenceFieldUpdater.newUpdater(j.class, Object.class, "_state"); - public volatile int _decision = 0; - public volatile Object _parentHandle = null; - public volatile Object _state = c.i; - public final CoroutineContext n; - public final Continuation o; - - /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: kotlin.coroutines.Continuation */ - /* JADX WARN: Multi-variable type inference failed */ - public j(Continuation continuation, int i) { - super(i); - this.o = continuation; - this.n = continuation.getContext(); - } - - /* JADX DEBUG: Multi-variable search result rejected for r4v3, resolved type: java.util.concurrent.atomic.AtomicReferenceFieldUpdater */ - /* JADX DEBUG: Multi-variable search result rejected for r2v4, resolved type: java.util.concurrent.atomic.AtomicReferenceFieldUpdater */ - /* JADX WARN: Multi-variable type inference failed */ - public final void A() { - Job job; - boolean v = v(); - if (this.k == 2) { - Continuation continuation = this.o; - Throwable th = null; - if (!(continuation instanceof f)) { - continuation = null; - } - f fVar = (f) continuation; - if (fVar != null) { - while (true) { - Object obj = fVar._reusableCancellableContinuation; - s sVar = g.b; - if (obj == sVar) { - if (f.l.compareAndSet(fVar, sVar, this)) { - break; - } - } else if (obj != null) { - if (!(obj instanceof Throwable)) { - throw new IllegalStateException(a.t("Inconsistent state ", obj).toString()); - } else if (f.l.compareAndSet(fVar, obj, null)) { - th = (Throwable) obj; - } else { - throw new IllegalArgumentException("Failed requirement.".toString()); - } - } - } - if (th != null) { - if (!v) { - j(th); - } - v = true; - } - } - } - if (!v && ((k0) this._parentHandle) == null && (job = (Job) this.o.getContext().get(Job.h)) != null) { - k0 x2 = c.q.a.k.a.x(job, true, false, new m(job, this), 2, null); - this._parentHandle = x2; - if (v() && !w()) { - x2.dispose(); - this._parentHandle = k1.i; - } - } - } - - public final s B(Object obj, Object obj2, Function1 function1) { - Object obj3; - do { - obj3 = this._state; - if (obj3 instanceof l1) { - } else if (!(obj3 instanceof t) || obj2 == null || ((t) obj3).d != obj2) { - return null; - } else { - return k.a; - } - } while (!m.compareAndSet(this, obj3, z((l1) obj3, obj, this.k, function1, obj2))); - s(); - return k.a; - } - - @Override // kotlinx.coroutines.CancellableContinuation - public boolean a() { - return this._state instanceof l1; - } - - @Override // kotlinx.coroutines.CancellableContinuation - public Object b(T t, Object obj) { - return B(t, obj, null); - } - - @Override // s.a.i0 - public void c(Object obj, Throwable th) { - while (true) { - Object obj2 = this._state; - if (obj2 instanceof l1) { - throw new IllegalStateException("Not completed".toString()); - } else if (!(obj2 instanceof u)) { - if (obj2 instanceof t) { - t tVar = (t) obj2; - if (!(tVar.e != null)) { - if (m.compareAndSet(this, obj2, t.a(tVar, null, null, null, null, th, 15))) { - h hVar = tVar.b; - if (hVar != null) { - p(hVar, th); - } - Function1 function1 = tVar.f2870c; - if (function1 != null) { - q(function1, th); - return; - } - return; - } - } else { - throw new IllegalStateException("Must be called at most once".toString()); - } - } else if (m.compareAndSet(this, obj2, new t(obj2, null, null, null, th, 14))) { - return; - } - } else { - return; - } - } - } - - @Override // s.a.i0 - public final Continuation d() { - return this.o; - } - - /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: java.util.concurrent.atomic.AtomicIntegerFieldUpdater */ - /* JADX WARN: Multi-variable type inference failed */ - @Override // kotlinx.coroutines.CancellableContinuation - public void e(Function1 function1) { - h y0Var = function1 instanceof h ? (h) function1 : new y0(function1); - while (true) { - Object obj = this._state; - if (!(obj instanceof c)) { - Throwable th = null; - if (!(obj instanceof h)) { - boolean z2 = obj instanceof u; - boolean z3 = true; - if (z2) { - u uVar = (u) obj; - Objects.requireNonNull(uVar); - if (!u.a.compareAndSet(uVar, 0, 1)) { - x(function1, obj); - throw null; - } else if (obj instanceof l) { - if (!z2) { - obj = null; - } - u uVar2 = (u) obj; - if (uVar2 != null) { - th = uVar2.b; - } - o(function1, th); - return; - } else { - return; - } - } else if (obj instanceof t) { - t tVar = (t) obj; - if (tVar.b != null) { - x(function1, obj); - throw null; - } else if (!(y0Var instanceof e)) { - Throwable th2 = tVar.e; - if (th2 == null) { - z3 = false; - } - if (z3) { - o(function1, th2); - return; - } else { - if (m.compareAndSet(this, obj, t.a(tVar, null, y0Var, null, null, null, 29))) { - return; - } - } - } else { - return; - } - } else if (!(y0Var instanceof e)) { - if (m.compareAndSet(this, obj, new t(obj, y0Var, null, null, null, 28))) { - return; - } - } else { - return; - } - } else { - x(function1, obj); - throw null; - } - } else if (m.compareAndSet(this, obj, y0Var)) { - return; - } - } - } - - @Override // s.a.i0 - public Throwable f(Object obj) { - Throwable f = super.f(obj); - if (f != null) { - return f; - } - return null; - } - - @Override // kotlinx.coroutines.CancellableContinuation - public Object g(Throwable th) { - return B(new u(th, false, 2), null, null); - } - - @Override // kotlin.coroutines.Continuation - public CoroutineContext getContext() { - return this.n; - } - - @Override // kotlinx.coroutines.CancellableContinuation - public Object h(T t, Object obj, Function1 function1) { - return B(t, null, function1); - } - - @Override // kotlinx.coroutines.CancellableContinuation - public void i(z zVar, T t) { - Continuation continuation = this.o; - if (!(continuation instanceof f)) { - continuation = null; - } - f fVar = (f) continuation; - y(t, (fVar != null ? fVar.p : null) == zVar ? 4 : this.k, null); - } - - @Override // kotlinx.coroutines.CancellableContinuation - public boolean j(Throwable th) { - Object obj; - boolean z2; - do { - obj = this._state; - if (!(obj instanceof l1)) { - return false; - } - z2 = obj instanceof h; - } while (!m.compareAndSet(this, obj, new l(this, th, z2))); - if (!z2) { - obj = null; - } - h hVar = (h) obj; - if (hVar != null) { - p(hVar, th); - } - s(); - t(this.k); - return true; - } - - @Override // kotlinx.coroutines.CancellableContinuation - public void k(Object obj) { - t(this.k); - } - - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.lang.Object */ - /* JADX WARN: Multi-variable type inference failed */ - @Override // s.a.i0 - public T l(Object obj) { - return obj instanceof t ? (T) ((t) obj).a : obj; - } - - @Override // s.a.i0 - public Object n() { - return this._state; - } - - public final void o(Function1 function1, Throwable th) { - try { - function1.invoke(th); - } catch (Throwable th2) { - CoroutineContext coroutineContext = this.n; - c.q.a.k.a.w(coroutineContext, new CompletionHandlerException("Exception in invokeOnCancellation handler for " + this, th2)); - } - } - - public final void p(h hVar, Throwable th) { - try { - hVar.a(th); - } catch (Throwable th2) { - CoroutineContext coroutineContext = this.n; - c.q.a.k.a.w(coroutineContext, new CompletionHandlerException("Exception in invokeOnCancellation handler for " + this, th2)); - } - } - - public final void q(Function1 function1, Throwable th) { - try { - function1.invoke(th); - } catch (Throwable th2) { - CoroutineContext coroutineContext = this.n; - c.q.a.k.a.w(coroutineContext, new CompletionHandlerException("Exception in resume onCancellation handler for " + this, th2)); - } - } - - public final void r() { - k0 k0Var = (k0) this._parentHandle; - if (k0Var != null) { - k0Var.dispose(); - } - this._parentHandle = k1.i; - } - - @Override // kotlin.coroutines.Continuation - public void resumeWith(Object obj) { - Throwable r0 = k.m80exceptionOrNullimpl(obj); - if (r0 != null) { - obj = new u(r0, false, 2); - } - y(obj, this.k, null); - } - - public final void s() { - if (!w()) { - r(); - } - } - - public final void t(int i) { - boolean z2; - boolean z3; - while (true) { - int i2 = this._decision; - z2 = false; - if (i2 == 0) { - if (l.compareAndSet(this, 0, 2)) { - z3 = true; - break; - } - } else if (i2 == 1) { - z3 = false; - } else { - throw new IllegalStateException("Already resumed".toString()); - } - } - if (!z3) { - Continuation d = d(); - if (i == 4) { - z2 = true; - } - if (z2 || !(d instanceof f) || c.q.a.k.a.B(i) != c.q.a.k.a.B(this.k)) { - c.q.a.k.a.L(this, d, z2); - return; - } - z zVar = ((f) d).p; - CoroutineContext context = d.getContext(); - if (zVar.isDispatchNeeded(context)) { - zVar.dispatch(context, this); - return; - } - q1 q1Var = q1.b; - o0 a = q1.a(); - if (a.N()) { - a.K(this); - return; - } - a.M(true); - try { - c.q.a.k.a.L(this, d(), true); - do { - } while (a.Q()); - } catch (Throwable th) { - a.H(true); - throw th; - } - a.H(true); - } - } - - @Override // java.lang.Object - public String toString() { - return "CancellableContinuation(" + c.q.a.k.a.c0(this.o) + "){" + this._state + "}@" + c.q.a.k.a.t(this); - } - - public final Object u() { - boolean z2; - Job job; - A(); - while (true) { - int i = this._decision; - z2 = false; - if (i == 0) { - if (l.compareAndSet(this, 0, 1)) { - z2 = true; - break; - } - } else if (i != 2) { - throw new IllegalStateException("Already suspended".toString()); - } - } - if (z2) { - return c.getCOROUTINE_SUSPENDED(); - } - Object obj = this._state; - if (obj instanceof u) { - throw ((u) obj).b; - } else if (!c.q.a.k.a.B(this.k) || (job = (Job) this.n.get(Job.h)) == null || job.a()) { - return l(obj); - } else { - CancellationException p = job.p(); - c(obj, p); - throw p; - } - } - - public boolean v() { - return !(this._state instanceof l1); - } - - public final boolean w() { - Continuation continuation = this.o; - if (!(continuation instanceof f)) { - return false; - } - Object obj = ((f) continuation)._reusableCancellableContinuation; - return obj != null && (!(obj instanceof j) || obj == this); - } - - public final void x(Function1 function1, Object obj) { - throw new IllegalStateException(("It's prohibited to register multiple handlers, tried to register " + function1 + ", already has " + obj).toString()); - } - - /* JADX DEBUG: Multi-variable search result rejected for r10v4, resolved type: java.util.concurrent.atomic.AtomicIntegerFieldUpdater */ - /* JADX WARN: Multi-variable type inference failed */ - public final void y(Object obj, int i, Function1 function1) { - Object obj2; - do { - obj2 = this._state; - if (obj2 instanceof l1) { - } else { - if (obj2 instanceof l) { - l lVar = (l) obj2; - Objects.requireNonNull(lVar); - if (l.f2869c.compareAndSet(lVar, 0, 1)) { - if (function1 != null) { - q(function1, lVar.b); - return; - } - return; - } - } - throw new IllegalStateException(a.t("Already resumed, but proposed with update ", obj).toString()); - } - } while (!m.compareAndSet(this, obj2, z((l1) obj2, obj, i, function1, null))); - s(); - t(i); - } - - public final Object z(l1 l1Var, Object obj, int i, Function1 function1, Object obj2) { - if (obj instanceof u) { - return obj; - } - if (!c.q.a.k.a.B(i) && obj2 == null) { - return obj; - } - if (function1 == null && ((!(l1Var instanceof h) || (l1Var instanceof e)) && obj2 == null)) { - return obj; - } - if (!(l1Var instanceof h)) { - l1Var = null; - } - return new t(obj, (h) l1Var, function1, obj2, null, 16); - } +/* compiled from: CompletionHandler.kt */ +public abstract class j implements Function1 { + public abstract void a(Throwable th); } diff --git a/app/src/main/java/s/a/j0.java b/app/src/main/java/s/a/j0.java index d5e8846db0..5769b28d20 100644 --- a/app/src/main/java/s/a/j0.java +++ b/app/src/main/java/s/a/j0.java @@ -1,14 +1,15 @@ package s.a; import java.util.Objects; -import s.a.y1.b; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.b2.b; /* compiled from: Dispatchers.kt */ public final class j0 { - public static final z a = (x.a ? b.o : q.j); - public static final z b = b.n; + public static final CoroutineDispatcher a = (y.a ? b.o : r.j); + public static final CoroutineDispatcher b = b.n; static { - s1 s1Var = s1.i; + v1 v1Var = v1.i; Objects.requireNonNull(b.o); } } diff --git a/app/src/main/java/s/a/j1.java b/app/src/main/java/s/a/j1.java index 76c84101cd..e6fea6c18f 100644 --- a/app/src/main/java/s/a/j1.java +++ b/app/src/main/java/s/a/j1.java @@ -1,20 +1,23 @@ package s.a; -import s.a.a.h; -/* compiled from: JobSupport.kt */ -public final class j1 extends h implements w0 { - @Override // s.a.w0 - public boolean a() { - return true; +import c.q.a.k.a; +import d0.w.g.b; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function2; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: Builders.common.kt */ +public final class j1 extends q1 { + public final Continuation l; + + public j1(CoroutineContext coroutineContext, Function2, ? extends Object> function2) { + super(coroutineContext, false); + this.l = b.createCoroutineUnintercepted(function2, this, this); } - @Override // s.a.w0 - public j1 getList() { - return this; - } - - @Override // s.a.a.j - public String toString() { - return super.toString(); + @Override // s.a.b + public void Z() { + a.R(this.l, this); } } diff --git a/app/src/main/java/s/a/k.java b/app/src/main/java/s/a/k.java index b9314626ba..6a5c1ece5d 100644 --- a/app/src/main/java/s/a/k.java +++ b/app/src/main/java/s/a/k.java @@ -1,7 +1,490 @@ package s.a; -import s.a.a.s; +import c.d.b.a.a; +import d0.w.g.c; +import java.util.Objects; +import java.util.concurrent.CancellationException; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import kotlin.coroutines.jvm.internal.CoroutineStackFrame; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.CancellableContinuation; +import kotlinx.coroutines.CompletionHandlerException; +import kotlinx.coroutines.CoroutineDispatcher; +import kotlinx.coroutines.Job; +import s.a.a.g; +import s.a.a.h; +import s.a.a.t; /* compiled from: CancellableContinuationImpl.kt */ -public final class k { - public static final s a = new s("RESUME_TOKEN"); +public class k extends i0 implements CancellableContinuation, CoroutineStackFrame { + public static final AtomicIntegerFieldUpdater l = AtomicIntegerFieldUpdater.newUpdater(k.class, "_decision"); + public static final AtomicReferenceFieldUpdater m = AtomicReferenceFieldUpdater.newUpdater(k.class, Object.class, "_state"); + public volatile int _decision = 0; + public volatile Object _parentHandle = null; + public volatile Object _state = c.i; + public final CoroutineContext n; + public final Continuation o; + + /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: kotlin.coroutines.Continuation */ + /* JADX WARN: Multi-variable type inference failed */ + public k(Continuation continuation, int i) { + super(i); + this.o = continuation; + this.n = continuation.getContext(); + } + + /* JADX DEBUG: Multi-variable search result rejected for r4v3, resolved type: java.util.concurrent.atomic.AtomicReferenceFieldUpdater */ + /* JADX DEBUG: Multi-variable search result rejected for r2v4, resolved type: java.util.concurrent.atomic.AtomicReferenceFieldUpdater */ + /* JADX WARN: Multi-variable type inference failed */ + public final void A() { + Job job; + boolean v = v(); + if (this.k == 2) { + Continuation continuation = this.o; + Throwable th = null; + if (!(continuation instanceof g)) { + continuation = null; + } + g gVar = (g) continuation; + if (gVar != null) { + while (true) { + Object obj = gVar._reusableCancellableContinuation; + t tVar = h.b; + if (obj == tVar) { + if (g.l.compareAndSet(gVar, tVar, this)) { + break; + } + } else if (obj != null) { + if (!(obj instanceof Throwable)) { + throw new IllegalStateException(a.t("Inconsistent state ", obj).toString()); + } else if (g.l.compareAndSet(gVar, obj, null)) { + th = (Throwable) obj; + } else { + throw new IllegalArgumentException("Failed requirement.".toString()); + } + } + } + if (th != null) { + if (!v) { + j(th); + } + v = true; + } + } + } + if (!v && ((l0) this._parentHandle) == null && (job = (Job) this.o.getContext().get(Job.h)) != null) { + l0 y2 = c.q.a.k.a.y(job, true, false, new n(job, this), 2, null); + this._parentHandle = y2; + if (v() && !w()) { + y2.dispose(); + this._parentHandle = m1.i; + } + } + } + + public final t B(Object obj, Object obj2, Function1 function1) { + Object obj3; + do { + obj3 = this._state; + if (obj3 instanceof n1) { + } else if (!(obj3 instanceof u) || obj2 == null || ((u) obj3).d != obj2) { + return null; + } else { + return l.a; + } + } while (!m.compareAndSet(this, obj3, z((n1) obj3, obj, this.k, function1, obj2))); + s(); + return l.a; + } + + @Override // kotlinx.coroutines.CancellableContinuation + public boolean a() { + return this._state instanceof n1; + } + + @Override // kotlinx.coroutines.CancellableContinuation + public Object b(T t, Object obj) { + return B(t, obj, null); + } + + @Override // s.a.i0 + public void c(Object obj, Throwable th) { + while (true) { + Object obj2 = this._state; + if (obj2 instanceof n1) { + throw new IllegalStateException("Not completed".toString()); + } else if (!(obj2 instanceof v)) { + if (obj2 instanceof u) { + u uVar = (u) obj2; + if (!(uVar.e != null)) { + if (m.compareAndSet(this, obj2, u.a(uVar, null, null, null, null, th, 15))) { + i iVar = uVar.b; + if (iVar != null) { + p(iVar, th); + } + Function1 function1 = uVar.f2873c; + if (function1 != null) { + q(function1, th); + return; + } + return; + } + } else { + throw new IllegalStateException("Must be called at most once".toString()); + } + } else if (m.compareAndSet(this, obj2, new u(obj2, null, null, null, th, 14))) { + return; + } + } else { + return; + } + } + } + + @Override // s.a.i0 + public final Continuation d() { + return this.o; + } + + /* JADX DEBUG: Multi-variable search result rejected for r5v0, resolved type: java.util.concurrent.atomic.AtomicIntegerFieldUpdater */ + /* JADX WARN: Multi-variable type inference failed */ + @Override // kotlinx.coroutines.CancellableContinuation + public void e(Function1 function1) { + i a1Var = function1 instanceof i ? (i) function1 : new a1(function1); + while (true) { + Object obj = this._state; + if (!(obj instanceof c)) { + Throwable th = null; + if (!(obj instanceof i)) { + boolean z2 = obj instanceof v; + boolean z3 = true; + if (z2) { + v vVar = (v) obj; + Objects.requireNonNull(vVar); + if (!v.a.compareAndSet(vVar, 0, 1)) { + x(function1, obj); + throw null; + } else if (obj instanceof m) { + if (!z2) { + obj = null; + } + v vVar2 = (v) obj; + if (vVar2 != null) { + th = vVar2.b; + } + o(function1, th); + return; + } else { + return; + } + } else if (obj instanceof u) { + u uVar = (u) obj; + if (uVar.b != null) { + x(function1, obj); + throw null; + } else if (!(a1Var instanceof e)) { + Throwable th2 = uVar.e; + if (th2 == null) { + z3 = false; + } + if (z3) { + o(function1, th2); + return; + } else { + if (m.compareAndSet(this, obj, u.a(uVar, null, a1Var, null, null, null, 29))) { + return; + } + } + } else { + return; + } + } else if (!(a1Var instanceof e)) { + if (m.compareAndSet(this, obj, new u(obj, a1Var, null, null, null, 28))) { + return; + } + } else { + return; + } + } else { + x(function1, obj); + throw null; + } + } else if (m.compareAndSet(this, obj, a1Var)) { + return; + } + } + } + + @Override // s.a.i0 + public Throwable f(Object obj) { + Throwable f = super.f(obj); + if (f != null) { + return f; + } + return null; + } + + @Override // kotlinx.coroutines.CancellableContinuation + public Object g(Throwable th) { + return B(new v(th, false, 2), null, null); + } + + @Override // kotlin.coroutines.Continuation + public CoroutineContext getContext() { + return this.n; + } + + @Override // kotlinx.coroutines.CancellableContinuation + public Object h(T t, Object obj, Function1 function1) { + return B(t, null, function1); + } + + @Override // kotlinx.coroutines.CancellableContinuation + public void i(CoroutineDispatcher coroutineDispatcher, T t) { + Continuation continuation = this.o; + if (!(continuation instanceof g)) { + continuation = null; + } + g gVar = (g) continuation; + y(t, (gVar != null ? gVar.p : null) == coroutineDispatcher ? 4 : this.k, null); + } + + @Override // kotlinx.coroutines.CancellableContinuation + public boolean j(Throwable th) { + Object obj; + boolean z2; + do { + obj = this._state; + if (!(obj instanceof n1)) { + return false; + } + z2 = obj instanceof i; + } while (!m.compareAndSet(this, obj, new m(this, th, z2))); + if (!z2) { + obj = null; + } + i iVar = (i) obj; + if (iVar != null) { + p(iVar, th); + } + s(); + t(this.k); + return true; + } + + @Override // kotlinx.coroutines.CancellableContinuation + public void k(Object obj) { + t(this.k); + } + + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.lang.Object */ + /* JADX WARN: Multi-variable type inference failed */ + @Override // s.a.i0 + public T l(Object obj) { + return obj instanceof u ? (T) ((u) obj).a : obj; + } + + @Override // s.a.i0 + public Object n() { + return this._state; + } + + public final void o(Function1 function1, Throwable th) { + try { + function1.invoke(th); + } catch (Throwable th2) { + CoroutineContext coroutineContext = this.n; + c.q.a.k.a.x(coroutineContext, new CompletionHandlerException("Exception in invokeOnCancellation handler for " + this, th2)); + } + } + + public final void p(i iVar, Throwable th) { + try { + iVar.a(th); + } catch (Throwable th2) { + CoroutineContext coroutineContext = this.n; + c.q.a.k.a.x(coroutineContext, new CompletionHandlerException("Exception in invokeOnCancellation handler for " + this, th2)); + } + } + + public final void q(Function1 function1, Throwable th) { + try { + function1.invoke(th); + } catch (Throwable th2) { + CoroutineContext coroutineContext = this.n; + c.q.a.k.a.x(coroutineContext, new CompletionHandlerException("Exception in resume onCancellation handler for " + this, th2)); + } + } + + public final void r() { + l0 l0Var = (l0) this._parentHandle; + if (l0Var != null) { + l0Var.dispose(); + } + this._parentHandle = m1.i; + } + + @Override // kotlin.coroutines.Continuation + public void resumeWith(Object obj) { + Throwable r0 = d0.k.m80exceptionOrNullimpl(obj); + if (r0 != null) { + obj = new v(r0, false, 2); + } + y(obj, this.k, null); + } + + public final void s() { + if (!w()) { + r(); + } + } + + public final void t(int i) { + boolean z2; + boolean z3; + while (true) { + int i2 = this._decision; + z2 = false; + if (i2 == 0) { + if (l.compareAndSet(this, 0, 2)) { + z3 = true; + break; + } + } else if (i2 == 1) { + z3 = false; + } else { + throw new IllegalStateException("Already resumed".toString()); + } + } + if (!z3) { + Continuation d = d(); + if (i == 4) { + z2 = true; + } + if (z2 || !(d instanceof g) || c.q.a.k.a.C(i) != c.q.a.k.a.C(this.k)) { + c.q.a.k.a.M(this, d, z2); + return; + } + CoroutineDispatcher coroutineDispatcher = ((g) d).p; + CoroutineContext context = d.getContext(); + if (coroutineDispatcher.isDispatchNeeded(context)) { + coroutineDispatcher.dispatch(context, this); + return; + } + t1 t1Var = t1.b; + p0 a = t1.a(); + if (a.N()) { + a.K(this); + return; + } + a.M(true); + try { + c.q.a.k.a.M(this, d(), true); + do { + } while (a.Q()); + } catch (Throwable th) { + a.H(true); + throw th; + } + a.H(true); + } + } + + @Override // java.lang.Object + public String toString() { + return "CancellableContinuation(" + c.q.a.k.a.d0(this.o) + "){" + this._state + "}@" + c.q.a.k.a.u(this); + } + + public final Object u() { + boolean z2; + Job job; + A(); + while (true) { + int i = this._decision; + z2 = false; + if (i == 0) { + if (l.compareAndSet(this, 0, 1)) { + z2 = true; + break; + } + } else if (i != 2) { + throw new IllegalStateException("Already suspended".toString()); + } + } + if (z2) { + return c.getCOROUTINE_SUSPENDED(); + } + Object obj = this._state; + if (obj instanceof v) { + throw ((v) obj).b; + } else if (!c.q.a.k.a.C(this.k) || (job = (Job) this.n.get(Job.h)) == null || job.a()) { + return l(obj); + } else { + CancellationException p = job.p(); + c(obj, p); + throw p; + } + } + + public boolean v() { + return !(this._state instanceof n1); + } + + public final boolean w() { + Continuation continuation = this.o; + if (!(continuation instanceof g)) { + return false; + } + Object obj = ((g) continuation)._reusableCancellableContinuation; + return obj != null && (!(obj instanceof k) || obj == this); + } + + public final void x(Function1 function1, Object obj) { + throw new IllegalStateException(("It's prohibited to register multiple handlers, tried to register " + function1 + ", already has " + obj).toString()); + } + + /* JADX DEBUG: Multi-variable search result rejected for r10v4, resolved type: java.util.concurrent.atomic.AtomicIntegerFieldUpdater */ + /* JADX WARN: Multi-variable type inference failed */ + public final void y(Object obj, int i, Function1 function1) { + Object obj2; + do { + obj2 = this._state; + if (obj2 instanceof n1) { + } else { + if (obj2 instanceof m) { + m mVar = (m) obj2; + Objects.requireNonNull(mVar); + if (m.f2872c.compareAndSet(mVar, 0, 1)) { + if (function1 != null) { + q(function1, mVar.b); + return; + } + return; + } + } + throw new IllegalStateException(a.t("Already resumed, but proposed with update ", obj).toString()); + } + } while (!m.compareAndSet(this, obj2, z((n1) obj2, obj, i, function1, null))); + s(); + t(i); + } + + public final Object z(n1 n1Var, Object obj, int i, Function1 function1, Object obj2) { + if (obj instanceof v) { + return obj; + } + if (!c.q.a.k.a.C(i) && obj2 == null) { + return obj; + } + if (function1 == null && ((!(n1Var instanceof i) || (n1Var instanceof e)) && obj2 == null)) { + return obj; + } + if (!(n1Var instanceof i)) { + n1Var = null; + } + return new u(obj, (i) n1Var, function1, obj2, null, 16); + } } diff --git a/app/src/main/java/s/a/k0.java b/app/src/main/java/s/a/k0.java index 91cacfaa08..f43e22add3 100644 --- a/app/src/main/java/s/a/k0.java +++ b/app/src/main/java/s/a/k0.java @@ -1,5 +1,24 @@ package s.a; -/* compiled from: Job.kt */ -public interface k0 { - void dispose(); + +import c.d.b.a.a; +import java.util.concurrent.Future; +/* compiled from: Executors.kt */ +public final class k0 implements l0 { + public final Future i; + + public k0(Future future) { + this.i = future; + } + + @Override // s.a.l0 + public void dispose() { + this.i.cancel(false); + } + + public String toString() { + StringBuilder L = a.L("DisposableFutureHandle["); + L.append(this.i); + L.append(']'); + return L.toString(); + } } diff --git a/app/src/main/java/s/a/k1.java b/app/src/main/java/s/a/k1.java index caad2c19ec..6af56f42aa 100644 --- a/app/src/main/java/s/a/k1.java +++ b/app/src/main/java/s/a/k1.java @@ -1,18 +1,36 @@ package s.a; -/* compiled from: Job.kt */ -public final class k1 implements k0, n { - public static final k1 i = new k1(); - @Override // s.a.k0 - public void dispose() { - } - - @Override // s.a.n - public boolean h(Throwable th) { - return false; +import c.q.a.k.a; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.n; +/* compiled from: MainCoroutineDispatcher.kt */ +public abstract class k1 extends CoroutineDispatcher { + public abstract k1 H(); + + public final String I() { + k1 k1Var; + CoroutineDispatcher coroutineDispatcher = j0.a; + k1 k1Var2 = n.b; + if (this == k1Var2) { + return "Dispatchers.Main"; + } + try { + k1Var = k1Var2.H(); + } catch (UnsupportedOperationException unused) { + k1Var = null; + } + if (this == k1Var) { + return "Dispatchers.Main.immediate"; + } + return null; } + @Override // kotlinx.coroutines.CoroutineDispatcher, java.lang.Object public String toString() { - return "NonDisposableHandle"; + String I = I(); + if (I != null) { + return I; + } + return getClass().getSimpleName() + '@' + a.u(this); } } diff --git a/app/src/main/java/s/a/l.java b/app/src/main/java/s/a/l.java index 0aa105a956..45193242c3 100644 --- a/app/src/main/java/s/a/l.java +++ b/app/src/main/java/s/a/l.java @@ -1,21 +1,7 @@ package s.a; -import java.util.concurrent.CancellationException; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import kotlin.coroutines.Continuation; -/* compiled from: CompletionState.kt */ -public final class l extends u { - - /* renamed from: c reason: collision with root package name */ - public static final AtomicIntegerFieldUpdater f2869c = AtomicIntegerFieldUpdater.newUpdater(l.class, "_resumed"); - public volatile int _resumed; - - /* JADX WARNING: Illegal instructions before constructor call */ - public l(Continuation continuation, Throwable th, boolean z2) { - super(th, z2); - if (th == null) { - th = new CancellationException("Continuation " + continuation + " was cancelled normally"); - } - this._resumed = 0; - } +import s.a.a.t; +/* compiled from: CancellableContinuationImpl.kt */ +public final class l { + public static final t a = new t("RESUME_TOKEN"); } diff --git a/app/src/main/java/s/a/l0.java b/app/src/main/java/s/a/l0.java index d6d9a68e4f..4aae05504b 100644 --- a/app/src/main/java/s/a/l0.java +++ b/app/src/main/java/s/a/l0.java @@ -1,32 +1,5 @@ package s.a; - -import c.d.b.a.a; -import kotlin.Unit; -/* compiled from: CancellableContinuation.kt */ -public final class l0 extends h { - public final k0 i; - - public l0(k0 k0Var) { - this.i = k0Var; - } - - @Override // s.a.i - public void a(Throwable th) { - this.i.dispose(); - } - - /* 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 Unit invoke(Throwable th) { - this.i.dispose(); - return Unit.a; - } - - public String toString() { - StringBuilder L = a.L("DisposeOnCancel["); - L.append(this.i); - L.append(']'); - return L.toString(); - } +/* compiled from: Job.kt */ +public interface l0 { + void dispose(); } diff --git a/app/src/main/java/s/a/l1.java b/app/src/main/java/s/a/l1.java index 3ac7960955..b15a2d7fa4 100644 --- a/app/src/main/java/s/a/l1.java +++ b/app/src/main/java/s/a/l1.java @@ -1,4 +1,20 @@ package s.a; -/* compiled from: CancellableContinuationImpl.kt */ -public interface l1 { + +import s.a.a.i; +/* compiled from: JobSupport.kt */ +public final class l1 extends i implements y0 { + @Override // s.a.y0 + public boolean a() { + return true; + } + + @Override // s.a.y0 + public l1 getList() { + return this; + } + + @Override // s.a.a.k + public String toString() { + return super.toString(); + } } diff --git a/app/src/main/java/s/a/m.java b/app/src/main/java/s/a/m.java index 044940d89c..a79362d07d 100644 --- a/app/src/main/java/s/a/m.java +++ b/app/src/main/java/s/a/m.java @@ -1,74 +1,21 @@ package s.a; -import c.d.b.a.a; -import java.util.Objects; import java.util.concurrent.CancellationException; -import kotlin.Unit; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import kotlin.coroutines.Continuation; -import kotlinx.coroutines.Job; -import s.a.a.f; -import s.a.a.g; -import s.a.a.s; -/* compiled from: JobSupport.kt */ -public final class m extends b1 { - public final j m; +/* compiled from: CompletionState.kt */ +public final class m extends v { - public m(Job job, j jVar) { - super(job); - this.m = jVar; - } + /* renamed from: c reason: collision with root package name */ + public static final AtomicIntegerFieldUpdater f2872c = AtomicIntegerFieldUpdater.newUpdater(m.class, "_resumed"); + public volatile int _resumed; - /* 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(Throwable th) { - q(th); - return Unit.a; - } - - @Override // s.a.w - public void q(Throwable th) { - j jVar = this.m; - J j = this.l; - Objects.requireNonNull(jVar); - CancellationException p = j.p(); - boolean z2 = true; - boolean z3 = false; - if (jVar.k == 2) { - Continuation continuation = jVar.o; - if (!(continuation instanceof f)) { - continuation = null; - } - f fVar = (f) continuation; - if (fVar != null) { - while (true) { - Object obj = fVar._reusableCancellableContinuation; - s sVar = g.b; - if (!d0.z.d.m.areEqual(obj, sVar)) { - if (obj instanceof Throwable) { - break; - } else if (f.l.compareAndSet(fVar, obj, null)) { - z2 = false; - break; - } - } else if (f.l.compareAndSet(fVar, sVar, p)) { - break; - } - } - z3 = z2; - } + /* JADX WARNING: Illegal instructions before constructor call */ + public m(Continuation continuation, Throwable th, boolean z2) { + super(th, z2); + if (th == null) { + th = new CancellationException("Continuation " + continuation + " was cancelled normally"); } - if (!z3) { - jVar.j(p); - jVar.s(); - } - } - - @Override // s.a.a.j - public String toString() { - StringBuilder L = a.L("ChildContinuation["); - L.append(this.m); - L.append(']'); - return L.toString(); + this._resumed = 0; } } diff --git a/app/src/main/java/s/a/m0.java b/app/src/main/java/s/a/m0.java index f7ff38753f..f6a7d4849b 100644 --- a/app/src/main/java/s/a/m0.java +++ b/app/src/main/java/s/a/m0.java @@ -2,33 +2,30 @@ package s.a; import c.d.b.a.a; import kotlin.Unit; -import kotlinx.coroutines.Job; -/* compiled from: JobSupport.kt */ -public final class m0 extends d1 { - public final k0 m; +/* compiled from: CancellableContinuation.kt */ +public final class m0 extends i { + public final l0 i; - public m0(Job job, k0 k0Var) { - super(job); - this.m = k0Var; + public m0(l0 l0Var) { + this.i = l0Var; + } + + @Override // s.a.j + public void a(Throwable th) { + this.i.dispose(); } /* 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 Unit invoke(Throwable th) { - this.m.dispose(); + this.i.dispose(); return Unit.a; } - @Override // s.a.w - public void q(Throwable th) { - this.m.dispose(); - } - - @Override // s.a.a.j public String toString() { - StringBuilder L = a.L("DisposeOnCompletion["); - L.append(this.m); + StringBuilder L = a.L("DisposeOnCancel["); + L.append(this.i); L.append(']'); return L.toString(); } diff --git a/app/src/main/java/s/a/m1.java b/app/src/main/java/s/a/m1.java index 6794de86c8..d2ef9bda8b 100644 --- a/app/src/main/java/s/a/m1.java +++ b/app/src/main/java/s/a/m1.java @@ -1,8 +1,18 @@ package s.a; - -import java.util.concurrent.CancellationException; -import kotlinx.coroutines.Job; /* compiled from: Job.kt */ -public interface m1 extends Job { - CancellationException z(); +public final class m1 implements l0, o { + public static final m1 i = new m1(); + + @Override // s.a.l0 + public void dispose() { + } + + @Override // s.a.o + public boolean h(Throwable th) { + return false; + } + + public String toString() { + return "NonDisposableHandle"; + } } diff --git a/app/src/main/java/s/a/n.java b/app/src/main/java/s/a/n.java index 805cbcc852..20891ca865 100644 --- a/app/src/main/java/s/a/n.java +++ b/app/src/main/java/s/a/n.java @@ -1,5 +1,75 @@ package s.a; -/* compiled from: Job.kt */ -public interface n extends k0 { - boolean h(Throwable th); + +import c.d.b.a.a; +import d0.z.d.m; +import java.util.Objects; +import java.util.concurrent.CancellationException; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlinx.coroutines.Job; +import s.a.a.g; +import s.a.a.h; +import s.a.a.t; +/* compiled from: JobSupport.kt */ +public final class n extends d1 { + public final k m; + + public n(Job job, k kVar) { + super(job); + this.m = kVar; + } + + /* 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(Throwable th) { + q(th); + return Unit.a; + } + + @Override // s.a.x + public void q(Throwable th) { + k kVar = this.m; + J j = this.l; + Objects.requireNonNull(kVar); + CancellationException p = j.p(); + boolean z2 = true; + boolean z3 = false; + if (kVar.k == 2) { + Continuation continuation = kVar.o; + if (!(continuation instanceof g)) { + continuation = null; + } + g gVar = (g) continuation; + if (gVar != null) { + while (true) { + Object obj = gVar._reusableCancellableContinuation; + t tVar = h.b; + if (!m.areEqual(obj, tVar)) { + if (obj instanceof Throwable) { + break; + } else if (g.l.compareAndSet(gVar, obj, null)) { + z2 = false; + break; + } + } else if (g.l.compareAndSet(gVar, tVar, p)) { + break; + } + } + z3 = z2; + } + } + if (!z3) { + kVar.j(p); + kVar.s(); + } + } + + @Override // s.a.a.k + public String toString() { + StringBuilder L = a.L("ChildContinuation["); + L.append(this.m); + L.append(']'); + return L.toString(); + } } diff --git a/app/src/main/java/s/a/n0.java b/app/src/main/java/s/a/n0.java index 9cb68a1093..db743d885a 100644 --- a/app/src/main/java/s/a/n0.java +++ b/app/src/main/java/s/a/n0.java @@ -1,28 +1,35 @@ package s.a; import c.d.b.a.a; +import kotlin.Unit; +import kotlinx.coroutines.Job; /* compiled from: JobSupport.kt */ -public final class n0 implements w0 { - public final boolean i; +public final class n0 extends f1 { + public final l0 m; - public n0(boolean z2) { - this.i = z2; + public n0(Job job, l0 l0Var) { + super(job); + this.m = l0Var; } - @Override // s.a.w0 - public boolean a() { - return this.i; + /* 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 Unit invoke(Throwable th) { + this.m.dispose(); + return Unit.a; } - @Override // s.a.w0 - public j1 getList() { - return null; + @Override // s.a.x + public void q(Throwable th) { + this.m.dispose(); } + @Override // s.a.a.k public String toString() { - StringBuilder L = a.L("Empty{"); - L.append(this.i ? "Active" : "New"); - L.append('}'); + StringBuilder L = a.L("DisposeOnCompletion["); + L.append(this.m); + L.append(']'); return L.toString(); } } diff --git a/app/src/main/java/s/a/n1.java b/app/src/main/java/s/a/n1.java index 42f9ca26dc..8ca2c53c67 100644 --- a/app/src/main/java/s/a/n1.java +++ b/app/src/main/java/s/a/n1.java @@ -1,17 +1,4 @@ package s.a; - -import c.q.a.k.a; -import kotlin.Unit; -import kotlin.coroutines.CoroutineContext; -/* compiled from: Builders.common.kt */ -public class n1 extends b { - public n1(CoroutineContext coroutineContext, boolean z2) { - super(coroutineContext, z2); - } - - @Override // s.a.e1 - public boolean H(Throwable th) { - a.w(this.j, th); - return true; - } +/* compiled from: CancellableContinuationImpl.kt */ +public interface n1 { } diff --git a/app/src/main/java/s/a/o.java b/app/src/main/java/s/a/o.java index e8ee73ace3..e5d10b1cbe 100644 --- a/app/src/main/java/s/a/o.java +++ b/app/src/main/java/s/a/o.java @@ -1,39 +1,5 @@ package s.a; - -import c.d.b.a.a; -import kotlin.Unit; -/* compiled from: JobSupport.kt */ -public final class o extends b1 implements n { - public final p m; - - public o(e1 e1Var, p pVar) { - super(e1Var); - this.m = pVar; - } - - @Override // s.a.n - public boolean h(Throwable th) { - return ((e1) this.l).s(th); - } - - /* 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(Throwable th) { - q(th); - return Unit.a; - } - - @Override // s.a.w - public void q(Throwable th) { - this.m.r((m1) this.l); - } - - @Override // s.a.a.j - public String toString() { - StringBuilder L = a.L("ChildHandle["); - L.append(this.m); - L.append(']'); - return L.toString(); - } +/* compiled from: Job.kt */ +public interface o extends l0 { + boolean h(Throwable th); } diff --git a/app/src/main/java/s/a/o0.java b/app/src/main/java/s/a/o0.java index c3a0fd87e2..72a801eca4 100644 --- a/app/src/main/java/s/a/o0.java +++ b/app/src/main/java/s/a/o0.java @@ -1,87 +1,28 @@ package s.a; -import d0.t.j; -import java.util.Objects; -import s.a.a.b; -/* compiled from: EventLoop.common.kt */ -public abstract class o0 extends z { - public long i; - public boolean j; - public b> k; +import c.d.b.a.a; +/* compiled from: JobSupport.kt */ +public final class o0 implements y0 { + public final boolean i; - public final void H(boolean z2) { - long I = this.i - I(z2); - this.i = I; - if (I <= 0 && this.j) { - shutdown(); - } + public o0(boolean z2) { + this.i = z2; } - public final long I(boolean z2) { - return z2 ? 4294967296L : 1; + @Override // s.a.y0 + public boolean a() { + return this.i; } - public final void K(i0 i0Var) { - b> bVar = this.k; - if (bVar == null) { - bVar = new b<>(); - this.k = bVar; - } - Object[] objArr = bVar.a; - int i = bVar.f2864c; - objArr[i] = i0Var; - int length = (objArr.length - 1) & (i + 1); - bVar.f2864c = length; - int i2 = bVar.b; - if (length == i2) { - int length2 = objArr.length; - Object[] objArr2 = new Object[(length2 << 1)]; - j.copyInto$default(objArr, objArr2, 0, i2, 0, 10, (Object) null); - Object[] objArr3 = bVar.a; - int length3 = objArr3.length; - int i3 = bVar.b; - j.copyInto$default(objArr3, objArr2, length3 - i3, 0, i3, 4, (Object) null); - bVar.a = objArr2; - bVar.b = 0; - bVar.f2864c = length2; - } + @Override // s.a.y0 + public l1 getList() { + return null; } - public final void M(boolean z2) { - this.i = I(z2) + this.i; - if (!z2) { - this.j = true; - } - } - - public final boolean N() { - return this.i >= I(true); - } - - /* JADX WARN: Multi-variable type inference failed */ - /* JADX WARNING: Unknown variable types count: 2 */ - public final boolean Q() { - b> bVar = this.k; - if (bVar != null) { - int i = bVar.b; - i0 i0Var = null; - if (i != bVar.f2864c) { - ?? r3 = bVar.a; - ?? r6 = r3[i]; - r3[i] = 0; - bVar.b = (i + 1) & (r3.length - 1); - Objects.requireNonNull(r6, "null cannot be cast to non-null type T"); - i0Var = r6; - } - i0 i0Var2 = i0Var; - if (i0Var2 != null) { - i0Var2.run(); - return true; - } - } - return false; - } - - public void shutdown() { + public String toString() { + StringBuilder L = a.L("Empty{"); + L.append(this.i ? "Active" : "New"); + L.append('}'); + return L.toString(); } } diff --git a/app/src/main/java/s/a/o1.java b/app/src/main/java/s/a/o1.java index 09ef318a1a..399bc0b4bd 100644 --- a/app/src/main/java/s/a/o1.java +++ b/app/src/main/java/s/a/o1.java @@ -1,14 +1,8 @@ package s.a; +import java.util.concurrent.CancellationException; import kotlinx.coroutines.Job; -/* compiled from: Supervisor.kt */ -public final class o1 extends c1 { - public o1(Job job) { - super(job); - } - - @Override // s.a.e1 - public boolean s(Throwable th) { - return false; - } +/* compiled from: Job.kt */ +public interface o1 extends Job { + CancellationException z(); } diff --git a/app/src/main/java/s/a/p.java b/app/src/main/java/s/a/p.java index 9e31e76489..f4ba5f3afd 100644 --- a/app/src/main/java/s/a/p.java +++ b/app/src/main/java/s/a/p.java @@ -1,7 +1,39 @@ package s.a; -import kotlinx.coroutines.Job; -/* compiled from: Job.kt */ -public interface p extends Job { - void r(m1 m1Var); +import c.d.b.a.a; +import kotlin.Unit; +/* compiled from: JobSupport.kt */ +public final class p extends d1 implements o { + public final q m; + + public p(g1 g1Var, q qVar) { + super(g1Var); + this.m = qVar; + } + + @Override // s.a.o + public boolean h(Throwable th) { + return ((g1) this.l).s(th); + } + + /* 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(Throwable th) { + q(th); + return Unit.a; + } + + @Override // s.a.x + public void q(Throwable th) { + this.m.r((o1) this.l); + } + + @Override // s.a.a.k + public String toString() { + StringBuilder L = a.L("ChildHandle["); + L.append(this.m); + L.append(']'); + return L.toString(); + } } diff --git a/app/src/main/java/s/a/p0.java b/app/src/main/java/s/a/p0.java index ff81bcb08a..8fe44f909c 100644 --- a/app/src/main/java/s/a/p0.java +++ b/app/src/main/java/s/a/p0.java @@ -1,449 +1,88 @@ package s.a; -import d0.d0.f; -import d0.z.d.m; -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; -import java.util.concurrent.locks.LockSupport; -import kotlin.Unit; -import kotlin.coroutines.CoroutineContext; -import kotlinx.coroutines.CancellableContinuation; -import s.a.a.l; -import s.a.a.s; -import s.a.a.u; -import s.a.a.v; +import d0.t.j; +import java.util.Objects; +import kotlinx.coroutines.CoroutineDispatcher; +import s.a.a.b; /* compiled from: EventLoop.common.kt */ -public abstract class p0 extends q0 implements g0 { - public static final AtomicReferenceFieldUpdater l = AtomicReferenceFieldUpdater.newUpdater(p0.class, Object.class, "_queue"); - public static final AtomicReferenceFieldUpdater m = AtomicReferenceFieldUpdater.newUpdater(p0.class, Object.class, "_delayed"); - public volatile Object _delayed = null; - public volatile int _isCompleted = 0; - public volatile Object _queue = null; +public abstract class p0 extends CoroutineDispatcher { + public long i; + public boolean j; + public b> k; - /* compiled from: EventLoop.common.kt */ - public final class a extends c { - public final CancellableContinuation l; - - /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: kotlinx.coroutines.CancellableContinuation */ - /* JADX WARN: Multi-variable type inference failed */ - public a(long j, CancellableContinuation cancellableContinuation) { - super(j); - this.l = cancellableContinuation; - } - - @Override // java.lang.Runnable - public void run() { - this.l.i(p0.this, Unit.a); - } - - @Override // s.a.p0.c, java.lang.Object - public String toString() { - return super.toString() + this.l.toString(); + public final void H(boolean z2) { + long I = this.i - I(z2); + this.i = I; + if (I <= 0 && this.j) { + shutdown(); } } - /* compiled from: EventLoop.common.kt */ - public static final class b extends c { - public final Runnable l; + public final long I(boolean z2) { + return z2 ? 4294967296L : 1; + } - public b(long j, Runnable runnable) { - super(j); - this.l = runnable; + public final void K(i0 i0Var) { + b> bVar = this.k; + if (bVar == null) { + bVar = new b<>(); + this.k = bVar; } - - @Override // java.lang.Runnable - public void run() { - this.l.run(); - } - - @Override // s.a.p0.c, java.lang.Object - public String toString() { - return super.toString() + this.l.toString(); + Object[] objArr = bVar.a; + int i = bVar.f2864c; + objArr[i] = i0Var; + int length = (objArr.length - 1) & (i + 1); + bVar.f2864c = length; + int i2 = bVar.b; + if (length == i2) { + int length2 = objArr.length; + Object[] objArr2 = new Object[(length2 << 1)]; + j.copyInto$default(objArr, objArr2, 0, i2, 0, 10, (Object) null); + Object[] objArr3 = bVar.a; + int length3 = objArr3.length; + int i3 = bVar.b; + j.copyInto$default(objArr3, objArr2, length3 - i3, 0, i3, 4, (Object) null); + bVar.a = objArr2; + bVar.b = 0; + bVar.f2864c = length2; } } - /* compiled from: EventLoop.common.kt */ - public static abstract class c implements Runnable, Comparable, k0, v { - public Object i; - public int j = -1; - public long k; - - public c(long j) { - this.k = j; - } - - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // java.lang.Comparable - public int compareTo(c cVar) { - int i = ((this.k - cVar.k) > 0 ? 1 : ((this.k - cVar.k) == 0 ? 0 : -1)); - if (i > 0) { - return 1; - } - return i < 0 ? -1 : 0; - } - - @Override // s.a.k0 - public final synchronized void dispose() { - Object obj = this.i; - s sVar = r0.a; - if (obj != sVar) { - if (!(obj instanceof d)) { - obj = null; - } - d dVar = (d) obj; - if (dVar != null) { - synchronized (dVar) { - if (i() != null) { - dVar.c(getIndex()); - } - } - } - this.i = sVar; - } - } - - @Override // s.a.a.v - public void f(int i) { - this.j = i; - } - - @Override // s.a.a.v - public void g(u uVar) { - if (this.i != r0.a) { - this.i = uVar; - return; - } - throw new IllegalArgumentException("Failed requirement.".toString()); - } - - @Override // s.a.a.v - public int getIndex() { - return this.j; - } - - @Override // s.a.a.v - public u i() { - Object obj = this.i; - if (!(obj instanceof u)) { - obj = null; - } - return (u) obj; - } - - @Override // java.lang.Object - public String toString() { - StringBuilder L = c.d.b.a.a.L("Delayed[nanos="); - L.append(this.k); - L.append(']'); - return L.toString(); + public final void M(boolean z2) { + this.i = I(z2) + this.i; + if (!z2) { + this.j = true; } } - /* compiled from: EventLoop.common.kt */ - public static final class d extends u { - public long b; - - public d(long j) { - this.b = j; - } + public final boolean N() { + return this.i >= I(true); } - public final void S(Runnable runnable) { - if (T(runnable)) { - Thread R = R(); - if (Thread.currentThread() != R) { - LockSupport.unpark(R); - return; - } - return; - } - c0.o.S(runnable); - } - - public final boolean T(Runnable runnable) { - while (true) { - Object obj = this._queue; - if (this._isCompleted != 0) { - return false; - } - if (obj == null) { - if (l.compareAndSet(this, null, runnable)) { - return true; - } - } else if (obj instanceof l) { - l lVar = (l) obj; - int a2 = lVar.a(runnable); - if (a2 == 0) { - return true; - } - if (a2 == 1) { - l.compareAndSet(this, obj, lVar.d()); - } else if (a2 == 2) { - return false; - } - } else if (obj == r0.b) { - return false; - } else { - l lVar2 = new l(8, true); - lVar2.a((Runnable) obj); - lVar2.a(runnable); - if (l.compareAndSet(this, obj, lVar2)) { - return true; - } - } - } - } - - public boolean U() { - s.a.a.b> bVar = this.k; - if (!(bVar == null || bVar.b == bVar.f2864c)) { - return false; - } - d dVar = (d) this._delayed; - if (dVar != null) { - if (!(dVar._size == 0)) { - return false; - } - } - Object obj = this._queue; - if (obj == null) { - return true; - } - return obj instanceof l ? ((l) obj).c() : obj == r0.b; - } - - /* JADX WARNING: Removed duplicated region for block: B:59:0x00a3 */ - /* JADX WARNING: Removed duplicated region for block: B:94:? A[RETURN, SYNTHETIC] */ - public long V() { - long j; - c b2; - c cVar; - if (Q()) { - return 0; - } - d dVar = (d) this._delayed; - Runnable runnable = null; - boolean z2 = true; - if (dVar != null) { - if (!(dVar._size == 0)) { - long nanoTime = System.nanoTime(); - do { - synchronized (dVar) { - c b3 = dVar.b(); - if (b3 != null) { - c cVar2 = b3; - cVar = ((nanoTime - cVar2.k) > 0 ? 1 : ((nanoTime - cVar2.k) == 0 ? 0 : -1)) >= 0 ? T(cVar2) : false ? dVar.c(0) : null; - } else { - cVar = null; - } - } - } while (cVar != null); - } - } - while (true) { - Object obj = this._queue; - if (obj != null) { - if (!(obj instanceof l)) { - if (obj == r0.b) { - break; - } else if (l.compareAndSet(this, obj, null)) { - runnable = (Runnable) obj; - break; - } - } else { - l lVar = (l) obj; - Object e = lVar.e(); - if (e != l.f2866c) { - runnable = (Runnable) e; - break; - } - l.compareAndSet(this, obj, lVar.d()); - } - } else { - break; - } - } - if (runnable != null) { - runnable.run(); - return 0; - } - s.a.a.b> bVar = this.k; + /* JADX WARN: Multi-variable type inference failed */ + /* JADX WARNING: Unknown variable types count: 2 */ + public final boolean Q() { + b> bVar = this.k; if (bVar != null) { - if (bVar.b != bVar.f2864c) { - z2 = false; + int i = bVar.b; + i0 i0Var = null; + if (i != bVar.f2864c) { + ?? r3 = bVar.a; + ?? r6 = r3[i]; + r3[i] = 0; + bVar.b = (i + 1) & (r3.length - 1); + Objects.requireNonNull(r6, "null cannot be cast to non-null type T"); + i0Var = r6; } - if (!z2) { - j = 0; - if (j != 0) { - return 0; - } - Object obj2 = this._queue; - if (obj2 != null) { - if (!(obj2 instanceof l)) { - if (obj2 != r0.b) { - return 0; - } - return Long.MAX_VALUE; - } else if (!((l) obj2).c()) { - return 0; - } - } - d dVar2 = (d) this._delayed; - if (dVar2 != null) { - synchronized (dVar2) { - b2 = dVar2.b(); - } - c cVar3 = b2; - if (cVar3 != null) { - return f.coerceAtLeast(cVar3.k - System.nanoTime(), 0); - } - } - return Long.MAX_VALUE; + i0 i0Var2 = i0Var; + if (i0Var2 != null) { + i0Var2.run(); + return true; } } - j = Long.MAX_VALUE; - if (j != 0) { - } + return false; } - /* JADX WARNING: Removed duplicated region for block: B:35:0x0067 */ - /* JADX WARNING: Removed duplicated region for block: B:40:0x007e */ - public final void W(long j, c cVar) { - char c2; - Thread R; - c b2; - boolean z2 = false; - c cVar2 = null; - if (this._isCompleted == 0) { - d dVar = (d) this._delayed; - if (dVar == null) { - m.compareAndSet(this, null, new d(j)); - Object obj = this._delayed; - m.checkNotNull(obj); - dVar = (d) obj; - } - synchronized (cVar) { - if (cVar.i == r0.a) { - c2 = 2; - } else { - synchronized (dVar) { - c b3 = dVar.b(); - if (this._isCompleted == 0) { - if (b3 == null) { - dVar.b = j; - } else { - long j2 = b3.k; - if (j2 - j >= 0) { - j2 = j; - } - if (j2 - dVar.b > 0) { - dVar.b = j2; - } - } - long j3 = cVar.k; - long j4 = dVar.b; - if (j3 - j4 < 0) { - cVar.k = j4; - } - dVar.a(cVar); - c2 = 0; - } - } - } - } - if (c2 != 0) { - d dVar2 = (d) this._delayed; - if (dVar2 != null) { - synchronized (dVar2) { - b2 = dVar2.b(); - } - cVar2 = b2; - } - if (cVar2 == cVar) { - z2 = true; - } - if (z2 && Thread.currentThread() != (R = R())) { - LockSupport.unpark(R); - return; - } - return; - } else if (c2 == 1) { - c0.o.W(j, cVar); - return; - } else if (c2 != 2) { - throw new IllegalStateException("unexpected result".toString()); - } else { - return; - } - } - c2 = 1; - if (c2 != 0) { - } - } - - @Override // s.a.g0 - public void b(long j, CancellableContinuation cancellableContinuation) { - long a2 = r0.a(j); - if (a2 < 4611686018427387903L) { - long nanoTime = System.nanoTime(); - a aVar = new a(a2 + nanoTime, cancellableContinuation); - ((j) cancellableContinuation).e(new l0(aVar)); - W(nanoTime, aVar); - } - } - - @Override // s.a.z - public final void dispatch(CoroutineContext coroutineContext, Runnable runnable) { - S(runnable); - } - - @Override // s.a.o0 public void shutdown() { - c c2; - q1 q1Var = q1.b; - q1.a.set(null); - this._isCompleted = 1; - while (true) { - Object obj = this._queue; - if (obj == null) { - if (l.compareAndSet(this, null, r0.b)) { - break; - } - } else if (obj instanceof l) { - ((l) obj).b(); - break; - } else if (obj == r0.b) { - break; - } else { - l lVar = new l(8, true); - lVar.a((Runnable) obj); - if (l.compareAndSet(this, obj, lVar)) { - break; - } - } - } - do { - } while (V() <= 0); - long nanoTime = System.nanoTime(); - while (true) { - d dVar = (d) this._delayed; - if (dVar != null) { - synchronized (dVar) { - c2 = dVar._size > 0 ? dVar.c(0) : null; - } - c cVar = c2; - if (cVar != null) { - c0.o.W(nanoTime, cVar); - } else { - return; - } - } else { - return; - } - } - } - - @Override // s.a.g0 - public k0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { - return d0.a.w(j, runnable, coroutineContext); } } diff --git a/app/src/main/java/s/a/p1.java b/app/src/main/java/s/a/p1.java index b3d9389f85..b4da269439 100644 --- a/app/src/main/java/s/a/p1.java +++ b/app/src/main/java/s/a/p1.java @@ -1,9 +1,22 @@ package s.a; -import kotlin.coroutines.CoroutineContext; -/* compiled from: ThreadContextElement.kt */ -public interface p1 extends CoroutineContext.Element { - S C(CoroutineContext coroutineContext); +import kotlin.Unit; +import kotlinx.coroutines.CancellableContinuation; +import kotlinx.coroutines.CoroutineDispatcher; +/* compiled from: Executors.kt */ +public final class p1 implements Runnable { + public final CoroutineDispatcher i; + public final CancellableContinuation j; - void x(CoroutineContext coroutineContext, S s2); + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlinx.coroutines.CancellableContinuation */ + /* JADX WARN: Multi-variable type inference failed */ + public p1(CoroutineDispatcher coroutineDispatcher, CancellableContinuation cancellableContinuation) { + this.i = coroutineDispatcher; + this.j = cancellableContinuation; + } + + @Override // java.lang.Runnable + public void run() { + this.j.i(this.i, Unit.a); + } } diff --git a/app/src/main/java/s/a/q.java b/app/src/main/java/s/a/q.java index 2a13e779e0..56d86cd840 100644 --- a/app/src/main/java/s/a/q.java +++ b/app/src/main/java/s/a/q.java @@ -1,156 +1,7 @@ package s.a; -import d0.d0.f; -import d0.g0.s; -import java.lang.reflect.Method; -import java.util.Objects; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; -import kotlin.coroutines.CoroutineContext; -/* compiled from: CommonPool.kt */ -public final class q extends t0 { - public static final int i; - public static final q j = new q(); - public static volatile Executor pool; - - /* compiled from: CommonPool.kt */ - public static final class a implements ThreadFactory { - public final /* synthetic */ AtomicInteger i; - - public a(AtomicInteger atomicInteger) { - this.i = atomicInteger; - } - - @Override // java.util.concurrent.ThreadFactory - public final Thread newThread(Runnable runnable) { - StringBuilder L = c.d.b.a.a.L("CommonPool-worker-"); - L.append(this.i.incrementAndGet()); - Thread thread = new Thread(runnable, L.toString()); - thread.setDaemon(true); - return thread; - } - } - - static { - String str; - int i2; - try { - str = System.getProperty("kotlinx.coroutines.default.parallelism"); - } catch (Throwable unused) { - str = null; - } - if (str != null) { - Integer intOrNull = s.toIntOrNull(str); - if (intOrNull == null || intOrNull.intValue() < 1) { - throw new IllegalStateException(c.d.b.a.a.u("Expected positive number in kotlinx.coroutines.default.parallelism, but has ", str).toString()); - } - i2 = intOrNull.intValue(); - } else { - i2 = -1; - } - i = i2; - } - - public final ExecutorService H() { - return Executors.newFixedThreadPool(K(), new a(new AtomicInteger())); - } - - public final ExecutorService I() { - Class cls; - ExecutorService executorService; - Integer num; - if (System.getSecurityManager() != null) { - return H(); - } - ExecutorService executorService2 = null; - try { - cls = Class.forName("java.util.concurrent.ForkJoinPool"); - } catch (Throwable unused) { - cls = null; - } - if (cls == null) { - return H(); - } - if (i < 0) { - try { - Method method = cls.getMethod("commonPool", new Class[0]); - Object invoke = method != null ? method.invoke(null, new Object[0]) : null; - if (!(invoke instanceof ExecutorService)) { - invoke = null; - } - executorService = (ExecutorService) invoke; - } catch (Throwable unused2) { - executorService = null; - } - if (executorService != null) { - Objects.requireNonNull(j); - executorService.submit(r.i); - try { - Object invoke2 = cls.getMethod("getPoolSize", new Class[0]).invoke(executorService, new Object[0]); - if (!(invoke2 instanceof Integer)) { - invoke2 = null; - } - num = (Integer) invoke2; - } catch (Throwable unused3) { - num = null; - } - if (!(num != null && num.intValue() >= 1)) { - executorService = null; - } - if (executorService != null) { - return executorService; - } - } - } - try { - Object newInstance = cls.getConstructor(Integer.TYPE).newInstance(Integer.valueOf(j.K())); - if (!(newInstance instanceof ExecutorService)) { - newInstance = null; - } - executorService2 = (ExecutorService) newInstance; - } catch (Throwable unused4) { - } - return executorService2 != null ? executorService2 : H(); - } - - public final int K() { - Integer valueOf = Integer.valueOf(i); - if (!(valueOf.intValue() > 0)) { - valueOf = null; - } - return valueOf != null ? valueOf.intValue() : f.coerceAtLeast(Runtime.getRuntime().availableProcessors() - 1, 1); - } - - @Override // java.io.Closeable, java.lang.AutoCloseable - public void close() { - throw new IllegalStateException("Close cannot be invoked on CommonPool".toString()); - } - - @Override // s.a.z - public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { - try { - Executor executor = pool; - if (executor == null) { - synchronized (this) { - executor = pool; - if (executor == null) { - executor = I(); - pool = executor; - } - } - } - executor.execute(runnable); - } catch (RejectedExecutionException unused) { - c0.o.S(runnable); - } - } - - @Override // s.a.z - public String toString() { - return "CommonPool"; - } +import kotlinx.coroutines.Job; +/* compiled from: Job.kt */ +public interface q extends Job { + void r(o1 o1Var); } diff --git a/app/src/main/java/s/a/q0.java b/app/src/main/java/s/a/q0.java index f03425223a..5fa3c67756 100644 --- a/app/src/main/java/s/a/q0.java +++ b/app/src/main/java/s/a/q0.java @@ -1,5 +1,448 @@ package s.a; -/* compiled from: EventLoop.kt */ -public abstract class q0 extends o0 { - public abstract Thread R(); + +import d0.d0.f; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; +import java.util.concurrent.locks.LockSupport; +import kotlin.Unit; +import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CancellableContinuation; +import s.a.a.m; +import s.a.a.t; +import s.a.a.v; +import s.a.a.w; +/* compiled from: EventLoop.common.kt */ +public abstract class q0 extends r0 implements g0 { + public static final AtomicReferenceFieldUpdater l = AtomicReferenceFieldUpdater.newUpdater(q0.class, Object.class, "_queue"); + public static final AtomicReferenceFieldUpdater m = AtomicReferenceFieldUpdater.newUpdater(q0.class, Object.class, "_delayed"); + public volatile Object _delayed = null; + public volatile int _isCompleted = 0; + public volatile Object _queue = null; + + /* compiled from: EventLoop.common.kt */ + public final class a extends c { + public final CancellableContinuation l; + + /* JADX DEBUG: Multi-variable search result rejected for r4v0, resolved type: kotlinx.coroutines.CancellableContinuation */ + /* JADX WARN: Multi-variable type inference failed */ + public a(long j, CancellableContinuation cancellableContinuation) { + super(j); + this.l = cancellableContinuation; + } + + @Override // java.lang.Runnable + public void run() { + this.l.i(q0.this, Unit.a); + } + + @Override // s.a.q0.c, java.lang.Object + public String toString() { + return super.toString() + this.l.toString(); + } + } + + /* compiled from: EventLoop.common.kt */ + public static final class b extends c { + public final Runnable l; + + public b(long j, Runnable runnable) { + super(j); + this.l = runnable; + } + + @Override // java.lang.Runnable + public void run() { + this.l.run(); + } + + @Override // s.a.q0.c, java.lang.Object + public String toString() { + return super.toString() + this.l.toString(); + } + } + + /* compiled from: EventLoop.common.kt */ + public static abstract class c implements Runnable, Comparable, l0, w { + public Object i; + public int j = -1; + public long k; + + public c(long j) { + this.k = j; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // java.lang.Comparable + public int compareTo(c cVar) { + int i = ((this.k - cVar.k) > 0 ? 1 : ((this.k - cVar.k) == 0 ? 0 : -1)); + if (i > 0) { + return 1; + } + return i < 0 ? -1 : 0; + } + + @Override // s.a.l0 + public final synchronized void dispose() { + Object obj = this.i; + t tVar = s0.a; + if (obj != tVar) { + if (!(obj instanceof d)) { + obj = null; + } + d dVar = (d) obj; + if (dVar != null) { + synchronized (dVar) { + if (i() != null) { + dVar.c(getIndex()); + } + } + } + this.i = tVar; + } + } + + @Override // s.a.a.w + public void f(int i) { + this.j = i; + } + + @Override // s.a.a.w + public void g(v vVar) { + if (this.i != s0.a) { + this.i = vVar; + return; + } + throw new IllegalArgumentException("Failed requirement.".toString()); + } + + @Override // s.a.a.w + public int getIndex() { + return this.j; + } + + @Override // s.a.a.w + public v i() { + Object obj = this.i; + if (!(obj instanceof v)) { + obj = null; + } + return (v) obj; + } + + @Override // java.lang.Object + public String toString() { + StringBuilder L = c.d.b.a.a.L("Delayed[nanos="); + L.append(this.k); + L.append(']'); + return L.toString(); + } + } + + /* compiled from: EventLoop.common.kt */ + public static final class d extends v { + public long b; + + public d(long j) { + this.b = j; + } + } + + public final void S(Runnable runnable) { + if (T(runnable)) { + Thread R = R(); + if (Thread.currentThread() != R) { + LockSupport.unpark(R); + return; + } + return; + } + c0.o.S(runnable); + } + + public final boolean T(Runnable runnable) { + while (true) { + Object obj = this._queue; + if (this._isCompleted != 0) { + return false; + } + if (obj == null) { + if (l.compareAndSet(this, null, runnable)) { + return true; + } + } else if (obj instanceof m) { + m mVar = (m) obj; + int a2 = mVar.a(runnable); + if (a2 == 0) { + return true; + } + if (a2 == 1) { + l.compareAndSet(this, obj, mVar.d()); + } else if (a2 == 2) { + return false; + } + } else if (obj == s0.b) { + return false; + } else { + m mVar2 = new m(8, true); + mVar2.a((Runnable) obj); + mVar2.a(runnable); + if (l.compareAndSet(this, obj, mVar2)) { + return true; + } + } + } + } + + public boolean U() { + s.a.a.b> bVar = this.k; + if (!(bVar == null || bVar.b == bVar.f2864c)) { + return false; + } + d dVar = (d) this._delayed; + if (dVar != null) { + if (!(dVar._size == 0)) { + return false; + } + } + Object obj = this._queue; + if (obj == null) { + return true; + } + return obj instanceof m ? ((m) obj).c() : obj == s0.b; + } + + /* JADX WARNING: Removed duplicated region for block: B:59:0x00a3 */ + /* JADX WARNING: Removed duplicated region for block: B:94:? A[RETURN, SYNTHETIC] */ + public long V() { + long j; + c b2; + c cVar; + if (Q()) { + return 0; + } + d dVar = (d) this._delayed; + Runnable runnable = null; + boolean z2 = true; + if (dVar != null) { + if (!(dVar._size == 0)) { + long nanoTime = System.nanoTime(); + do { + synchronized (dVar) { + c b3 = dVar.b(); + if (b3 != null) { + c cVar2 = b3; + cVar = ((nanoTime - cVar2.k) > 0 ? 1 : ((nanoTime - cVar2.k) == 0 ? 0 : -1)) >= 0 ? T(cVar2) : false ? dVar.c(0) : null; + } else { + cVar = null; + } + } + } while (cVar != null); + } + } + while (true) { + Object obj = this._queue; + if (obj != null) { + if (!(obj instanceof m)) { + if (obj == s0.b) { + break; + } else if (l.compareAndSet(this, obj, null)) { + runnable = (Runnable) obj; + break; + } + } else { + m mVar = (m) obj; + Object e = mVar.e(); + if (e != m.f2866c) { + runnable = (Runnable) e; + break; + } + l.compareAndSet(this, obj, mVar.d()); + } + } else { + break; + } + } + if (runnable != null) { + runnable.run(); + return 0; + } + s.a.a.b> bVar = this.k; + if (bVar != null) { + if (bVar.b != bVar.f2864c) { + z2 = false; + } + if (!z2) { + j = 0; + if (j != 0) { + return 0; + } + Object obj2 = this._queue; + if (obj2 != null) { + if (!(obj2 instanceof m)) { + if (obj2 != s0.b) { + return 0; + } + return Long.MAX_VALUE; + } else if (!((m) obj2).c()) { + return 0; + } + } + d dVar2 = (d) this._delayed; + if (dVar2 != null) { + synchronized (dVar2) { + b2 = dVar2.b(); + } + c cVar3 = b2; + if (cVar3 != null) { + return f.coerceAtLeast(cVar3.k - System.nanoTime(), 0); + } + } + return Long.MAX_VALUE; + } + } + j = Long.MAX_VALUE; + if (j != 0) { + } + } + + /* JADX WARNING: Removed duplicated region for block: B:35:0x0067 */ + /* JADX WARNING: Removed duplicated region for block: B:40:0x007e */ + public final void W(long j, c cVar) { + char c2; + Thread R; + c b2; + boolean z2 = false; + c cVar2 = null; + if (this._isCompleted == 0) { + d dVar = (d) this._delayed; + if (dVar == null) { + m.compareAndSet(this, null, new d(j)); + Object obj = this._delayed; + d0.z.d.m.checkNotNull(obj); + dVar = (d) obj; + } + synchronized (cVar) { + if (cVar.i == s0.a) { + c2 = 2; + } else { + synchronized (dVar) { + c b3 = dVar.b(); + if (this._isCompleted == 0) { + if (b3 == null) { + dVar.b = j; + } else { + long j2 = b3.k; + if (j2 - j >= 0) { + j2 = j; + } + if (j2 - dVar.b > 0) { + dVar.b = j2; + } + } + long j3 = cVar.k; + long j4 = dVar.b; + if (j3 - j4 < 0) { + cVar.k = j4; + } + dVar.a(cVar); + c2 = 0; + } + } + } + } + if (c2 != 0) { + d dVar2 = (d) this._delayed; + if (dVar2 != null) { + synchronized (dVar2) { + b2 = dVar2.b(); + } + cVar2 = b2; + } + if (cVar2 == cVar) { + z2 = true; + } + if (z2 && Thread.currentThread() != (R = R())) { + LockSupport.unpark(R); + return; + } + return; + } else if (c2 == 1) { + c0.o.W(j, cVar); + return; + } else if (c2 != 2) { + throw new IllegalStateException("unexpected result".toString()); + } else { + return; + } + } + c2 = 1; + if (c2 != 0) { + } + } + + @Override // s.a.g0 + public void b(long j, CancellableContinuation cancellableContinuation) { + long a2 = s0.a(j); + if (a2 < 4611686018427387903L) { + long nanoTime = System.nanoTime(); + a aVar = new a(a2 + nanoTime, cancellableContinuation); + cancellableContinuation.e(new m0(aVar)); + W(nanoTime, aVar); + } + } + + @Override // kotlinx.coroutines.CoroutineDispatcher + public final void dispatch(CoroutineContext coroutineContext, Runnable runnable) { + S(runnable); + } + + @Override // s.a.p0 + public void shutdown() { + c c2; + t1 t1Var = t1.b; + t1.a.set(null); + this._isCompleted = 1; + while (true) { + Object obj = this._queue; + if (obj == null) { + if (l.compareAndSet(this, null, s0.b)) { + break; + } + } else if (obj instanceof m) { + ((m) obj).b(); + break; + } else if (obj == s0.b) { + break; + } else { + m mVar = new m(8, true); + mVar.a((Runnable) obj); + if (l.compareAndSet(this, obj, mVar)) { + break; + } + } + } + do { + } while (V() <= 0); + long nanoTime = System.nanoTime(); + while (true) { + d dVar = (d) this._delayed; + if (dVar != null) { + synchronized (dVar) { + c2 = dVar._size > 0 ? dVar.c(0) : null; + } + c cVar = c2; + if (cVar != null) { + c0.o.W(nanoTime, cVar); + } else { + return; + } + } else { + return; + } + } + } + + @Override // s.a.g0 + public l0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { + return d0.a.w(j, runnable, coroutineContext); + } } diff --git a/app/src/main/java/s/a/q1.java b/app/src/main/java/s/a/q1.java index e014987bc9..3d6ca06961 100644 --- a/app/src/main/java/s/a/q1.java +++ b/app/src/main/java/s/a/q1.java @@ -1,17 +1,17 @@ package s.a; -/* compiled from: EventLoop.common.kt */ -public final class q1 { - public static final ThreadLocal a = new ThreadLocal<>(); - public static final q1 b = null; - public static final o0 a() { - ThreadLocal threadLocal = a; - o0 o0Var = threadLocal.get(); - if (o0Var != null) { - return o0Var; - } - f fVar = new f(Thread.currentThread()); - threadLocal.set(fVar); - return fVar; +import c.q.a.k.a; +import kotlin.Unit; +import kotlin.coroutines.CoroutineContext; +/* compiled from: Builders.common.kt */ +public class q1 extends b { + public q1(CoroutineContext coroutineContext, boolean z2) { + super(coroutineContext, z2); + } + + @Override // s.a.g1 + public boolean H(Throwable th) { + a.x(this.j, th); + return true; } } diff --git a/app/src/main/java/s/a/r.java b/app/src/main/java/s/a/r.java index 4dd2880b38..6c2e4a9af6 100644 --- a/app/src/main/java/s/a/r.java +++ b/app/src/main/java/s/a/r.java @@ -1,9 +1,157 @@ package s.a; -/* compiled from: CommonPool.kt */ -public final class r implements Runnable { - public static final r i = new r(); - @Override // java.lang.Runnable - public final void run() { +import d0.d0.f; +import d0.g0.s; +import java.lang.reflect.Method; +import java.util.Objects; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; +import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.ExecutorCoroutineDispatcher; +/* compiled from: CommonPool.kt */ +public final class r extends ExecutorCoroutineDispatcher { + public static final int i; + public static final r j = new r(); + public static volatile Executor pool; + + /* compiled from: CommonPool.kt */ + public static final class a implements ThreadFactory { + public final /* synthetic */ AtomicInteger i; + + public a(AtomicInteger atomicInteger) { + this.i = atomicInteger; + } + + @Override // java.util.concurrent.ThreadFactory + public final Thread newThread(Runnable runnable) { + StringBuilder L = c.d.b.a.a.L("CommonPool-worker-"); + L.append(this.i.incrementAndGet()); + Thread thread = new Thread(runnable, L.toString()); + thread.setDaemon(true); + return thread; + } + } + + static { + String str; + int i2; + try { + str = System.getProperty("kotlinx.coroutines.default.parallelism"); + } catch (Throwable unused) { + str = null; + } + if (str != null) { + Integer intOrNull = s.toIntOrNull(str); + if (intOrNull == null || intOrNull.intValue() < 1) { + throw new IllegalStateException(c.d.b.a.a.u("Expected positive number in kotlinx.coroutines.default.parallelism, but has ", str).toString()); + } + i2 = intOrNull.intValue(); + } else { + i2 = -1; + } + i = i2; + } + + public final ExecutorService I() { + return Executors.newFixedThreadPool(M(), new a(new AtomicInteger())); + } + + public final ExecutorService K() { + Class cls; + ExecutorService executorService; + Integer num; + if (System.getSecurityManager() != null) { + return I(); + } + ExecutorService executorService2 = null; + try { + cls = Class.forName("java.util.concurrent.ForkJoinPool"); + } catch (Throwable unused) { + cls = null; + } + if (cls == null) { + return I(); + } + if (i < 0) { + try { + Method method = cls.getMethod("commonPool", new Class[0]); + Object invoke = method != null ? method.invoke(null, new Object[0]) : null; + if (!(invoke instanceof ExecutorService)) { + invoke = null; + } + executorService = (ExecutorService) invoke; + } catch (Throwable unused2) { + executorService = null; + } + if (executorService != null) { + Objects.requireNonNull(j); + executorService.submit(s.i); + try { + Object invoke2 = cls.getMethod("getPoolSize", new Class[0]).invoke(executorService, new Object[0]); + if (!(invoke2 instanceof Integer)) { + invoke2 = null; + } + num = (Integer) invoke2; + } catch (Throwable unused3) { + num = null; + } + if (!(num != null && num.intValue() >= 1)) { + executorService = null; + } + if (executorService != null) { + return executorService; + } + } + } + try { + Object newInstance = cls.getConstructor(Integer.TYPE).newInstance(Integer.valueOf(j.M())); + if (!(newInstance instanceof ExecutorService)) { + newInstance = null; + } + executorService2 = (ExecutorService) newInstance; + } catch (Throwable unused4) { + } + return executorService2 != null ? executorService2 : I(); + } + + public final int M() { + Integer valueOf = Integer.valueOf(i); + if (!(valueOf.intValue() > 0)) { + valueOf = null; + } + return valueOf != null ? valueOf.intValue() : f.coerceAtLeast(Runtime.getRuntime().availableProcessors() - 1, 1); + } + + @Override // java.io.Closeable, java.lang.AutoCloseable + public void close() { + throw new IllegalStateException("Close cannot be invoked on CommonPool".toString()); + } + + @Override // kotlinx.coroutines.CoroutineDispatcher + public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { + try { + Executor executor = pool; + if (executor == null) { + synchronized (this) { + executor = pool; + if (executor == null) { + executor = K(); + pool = executor; + } + } + } + executor.execute(runnable); + } catch (RejectedExecutionException unused) { + c0.o.S(runnable); + } + } + + @Override // kotlinx.coroutines.CoroutineDispatcher, java.lang.Object + public String toString() { + return "CommonPool"; } } diff --git a/app/src/main/java/s/a/r0.java b/app/src/main/java/s/a/r0.java index f44cf629fb..07fa040dcf 100644 --- a/app/src/main/java/s/a/r0.java +++ b/app/src/main/java/s/a/r0.java @@ -1,18 +1,5 @@ package s.a; - -import s.a.a.s; -/* compiled from: EventLoop.common.kt */ -public final class r0 { - public static final s a = new s("REMOVED_TASK"); - public static final s b = new s("CLOSED_EMPTY"); - - public static final long a(long j) { - if (j <= 0) { - return 0; - } - if (j >= 9223372036854L) { - return Long.MAX_VALUE; - } - return 1000000 * j; - } +/* compiled from: EventLoop.kt */ +public abstract class r0 extends p0 { + public abstract Thread R(); } diff --git a/app/src/main/java/s/a/r1.java b/app/src/main/java/s/a/r1.java index 6c920e68f2..5874e0d5a5 100644 --- a/app/src/main/java/s/a/r1.java +++ b/app/src/main/java/s/a/r1.java @@ -1,26 +1,14 @@ package s.a; -import c.d.b.a.a; -import d0.w.h.a.d; -import kotlin.coroutines.Continuation; -import kotlinx.coroutines.TimeoutCancellationException; -import s.a.a.q; -/* compiled from: Timeout.kt */ -public final class r1 extends q implements Runnable { - public final long m; - - public r1(long j, Continuation continuation) { - super(((d) continuation).getContext(), continuation); - this.m = j; +import kotlinx.coroutines.Job; +/* compiled from: Supervisor.kt */ +public final class r1 extends e1 { + public r1(Job job) { + super(job); } - @Override // s.a.b, s.a.e1 - public String N() { - return super.N() + "(timeMillis=" + this.m + ')'; - } - - @Override // java.lang.Runnable - public void run() { - n(new TimeoutCancellationException(a.r("Timed out waiting for ", this.m, " ms"), this)); + @Override // s.a.g1 + public boolean s(Throwable th) { + return false; } } diff --git a/app/src/main/java/s/a/s.java b/app/src/main/java/s/a/s.java index ca63a40f1f..75339a90e2 100644 --- a/app/src/main/java/s/a/s.java +++ b/app/src/main/java/s/a/s.java @@ -1,6 +1,9 @@ package s.a; +/* compiled from: CommonPool.kt */ +public final class s implements Runnable { + public static final s i = new s(); -import kotlinx.coroutines.Job; -/* compiled from: CompletableJob.kt */ -public interface s extends Job { + @Override // java.lang.Runnable + public final void run() { + } } diff --git a/app/src/main/java/s/a/s0.java b/app/src/main/java/s/a/s0.java index 58c69899a6..f1a3581c3e 100644 --- a/app/src/main/java/s/a/s0.java +++ b/app/src/main/java/s/a/s0.java @@ -1,24 +1,18 @@ package s.a; -import d0.z.d.o; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function1; -/* compiled from: Executors.kt */ -public final class s0 extends o implements Function1 { - public static final s0 i = new s0(); +import s.a.a.t; +/* compiled from: EventLoop.common.kt */ +public final class s0 { + public static final t a = new t("REMOVED_TASK"); + public static final t b = new t("CLOSED_EMPTY"); - public s0() { - 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 t0 invoke(CoroutineContext.Element element) { - CoroutineContext.Element element2 = element; - if (!(element2 instanceof t0)) { - element2 = null; + public static final long a(long j) { + if (j <= 0) { + return 0; } - return (t0) element2; + if (j >= 9223372036854L) { + return Long.MAX_VALUE; + } + return 1000000 * j; } } diff --git a/app/src/main/java/s/a/s1.java b/app/src/main/java/s/a/s1.java index f4fbd6da70..d1ebd66b49 100644 --- a/app/src/main/java/s/a/s1.java +++ b/app/src/main/java/s/a/s1.java @@ -1,24 +1,9 @@ package s.a; import kotlin.coroutines.CoroutineContext; -/* compiled from: Unconfined.kt */ -public final class s1 extends z { - public static final s1 i = new s1(); +/* compiled from: ThreadContextElement.kt */ +public interface s1 extends CoroutineContext.Element { + S C(CoroutineContext coroutineContext); - @Override // s.a.z - public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { - if (((u1) coroutineContext.get(u1.i)) == null) { - throw new UnsupportedOperationException("Dispatchers.Unconfined.dispatch function can only be used by the yield function. If you wrap Unconfined dispatcher in your code, make sure you properly delegate isDispatchNeeded and dispatch calls."); - } - } - - @Override // s.a.z - public boolean isDispatchNeeded(CoroutineContext coroutineContext) { - return false; - } - - @Override // s.a.z - public String toString() { - return "Dispatchers.Unconfined"; - } + void x(CoroutineContext coroutineContext, S s2); } diff --git a/app/src/main/java/s/a/t.java b/app/src/main/java/s/a/t.java index 5ce3e2cd15..7479775f49 100644 --- a/app/src/main/java/s/a/t.java +++ b/app/src/main/java/s/a/t.java @@ -1,99 +1,6 @@ package s.a; -import c.d.b.a.a; -import d0.z.d.m; -import java.util.Objects; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: CancellableContinuationImpl.kt */ -public final class t { - public final Object a; - public final h b; - - /* renamed from: c reason: collision with root package name */ - public final Function1 f2870c; - public final Object d; - public final Throwable e; - - /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.jvm.functions.Function1 */ - /* JADX WARN: Multi-variable type inference failed */ - public t(Object obj, h hVar, Function1 function1, Object obj2, Throwable th) { - this.a = obj; - this.b = hVar; - this.f2870c = function1; - this.d = obj2; - this.e = th; - } - - public t(Object obj, h hVar, Function1 function1, Object obj2, Throwable th, int i) { - hVar = (i & 2) != 0 ? null : hVar; - function1 = (i & 4) != 0 ? null : function1; - obj2 = (i & 8) != 0 ? null : obj2; - th = (i & 16) != 0 ? null : th; - this.a = obj; - this.b = hVar; - this.f2870c = function1; - this.d = obj2; - this.e = th; - } - - public static t a(t tVar, Object obj, h hVar, Function1 function1, Object obj2, Throwable th, int i) { - Object obj3 = null; - Object obj4 = (i & 1) != 0 ? tVar.a : null; - if ((i & 2) != 0) { - hVar = tVar.b; - } - Function1 function12 = (i & 4) != 0 ? tVar.f2870c : null; - if ((i & 8) != 0) { - obj3 = tVar.d; - } - if ((i & 16) != 0) { - th = tVar.e; - } - Objects.requireNonNull(tVar); - return new t(obj4, hVar, function12, obj3, th); - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof t)) { - return false; - } - t tVar = (t) obj; - return m.areEqual(this.a, tVar.a) && m.areEqual(this.b, tVar.b) && m.areEqual(this.f2870c, tVar.f2870c) && m.areEqual(this.d, tVar.d) && m.areEqual(this.e, tVar.e); - } - - public int hashCode() { - Object obj = this.a; - int i = 0; - int hashCode = (obj != null ? obj.hashCode() : 0) * 31; - h hVar = this.b; - int hashCode2 = (hashCode + (hVar != null ? hVar.hashCode() : 0)) * 31; - Function1 function1 = this.f2870c; - int hashCode3 = (hashCode2 + (function1 != null ? function1.hashCode() : 0)) * 31; - Object obj2 = this.d; - int hashCode4 = (hashCode3 + (obj2 != null ? obj2.hashCode() : 0)) * 31; - Throwable th = this.e; - if (th != null) { - i = th.hashCode(); - } - return hashCode4 + i; - } - - public String toString() { - StringBuilder L = a.L("CompletedContinuation(result="); - L.append(this.a); - L.append(", cancelHandler="); - L.append(this.b); - L.append(", onCancellation="); - L.append(this.f2870c); - L.append(", idempotentResume="); - L.append(this.d); - L.append(", cancelCause="); - L.append(this.e); - L.append(")"); - return L.toString(); - } +import kotlinx.coroutines.Job; +/* compiled from: CompletableJob.kt */ +public interface t extends Job { } diff --git a/app/src/main/java/s/a/t0.java b/app/src/main/java/s/a/t0.java index a53ed60f39..83981cc812 100644 --- a/app/src/main/java/s/a/t0.java +++ b/app/src/main/java/s/a/t0.java @@ -1,19 +1,25 @@ package s.a; -import d0.w.b; -import java.io.Closeable; -import kotlin.jvm.internal.DefaultConstructorMarker; +import d0.z.d.o; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.ExecutorCoroutineDispatcher; /* compiled from: Executors.kt */ -public abstract class t0 extends z implements Closeable { +public final class t0 extends o implements Function1 { + public static final t0 i = new t0(); - /* compiled from: Executors.kt */ - public static final class a extends b { - public a(DefaultConstructorMarker defaultConstructorMarker) { - super(z.Key, s0.i); - } + public t0() { + super(1); } - static { - new a(null); + /* 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 ExecutorCoroutineDispatcher invoke(CoroutineContext.Element element) { + CoroutineContext.Element element2 = element; + if (!(element2 instanceof ExecutorCoroutineDispatcher)) { + element2 = null; + } + return (ExecutorCoroutineDispatcher) element2; } } diff --git a/app/src/main/java/s/a/t1.java b/app/src/main/java/s/a/t1.java index 67ff64b272..91bfbea96c 100644 --- a/app/src/main/java/s/a/t1.java +++ b/app/src/main/java/s/a/t1.java @@ -1,24 +1,17 @@ package s.a; +/* compiled from: EventLoop.common.kt */ +public final class t1 { + public static final ThreadLocal a = new ThreadLocal<>(); + public static final t1 b = null; -import c.q.a.k.a; -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; -import s.a.a.q; -/* compiled from: Builders.common.kt */ -public final class t1 extends q { - public t1(CoroutineContext coroutineContext, Continuation continuation) { - super(coroutineContext, continuation); - } - - @Override // s.a.a.q, s.a.b - public void X(Object obj) { - Object K = a.K(obj, this.l); - CoroutineContext context = this.l.getContext(); - Object b = s.a.a.a.b(context, null); - try { - this.l.resumeWith(K); - } finally { - s.a.a.a.a(context, b); + public static final p0 a() { + ThreadLocal threadLocal = a; + p0 p0Var = threadLocal.get(); + if (p0Var != null) { + return p0Var; } + f fVar = new f(Thread.currentThread()); + threadLocal.set(fVar); + return fVar; } } diff --git a/app/src/main/java/s/a/u.java b/app/src/main/java/s/a/u.java index 480bb6b17a..06ad069729 100644 --- a/app/src/main/java/s/a/u.java +++ b/app/src/main/java/s/a/u.java @@ -1,27 +1,99 @@ package s.a; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -/* compiled from: CompletionState.kt */ -public class u { - public static final AtomicIntegerFieldUpdater a = AtomicIntegerFieldUpdater.newUpdater(u.class, "_handled"); - public volatile int _handled; - public final Throwable b; +import c.d.b.a.a; +import d0.z.d.m; +import java.util.Objects; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: CancellableContinuationImpl.kt */ +public final class u { + public final Object a; + public final i b; - public u(Throwable th, boolean z2) { - this.b = th; - this._handled = z2 ? 1 : 0; + /* renamed from: c reason: collision with root package name */ + public final Function1 f2873c; + public final Object d; + public final Throwable e; + + /* JADX DEBUG: Multi-variable search result rejected for r3v0, resolved type: kotlin.jvm.functions.Function1 */ + /* JADX WARN: Multi-variable type inference failed */ + public u(Object obj, i iVar, Function1 function1, Object obj2, Throwable th) { + this.a = obj; + this.b = iVar; + this.f2873c = function1; + this.d = obj2; + this.e = th; } - public u(Throwable th, boolean z2, int i) { - z2 = (i & 2) != 0 ? false : z2; - this.b = th; - int i2 = z2 ? 1 : 0; - int i3 = z2 ? 1 : 0; - int i4 = z2 ? 1 : 0; - this._handled = i2; + public u(Object obj, i iVar, Function1 function1, Object obj2, Throwable th, int i) { + iVar = (i & 2) != 0 ? null : iVar; + function1 = (i & 4) != 0 ? null : function1; + obj2 = (i & 8) != 0 ? null : obj2; + th = (i & 16) != 0 ? null : th; + this.a = obj; + this.b = iVar; + this.f2873c = function1; + this.d = obj2; + this.e = th; + } + + public static u a(u uVar, Object obj, i iVar, Function1 function1, Object obj2, Throwable th, int i) { + Object obj3 = null; + Object obj4 = (i & 1) != 0 ? uVar.a : null; + if ((i & 2) != 0) { + iVar = uVar.b; + } + Function1 function12 = (i & 4) != 0 ? uVar.f2873c : null; + if ((i & 8) != 0) { + obj3 = uVar.d; + } + if ((i & 16) != 0) { + th = uVar.e; + } + Objects.requireNonNull(uVar); + return new u(obj4, iVar, function12, obj3, th); + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof u)) { + return false; + } + u uVar = (u) obj; + return m.areEqual(this.a, uVar.a) && m.areEqual(this.b, uVar.b) && m.areEqual(this.f2873c, uVar.f2873c) && m.areEqual(this.d, uVar.d) && m.areEqual(this.e, uVar.e); + } + + public int hashCode() { + Object obj = this.a; + int i = 0; + int hashCode = (obj != null ? obj.hashCode() : 0) * 31; + i iVar = this.b; + int hashCode2 = (hashCode + (iVar != null ? iVar.hashCode() : 0)) * 31; + Function1 function1 = this.f2873c; + int hashCode3 = (hashCode2 + (function1 != null ? function1.hashCode() : 0)) * 31; + Object obj2 = this.d; + int hashCode4 = (hashCode3 + (obj2 != null ? obj2.hashCode() : 0)) * 31; + Throwable th = this.e; + if (th != null) { + i = th.hashCode(); + } + return hashCode4 + i; } public String toString() { - return getClass().getSimpleName() + '[' + this.b + ']'; + StringBuilder L = a.L("CompletedContinuation(result="); + L.append(this.a); + L.append(", cancelHandler="); + L.append(this.b); + L.append(", onCancellation="); + L.append(this.f2873c); + L.append(", idempotentResume="); + L.append(this.d); + L.append(", cancelCause="); + L.append(this.e); + L.append(")"); + return L.toString(); } } diff --git a/app/src/main/java/s/a/u0.java b/app/src/main/java/s/a/u0.java index 7cdff4ffbc..d256bfea86 100644 --- a/app/src/main/java/s/a/u0.java +++ b/app/src/main/java/s/a/u0.java @@ -1,14 +1,97 @@ package s.a; -import d0.w.f; +import java.util.concurrent.CancellationException; +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import kotlin.Unit; import kotlin.coroutines.CoroutineContext; -import kotlinx.coroutines.CoroutineScope; -/* compiled from: CoroutineScope.kt */ -public final class u0 implements CoroutineScope { - public static final u0 i = new u0(); +import kotlinx.coroutines.CancellableContinuation; +import kotlinx.coroutines.ExecutorCoroutineDispatcher; +import kotlinx.coroutines.Job; +/* compiled from: Executors.kt */ +public abstract class u0 extends ExecutorCoroutineDispatcher implements g0 { + public boolean i; - @Override // kotlinx.coroutines.CoroutineScope - public CoroutineContext getCoroutineContext() { - return f.i; + public final void I(CoroutineContext coroutineContext, RejectedExecutionException rejectedExecutionException) { + CancellationException cancellationException = new CancellationException("The task was rejected"); + cancellationException.initCause(rejectedExecutionException); + Job job = (Job) coroutineContext.get(Job.h); + if (job != null) { + job.B(cancellationException); + } + } + + public final ScheduledFuture K(Runnable runnable, CoroutineContext coroutineContext, long j) { + try { + Executor H = H(); + if (!(H instanceof ScheduledExecutorService)) { + H = null; + } + ScheduledExecutorService scheduledExecutorService = (ScheduledExecutorService) H; + if (scheduledExecutorService != null) { + return scheduledExecutorService.schedule(runnable, j, TimeUnit.MILLISECONDS); + } + return null; + } catch (RejectedExecutionException e) { + I(coroutineContext, e); + return null; + } + } + + @Override // s.a.g0 + public void b(long j, CancellableContinuation cancellableContinuation) { + ScheduledFuture K = this.i ? K(new p1(this, cancellableContinuation), ((k) cancellableContinuation).n, j) : null; + if (K != null) { + ((k) cancellableContinuation).e(new h(K)); + } else { + c0.o.b(j, cancellableContinuation); + } + } + + @Override // java.io.Closeable, java.lang.AutoCloseable + public void close() { + Executor H = H(); + if (!(H instanceof ExecutorService)) { + H = null; + } + ExecutorService executorService = (ExecutorService) H; + if (executorService != null) { + executorService.shutdown(); + } + } + + @Override // kotlinx.coroutines.CoroutineDispatcher + public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { + try { + H().execute(runnable); + } catch (RejectedExecutionException e) { + I(coroutineContext, e); + j0.b.dispatch(coroutineContext, runnable); + } + } + + @Override // java.lang.Object + public boolean equals(Object obj) { + return (obj instanceof u0) && ((u0) obj).H() == H(); + } + + @Override // java.lang.Object + public int hashCode() { + return System.identityHashCode(H()); + } + + @Override // kotlinx.coroutines.CoroutineDispatcher, java.lang.Object + public String toString() { + return H().toString(); + } + + @Override // s.a.g0 + public l0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { + ScheduledFuture K = this.i ? K(runnable, coroutineContext, j) : null; + return K != null ? new k0(K) : c0.o.w(j, runnable, coroutineContext); } } diff --git a/app/src/main/java/s/a/u1.java b/app/src/main/java/s/a/u1.java index a2240d1ff6..5d7926524d 100644 --- a/app/src/main/java/s/a/u1.java +++ b/app/src/main/java/s/a/u1.java @@ -1,18 +1,26 @@ package s.a; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.internal.DefaultConstructorMarker; -/* compiled from: Unconfined.kt */ -public final class u1 extends d0.w.a { - public static final a i = new a(null); +import c.d.b.a.a; +import d0.w.h.a.d; +import kotlin.coroutines.Continuation; +import kotlinx.coroutines.TimeoutCancellationException; +import s.a.a.r; +/* compiled from: Timeout.kt */ +public final class u1 extends r implements Runnable { + public final long m; - /* compiled from: Unconfined.kt */ - public static final class a implements CoroutineContext.Key { - public a(DefaultConstructorMarker defaultConstructorMarker) { - } + public u1(long j, Continuation continuation) { + super(((d) continuation).getContext(), continuation); + this.m = j; } - public u1() { - super(i); + @Override // s.a.b, s.a.g1 + public String N() { + return super.N() + "(timeMillis=" + this.m + ')'; + } + + @Override // java.lang.Runnable + public void run() { + n(new TimeoutCancellationException(a.r("Timed out waiting for ", this.m, " ms"), this)); } } diff --git a/app/src/main/java/s/a/v.java b/app/src/main/java/s/a/v.java index 02eaa8c6b1..b108576b37 100644 --- a/app/src/main/java/s/a/v.java +++ b/app/src/main/java/s/a/v.java @@ -1,49 +1,27 @@ package s.a; -import c.d.b.a.a; -import d0.z.d.m; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; /* compiled from: CompletionState.kt */ -public final class v { - public final Object a; - public final Function1 b; +public class v { + public static final AtomicIntegerFieldUpdater a = AtomicIntegerFieldUpdater.newUpdater(v.class, "_handled"); + public volatile int _handled; + public final Throwable b; - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ - /* JADX WARN: Multi-variable type inference failed */ - public v(Object obj, Function1 function1) { - this.a = obj; - this.b = function1; + public v(Throwable th, boolean z2) { + this.b = th; + this._handled = z2 ? 1 : 0; } - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof v)) { - return false; - } - v vVar = (v) obj; - return m.areEqual(this.a, vVar.a) && m.areEqual(this.b, vVar.b); - } - - public int hashCode() { - Object obj = this.a; - int i = 0; - int hashCode = (obj != null ? obj.hashCode() : 0) * 31; - Function1 function1 = this.b; - if (function1 != null) { - i = function1.hashCode(); - } - return hashCode + i; + public v(Throwable th, boolean z2, int i) { + z2 = (i & 2) != 0 ? false : z2; + this.b = th; + int i2 = z2 ? 1 : 0; + int i3 = z2 ? 1 : 0; + int i4 = z2 ? 1 : 0; + this._handled = i2; } public String toString() { - StringBuilder L = a.L("CompletedWithCancellation(result="); - L.append(this.a); - L.append(", onCancellation="); - L.append(this.b); - L.append(")"); - return L.toString(); + return getClass().getSimpleName() + '[' + this.b + ']'; } } diff --git a/app/src/main/java/s/a/v0.java b/app/src/main/java/s/a/v0.java index 521faf72b8..e0b305bfae 100644 --- a/app/src/main/java/s/a/v0.java +++ b/app/src/main/java/s/a/v0.java @@ -1,23 +1,31 @@ package s.a; -/* compiled from: JobSupport.kt */ -public final class v0 implements w0 { - public final j1 i; - public v0(j1 j1Var) { - this.i = j1Var; +import java.lang.reflect.Method; +import java.util.concurrent.Executor; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import s.a.a.e; +/* compiled from: Executors.kt */ +public final class v0 extends u0 { + public final Executor j; + + public v0(Executor executor) { + Method method; + this.j = executor; + Method method2 = e.a; + boolean z2 = false; + try { + ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = (ScheduledThreadPoolExecutor) (!(executor instanceof ScheduledThreadPoolExecutor) ? null : executor); + if (!(scheduledThreadPoolExecutor == null || (method = e.a) == null)) { + method.invoke(scheduledThreadPoolExecutor, Boolean.TRUE); + z2 = true; + } + } catch (Throwable unused) { + } + this.i = z2; } - @Override // s.a.w0 - public boolean a() { - return false; - } - - @Override // s.a.w0 - public j1 getList() { - return this.i; - } - - public String toString() { - return super.toString(); + @Override // kotlinx.coroutines.ExecutorCoroutineDispatcher + public Executor H() { + return this.j; } } diff --git a/app/src/main/java/s/a/v1.java b/app/src/main/java/s/a/v1.java new file mode 100644 index 0000000000..a83aadc56c --- /dev/null +++ b/app/src/main/java/s/a/v1.java @@ -0,0 +1,25 @@ +package s.a; + +import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CoroutineDispatcher; +/* compiled from: Unconfined.kt */ +public final class v1 extends CoroutineDispatcher { + public static final v1 i = new v1(); + + @Override // kotlinx.coroutines.CoroutineDispatcher + public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { + if (((x1) coroutineContext.get(x1.i)) == null) { + throw new UnsupportedOperationException("Dispatchers.Unconfined.dispatch function can only be used by the yield function. If you wrap Unconfined dispatcher in your code, make sure you properly delegate isDispatchNeeded and dispatch calls."); + } + } + + @Override // kotlinx.coroutines.CoroutineDispatcher + public boolean isDispatchNeeded(CoroutineContext coroutineContext) { + return false; + } + + @Override // kotlinx.coroutines.CoroutineDispatcher, java.lang.Object + public String toString() { + return "Dispatchers.Unconfined"; + } +} diff --git a/app/src/main/java/s/a/v1/a.java b/app/src/main/java/s/a/v1/a.java deleted file mode 100644 index ada33947f6..0000000000 --- a/app/src/main/java/s/a/v1/a.java +++ /dev/null @@ -1,142 +0,0 @@ -package s.a.v1; - -import android.os.Handler; -import android.os.Looper; -import d0.d0.f; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function1; -import kotlinx.coroutines.CancellableContinuation; -import s.a.g0; -import s.a.i1; -import s.a.j; -import s.a.k0; -/* compiled from: HandlerDispatcher.kt */ -public final class a extends b implements g0 { - public volatile a _immediate; - public final a i; - public final Handler j; - public final String k; - public final boolean l; - - /* compiled from: HandlerDispatcher.kt */ - /* renamed from: s.a.v1.a$a reason: collision with other inner class name */ - public static final class C0339a implements k0 { - public final /* synthetic */ a i; - public final /* synthetic */ Runnable j; - - public C0339a(a aVar, Runnable runnable) { - this.i = aVar; - this.j = runnable; - } - - @Override // s.a.k0 - public void dispose() { - this.i.j.removeCallbacks(this.j); - } - } - - /* compiled from: Runnable.kt */ - public static final class b implements Runnable { - public final /* synthetic */ a i; - public final /* synthetic */ CancellableContinuation j; - - public b(a aVar, CancellableContinuation cancellableContinuation) { - this.i = aVar; - this.j = cancellableContinuation; - } - - @Override // java.lang.Runnable - public final void run() { - this.j.i(this.i, Unit.a); - } - } - - /* compiled from: HandlerDispatcher.kt */ - public static final class c extends o implements Function1 { - public final /* synthetic */ Runnable $block; - public final /* synthetic */ a this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public c(a aVar, Runnable runnable) { - super(1); - this.this$0 = aVar; - this.$block = runnable; - } - - /* 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 Unit invoke(Throwable th) { - this.this$0.j.removeCallbacks(this.$block); - return Unit.a; - } - } - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public a(Handler handler, String str, boolean z2) { - super(null); - a aVar = null; - this.j = handler; - this.k = str; - this.l = z2; - this._immediate = z2 ? this : aVar; - a aVar2 = this._immediate; - if (aVar2 == null) { - aVar2 = new a(handler, str, true); - this._immediate = aVar2; - } - this.i = aVar2; - } - - @Override // s.a.i1 - public i1 H() { - return this.i; - } - - @Override // s.a.g0 - public void b(long j, CancellableContinuation cancellableContinuation) { - b bVar = new b(this, cancellableContinuation); - this.j.postDelayed(bVar, f.coerceAtMost(j, 4611686018427387903L)); - ((j) cancellableContinuation).e(new c(this, bVar)); - } - - @Override // s.a.z - public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { - this.j.post(runnable); - } - - public boolean equals(Object obj) { - return (obj instanceof a) && ((a) obj).j == this.j; - } - - public int hashCode() { - return System.identityHashCode(this.j); - } - - @Override // s.a.z - public boolean isDispatchNeeded(CoroutineContext coroutineContext) { - return !this.l || (m.areEqual(Looper.myLooper(), this.j.getLooper()) ^ true); - } - - @Override // s.a.i1, s.a.z - public String toString() { - String I = I(); - if (I != null) { - return I; - } - String str = this.k; - if (str == null) { - str = this.j.toString(); - } - return this.l ? c.d.b.a.a.u(str, ".immediate") : str; - } - - @Override // s.a.v1.b, s.a.g0 - public k0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { - this.j.postDelayed(runnable, f.coerceAtMost(j, 4611686018427387903L)); - return new C0339a(this, runnable); - } -} diff --git a/app/src/main/java/s/a/v1/b.java b/app/src/main/java/s/a/v1/b.java deleted file mode 100644 index 7a5b329e81..0000000000 --- a/app/src/main/java/s/a/v1/b.java +++ /dev/null @@ -1,21 +0,0 @@ -package s.a.v1; - -import c.q.a.k.a; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.internal.DefaultConstructorMarker; -import s.a.g0; -import s.a.i1; -import s.a.k0; -/* compiled from: HandlerDispatcher.kt */ -public abstract class b extends i1 implements g0 { - public b() { - } - - public b(DefaultConstructorMarker defaultConstructorMarker) { - } - - @Override // s.a.g0 - public k0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { - return a.y(j, runnable, coroutineContext); - } -} diff --git a/app/src/main/java/s/a/v1/c.java b/app/src/main/java/s/a/v1/c.java deleted file mode 100644 index 47518861e9..0000000000 --- a/app/src/main/java/s/a/v1/c.java +++ /dev/null @@ -1,43 +0,0 @@ -package s.a.v1; - -import android.os.Build; -import android.os.Handler; -import android.os.Looper; -import androidx.annotation.VisibleForTesting; -import d0.k; -import d0.l; -import java.util.Objects; -/* compiled from: HandlerDispatcher.kt */ -public final class c { - static { - Object obj; - b bVar = null; - try { - k.a aVar = k.i; - obj = k.m78constructorimpl(new a(a(Looper.getMainLooper(), true), null, false)); - } catch (Throwable th) { - k.a aVar2 = k.i; - obj = k.m78constructorimpl(l.createFailure(th)); - } - if (!k.m82isFailureimpl(obj)) { - bVar = obj; - } - } - - @VisibleForTesting - public static final Handler a(Looper looper, boolean z2) { - if (!z2) { - return new Handler(looper); - } - if (Build.VERSION.SDK_INT >= 28) { - Object invoke = Handler.class.getDeclaredMethod("createAsync", Looper.class).invoke(null, looper); - Objects.requireNonNull(invoke, "null cannot be cast to non-null type android.os.Handler"); - return (Handler) invoke; - } - try { - return (Handler) Handler.class.getDeclaredConstructor(Looper.class, Handler.Callback.class, Boolean.TYPE).newInstance(looper, null, Boolean.TRUE); - } catch (NoSuchMethodException unused) { - return new Handler(looper); - } - } -} diff --git a/app/src/main/java/s/a/w.java b/app/src/main/java/s/a/w.java index ddd8a01c84..d421d6ad8c 100644 --- a/app/src/main/java/s/a/w.java +++ b/app/src/main/java/s/a/w.java @@ -1,9 +1,49 @@ package s.a; +import c.d.b.a.a; +import d0.z.d.m; import kotlin.Unit; import kotlin.jvm.functions.Function1; -import s.a.a.j; -/* compiled from: CompletionHandler.kt */ -public abstract class w extends j implements Function1 { - public abstract void q(Throwable th); +/* compiled from: CompletionState.kt */ +public final class w { + public final Object a; + public final Function1 b; + + /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ + /* JADX WARN: Multi-variable type inference failed */ + public w(Object obj, Function1 function1) { + this.a = obj; + this.b = function1; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof w)) { + return false; + } + w wVar = (w) obj; + return m.areEqual(this.a, wVar.a) && m.areEqual(this.b, wVar.b); + } + + public int hashCode() { + Object obj = this.a; + int i = 0; + int hashCode = (obj != null ? obj.hashCode() : 0) * 31; + Function1 function1 = this.b; + if (function1 != null) { + i = function1.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder L = a.L("CompletedWithCancellation(result="); + L.append(this.a); + L.append(", onCancellation="); + L.append(this.b); + L.append(")"); + return L.toString(); + } } diff --git a/app/src/main/java/s/a/w0.java b/app/src/main/java/s/a/w0.java index 24a7ff0bd9..6962b6aa71 100644 --- a/app/src/main/java/s/a/w0.java +++ b/app/src/main/java/s/a/w0.java @@ -1,7 +1,14 @@ package s.a; -/* compiled from: JobSupport.kt */ -public interface w0 { - boolean a(); - j1 getList(); +import d0.w.f; +import kotlin.coroutines.CoroutineContext; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: CoroutineScope.kt */ +public final class w0 implements CoroutineScope { + public static final w0 i = new w0(); + + @Override // kotlinx.coroutines.CoroutineScope + public CoroutineContext getCoroutineContext() { + return f.i; + } } diff --git a/app/src/main/java/s/a/w1.java b/app/src/main/java/s/a/w1.java new file mode 100644 index 0000000000..e6cb0679ee --- /dev/null +++ b/app/src/main/java/s/a/w1.java @@ -0,0 +1,24 @@ +package s.a; + +import c.q.a.k.a; +import kotlin.coroutines.Continuation; +import kotlin.coroutines.CoroutineContext; +import s.a.a.r; +/* compiled from: Builders.common.kt */ +public final class w1 extends r { + public w1(CoroutineContext coroutineContext, Continuation continuation) { + super(coroutineContext, continuation); + } + + @Override // s.a.a.r, s.a.b + public void X(Object obj) { + Object L = a.L(obj, this.l); + CoroutineContext context = this.l.getContext(); + Object b = s.a.a.a.b(context, null); + try { + this.l.resumeWith(L); + } finally { + s.a.a.a.a(context, b); + } + } +} diff --git a/app/src/main/java/s/a/w1/b.java b/app/src/main/java/s/a/w1/b.java deleted file mode 100644 index f72fe5aada..0000000000 --- a/app/src/main/java/s/a/w1/b.java +++ /dev/null @@ -1,12 +0,0 @@ -package s.a.w1; - -import s.a.a.s; -/* compiled from: AbstractChannel.kt */ -public final class b { - public static final s a = new s("EMPTY"); - public static final s b = new s("OFFER_SUCCESS"); - - /* renamed from: c reason: collision with root package name */ - public static final s f2871c = new s("OFFER_FAILED"); - public static final s d = new s("POLL_FAILED"); -} diff --git a/app/src/main/java/s/a/w1/k.java b/app/src/main/java/s/a/w1/k.java deleted file mode 100644 index 65b1320c61..0000000000 --- a/app/src/main/java/s/a/w1/k.java +++ /dev/null @@ -1,6 +0,0 @@ -package s.a.w1; - -import s.a.a.j; -/* compiled from: AbstractChannel.kt */ -public abstract class k extends j { -} diff --git a/app/src/main/java/s/a/x.java b/app/src/main/java/s/a/x.java index 2ab7ce89eb..fe10dea61e 100644 --- a/app/src/main/java/s/a/x.java +++ b/app/src/main/java/s/a/x.java @@ -1,45 +1,9 @@ package s.a; -import c.q.a.k.a; -import d0.w.d; -import kotlin.coroutines.CoroutineContext; -import kotlinx.coroutines.CoroutineScope; -/* compiled from: CoroutineContext.kt */ -public final class x { - public static final boolean a; - - /* JADX WARNING: Code restructure failed: missing block: B:12:0x0028, code lost: - if (r0.equals("on") != false) goto L_0x0033; - */ - /* JADX WARNING: Code restructure failed: missing block: B:14:0x0031, code lost: - if (r0.equals("") != false) goto L_0x0033; - */ - static { - boolean z2; - String V = a.V("kotlinx.coroutines.scheduler"); - if (V != null) { - int hashCode = V.hashCode(); - if (hashCode != 0) { - if (hashCode != 3551) { - if (hashCode == 109935 && V.equals("off")) { - z2 = false; - a = z2; - } - } - } - throw new IllegalStateException(("System property 'kotlinx.coroutines.scheduler' has unrecognized value '" + V + '\'').toString()); - } - z2 = true; - a = z2; - } - - public static final CoroutineContext a(CoroutineScope coroutineScope, CoroutineContext coroutineContext) { - CoroutineContext plus = coroutineScope.getCoroutineContext().plus(coroutineContext); - z zVar = j0.a; - if (plus == zVar) { - return plus; - } - int i = d.e; - return plus.get(d.b.a) == null ? plus.plus(zVar) : plus; - } +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +import s.a.a.k; +/* compiled from: CompletionHandler.kt */ +public abstract class x extends k implements Function1 { + public abstract void q(Throwable th); } diff --git a/app/src/main/java/s/a/x0.java b/app/src/main/java/s/a/x0.java index 6069f7ad00..dcd256b78f 100644 --- a/app/src/main/java/s/a/x0.java +++ b/app/src/main/java/s/a/x0.java @@ -1,9 +1,23 @@ package s.a; /* compiled from: JobSupport.kt */ -public final class x0 { - public final w0 a; +public final class x0 implements y0 { + public final l1 i; - public x0(w0 w0Var) { - this.a = w0Var; + public x0(l1 l1Var) { + this.i = l1Var; + } + + @Override // s.a.y0 + public boolean a() { + return false; + } + + @Override // s.a.y0 + public l1 getList() { + return this.i; + } + + public String toString() { + return super.toString(); } } diff --git a/app/src/main/java/s/a/x1.java b/app/src/main/java/s/a/x1.java new file mode 100644 index 0000000000..0ab819ff6f --- /dev/null +++ b/app/src/main/java/s/a/x1.java @@ -0,0 +1,18 @@ +package s.a; + +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: Unconfined.kt */ +public final class x1 extends d0.w.a { + public static final a i = new a(null); + + /* compiled from: Unconfined.kt */ + public static final class a implements CoroutineContext.Key { + public a(DefaultConstructorMarker defaultConstructorMarker) { + } + } + + public x1() { + super(i); + } +} diff --git a/app/src/main/java/s/a/y.java b/app/src/main/java/s/a/y.java index 0e8fc1cf79..26e08e7068 100644 --- a/app/src/main/java/s/a/y.java +++ b/app/src/main/java/s/a/y.java @@ -1,24 +1,46 @@ package s.a; -import d0.z.d.o; +import c.q.a.k.a; +import d0.w.d; import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function1; -/* compiled from: CoroutineDispatcher.kt */ -public final class y extends o implements Function1 { - public static final y i = new y(); +import kotlinx.coroutines.CoroutineDispatcher; +import kotlinx.coroutines.CoroutineScope; +/* compiled from: CoroutineContext.kt */ +public final class y { + public static final boolean a; - public y() { - super(1); + /* JADX WARNING: Code restructure failed: missing block: B:12:0x0028, code lost: + if (r0.equals("on") != false) goto L_0x0033; + */ + /* JADX WARNING: Code restructure failed: missing block: B:14:0x0031, code lost: + if (r0.equals("") != false) goto L_0x0033; + */ + static { + boolean z2; + String W = a.W("kotlinx.coroutines.scheduler"); + if (W != null) { + int hashCode = W.hashCode(); + if (hashCode != 0) { + if (hashCode != 3551) { + if (hashCode == 109935 && W.equals("off")) { + z2 = false; + a = z2; + } + } + } + throw new IllegalStateException(("System property 'kotlinx.coroutines.scheduler' has unrecognized value '" + W + '\'').toString()); + } + z2 = true; + a = z2; } - /* 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 z invoke(CoroutineContext.Element element) { - CoroutineContext.Element element2 = element; - if (!(element2 instanceof z)) { - element2 = null; + public static final CoroutineContext a(CoroutineScope coroutineScope, CoroutineContext coroutineContext) { + CoroutineContext plus = coroutineScope.getCoroutineContext().plus(coroutineContext); + CoroutineDispatcher coroutineDispatcher = j0.a; + if (plus == coroutineDispatcher) { + return plus; } - return (z) element2; + int i = d.e; + return plus.get(d.b.a) == null ? plus.plus(coroutineDispatcher) : plus; } } diff --git a/app/src/main/java/s/a/y0.java b/app/src/main/java/s/a/y0.java index a3ba499a97..ff7070bad7 100644 --- a/app/src/main/java/s/a/y0.java +++ b/app/src/main/java/s/a/y0.java @@ -1,37 +1,7 @@ package s.a; +/* compiled from: JobSupport.kt */ +public interface y0 { + boolean a(); -import c.d.b.a.a; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: CancellableContinuationImpl.kt */ -public final class y0 extends h { - public final Function1 i; - - /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: kotlin.jvm.functions.Function1 */ - /* JADX WARN: Multi-variable type inference failed */ - public y0(Function1 function1) { - this.i = function1; - } - - @Override // s.a.i - public void a(Throwable th) { - this.i.invoke(th); - } - - /* 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 Unit invoke(Throwable th) { - this.i.invoke(th); - return Unit.a; - } - - public String toString() { - StringBuilder L = a.L("InvokeOnCancel["); - L.append(c.q.a.k.a.q(this.i)); - L.append('@'); - L.append(c.q.a.k.a.t(this)); - L.append(']'); - return L.toString(); - } + l1 getList(); } diff --git a/app/src/main/java/s/a/y1/a.java b/app/src/main/java/s/a/y1/a.java index b58895cdfb..d711d75c80 100644 --- a/app/src/main/java/s/a/y1/a.java +++ b/app/src/main/java/s/a/y1/a.java @@ -1,639 +1,142 @@ package s.a.y1; -import c.c.a.y.b; -import d0.c0.c; +import android.os.Handler; +import android.os.Looper; import d0.d0.f; import d0.z.d.m; -import java.io.Closeable; -import java.util.ArrayList; -import java.util.Objects; -import java.util.concurrent.Executor; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import java.util.concurrent.atomic.AtomicReferenceArray; -import java.util.concurrent.locks.LockSupport; -import s.a.a.s; -/* compiled from: CoroutineScheduler.kt */ -public final class a implements Executor, Closeable { - public static final AtomicLongFieldUpdater i = AtomicLongFieldUpdater.newUpdater(a.class, "parkedWorkersStack"); - public static final AtomicLongFieldUpdater j = AtomicLongFieldUpdater.newUpdater(a.class, "controlState"); - public static final AtomicIntegerFieldUpdater k = AtomicIntegerFieldUpdater.newUpdater(a.class, "_isTerminated"); - public static final s l = new s("NOT_IN_STACK"); - public volatile int _isTerminated; - public volatile long controlState; - public final d m; - public final d n; - public final AtomicReferenceArray o; - public final int p; - public volatile long parkedWorkersStack; - public final int q; - public final long r; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.CancellableContinuation; +import s.a.g0; +import s.a.k; +import s.a.k1; +import s.a.l0; +/* compiled from: HandlerDispatcher.kt */ +public final class a extends b implements g0 { + public volatile a _immediate; + public final a i; + public final Handler j; + public final String k; + public final boolean l; - /* renamed from: s reason: collision with root package name */ - public final String f2873s; - - /* compiled from: CoroutineScheduler.kt */ + /* compiled from: HandlerDispatcher.kt */ /* renamed from: s.a.y1.a$a reason: collision with other inner class name */ - public final class C0343a extends Thread { - public static final AtomicIntegerFieldUpdater i = AtomicIntegerFieldUpdater.newUpdater(C0343a.class, "workerCtl"); - public volatile int indexInArray; - public final m j = new m(); - public int k = 4; - public long l; - public long m; - public int n = c.b.nextInt(); - public volatile Object nextParkedWorker = a.l; - public boolean o; - public volatile int workerCtl = 0; + public static final class C0342a implements l0 { + public final /* synthetic */ a i; + public final /* synthetic */ Runnable j; - public C0343a(int i2) { - setDaemon(true); - d(i2); + public C0342a(a aVar, Runnable runnable) { + this.i = aVar; + this.j = runnable; } - /* JADX WARNING: Removed duplicated region for block: B:14:0x0033 */ - /* JADX WARNING: Removed duplicated region for block: B:29:0x006a */ - public final h a(boolean z2) { - boolean z3; - h hVar; - h c2; - h c3; - boolean z4; - boolean z5 = true; - if (this.k != 1) { - a aVar = a.this; - while (true) { - long j = aVar.controlState; - if (((int) ((9223367638808264704L & j) >> 42)) != 0) { - if (a.j.compareAndSet(aVar, j, j - 4398046511104L)) { - z4 = true; - break; - } - } else { - z4 = false; - break; - } - } - if (z4) { - this.k = 1; - } else { - z3 = false; - if (!z3) { - if (z2) { - if (b(a.this.p * 2) != 0) { - z5 = false; - } - if (z5 && (c3 = c()) != null) { - return c3; - } - h e = this.j.e(); - if (e != null) { - return e; - } - if (!z5 && (c2 = c()) != null) { - return c2; - } - } else { - h c4 = c(); - if (c4 != null) { - return c4; - } - } - return f(false); - } - if (z2) { - hVar = this.j.e(); - if (hVar == null) { - hVar = a.this.n.d(); - } - } else { - hVar = a.this.n.d(); - } - return hVar != null ? hVar : f(true); - } - } - z3 = true; - if (!z3) { - } - } - - public final int b(int i2) { - int i3 = this.n; - int i4 = i3 ^ (i3 << 13); - int i5 = i4 ^ (i4 >> 17); - int i6 = i5 ^ (i5 << 5); - this.n = i6; - int i7 = i2 - 1; - return (i7 & i2) == 0 ? i6 & i7 : (i6 & Integer.MAX_VALUE) % i2; - } - - public final h c() { - if (b(2) == 0) { - h d = a.this.m.d(); - return d != null ? d : a.this.n.d(); - } - h d2 = a.this.n.d(); - return d2 != null ? d2 : a.this.m.d(); - } - - public final void d(int i2) { - StringBuilder sb = new StringBuilder(); - sb.append(a.this.f2873s); - sb.append("-worker-"); - sb.append(i2 == 0 ? "TERMINATED" : String.valueOf(i2)); - setName(sb.toString()); - this.indexInArray = i2; - } - - public final boolean e(int i2) { - int i3 = this.k; - boolean z2 = true; - if (i3 != 1) { - z2 = false; - } - if (z2) { - a.j.addAndGet(a.this, 4398046511104L); - } - if (i3 != i2) { - this.k = i2; - } - return z2; - } - - public final h f(boolean z2) { - long j; - int i2 = (int) (a.this.controlState & 2097151); - if (i2 < 2) { - return null; - } - int b = b(i2); - long j2 = Long.MAX_VALUE; - for (int i3 = 0; i3 < i2; i3++) { - b++; - if (b > i2) { - b = 1; - } - C0343a aVar = a.this.o.get(b); - if (aVar != null && aVar != this) { - if (z2) { - m mVar = this.j; - m mVar2 = aVar.j; - Objects.requireNonNull(mVar); - int i4 = mVar2.consumerIndex; - int i5 = mVar2.producerIndex; - AtomicReferenceArray atomicReferenceArray = mVar2.e; - while (true) { - if (i4 == i5) { - break; - } - int i6 = i4 & 127; - if (mVar2.blockingTasksInBuffer == 0) { - break; - } - h hVar = atomicReferenceArray.get(i6); - if (hVar != null) { - if ((hVar.j.s() == 1) && atomicReferenceArray.compareAndSet(i6, hVar, null)) { - m.d.decrementAndGet(mVar2); - mVar.a(hVar, false); - j = -1; - break; - } - } - i4++; - } - j = mVar.g(mVar2, true); - } else { - m mVar3 = this.j; - m mVar4 = aVar.j; - Objects.requireNonNull(mVar3); - h f = mVar4.f(); - if (f != null) { - mVar3.a(f, false); - j = -1; - } else { - j = mVar3.g(mVar4, false); - } - } - if (j == -1) { - return this.j.e(); - } - if (j > 0) { - j2 = Math.min(j2, j); - } - } - } - if (j2 == Long.MAX_VALUE) { - j2 = 0; - } - this.m = j2; - return null; - } - - @Override // java.lang.Thread, java.lang.Runnable - public void run() { - long j; - int i2; - loop0: - while (true) { - boolean z2 = false; - while (a.this._isTerminated == 0 && this.k != 5) { - h a = a(this.o); - if (a == null) { - this.o = false; - if (this.m == 0) { - Object obj = this.nextParkedWorker; - s sVar = a.l; - if (obj != sVar) { - this.workerCtl = -1; - while (true) { - if (!(this.nextParkedWorker != a.l) || a.this._isTerminated != 0 || this.k == 5) { - break; - } - e(3); - Thread.interrupted(); - if (this.l == 0) { - this.l = System.nanoTime() + a.this.r; - } - LockSupport.parkNanos(a.this.r); - if (System.nanoTime() - this.l >= 0) { - this.l = 0; - synchronized (a.this.o) { - if (a.this._isTerminated == 0) { - if (((int) (a.this.controlState & 2097151)) > a.this.p) { - if (i.compareAndSet(this, -1, 1)) { - int i3 = this.indexInArray; - d(0); - a.this.p(this, i3, 0); - int andDecrement = (int) (a.j.getAndDecrement(a.this) & 2097151); - if (andDecrement != i3) { - C0343a aVar = a.this.o.get(andDecrement); - m.checkNotNull(aVar); - C0343a aVar2 = aVar; - a.this.o.set(i3, aVar2); - aVar2.d(i3); - a.this.p(aVar2, andDecrement, i3); - } - a.this.o.set(andDecrement, null); - this.k = 5; - } - } - } - } - } - } - } else { - a aVar3 = a.this; - Objects.requireNonNull(aVar3); - if (this.nextParkedWorker == sVar) { - do { - j = aVar3.parkedWorkersStack; - i2 = this.indexInArray; - this.nextParkedWorker = aVar3.o.get((int) (j & 2097151)); - } while (!a.i.compareAndSet(aVar3, j, ((long) i2) | ((2097152 + j) & -2097152))); - } - } - } else if (!z2) { - z2 = true; - } else { - e(3); - Thread.interrupted(); - LockSupport.parkNanos(this.m); - this.m = 0; - } - } else { - this.m = 0; - int s2 = a.j.s(); - this.l = 0; - if (this.k == 3) { - this.k = 2; - } - if (s2 != 0 && e(2)) { - a.this.s(); - } - a.this.r(a); - if (s2 != 0) { - a.j.addAndGet(a.this, -2097152); - if (this.k != 5) { - this.k = 4; - } - } - } - } - } - e(5); + @Override // s.a.l0 + public void dispose() { + this.i.j.removeCallbacks(this.j); } } - public a(int i2, int i3, long j2, String str) { - this.p = i2; - this.q = i3; - this.r = j2; - this.f2873s = str; - if (i2 >= 1) { - if (i3 >= i2) { - if (i3 <= 2097150) { - if (j2 > 0) { - this.m = new d(); - this.n = new d(); - this.parkedWorkersStack = 0; - this.o = new AtomicReferenceArray<>(i3 + 1); - this.controlState = ((long) i2) << 42; - this._isTerminated = 0; - return; - } - throw new IllegalArgumentException(c.d.b.a.a.r("Idle worker keep alive time ", j2, " must be positive").toString()); - } - throw new IllegalArgumentException(c.d.b.a.a.n("Max pool size ", i3, " should not exceed maximal supported number of threads 2097150").toString()); - } - throw new IllegalArgumentException(c.d.b.a.a.o("Max pool size ", i3, " should be greater than or equals to core pool size ", i2).toString()); - } - throw new IllegalArgumentException(c.d.b.a.a.n("Core pool size ", i2, " should be at least 1").toString()); - } + /* compiled from: Runnable.kt */ + public static final class b implements Runnable { + public final /* synthetic */ a i; + public final /* synthetic */ CancellableContinuation j; - public static /* synthetic */ void e(a aVar, Runnable runnable, i iVar, boolean z2, int i2) { - g gVar = (i2 & 2) != 0 ? g.i : null; - if ((i2 & 4) != 0) { - z2 = false; + public b(a aVar, CancellableContinuation cancellableContinuation) { + this.i = aVar; + this.j = cancellableContinuation; } - aVar.d(runnable, gVar, z2); - } - public final int a() { - synchronized (this.o) { - if (this._isTerminated != 0) { - return -1; - } - long j2 = this.controlState; - int i2 = (int) (j2 & 2097151); - boolean z2 = false; - int coerceAtLeast = f.coerceAtLeast(i2 - ((int) ((j2 & 4398044413952L) >> 21)), 0); - if (coerceAtLeast >= this.p) { - return 0; - } - if (i2 >= this.q) { - return 0; - } - int i3 = ((int) (this.controlState & 2097151)) + 1; - if (i3 > 0 && this.o.get(i3) == null) { - C0343a aVar = new C0343a(i3); - this.o.set(i3, aVar); - if (i3 == ((int) (2097151 & j.incrementAndGet(this)))) { - z2 = true; - } - if (z2) { - aVar.start(); - return coerceAtLeast + 1; - } - throw new IllegalArgumentException("Failed requirement.".toString()); - } - throw new IllegalArgumentException("Failed requirement.".toString()); + @Override // java.lang.Runnable + public final void run() { + this.j.i(this.i, Unit.a); } } - public final h b(Runnable runnable, i iVar) { - long a = k.e.a(); - if (!(runnable instanceof h)) { - return new j(runnable, a, iVar); - } - h hVar = (h) runnable; - hVar.i = a; - hVar.j = iVar; - return hVar; - } + /* compiled from: HandlerDispatcher.kt */ + public static final class c extends o implements Function1 { + public final /* synthetic */ Runnable $block; + public final /* synthetic */ a this$0; - public final C0343a c() { - Thread currentThread = Thread.currentThread(); - if (!(currentThread instanceof C0343a)) { - currentThread = null; + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public c(a aVar, Runnable runnable) { + super(1); + this.this$0 = aVar; + this.$block = runnable; } - C0343a aVar = (C0343a) currentThread; - if (aVar == null || !m.areEqual(a.this, this)) { - return null; - } - return aVar; - } - /* JADX WARNING: Code restructure failed: missing block: B:28:0x0073, code lost: - if (r1 != null) goto L_0x007e; - */ - @Override // java.io.Closeable, java.lang.AutoCloseable - public void close() { - int i2; - h hVar; - boolean z2; - if (k.compareAndSet(this, 0, 1)) { - C0343a c2 = c(); - synchronized (this.o) { - i2 = (int) (this.controlState & 2097151); - } - if (1 <= i2) { - int i3 = 1; - while (true) { - C0343a aVar = this.o.get(i3); - m.checkNotNull(aVar); - C0343a aVar2 = aVar; - if (aVar2 != c2) { - while (aVar2.isAlive()) { - LockSupport.unpark(aVar2); - aVar2.join(10000); - } - m mVar = aVar2.j; - d dVar = this.n; - Objects.requireNonNull(mVar); - h hVar2 = (h) m.a.getAndSet(mVar, null); - if (hVar2 != null) { - dVar.a(hVar2); - } - do { - h f = mVar.f(); - if (f != null) { - dVar.a(f); - z2 = true; - continue; - } else { - z2 = false; - continue; - } - } while (z2); - } - if (i3 == i2) { - break; - } - i3++; - } - } - this.n.b(); - this.m.b(); - while (true) { - if (c2 != null) { - hVar = c2.a(true); - } - hVar = this.m.d(); - if (hVar == null) { - hVar = this.n.d(); - } - if (hVar == null) { - break; - } - r(hVar); - } - if (c2 != null) { - c2.e(5); - } - this.parkedWorkersStack = 0; - this.controlState = 0; + /* 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 Unit invoke(Throwable th) { + this.this$0.j.removeCallbacks(this.$block); + return Unit.a; } } - public final void d(Runnable runnable, i iVar, boolean z2) { - h hVar; - h b = b(runnable, iVar); - C0343a c2 = c(); - boolean z3 = true; - if (c2 == null || c2.k == 5 || (b.j.s() == 0 && c2.k == 2)) { - hVar = b; - } else { - c2.o = true; - hVar = c2.j.a(b, z2); - } - if (hVar != null) { - if (!(hVar.j.s() == 1 ? this.n.a(hVar) : this.m.a(hVar))) { - throw new RejectedExecutionException(c.d.b.a.a.D(new StringBuilder(), this.f2873s, " was terminated")); - } - } - if (!z2 || c2 == null) { - z3 = false; - } - if (b.j.s() != 0) { - long addAndGet = j.addAndGet(this, 2097152); - if (!z3 && !w() && !t(addAndGet)) { - w(); - } - } else if (!z3) { - s(); + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public a(Handler handler, String str, boolean z2) { + super(null); + a aVar = null; + this.j = handler; + this.k = str; + this.l = z2; + this._immediate = z2 ? this : aVar; + a aVar2 = this._immediate; + if (aVar2 == null) { + aVar2 = new a(handler, str, true); + this._immediate = aVar2; } + this.i = aVar2; } - @Override // java.util.concurrent.Executor - public void execute(Runnable runnable) { - e(this, runnable, null, false, 6); + @Override // s.a.k1 + public k1 H() { + return this.i; } - public final int f(C0343a aVar) { - Object obj = aVar.nextParkedWorker; - while (obj != l) { - if (obj == null) { - return 0; - } - C0343a aVar2 = (C0343a) obj; - int i2 = aVar2.indexInArray; - if (i2 != 0) { - return i2; - } - obj = aVar2.nextParkedWorker; - } - return -1; + @Override // s.a.g0 + public void b(long j, CancellableContinuation cancellableContinuation) { + b bVar = new b(this, cancellableContinuation); + this.j.postDelayed(bVar, f.coerceAtMost(j, 4611686018427387903L)); + ((k) cancellableContinuation).e(new c(this, bVar)); } - public final void p(C0343a aVar, int i2, int i3) { - while (true) { - long j2 = this.parkedWorkersStack; - int i4 = (int) (2097151 & j2); - long j3 = (2097152 + j2) & -2097152; - if (i4 == i2) { - i4 = i3 == 0 ? f(aVar) : i3; - } - if (i4 >= 0 && i.compareAndSet(this, j2, j3 | ((long) i4))) { - return; - } - } + @Override // kotlinx.coroutines.CoroutineDispatcher + public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { + this.j.post(runnable); } - public final void r(h hVar) { - try { - hVar.run(); - } catch (Throwable th) { - Thread currentThread = Thread.currentThread(); - currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, th); - } + public boolean equals(Object obj) { + return (obj instanceof a) && ((a) obj).j == this.j; } - public final void s() { - if (!w() && !t(this.controlState)) { - w(); - } + public int hashCode() { + return System.identityHashCode(this.j); } - public final boolean t(long j2) { - if (f.coerceAtLeast(((int) (2097151 & j2)) - ((int) ((j2 & 4398044413952L) >> 21)), 0) < this.p) { - int a = a(); - if (a == 1 && this.p > 1) { - a(); - } - if (a > 0) { - return true; - } - } - return false; + @Override // kotlinx.coroutines.CoroutineDispatcher + public boolean isDispatchNeeded(CoroutineContext coroutineContext) { + return !this.l || (m.areEqual(Looper.myLooper(), this.j.getLooper()) ^ true); } - @Override // java.lang.Object + @Override // s.a.k1, kotlinx.coroutines.CoroutineDispatcher, java.lang.Object public String toString() { - ArrayList arrayList = new ArrayList(); - int length = this.o.length(); - int i2 = 0; - int i3 = 0; - int i4 = 0; - int i5 = 0; - int i6 = 0; - for (int i7 = 1; i7 < length; i7++) { - C0343a aVar = this.o.get(i7); - if (aVar != null) { - int d = aVar.j.d(); - int h = b.h(aVar.k); - if (h == 0) { - i2++; - arrayList.add(String.valueOf(d) + "c"); - } else if (h == 1) { - i3++; - arrayList.add(String.valueOf(d) + "b"); - } else if (h == 2) { - i4++; - } else if (h == 3) { - i5++; - if (d > 0) { - arrayList.add(String.valueOf(d) + "d"); - } - } else if (h == 4) { - i6++; - } - } + String I = I(); + if (I != null) { + return I; } - long j2 = this.controlState; - return this.f2873s + '@' + c.q.a.k.a.t(this) + "[Pool Size {core = " + this.p + ", max = " + this.q + "}, Worker States {CPU = " + i2 + ", blocking = " + i3 + ", parked = " + i4 + ", dormant = " + i5 + ", terminated = " + i6 + "}, running workers queues = " + arrayList + ", global CPU queue size = " + this.m.c() + ", global blocking queue size = " + this.n.c() + ", Control State {created workers= " + ((int) (2097151 & j2)) + ", blocking tasks = " + ((int) ((4398044413952L & j2) >> 21)) + ", CPUs acquired = " + (this.p - ((int) ((9223367638808264704L & j2) >> 42))) + "}]"; + String str = this.k; + if (str == null) { + str = this.j.toString(); + } + return this.l ? c.d.b.a.a.u(str, ".immediate") : str; } - public final boolean w() { - while (true) { - long j2 = this.parkedWorkersStack; - C0343a aVar = this.o.get((int) (2097151 & j2)); - if (aVar != null) { - long j3 = (2097152 + j2) & -2097152; - int f = f(aVar); - if (f >= 0 && i.compareAndSet(this, j2, ((long) f) | j3)) { - aVar.nextParkedWorker = l; - } - } else { - aVar = null; - } - if (aVar == null) { - return false; - } - if (C0343a.i.compareAndSet(aVar, -1, 0)) { - LockSupport.unpark(aVar); - return true; - } - } + @Override // s.a.y1.b, s.a.g0 + public l0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { + this.j.postDelayed(runnable, f.coerceAtMost(j, 4611686018427387903L)); + return new C0342a(this, runnable); } } diff --git a/app/src/main/java/s/a/y1/b.java b/app/src/main/java/s/a/y1/b.java index 5e4a12ea32..77e0614128 100644 --- a/app/src/main/java/s/a/y1/b.java +++ b/app/src/main/java/s/a/y1/b.java @@ -1,31 +1,21 @@ package s.a.y1; import c.q.a.k.a; -import d0.d0.f; -import s.a.a.t; -import s.a.z; -/* compiled from: Dispatcher.kt */ -public final class b extends c { - public static final z n; - public static final b o; - - static { - b bVar = new b(); - o = bVar; - n = new e(bVar, a.W("kotlinx.coroutines.io.parallelism", f.coerceAtLeast(64, t.a), 0, 0, 12, null), "Dispatchers.IO", 1); - } - +import kotlin.coroutines.CoroutineContext; +import kotlin.jvm.internal.DefaultConstructorMarker; +import s.a.g0; +import s.a.k1; +import s.a.l0; +/* compiled from: HandlerDispatcher.kt */ +public abstract class b extends k1 implements g0 { public b() { - super(0, 0, null, 7); } - @Override // java.io.Closeable, java.lang.AutoCloseable - public void close() { - throw new UnsupportedOperationException("Dispatchers.Default cannot be closed"); + public b(DefaultConstructorMarker defaultConstructorMarker) { } - @Override // s.a.z - public String toString() { - return "Dispatchers.Default"; + @Override // s.a.g0 + public l0 w(long j, Runnable runnable, CoroutineContext coroutineContext) { + return a.z(j, runnable, coroutineContext); } } diff --git a/app/src/main/java/s/a/y1/c.java b/app/src/main/java/s/a/y1/c.java index f7d91046a1..e77138a38d 100644 --- a/app/src/main/java/s/a/y1/c.java +++ b/app/src/main/java/s/a/y1/c.java @@ -1,44 +1,43 @@ package s.a.y1; -import java.util.concurrent.RejectedExecutionException; -import kotlin.coroutines.CoroutineContext; -import s.a.c0; -import s.a.t0; -/* compiled from: Dispatcher.kt */ -public class c extends t0 { - public a i; - public final int j; - public final int k; - public final long l; - public final String m; - - public c(int i, int i2, String str, int i3) { - i = (i3 & 1) != 0 ? k.b : i; - i2 = (i3 & 2) != 0 ? k.f2874c : i2; - String str2 = (i3 & 4) != 0 ? "DefaultDispatcher" : null; - long j = k.d; - this.j = i; - this.k = i2; - this.l = j; - this.m = str2; - this.i = new a(i, i2, j, str2); - } - - @Override // s.a.z - public void dispatch(CoroutineContext coroutineContext, Runnable runnable) { +import android.os.Build; +import android.os.Handler; +import android.os.Looper; +import androidx.annotation.VisibleForTesting; +import d0.k; +import d0.l; +import java.util.Objects; +/* compiled from: HandlerDispatcher.kt */ +public final class c { + static { + Object obj; + b bVar = null; try { - a.e(this.i, runnable, null, false, 6); - } catch (RejectedExecutionException unused) { - c0.o.S(runnable); + k.a aVar = k.i; + obj = k.m78constructorimpl(new a(a(Looper.getMainLooper(), true), null, false)); + } catch (Throwable th) { + k.a aVar2 = k.i; + obj = k.m78constructorimpl(l.createFailure(th)); + } + if (!k.m82isFailureimpl(obj)) { + bVar = obj; } } - @Override // s.a.z - public void dispatchYield(CoroutineContext coroutineContext, Runnable runnable) { + @VisibleForTesting + public static final Handler a(Looper looper, boolean z2) { + if (!z2) { + return new Handler(looper); + } + if (Build.VERSION.SDK_INT >= 28) { + Object invoke = Handler.class.getDeclaredMethod("createAsync", Looper.class).invoke(null, looper); + Objects.requireNonNull(invoke, "null cannot be cast to non-null type android.os.Handler"); + return (Handler) invoke; + } try { - a.e(this.i, runnable, null, true, 2); - } catch (RejectedExecutionException unused) { - c0.o.dispatchYield(coroutineContext, runnable); + return (Handler) Handler.class.getDeclaredConstructor(Looper.class, Handler.Callback.class, Boolean.TYPE).newInstance(looper, null, Boolean.TRUE); + } catch (NoSuchMethodException unused) { + return new Handler(looper); } } } diff --git a/app/src/main/java/s/a/y1/k.java b/app/src/main/java/s/a/y1/k.java deleted file mode 100644 index 84582d93ee..0000000000 --- a/app/src/main/java/s/a/y1/k.java +++ /dev/null @@ -1,24 +0,0 @@ -package s.a.y1; - -import c.q.a.k.a; -import d0.d0.f; -import java.util.concurrent.TimeUnit; -import s.a.a.t; -/* compiled from: Tasks.kt */ -public final class k { - public static final long a = a.X("kotlinx.coroutines.scheduler.resolution.ns", 100000, 0, 0, 12, null); - public static final int b; - - /* renamed from: c reason: collision with root package name */ - public static final int f2874c; - public static final long d = TimeUnit.SECONDS.toNanos(a.X("kotlinx.coroutines.scheduler.keep.alive.sec", 60, 0, 0, 12, null)); - public static l e = f.a; - - static { - a.W("kotlinx.coroutines.scheduler.blocking.parallelism", 16, 0, 0, 12, null); - int i = t.a; - int W = a.W("kotlinx.coroutines.scheduler.core.pool.size", f.coerceAtLeast(i, 2), 1, 0, 8, null); - b = W; - f2874c = a.W("kotlinx.coroutines.scheduler.max.pool.size", f.coerceIn(i * 128, W, 2097150), 0, 2097150, 4, null); - } -} diff --git a/app/src/main/java/s/a/z.java b/app/src/main/java/s/a/z.java index 71fd37c0e4..82b9de47d0 100644 --- a/app/src/main/java/s/a/z.java +++ b/app/src/main/java/s/a/z.java @@ -1,72 +1,25 @@ package s.a; -import d0.w.b; -import d0.w.d; -import java.util.Objects; -import kotlin.coroutines.Continuation; +import d0.z.d.o; import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.internal.DefaultConstructorMarker; -import s.a.a.f; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.CoroutineDispatcher; /* compiled from: CoroutineDispatcher.kt */ -public abstract class z extends d0.w.a implements d { - public static final a Key = new a(null); - - /* compiled from: CoroutineDispatcher.kt */ - public static final class a extends b { - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public a(DefaultConstructorMarker defaultConstructorMarker) { - super(d.b.a, y.i); - int i = d.e; - } - } +public final class z extends o implements Function1 { + public static final z i = new z(); public z() { - super(d.b.a); + super(1); } - public abstract void dispatch(CoroutineContext coroutineContext, Runnable runnable); - - public void dispatchYield(CoroutineContext coroutineContext, Runnable runnable) { - dispatch(coroutineContext, runnable); - } - - @Override // d0.w.a, kotlin.coroutines.CoroutineContext.Element, kotlin.coroutines.CoroutineContext - public E get(CoroutineContext.Key key) { - return (E) d.a.get(this, key); - } - - @Override // d0.w.d - public final Continuation interceptContinuation(Continuation continuation) { - return new f(this, continuation); - } - - public boolean isDispatchNeeded(CoroutineContext coroutineContext) { - return true; - } - - @Override // d0.w.a, kotlin.coroutines.CoroutineContext - public CoroutineContext minusKey(CoroutineContext.Key key) { - return d.a.minusKey(this, key); - } - - public final z plus(z zVar) { - return zVar; - } - - @Override // d0.w.d - public void releaseInterceptedContinuation(Continuation continuation) { - Objects.requireNonNull(continuation, "null cannot be cast to non-null type kotlinx.coroutines.internal.DispatchedContinuation<*>"); - Object obj = ((f) continuation)._reusableCancellableContinuation; - if (!(obj instanceof j)) { - obj = null; + /* 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 CoroutineDispatcher invoke(CoroutineContext.Element element) { + CoroutineContext.Element element2 = element; + if (!(element2 instanceof CoroutineDispatcher)) { + element2 = null; } - j jVar = (j) obj; - if (jVar != null) { - jVar.r(); - } - } - - public String toString() { - return getClass().getSimpleName() + '@' + c.q.a.k.a.t(this); + return (CoroutineDispatcher) element2; } } diff --git a/app/src/main/java/s/a/z0.java b/app/src/main/java/s/a/z0.java index 0e1c67e4e7..f334483985 100644 --- a/app/src/main/java/s/a/z0.java +++ b/app/src/main/java/s/a/z0.java @@ -1,45 +1,9 @@ package s.a; - -import c.d.b.a.a; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -import kotlinx.coroutines.Job; /* compiled from: JobSupport.kt */ -public final class z0 extends b1 { - public static final AtomicIntegerFieldUpdater m = AtomicIntegerFieldUpdater.newUpdater(z0.class, "_invoked"); - public volatile int _invoked = 0; - public final Function1 n; +public final class z0 { + public final y0 a; - /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ - /* JADX WARN: Multi-variable type inference failed */ - public z0(Job job, Function1 function1) { - super(job); - this.n = function1; - } - - /* 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(Throwable th) { - q(th); - return Unit.a; - } - - @Override // s.a.w - public void q(Throwable th) { - if (m.compareAndSet(this, 0, 1)) { - this.n.invoke(th); - } - } - - @Override // s.a.a.j - public String toString() { - StringBuilder L = a.L("InvokeOnCancelling["); - L.append(z0.class.getSimpleName()); - L.append('@'); - L.append(c.q.a.k.a.t(this)); - L.append(']'); - return L.toString(); + public z0(y0 y0Var) { + this.a = y0Var; } } diff --git a/app/src/main/java/s/a/w1/a.java b/app/src/main/java/s/a/z1/a.java similarity index 68% rename from app/src/main/java/s/a/w1/a.java rename to app/src/main/java/s/a/z1/a.java index 2ddd552a99..095ba6fa49 100644 --- a/app/src/main/java/s/a/w1/a.java +++ b/app/src/main/java/s/a/z1/a.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; import d0.k; import java.util.Objects; @@ -6,42 +6,43 @@ import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function1; import kotlinx.coroutines.CancellableContinuation; -import s.a.a.f; import s.a.a.g; import s.a.a.h; import s.a.a.i; import s.a.a.j; -import s.a.a.n; -import s.a.a.r; +import s.a.a.k; +import s.a.a.o; import s.a.a.s; +import s.a.a.t; import s.a.e; -import s.a.j; -import s.a.t; +import s.a.k; +import s.a.l; +import s.a.u; /* compiled from: AbstractChannel.kt */ public abstract class a extends c implements d { /* compiled from: AbstractChannel.kt */ - /* renamed from: s.a.w1.a$a reason: collision with other inner class name */ - public static final class C0340a implements e { + /* renamed from: s.a.z1.a$a reason: collision with other inner class name */ + public static final class C0343a implements e { public Object a = b.d; public final a b; - public C0340a(a aVar) { + public C0343a(a aVar) { this.b = aVar; } /* JADX WARNING: Code restructure failed: missing block: B:39:0x007f, code lost: if (r1 != null) goto L_0x0041; */ - @Override // s.a.w1.e + @Override // s.a.z1.e public Object a(Continuation continuation) { - j jVar; - j jVar2; + k kVar; + k kVar2; boolean z2; Object obj = this.a; - s sVar = b.d; + t tVar = b.d; boolean z3 = false; - if (obj != sVar) { + if (obj != tVar) { if (obj instanceof f) { Objects.requireNonNull((f) obj); } else { @@ -51,7 +52,7 @@ public abstract class a extends c implements d { } Object i = this.b.i(); this.a = i; - if (i != sVar) { + if (i != tVar) { if (i instanceof f) { Objects.requireNonNull((f) i); } else { @@ -60,46 +61,46 @@ public abstract class a extends c implements d { return d0.w.h.a.b.boxBoolean(z3); } Continuation intercepted = d0.w.g.b.intercepted(continuation); - n nVar = null; - if (!(intercepted instanceof f)) { - jVar2 = new j(intercepted, 2); + o oVar = null; + if (!(intercepted instanceof g)) { + kVar2 = new k(intercepted, 2); } else { - f fVar = (f) intercepted; + g gVar = (g) intercepted; while (true) { - Object obj2 = fVar._reusableCancellableContinuation; + Object obj2 = gVar._reusableCancellableContinuation; if (obj2 == null) { - fVar._reusableCancellableContinuation = g.b; - jVar = null; + gVar._reusableCancellableContinuation = h.b; + kVar = null; break; - } else if (obj2 instanceof j) { - if (f.l.compareAndSet(fVar, obj2, g.b)) { - jVar = (j) obj2; + } else if (obj2 instanceof k) { + if (g.l.compareAndSet(gVar, obj2, h.b)) { + kVar = (k) obj2; break; } } else { throw new IllegalStateException(c.d.b.a.a.t("Inconsistent state ", obj2).toString()); } } - if (jVar != null) { - Object obj3 = jVar._state; - if (!(obj3 instanceof t) || ((t) obj3).d == null) { - jVar._decision = 0; - jVar._state = s.a.c.i; + if (kVar != null) { + Object obj3 = kVar._state; + if (!(obj3 instanceof u) || ((u) obj3).d == null) { + kVar._decision = 0; + kVar._state = s.a.c.i; z2 = true; } else { - jVar.r(); + kVar.r(); z2 = false; } - jVar2 = z2 ? jVar : null; + kVar2 = z2 ? kVar : null; } - jVar2 = new j(intercepted, 2); + kVar2 = new k(intercepted, 2); } - b bVar = new b(this, jVar2); + b bVar = new b(this, kVar2); while (true) { if (this.b.f(bVar)) { a aVar = this.b; Objects.requireNonNull(aVar); - jVar2.e(new c(bVar)); + kVar2.e(new c(bVar)); break; } Object i2 = this.b.i(); @@ -107,72 +108,72 @@ public abstract class a extends c implements d { if (i2 instanceof f) { Objects.requireNonNull((f) i2); Boolean boxBoolean = d0.w.h.a.b.boxBoolean(false); - k.a aVar2 = k.i; - jVar2.resumeWith(k.m78constructorimpl(boxBoolean)); + k.a aVar2 = d0.k.i; + kVar2.resumeWith(d0.k.m78constructorimpl(boxBoolean)); break; } else if (i2 != b.d) { Boolean boxBoolean2 = d0.w.h.a.b.boxBoolean(true); Function1 function1 = this.b.b; if (function1 != null) { - nVar = new n(function1, i2, jVar2.n); + oVar = new o(function1, i2, kVar2.n); } - jVar2.y(boxBoolean2, jVar2.k, nVar); + kVar2.y(boxBoolean2, kVar2.k, oVar); } } - Object u = jVar2.u(); + Object u = kVar2.u(); if (u == d0.w.g.c.getCOROUTINE_SUSPENDED()) { d0.w.h.a.g.probeCoroutineSuspended(continuation); } return u; } - @Override // s.a.w1.e + @Override // s.a.z1.e public E next() { E e = (E) this.a; if (!(e instanceof f)) { - s sVar = b.d; - if (e != sVar) { - this.a = sVar; + t tVar = b.d; + if (e != tVar) { + this.a = tVar; return e; } throw new IllegalStateException("'hasNext' should be called prior to 'next' invocation"); } Throwable q = e.q(); - String str = r.a; + String str = s.a; throw q; } } /* compiled from: AbstractChannel.kt */ public static class b extends h { - public final C0340a l; + public final C0343a l; public final CancellableContinuation m; /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlinx.coroutines.CancellableContinuation */ /* JADX WARN: Multi-variable type inference failed */ - public b(C0340a aVar, CancellableContinuation cancellableContinuation) { + public b(C0343a aVar, CancellableContinuation cancellableContinuation) { this.l = aVar; this.m = cancellableContinuation; } - @Override // s.a.w1.j + @Override // s.a.z1.j public void c(E e) { this.l.a = e; - this.m.k(s.a.k.a); + this.m.k(l.a); } - @Override // s.a.w1.j - public s d(E e, j.b bVar) { + @Override // s.a.z1.j + public t d(E e, k.b bVar) { CancellableContinuation cancellableContinuation = this.m; Boolean bool = Boolean.TRUE; Function1 function1 = this.l.b.b; - if (cancellableContinuation.h(bool, null, function1 != null ? new n(function1, e, cancellableContinuation.getContext()) : null) != null) { - return s.a.k.a; + if (cancellableContinuation.h(bool, null, function1 != null ? new o(function1, e, cancellableContinuation.getContext()) : null) != null) { + return l.a; } return null; } - @Override // s.a.w1.h + @Override // s.a.z1.h public void q(f fVar) { Object b = this.m.b(Boolean.FALSE, null); if (b != null) { @@ -181,10 +182,10 @@ public abstract class a extends c implements d { } } - @Override // s.a.a.j + @Override // s.a.a.k public String toString() { StringBuilder L = c.d.b.a.a.L("ReceiveHasNext@"); - L.append(c.q.a.k.a.t(this)); + L.append(c.q.a.k.a.u(this)); return L.toString(); } } @@ -197,7 +198,7 @@ public abstract class a extends c implements d { this.i = hVar; } - @Override // s.a.i + @Override // s.a.j public void a(Throwable th) { if (this.i.n()) { Objects.requireNonNull(a.this); @@ -223,22 +224,22 @@ public abstract class a extends c implements d { } /* compiled from: LockFreeLinkedList.kt */ - public static final class d extends j.a { + public static final class d extends k.a { public final /* synthetic */ a d; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public d(s.a.a.j jVar, s.a.a.j jVar2, a aVar) { - super(jVar2); + public d(s.a.a.k kVar, s.a.a.k kVar2, a aVar) { + super(kVar2); this.d = aVar; } /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // s.a.a.d - public Object c(s.a.a.j jVar) { + public Object c(s.a.a.k kVar) { if (this.d.h()) { return null; } - return i.a; + return j.a; } } @@ -248,27 +249,27 @@ public abstract class a extends c implements d { public boolean f(h hVar) { int p; - s.a.a.j k; + s.a.a.k k; if (!g()) { - s.a.a.j jVar = this.a; + s.a.a.k kVar = this.a; d dVar = new d(hVar, hVar, this); do { - s.a.a.j k2 = jVar.k(); + s.a.a.k k2 = kVar.k(); if (!(!(k2 instanceof k))) { break; } - p = k2.p(hVar, jVar, dVar); + p = k2.p(hVar, kVar, dVar); if (p == 1) { return true; } } while (p != 2); } else { - s.a.a.j jVar2 = this.a; + s.a.a.k kVar2 = this.a; do { - k = jVar2.k(); + k = kVar2.k(); if (!(!(k instanceof k))) { } - } while (!k.e(hVar, jVar2)); + } while (!k.e(hVar, kVar2)); return true; } return false; @@ -280,31 +281,31 @@ public abstract class a extends c implements d { public abstract Object i(); - @Override // s.a.w1.i + @Override // s.a.z1.i public final e iterator() { - return new C0340a(this); + return new C0343a(this); } public j j() { - s.a.a.j jVar; - s.a.a.j o; - h hVar = this.a; + s.a.a.k kVar; + s.a.a.k o; + i iVar = this.a; while (true) { - Object i = hVar.i(); + Object i = iVar.i(); Objects.requireNonNull(i, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); - jVar = (s.a.a.j) i; - if (jVar != hVar && (jVar instanceof j)) { - if (((((j) jVar) instanceof f) && !jVar.m()) || (o = jVar.o()) == null) { + kVar = (s.a.a.k) i; + if (kVar != iVar && (kVar instanceof j)) { + if (((((j) kVar) instanceof f) && !kVar.m()) || (o = kVar.o()) == null) { break; } o.l(); } } - jVar = null; - j jVar2 = (j) jVar; - if (jVar2 != null) { - boolean z2 = jVar2 instanceof f; + kVar = null; + j jVar = (j) kVar; + if (jVar != null) { + boolean z2 = jVar instanceof f; } - return jVar2; + return jVar; } } diff --git a/app/src/main/java/s/a/z1/b.java b/app/src/main/java/s/a/z1/b.java new file mode 100644 index 0000000000..8e2d8770f6 --- /dev/null +++ b/app/src/main/java/s/a/z1/b.java @@ -0,0 +1,12 @@ +package s.a.z1; + +import s.a.a.t; +/* compiled from: AbstractChannel.kt */ +public final class b { + public static final t a = new t("EMPTY"); + public static final t b = new t("OFFER_SUCCESS"); + + /* renamed from: c reason: collision with root package name */ + public static final t f2874c = new t("OFFER_FAILED"); + public static final t d = new t("POLL_FAILED"); +} diff --git a/app/src/main/java/s/a/w1/c.java b/app/src/main/java/s/a/z1/c.java similarity index 89% rename from app/src/main/java/s/a/w1/c.java rename to app/src/main/java/s/a/z1/c.java index e9db112f4e..db75546e2d 100644 --- a/app/src/main/java/s/a/w1/c.java +++ b/app/src/main/java/s/a/z1/c.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; import c.q.a.k.a; import d0.b; @@ -9,13 +9,13 @@ import kotlin.Unit; import kotlin.jvm.functions.Function1; import kotlinx.coroutines.channels.ClosedSendChannelException; import kotlinx.coroutines.internal.UndeliveredElementException; -import s.a.a.h; -import s.a.a.j; -import s.a.a.p; -import s.a.a.r; +import s.a.a.i; +import s.a.a.k; +import s.a.a.q; +import s.a.a.s; /* compiled from: AbstractChannel.kt */ public abstract class c implements l { - public final h a = new h(); + public final i a = new i(); public final Function1 b; public volatile Object onCloseHandler = null; @@ -28,7 +28,7 @@ public abstract class c implements l { public abstract String a(); public final f b() { - j k = this.a.k(); + k k = this.a.k(); if (!(k instanceof f)) { k = null; } @@ -46,7 +46,7 @@ public abstract class c implements l { public final void c(f fVar) { h hVar = null; while (true) { - j k = fVar.k(); + k k = fVar.k(); if (!(k instanceof h)) { k = null; } @@ -56,7 +56,7 @@ public abstract class c implements l { } else if (!hVar2.n()) { Object i = hVar2.i(); Objects.requireNonNull(i, "null cannot be cast to non-null type kotlinx.coroutines.internal.Removed"); - ((p) i).a.f(null); + ((q) i).a.f(null); } else if (hVar == null) { hVar = hVar2; } else if (hVar instanceof ArrayList) { @@ -93,23 +93,23 @@ public abstract class c implements l { public abstract Object e(E e); - @Override // s.a.w1.l + @Override // s.a.z1.l public final boolean offer(E e) { Object e2 = e(e); if (e2 == b.b) { return true; } - if (e2 == b.f2871c) { + if (e2 == b.f2874c) { f b = b(); if (b == null) { return false; } Throwable d = d(e, b); - String str = r.a; + String str = s.a; throw d; } else if (e2 instanceof f) { Throwable d2 = d(e, (f) e2); - String str2 = r.a; + String str2 = s.a; throw d2; } else { throw new IllegalStateException(c.d.b.a.a.t("offerInternal returned ", e2).toString()); @@ -122,9 +122,9 @@ public abstract class c implements l { StringBuilder sb = new StringBuilder(); sb.append(getClass().getSimpleName()); sb.append('@'); - sb.append(a.t(this)); + sb.append(a.u(this)); sb.append('{'); - j j = this.a.j(); + k j = this.a.j(); if (j == this.a) { str = "EmptyQueue"; } else { @@ -137,14 +137,14 @@ public abstract class c implements l { } else { str2 = "UNEXPECTED:" + j; } - j k = this.a.k(); + k k = this.a.k(); if (k != j) { StringBuilder P = c.d.b.a.a.P(str2, ",queueSize="); - h hVar = this.a; - Object i = hVar.i(); + i iVar = this.a; + Object i = iVar.i(); Objects.requireNonNull(i, "null cannot be cast to non-null type kotlinx.coroutines.internal.Node /* = kotlinx.coroutines.internal.LockFreeLinkedListNode */"); int i2 = 0; - for (j jVar = (j) i; !m.areEqual(jVar, hVar); jVar = jVar.j()) { + for (k kVar = (k) i; !m.areEqual(kVar, iVar); kVar = kVar.j()) { i2++; } P.append(i2); diff --git a/app/src/main/java/s/a/w1/d.java b/app/src/main/java/s/a/z1/d.java similarity index 82% rename from app/src/main/java/s/a/w1/d.java rename to app/src/main/java/s/a/z1/d.java index 1166e81617..ab55b28d01 100644 --- a/app/src/main/java/s/a/w1/d.java +++ b/app/src/main/java/s/a/z1/d.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; /* compiled from: Channel.kt */ public interface d extends l, i { } diff --git a/app/src/main/java/s/a/w1/e.java b/app/src/main/java/s/a/z1/e.java similarity index 91% rename from app/src/main/java/s/a/w1/e.java rename to app/src/main/java/s/a/z1/e.java index d79c9446aa..decd0a650b 100644 --- a/app/src/main/java/s/a/w1/e.java +++ b/app/src/main/java/s/a/z1/e.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; import kotlin.coroutines.Continuation; /* compiled from: Channel.kt */ diff --git a/app/src/main/java/s/a/w1/f.java b/app/src/main/java/s/a/z1/f.java similarity index 69% rename from app/src/main/java/s/a/w1/f.java rename to app/src/main/java/s/a/z1/f.java index d4df4c2975..be1bffd104 100644 --- a/app/src/main/java/s/a/w1/f.java +++ b/app/src/main/java/s/a/z1/f.java @@ -1,34 +1,34 @@ -package s.a.w1; +package s.a.z1; import c.d.b.a.a; import kotlinx.coroutines.channels.ClosedReceiveChannelException; -import s.a.a.j; -import s.a.a.s; -import s.a.k; +import s.a.a.k; +import s.a.a.t; +import s.a.l; /* compiled from: AbstractChannel.kt */ public final class f extends k implements j { - @Override // s.a.w1.j + @Override // s.a.z1.j public Object b() { return this; } - @Override // s.a.w1.j + @Override // s.a.z1.j public void c(E e) { } - @Override // s.a.w1.j - public s d(E e, j.b bVar) { - return k.a; + @Override // s.a.z1.j + public t d(E e, k.b bVar) { + return l.a; } public final Throwable q() { return new ClosedReceiveChannelException("Channel was closed"); } - @Override // s.a.a.j + @Override // s.a.a.k public String toString() { StringBuilder L = a.L("Closed@"); - L.append(c.q.a.k.a.t(this)); + L.append(c.q.a.k.a.u(this)); L.append('['); L.append((Object) null); L.append(']'); diff --git a/app/src/main/java/s/a/w1/g.java b/app/src/main/java/s/a/z1/g.java similarity index 83% rename from app/src/main/java/s/a/w1/g.java rename to app/src/main/java/s/a/z1/g.java index c5dfff7b3b..fe5433403d 100644 --- a/app/src/main/java/s/a/w1/g.java +++ b/app/src/main/java/s/a/z1/g.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; import c.d.b.a.a; import d0.z.d.m; @@ -6,19 +6,19 @@ import java.util.concurrent.locks.ReentrantLock; import kotlin.Unit; import kotlin.jvm.functions.Function1; import kotlinx.coroutines.internal.UndeliveredElementException; -import s.a.a.s; +import s.a.a.t; /* compiled from: ConflatedChannel.kt */ public class g extends a { /* renamed from: c reason: collision with root package name */ - public final ReentrantLock f2872c = new ReentrantLock(); + public final ReentrantLock f2875c = new ReentrantLock(); public Object d = b.a; public g(Function1 function1) { super(function1); } - @Override // s.a.w1.c + @Override // s.a.z1.c public String a() { StringBuilder L = a.L("(value="); L.append(this.d); @@ -26,11 +26,11 @@ public class g extends a { return L.toString(); } - @Override // s.a.w1.c + @Override // s.a.z1.c public Object e(E e) { Function1 function1; j j; - ReentrantLock reentrantLock = this.f2872c; + ReentrantLock reentrantLock = this.f2875c; reentrantLock.lock(); try { f b = b(); @@ -62,9 +62,9 @@ public class g extends a { } this.d = e; if (undeliveredElementException == null) { - s sVar = b.b; + t tVar = b.b; reentrantLock.unlock(); - return sVar; + return tVar; } throw undeliveredElementException; } finally { @@ -72,9 +72,9 @@ public class g extends a { } } - @Override // s.a.w1.a + @Override // s.a.z1.a public boolean f(h hVar) { - ReentrantLock reentrantLock = this.f2872c; + ReentrantLock reentrantLock = this.f2875c; reentrantLock.lock(); try { return super.f(hVar); @@ -83,31 +83,31 @@ public class g extends a { } } - @Override // s.a.w1.a + @Override // s.a.z1.a public final boolean g() { return false; } - @Override // s.a.w1.a + @Override // s.a.z1.a public final boolean h() { return this.d == b.a; } - @Override // s.a.w1.a + @Override // s.a.z1.a public Object i() { - ReentrantLock reentrantLock = this.f2872c; + ReentrantLock reentrantLock = this.f2875c; reentrantLock.lock(); try { Object obj = this.d; - s sVar = b.a; - if (obj == sVar) { + t tVar = b.a; + if (obj == tVar) { Object b = b(); if (b == null) { b = b.d; } return b; } - this.d = sVar; + this.d = tVar; reentrantLock.unlock(); return obj; } finally { diff --git a/app/src/main/java/s/a/w1/h.java b/app/src/main/java/s/a/z1/h.java similarity index 58% rename from app/src/main/java/s/a/w1/h.java rename to app/src/main/java/s/a/z1/h.java index 8164d311d4..21b14fcdb1 100644 --- a/app/src/main/java/s/a/w1/h.java +++ b/app/src/main/java/s/a/z1/h.java @@ -1,9 +1,9 @@ -package s.a.w1; +package s.a.z1; -import s.a.a.j; +import s.a.a.k; /* compiled from: AbstractChannel.kt */ -public abstract class h extends j implements j { - @Override // s.a.w1.j +public abstract class h extends k implements j { + @Override // s.a.z1.j public /* bridge */ /* synthetic */ Object b() { return b.b; } diff --git a/app/src/main/java/s/a/w1/i.java b/app/src/main/java/s/a/z1/i.java similarity index 83% rename from app/src/main/java/s/a/w1/i.java rename to app/src/main/java/s/a/z1/i.java index 087804faa8..245986293d 100644 --- a/app/src/main/java/s/a/w1/i.java +++ b/app/src/main/java/s/a/z1/i.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; /* compiled from: Channel.kt */ public interface i { e iterator(); diff --git a/app/src/main/java/s/a/w1/j.java b/app/src/main/java/s/a/z1/j.java similarity index 58% rename from app/src/main/java/s/a/w1/j.java rename to app/src/main/java/s/a/z1/j.java index 44727882d0..410507c618 100644 --- a/app/src/main/java/s/a/w1/j.java +++ b/app/src/main/java/s/a/z1/j.java @@ -1,12 +1,12 @@ -package s.a.w1; +package s.a.z1; -import s.a.a.j; -import s.a.a.s; +import s.a.a.k; +import s.a.a.t; /* compiled from: AbstractChannel.kt */ public interface j { Object b(); void c(E e); - s d(E e, j.b bVar); + t d(E e, k.b bVar); } diff --git a/app/src/main/java/s/a/z1/k.java b/app/src/main/java/s/a/z1/k.java new file mode 100644 index 0000000000..5f05c3a201 --- /dev/null +++ b/app/src/main/java/s/a/z1/k.java @@ -0,0 +1,4 @@ +package s.a.z1; +/* compiled from: AbstractChannel.kt */ +public abstract class k extends s.a.a.k { +} diff --git a/app/src/main/java/s/a/w1/l.java b/app/src/main/java/s/a/z1/l.java similarity index 83% rename from app/src/main/java/s/a/w1/l.java rename to app/src/main/java/s/a/z1/l.java index a582ea4d4f..a7e5688f12 100644 --- a/app/src/main/java/s/a/w1/l.java +++ b/app/src/main/java/s/a/z1/l.java @@ -1,4 +1,4 @@ -package s.a.w1; +package s.a.z1; /* compiled from: Channel.kt */ public interface l { boolean offer(E e); diff --git a/app/src/main/res/color/uikit_text_color_selector.xml b/app/src/main/res/color/uikit_text_color_selector.xml new file mode 100644 index 0000000000..239196091f --- /dev/null +++ b/app/src/main/res/color/uikit_text_color_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_compass.xml b/app/src/main/res/drawable/ic_compass.xml new file mode 100644 index 0000000000..bbbf3593a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_compass.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/drawable/ic_directory_selected_background.xml b/app/src/main/res/drawable/ic_directory_selected_background.xml new file mode 100644 index 0000000000..f7d5e8fc2d --- /dev/null +++ b/app/src/main/res/drawable/ic_directory_selected_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_directory_selector_background.xml b/app/src/main/res/drawable/ic_directory_selector_background.xml new file mode 100644 index 0000000000..961e68600e --- /dev/null +++ b/app/src/main/res/drawable/ic_directory_selector_background.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml b/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml index eba1481cc1..fd5fc62152 100644 --- a/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml +++ b/app/src/main/res/layout-v22/layout_contact_sync_suggestions.xml @@ -3,5 +3,5 @@ - + diff --git a/app/src/main/res/layout-v22/view_stage_channel_speaker.xml b/app/src/main/res/layout-v22/view_stage_channel_speaker.xml index a3839c51c1..1c310eb641 100644 --- a/app/src/main/res/layout-v22/view_stage_channel_speaker.xml +++ b/app/src/main/res/layout-v22/view_stage_channel_speaker.xml @@ -1,8 +1,9 @@ + - + diff --git a/app/src/main/res/layout-v22/voice_controls_sheet_view.xml b/app/src/main/res/layout-v22/voice_controls_sheet_view.xml index 11bf893150..e82999f3da 100644 --- a/app/src/main/res/layout-v22/voice_controls_sheet_view.xml +++ b/app/src/main/res/layout-v22/voice_controls_sheet_view.xml @@ -9,6 +9,7 @@ + diff --git a/app/src/main/res/layout/layout_contact_sync_suggestions.xml b/app/src/main/res/layout/layout_contact_sync_suggestions.xml index ad0f203e19..a410328ff5 100644 --- a/app/src/main/res/layout/layout_contact_sync_suggestions.xml +++ b/app/src/main/res/layout/layout_contact_sync_suggestions.xml @@ -3,5 +3,5 @@ - + diff --git a/app/src/main/res/layout/thread_browser_empty.xml b/app/src/main/res/layout/thread_browser_empty.xml index a7f127133e..0118d13282 100644 --- a/app/src/main/res/layout/thread_browser_empty.xml +++ b/app/src/main/res/layout/thread_browser_empty.xml @@ -3,5 +3,5 @@ - + diff --git a/app/src/main/res/layout/view_premium_settings_perks.xml b/app/src/main/res/layout/view_premium_settings_perks.xml index 0038f2f791..b3b9ead0db 100644 --- a/app/src/main/res/layout/view_premium_settings_perks.xml +++ b/app/src/main/res/layout/view_premium_settings_perks.xml @@ -11,4 +11,5 @@ + diff --git a/app/src/main/res/layout/view_premium_settings_tier_1.xml b/app/src/main/res/layout/view_premium_settings_tier_1.xml index e3b8a5b648..e2ba598bbf 100644 --- a/app/src/main/res/layout/view_premium_settings_tier_1.xml +++ b/app/src/main/res/layout/view_premium_settings_tier_1.xml @@ -10,5 +10,6 @@ + diff --git a/app/src/main/res/layout/view_stage_channel_speaker.xml b/app/src/main/res/layout/view_stage_channel_speaker.xml index 89de56126a..aea24566b0 100644 --- a/app/src/main/res/layout/view_stage_channel_speaker.xml +++ b/app/src/main/res/layout/view_stage_channel_speaker.xml @@ -1,8 +1,9 @@ + - + diff --git a/app/src/main/res/layout/voice_controls_sheet_view.xml b/app/src/main/res/layout/voice_controls_sheet_view.xml index 29ff4c3786..d003c6b65f 100644 --- a/app/src/main/res/layout/voice_controls_sheet_view.xml +++ b/app/src/main/res/layout/voice_controls_sheet_view.xml @@ -9,6 +9,7 @@ + diff --git a/app/src/main/res/layout/widget_channels_list_item_directory.xml b/app/src/main/res/layout/widget_channels_list_item_directory.xml new file mode 100644 index 0000000000..75bcb2fbe1 --- /dev/null +++ b/app/src/main/res/layout/widget_channels_list_item_directory.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/widget_chat_list_actions.xml b/app/src/main/res/layout/widget_chat_list_actions.xml index 0ab117c810..ec24739b57 100644 --- a/app/src/main/res/layout/widget_chat_list_actions.xml +++ b/app/src/main/res/layout/widget_chat_list_actions.xml @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/res/layout/widget_settings_accessibility.xml b/app/src/main/res/layout/widget_settings_accessibility.xml index eac6dad3d3..855ca1df49 100644 --- a/app/src/main/res/layout/widget_settings_accessibility.xml +++ b/app/src/main/res/layout/widget_settings_accessibility.xml @@ -11,7 +11,7 @@ - + diff --git a/app/src/main/res/layout/widget_user_sheet.xml b/app/src/main/res/layout/widget_user_sheet.xml index d8b5253665..c2e8b11112 100644 --- a/app/src/main/res/layout/widget_user_sheet.xml +++ b/app/src/main/res/layout/widget_user_sheet.xml @@ -45,7 +45,7 @@ - + diff --git a/app/src/main/res/menu/menu_call_fullscreen.xml b/app/src/main/res/menu/menu_call_fullscreen.xml index 1e0f356066..0f5d2be7f5 100644 --- a/app/src/main/res/menu/menu_call_fullscreen.xml +++ b/app/src/main/res/menu/menu_call_fullscreen.xml @@ -3,6 +3,5 @@ - diff --git a/app/src/main/res/menu/menu_thread_browser.xml b/app/src/main/res/menu/menu_thread_browser.xml index caefc27d00..f35417f62a 100644 --- a/app/src/main/res/menu/menu_thread_browser.xml +++ b/app/src/main/res/menu/menu_thread_browser.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml index 22d9ecee52..72ddeb15d9 100644 --- a/app/src/main/res/values-ar-rXB/plurals.xml +++ b/app/src/main/res/values-ar-rXB/plurals.xml @@ -208,6 +208,10 @@ ‏‮{#}‬‏ ‏‮minute‬‏ ‏‮{#}‬‏ ‏‮minutes‬‏ + + ‏‮**1**‬‏ ‏‮community‬‏ + ‏‮**‬‏‏‮{numResults}‬‏‏‮**‬‏ ‏‮communities‬‏ + ‏‮+‬‏‏‮{count}‬‏ ‏‮Speaker‬‏ ‏‮+‬‏‏‮{count}‬‏ ‏‮Speakers‬‏ @@ -513,12 +517,12 @@ ‏‮,‬‏ ‏‮{#}‬‏ ‏‮unread‬‏ ‏‮mentions‬‏ - ‏‮Changed‬‏ ‏‮default‬‏ ‏‮auto-archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minute**‬‏ - ‏‮Changed‬‏ ‏‮default‬‏ ‏‮auto-archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minutes**‬‏ + ‏‮Changed‬‏ ‏‮default‬‏ ‏‮archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minute**‬‏ + ‏‮Changed‬‏ ‏‮default‬‏ ‏‮archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minutes**‬‏ - ‏‮Set‬‏ ‏‮default‬‏ ‏‮auto-archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minute**‬‏ - ‏‮Set‬‏ ‏‮default‬‏ ‏‮auto-archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minutes**‬‏ + ‏‮Set‬‏ ‏‮default‬‏ ‏‮archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minute**‬‏ + ‏‮Set‬‏ ‏‮default‬‏ ‏‮archive‬‏ ‏‮duration‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{#}‬‏ ‏‮minutes**‬‏ ‏‮a‬‏ ‏‮permission‬‏ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 0ebe88bebc..6b63f8e05a 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -701,9 +701,9 @@ ‏‮1‬‏ ‏‮Week‬‏ ‏‮24‬‏ ‏‮Hours‬‏ ‏‮3‬‏ ‏‮Days‬‏ - ‏‮Auto-archive‬‏ ‏‮after‬‏ ‏‮{duration}‬‏ ‏‮of‬‏ ‏‮inactivity‬‏ + ‏‮Archive‬‏ ‏‮after‬‏ ‏‮{duration}‬‏ ‏‮of‬‏ ‏‮inactivity‬‏ ‏‮Auto-archive‬‏ ‏‮at‬‏ ‏‮{time}‬‏ - ‏‮This‬‏ ‏‮thread‬‏ ‏‮will‬‏ ‏‮auto-archive:‬‏ ‏‮{time}‬‏ + ‏‮This‬‏ ‏‮thread‬‏ ‏‮will‬‏ ‏‮archive:‬‏ ‏‮{time}‬‏ ‏‮Sticker‬‏ ‏‮Suggestions‬‏ ‏‮Allows‬‏ ‏‮sticker‬‏ ‏‮suggestions‬‏ ‏‮to‬‏ ‏‮appear‬‏ ‏‮when‬‏ ‏‮typing‬‏ ‏‮messages.‬‏ ‏‮Automatically‬‏ ‏‮enable/disable‬‏ ‏‮Streamer‬‏ ‏‮Mode‬‏ ‏‮if‬‏ ‏‮OBS‬‏ ‏‮or‬‏ ‏‮XSplit‬‏ ‏‮are‬‏ ‏‮running‬‏ ‏‮on‬‏ ‏‮this‬‏ ‏‮computer.‬‏ @@ -741,7 +741,7 @@ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮ban‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!?‬‏ ‏‮They‬‏ ‏‮won\'t‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮return‬‏ ‏‮unless‬‏ ‏‮you‬‏ ‏‮unban‬‏ ‏‮them.‬‏ ‏‮\'!!‬‏‏‮{user}‬‏‏‮!!\'‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮banned‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮server.‬‏ ‏‮Whoops…‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮banned.‬‏ ‏‮Please‬‏ ‏‮try‬‏ ‏‮again!‬‏ - ‏‮Ban‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮From‬‏ ‏‮Server‬‏ + ‏‮Ban‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮Server‬‏ ‏‮Ban‬‏ ‏‮\'!!‬‏‏‮{user}‬‏ ‏‮Bans‬‏ ‏‮{bans}‬‏ @@ -760,7 +760,7 @@ ‏‮Welcome‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮beginning‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**‬‏ ‏‮group.‬‏ ‏‮You‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮leave‬‏ ‏‮this‬‏ ‏‮group‬‏ ‏‮when‬‏ ‏‮you\'re‬‏ ‏‮done.‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮the‬‏ ‏‮start‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮!!‬‏‏‮{channelName}‬‏‏‮!!‬‏ ‏‮**private**‬‏ ‏‮channel.‬‏ ‏‮$[](topicHook)‬‏ - ‏‮This‬‏ ‏‮thread‬‏ ‏‮will‬‏ ‏‮auto-archive‬‏ ‏‮after‬‏ ‏‮$[](autoArchiveDurationHook)‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ + ‏‮This‬‏ ‏‮thread‬‏ ‏‮will‬‏ ‏‮archive‬‏ ‏‮after‬‏ ‏‮$[](autoArchiveDurationHook)‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ ‏‮Beta‬‏ ‏‮Bulgarian‬‏ ‏‮Billing‬‏ @@ -839,6 +839,7 @@ ‏‮No‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮saved‬‏ ‏‮Checkout‬‏ ‏‮faster‬‏ ‏‮by‬‏ ‏‮saving‬‏ ‏‮a‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮Pay‬‏ ‏‮for‬‏ ‏‮it‬‏ ‏‮With‬‏ + ‏‮A‬‏ ‏‮small‬‏ ‏‮hold‬‏ ‏‮may‬‏ ‏‮be‬‏ ‏‮placed‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮method.‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{helpDeskArticle}‬‏‏‮)‬‏ ‏‮Taxes‬‏ ‏‮Total‬‏ ‏‮Transaction‬‏ ‏‮History‬‏ @@ -963,8 +964,8 @@ ‏‮Your‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮delivered.‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮usually‬‏ ‏‮because‬‏ ‏‮you‬‏ ‏‮don\'t‬‏ ‏‮share‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮recipient‬‏ ‏‮or‬‏ ‏‮the‬‏ ‏‮recipient‬‏ ‏‮is‬‏ ‏‮only‬‏ ‏‮accepting‬‏ ‏‮direct‬‏ ‏‮messages‬‏ ‏‮from‬‏ ‏‮friends.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮the‬‏ ‏‮full‬‏ ‏‮list‬‏ ‏‮of‬‏ ‏‮reasons‬‏ ‏‮here:‬‏ ‏‮{helpUrl}‬‏ ‏‮Your‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮delivered.‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮usually‬‏ ‏‮because‬‏ ‏‮you‬‏ ‏‮don\'t‬‏ ‏‮share‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮recipient‬‏ ‏‮or‬‏ ‏‮the‬‏ ‏‮recipient‬‏ ‏‮is‬‏ ‏‮only‬‏ ‏‮accepting‬‏ ‏‮direct‬‏ ‏‮messages‬‏ ‏‮from‬‏ ‏‮friends.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮the‬‏ ‏‮full‬‏ ‏‮list‬‏ ‏‮of‬‏ ‏‮reasons‬‏ ‏‮[here](‬‏‏‮{helpUrl}‬‏‏‮)‬‏ ‏‮Sending‬‏ ‏‮messages‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮temporarily‬‏ ‏‮disabled.‬‏ ‏‮Try‬‏ ‏‮again‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮bit.‬‏ - ‏‮Your‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮sent‬‏ ‏‮because‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮large‬‏ ‏‮announcement‬‏ ‏‮threads‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮reached.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ - ‏‮Your‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮sent‬‏ ‏‮because‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮active‬‏ ‏‮threads‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮reached.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ + ‏‮Your‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮sent‬‏ ‏‮because‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮reached‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮announcement‬‏ ‏‮threads.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ + ‏‮Your‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮sent‬‏ ‏‮because‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮reached‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮threads.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ ‏‮Woah‬‏ ‏‮there!‬‏ ‏‮Someone‬‏ ‏‮in‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮has‬‏ ‏‮requested‬‏ ‏‮that‬‏ ‏‮Discord‬‏ ‏‮block‬‏ ‏‮any‬‏ ‏‮messages‬‏ ‏‮our‬‏ ‏‮mostly-accurate‬‏ ‏‮robots‬‏ ‏‮deem‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮explicit,‬‏ ‏‮so‬‏ ‏‮your‬‏ ‏‮message‬‏ ‏‮has‬‏ ‏‮not‬‏ ‏‮been‬‏ ‏‮sent.‬‏ ‏‮Woah‬‏ ‏‮there!‬‏ ‏‮The‬‏ ‏‮owner‬‏ ‏‮of‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮has‬‏ ‏‮requested‬‏ ‏‮that‬‏ ‏‮Discord‬‏ ‏‮block‬‏ ‏‮any‬‏ ‏‮messages‬‏ ‏‮our‬‏ ‏‮mostly-accurate‬‏ ‏‮robots‬‏ ‏‮deem‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮explicit,‬‏ ‏‮so‬‏ ‏‮your‬‏ ‏‮message‬‏ ‏‮has‬‏ ‏‮not‬‏ ‏‮been‬‏ ‏‮sent.‬‏ ‏‮You‬‏ ‏‮need‬‏ ‏‮to‬‏ ‏‮verify‬‏ ‏‮your‬‏ ‏‮email‬‏ ‏‮before‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮messages‬‏ ‏‮here.‬‏ @@ -1197,6 +1198,7 @@ ‏‮{mentionCount}‬‏ ‏‮!!‬‏‏‮{author}‬‏‏‮!!‬‏ ‏‮at‬‏ ‏‮{timestamp}‬‏‏‮:‬‏ ‏‮!!‬‏‏‮{content}‬‏‏‮!!‬‏ ‏‮message‬‏ + ‏‮!!‬‏‏‮{author}‬‏‏‮!!‬‏ ‏‮replying‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{repliedAuthor}‬‏‏‮!!‬‏ ‏‮Use‬‏ ‏‮the‬‏ ‏‮up‬‏ ‏‮and‬‏ ‏‮down‬‏ ‏‮arrow‬‏ ‏‮keys‬‏ ‏‮to‬‏ ‏‮navigate‬‏ ‏‮between‬‏ ‏‮messages‬‏ ‏‮quickly.‬‏ ‏‮New‬‏ ‏‮messages‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮added‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮bottom‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮list‬‏ ‏‮as‬‏ ‏‮they‬‏ ‏‮come‬‏ ‏‮in.‬‏ ‏‮Messages‬‏ ‏‮in‬‏ ‏‮!!‬‏‏‮{channelName}‬‏‏‮!!‬‏ ‏‮message‬‏ ‏‮list‬‏ @@ -1810,7 +1812,6 @@ ‏‮Crash‬‏ ‏‮Timestamp:‬‏ ‏‮{timestamp}‬‏ ‏‮Discord‬‏ ‏‮has‬‏ ‏‮crashed‬‏ ‏‮unexpectedly.‬‏ ‏‮Create‬‏ - ‏‮Create‬‏ ‏‮a‬‏ ‏‮Thread‬‏ ‏‮Create‬‏ ‏‮Category‬‏ ‏‮Create‬‏ ‏‮Channel‬‏ ‏‮Something‬‏ ‏‮went‬‏ ‏‮wrong‬‏ ‏‮trying‬‏ ‏‮to‬‏ ‏‮create‬‏ ‏‮a‬‏ ‏‮channel.‬‏ ‏‮Please‬‏ ‏‮try‬‏ ‏‮again‬‏ ‏‮later.‬‏ @@ -1881,7 +1882,7 @@ ‏‮Post‬‏ ‏‮images,‬‏ ‏‮GIFs,‬‏ ‏‮stickers,‬‏ ‏‮opinions,‬‏ ‏‮and‬‏ ‏‮puns‬‏ ‏‮Create‬‏ ‏‮Thread‬‏ ‏‮Send‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮a‬‏ ‏‮thread‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel!‬‏ - ‏‮It‬‏ ‏‮will‬‏ ‏‮auto-archive‬‏ ‏‮after‬‏ ‏‮$[](durationHook)‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ + ‏‮It‬‏ ‏‮will‬‏ ‏‮archive‬‏ ‏‮after‬‏ ‏‮$[](durationHook)‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ ‏‮Create‬‏ ‏‮Voice‬‏ ‏‮Channel‬‏ ‏‮Hang‬‏ ‏‮out‬‏ ‏‮with‬‏ ‏‮voice,‬‏ ‏‮video,‬‏ ‏‮and‬‏ ‏‮screen‬‏ ‏‮sharing‬‏ ‏‮I\'m‬‏ ‏‮making‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮club‬‏ ‏‮or‬‏ ‏‮community.‬‏ @@ -2000,6 +2001,10 @@ ‏‮Description‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮designate‬‏ ‏‮another‬‏ ‏‮inside‬‏ ‏‮[Server‬‏ ‏‮Settings‬‏ ‏‮>‬‏ ‏‮Community‬‏ ‏‮>‬‏ ‏‮Overview](onClick)‬‏ ‏‮before‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮can‬‏ ‏‮be‬‏ ‏‮deleted.‬‏ ‏‮Desktop‬‏ ‏‮App‬‏ + ‏‮More‬‏ ‏‮features,‬‏ ‏‮better‬‏ ‏‮performance,‬‏ ‏‮and‬‏ ‏‮easy‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮all‬‏ ‏‮your‬‏ ‏‮conversations.‬‏ + ‏‮Discord‬‏ ‏‮for‬‏ ‏‮Linux‬‏ + ‏‮Discord‬‏ ‏‮for‬‏ ‏‮Mac‬‏ + ‏‮Discord‬‏ ‏‮for‬‏ ‏‮Windows‬‏ ‏‮Enable‬‏ ‏‮Desktop‬‏ ‏‮Notifications‬‏ ‏‮If‬‏ ‏‮you\'re‬‏ ‏‮looking‬‏ ‏‮for‬‏ ‏‮per-channel‬‏ ‏‮or‬‏ ‏‮per-server‬‏ ‏‮notifications,‬‏ ‏‮right-click‬‏ ‏‮the‬‏ ‏‮desired‬‏ ‏‮server‬‏ ‏‮icon‬‏ ‏‮and‬‏ ‏‮select‬‏ ‏‮Notification‬‏ ‏‮Settings.‬‏ ‏‮Automatically‬‏ ‏‮detect‬‏ ‏‮accounts‬‏ ‏‮from‬‏ ‏‮other‬‏ ‏‮platforms‬‏ ‏‮on‬‏ ‏‮this‬‏ ‏‮computer.‬‏ @@ -2028,6 +2033,11 @@ ‏‮unread,‬‏ ‏‮!!‬‏‏‮{channelName}‬‏‏‮!!‬‏ ‏‮(direct‬‏ ‏‮message)‬‏ ‏‮Direct‬‏ ‏‮Messages‬‏ ‏‮Direct‬‏ ‏‮Messages,‬‏ ‏‮{requestCount}‬‏ ‏‮pending‬‏ ‏‮friend‬‏ ‏‮requests‬‏ + ‏‮Directory‬‏ ‏‮Entry‬‏ ‏‮Actions‬‏ + ‏‮Try‬‏ ‏‮another‬‏ ‏‮search‬‏ ‏‮or‬‏ ‏‮$[add‬‏ ‏‮a‬‏ ‏‮server](addServerHook).‬‏ + ‏‮No‬‏ ‏‮matches‬‏ ‏‮found‬‏ + ‏‮Explore‬‏ ‏‮servers‬‏ + ‏‮{numResults}‬‏ ‏‮for‬‏ ‏‮**‬‏‏‮{query}‬‏‏‮**‬‏ ‏‮Disable‬‏ ‏‮Disable‬‏ ‏‮Account‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮that‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮disable‬‏ ‏‮your‬‏ ‏‮account?‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮immediately‬‏ ‏‮log‬‏ ‏‮you‬‏ ‏‮out‬‏ ‏‮and‬‏ ‏‮make‬‏ ‏‮your‬‏ ‏‮account‬‏ ‏‮inaccessible‬‏ ‏‮to‬‏ ‏‮anyone.‬‏ @@ -2467,14 +2477,14 @@ ‏‮Diagnostic‬‏ ‏‮audio‬‏ ‏‮recording‬‏ ‏‮is‬‏ ‏‮used‬‏ ‏‮for‬‏ ‏‮analyzing‬‏ ‏‮audio‬‏ ‏‮problems.‬‏ ‏‮The‬‏ ‏‮last‬‏ ‏‮five‬‏ ‏‮minutes‬‏ ‏‮of‬‏ ‏‮voice‬‏ ‏‮is‬‏ ‏‮saved‬‏ ‏‮to‬‏ ‏‮voice‬‏ ‏‮module‬‏ ‏‮folder.‬‏ ‏‮Automatically‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮and‬‏ ‏‮mute‬‏ ‏‮them‬‏ ‏‮when‬‏ ‏‮they‬‏ ‏‮have‬‏ ‏‮been‬‏ ‏‮idle‬‏ ‏‮for‬‏ ‏‮longer‬‏ ‏‮than‬‏ ‏‮the‬‏ ‏‮inactive‬‏ ‏‮timeout.‬‏ ‏‮This‬‏ ‏‮does‬‏ ‏‮not‬‏ ‏‮affect‬‏ ‏‮browsers.‬‏ ‏‮Lower‬‏ ‏‮the‬‏ ‏‮volume‬‏ ‏‮of‬‏ ‏‮other‬‏ ‏‮applications‬‏ ‏‮by‬‏ ‏‮this‬‏ ‏‮percent‬‏ ‏‮when‬‏ ‏‮someone‬‏ ‏‮is‬‏ ‏‮speaking.‬‏ ‏‮Set‬‏ ‏‮to‬‏ ‏‮0%%‬‏ ‏‮to‬‏ ‏‮completely‬‏ ‏‮disable‬‏ ‏‮attenuation.‬‏ - ‏‮Threads‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮archive‬‏ ‏‮after‬‏ ‏‮the‬‏ ‏‮specified‬‏ ‏‮duration‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ + ‏‮Threads‬‏ ‏‮will‬‏ ‏‮archive‬‏ ‏‮after‬‏ ‏‮the‬‏ ‏‮specified‬‏ ‏‮duration‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ ‏‮If‬‏ ‏‮the‬‏ ‏‮indicator‬‏ ‏‮is‬‏ ‏‮solid‬‏ ‏‮green‬‏ ‏‮then‬‏ ‏‮Discord‬‏ ‏‮is‬‏ ‏‮transmitting‬‏ ‏‮your‬‏ ‏‮beautiful‬‏ ‏‮voice.‬‏ ‏‮ALL‬‏ ‏‮THE‬‏ ‏‮BITS!‬‏ ‏‮Going‬‏ ‏‮above‬‏ ‏‮{bitrate}‬‏‏‮kbps‬‏ ‏‮may‬‏ ‏‮adversely‬‏ ‏‮affect‬‏ ‏‮people‬‏ ‏‮on‬‏ ‏‮poor‬‏ ‏‮connections.‬‏ ‏‮While‬‏ ‏‮using‬‏ ‏‮a‬‏ ‏‮Discord‬‏ ‏‮Certified‬‏ ‏‮microphone‬‏ ‏‮certain‬‏ ‏‮voice‬‏ ‏‮processing‬‏ ‏‮features‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮longer‬‏ ‏‮handled‬‏ ‏‮by‬‏ ‏‮Discord‬‏ ‏‮itself,‬‏ ‏‮but‬‏ ‏‮rather‬‏ ‏‮the‬‏ ‏‮microphone.‬‏ ‏‮Change‬‏ ‏‮privacy‬‏ ‏‮settings‬‏ ‏‮and‬‏ ‏‮customize‬‏ ‏‮how‬‏ ‏‮members‬‏ ‏‮can‬‏ ‏‮interact‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮Records‬‏ ‏‮all‬‏ ‏‮RTP‬‏ ‏‮data‬‏ ‏‮received‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮voice/video‬‏ ‏‮connection‬‏ ‏‮for‬‏ ‏‮debugging‬‏ ‏‮purposes.‬‏ ‏‮Saves‬‏ ‏‮debug‬‏ ‏‮logs‬‏ ‏‮to‬‏ ‏‮voice‬‏ ‏‮module‬‏ ‏‮folder‬‏ ‏‮that‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮upload‬‏ ‏‮to‬‏ ‏‮Discord‬‏ ‏‮Support‬‏ ‏‮for‬‏ ‏‮troubleshooting.‬‏ - ‏‮New‬‏ ‏‮threads‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮set‬‏ ‏‮to‬‏ ‏‮auto-archive‬‏ ‏‮after‬‏ ‏‮the‬‏ ‏‮specified‬‏ ‏‮duration‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ + ‏‮New‬‏ ‏‮threads‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮set‬‏ ‏‮to‬‏ ‏‮archive‬‏ ‏‮after‬‏ ‏‮the‬‏ ‏‮specified‬‏ ‏‮duration‬‏ ‏‮of‬‏ ‏‮inactivity.‬‏ ‏‮This‬‏ ‏‮will‬‏ ‏‮determine‬‏ ‏‮whether‬‏ ‏‮members‬‏ ‏‮who‬‏ ‏‮have‬‏ ‏‮not‬‏ ‏‮explicitly‬‏ ‏‮set‬‏ ‏‮their‬‏ ‏‮notification‬‏ ‏‮settings‬‏ ‏‮receive‬‏ ‏‮a‬‏ ‏‮notification‬‏ ‏‮for‬‏ ‏‮every‬‏ ‏‮message‬‏ ‏‮sent‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮or‬‏ ‏‮not.‬‏ ‏‮We‬‏ ‏‮highly‬‏ ‏‮recommend‬‏ ‏‮setting‬‏ ‏‮this‬‏ ‏‮to‬‏ ‏‮only‬‏ ‏‮@mentions‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮public‬‏ ‏‮Discord‬‏ ‏‮May‬‏ ‏‮take‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮15‬‏ ‏‮minutes‬‏ ‏‮to‬‏ ‏‮take‬‏ ‏‮effect.‬‏ ‏‮This‬‏ ‏‮image‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮displayed‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮Discovery‬‏ ‏‮Listing.‬‏ ‏‮The‬‏ ‏‮recommended‬‏ ‏‮minimum‬‏ ‏‮size‬‏ ‏‮is‬‏ ‏‮1920x1080‬‏ ‏‮and‬‏ ‏‮recommended‬‏ ‏‮aspect‬‏ ‏‮ratio‬‏ ‏‮is‬‏ ‏‮16:9.‬‏ @@ -2675,12 +2685,12 @@ ‏‮What‬‏ ‏‮should‬‏ ‏‮everyone‬‏ ‏‮call‬‏ ‏‮you?‬‏ ‏‮Only‬‏ ‏‮people‬‏ ‏‮you‬‏ ‏‮invite‬‏ ‏‮and‬‏ ‏‮moderators‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮this‬‏ ‏‮thread.‬‏ ‏‮Reports‬‏ ‏‮are‬‏ ‏‮sent‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Trust‬‏ ‏‮&‬‏ ‏‮Safety‬‏ ‏‮team‬‏ ‏‮-‬‏ ‏‮**not‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮owner**.‬‏ ‏‮Creating‬‏ ‏‮false‬‏ ‏‮reports‬‏ ‏‮and/or‬‏ ‏‮spamming‬‏ ‏‮the‬‏ ‏‮report‬‏ ‏‮button‬‏ ‏‮may‬‏ ‏‮result‬‏ ‏‮in‬‏ ‏‮a‬‏ ‏‮suspension‬‏ ‏‮of‬‏ ‏‮reporting‬‏ ‏‮abilities.‬‏ ‏‮Learn‬‏ ‏‮more‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮[Discord‬‏ ‏‮Community‬‏ ‏‮Guidelines](‬‏‏‮{guidelinesURL}‬‏‏‮).‬‏ ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮keeping‬‏ ‏‮things‬‏ ‏‮safe‬‏ ‏‮and‬‏ ‏‮sound.‬‏ - ‏‮Auto-archive‬‏ ‏‮After‬‏ ‏‮Inactivity‬‏ + ‏‮Archive‬‏ ‏‮After‬‏ ‏‮Inactivity‬‏ ‏‮Name‬‏ ‏‮New‬‏ ‏‮Thread‬‏ - ‏‮Thread‬‏ ‏‮name‬‏ ‏‮is‬‏ ‏‮required‬‏ + ‏‮Thread‬‏ ‏‮Name‬‏ ‏‮is‬‏ ‏‮required‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮invite‬‏ ‏‮new‬‏ ‏‮people‬‏ ‏‮by‬‏ ‏‮@mentioning‬‏ ‏‮them.‬‏ - ‏‮Only‬‏ ‏‮the‬‏ ‏‮invited‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮this‬‏ ‏‮thread‬‏ + ‏‮Only‬‏ ‏‮people‬‏ ‏‮you‬‏ ‏‮invite‬‏ ‏‮and‬‏ ‏‮moderators‬‏ ‏‮can‬‏ ‏‮see‬‏ ‏‮Enter‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮the‬‏ ‏‮conversation!‬‏ ‏‮Starter‬‏ ‏‮Message‬‏ ‏‮You‬‏ ‏‮do‬‏ ‏‮not‬‏ ‏‮have‬‏ ‏‮any‬‏ ‏‮input‬‏ ‏‮devices‬‏ ‏‮enabled.‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮grant‬‏ ‏‮Discord‬‏ ‏‮[access‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮microphone](onEnableClick)‬‏ ‏‮in‬‏ ‏‮order‬‏ ‏‮to‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮observe‬‏ ‏‮input‬‏ ‏‮sensitivity.‬‏ @@ -3618,6 +3628,7 @@ ‏‮Vanity‬‏ ‏‮URL‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮{bitrate}‬‏ ‏‮Kbps‬‏ ‏‮audio‬‏ ‏‮quality‬‏ ‏‮+‬‏‏‮{adding}‬‏ ‏‮server‬‏ ‏‮emoji‬‏ ‏‮slots‬‏ ‏‮(for‬‏ ‏‮a‬‏ ‏‮total‬‏ ‏‮of‬‏ ‏‮{total}‬‏‏‮)‬‏ + ‏‮+‬‏‏‮{adding}‬‏ ‏‮custom‬‏ ‏‮sticker‬‏ ‏‮slots‬‏ ‏‮(for‬‏ ‏‮a‬‏ ‏‮total‬‏ ‏‮of‬‏ ‏‮{total}‬‏‏‮)‬‏ ‏‮{fileSize}‬‏ ‏‮upload‬‏ ‏‮limit‬‏ ‏‮for‬‏ ‏‮all‬‏ ‏‮members‬‏ ‏‮Boosted‬‏ ‏‮server‬‏ ‏‮perks‬‏ ‏‮include‬‏ ‏‮—‬‏ ‏‮No‬‏ ‏‮one‬‏ ‏‮has‬‏ ‏‮bestowed‬‏ ‏‮Boosts‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮yet.‬‏ ‏‮See‬‏ ‏‮if‬‏ ‏‮any‬‏ ‏‮members‬‏ ‏‮would‬‏ ‏‮kindly‬‏ ‏‮bless‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮server-wide‬‏ ‏‮Boost‬‏ ‏‮Perks!‬‏ @@ -3895,6 +3906,7 @@ ‏‮Wave‬‏ ‏‮hello,‬‏ ‏‮share‬‏ ‏‮your‬‏ ‏‮screen,‬‏ ‏‮or‬‏ ‏‮just‬‏ ‏‮chat.‬‏ ‏‮Collaborate,‬‏ ‏‮ideate,‬‏ ‏‮and‬‏ ‏‮show‬‏ ‏‮your‬‏ ‏‮stuff.‬‏ ‏‮Make‬‏ ‏‮a‬‏ ‏‮home,‬‏ ‏‮have‬‏ ‏‮fun,‬‏ ‏‮and‬‏ ‏‮hang‬‏ ‏‮out.‬‏ + ‏‮Your‬‏ ‏‮hackathon‬‏ ‏‮–‬‏ ‏‮all‬‏ ‏‮together‬‏ ‏‮in‬‏ ‏‮one‬‏ ‏‮place.‬‏ ‏‮Coordinate,‬‏ ‏‮share‬‏ ‏‮resources,‬‏ ‏‮and‬‏ ‏‮host‬‏ ‏‮events.‬‏ ‏‮Stay‬‏ ‏‮in‬‏ ‏‮touch‬‏ ‏‮on‬‏ ‏‮and‬‏ ‏‮off‬‏ ‏‮the‬‏ ‏‮Rift.‬‏ ‏‮Meet‬‏ ‏‮up,‬‏ ‏‮organize,‬‏ ‏‮and‬‏ ‏‮stay‬‏ ‏‮in‬‏ ‏‮touch.‬‏ @@ -3909,6 +3921,7 @@ ‏‮Create‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮group‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮friends‬‏ + ‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮hackathon‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮community‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮community‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮community‬‏ @@ -4050,10 +4063,27 @@ ‏‮Hello.‬‏ ‏‮Beep.‬‏ ‏‮Boop.‬‏ ‏‮If‬‏ ‏‮you‬‏ ‏‮wanna‬‏ ‏‮invite‬‏ ‏‮friends‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮server,‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮server‬‏ ‏‮name‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮top‬‏ ‏‮left‬‏ ‏‮and‬‏ ‏‮select‬‏ ‏‮!!‬‏‏‮{invitePeople}‬‏‏‮!!.‬‏ ‏‮Beep!‬‏ ‏‮Croatian‬‏ ‏‮Hungarian‬‏ - ‏‮Add‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮hub‬‏ - ‏‮Invite‬‏ ‏‮people‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮hub‬‏ + ‏‮The‬‏ ‏‮server‬‏ ‏‮description‬‏ ‏‮will‬‏ ‏‮appear‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮hub.‬‏ ‏‮Use‬‏ ‏‮it‬‏ ‏‮to‬‏ ‏‮help‬‏ ‏‮students‬‏ ‏‮decide‬‏ ‏‮whether‬‏ ‏‮to‬‏ ‏‮join.‬‏ + ‏‮Description‬‏ ‏‮of‬‏ ‏‮class,‬‏ ‏‮professor,‬‏ ‏‮and‬‏ ‏‮server‬‏ ‏‮goals‬‏ ‏‮(study‬‏ ‏‮group),‬‏ ‏‮etc.‬‏ + ‏‮Server‬‏ ‏‮Description‬‏ + ‏‮Add‬‏ ‏‮Server‬‏ + ‏‮Choose‬‏ ‏‮a‬‏ ‏‮relevant‬‏ ‏‮server‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮list‬‏ ‏‮of‬‏ ‏‮servers‬‏ ‏‮you‬‏ ‏‮are‬‏ ‏‮an‬‏ ‏‮admin‬‏ ‏‮for.‬‏ ‏‮It‬‏ ‏‮will‬‏ ‏‮still‬‏ ‏‮be‬‏ ‏‮accessible‬‏ ‏‮to‬‏ ‏‮people‬‏ ‏‮outside‬‏ ‏‮the‬‏ ‏‮hub.‬‏ + ‏‮Add‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ + ‏‮Create‬‏ ‏‮New‬‏ ‏‮Server‬‏ + ‏‮Have‬‏ ‏‮an‬‏ ‏‮idea‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮server?‬‏ + ‏‮When‬‏ ‏‮you‬‏ ‏‮add‬‏ ‏‮a‬‏ ‏‮server,‬‏ ‏‮it‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮visible‬‏ ‏‮to‬‏ ‏‮other‬‏ ‏‮students‬‏ ‏‮and‬‏ ‏‮members,‬‏ ‏‮so‬‏ ‏‮make‬‏ ‏‮sure‬‏ ‏‮it\'s‬‏ ‏‮school‬‏ ‏‮appropriate.‬‏ + ‏‮Help‬‏ ‏‮grow‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ + ‏‮Help‬‏ ‏‮other‬‏ ‏‮students‬‏ ‏‮find‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ + ‏‮Add‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮Hub‬‏ + ‏‮Invite‬‏ ‏‮people‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮Hub‬‏ ‏‮You\'re‬‏ ‏‮one‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮first‬‏ ‏‮people‬‏ ‏‮here!‬‏ ‏‮Let\'s‬‏ ‏‮start‬‏ ‏‮by‬‏ ‏‮adding‬‏ ‏‮some‬‏ ‏‮servers‬‏ ‏‮and‬‏ ‏‮members.‬‏ - ‏‮Welcome‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮students‬‏ + ‏‮Welcome‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮students‬‏ + ‏‮Discord‬‏ ‏‮Hub‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ + ‏‮From‬‏ ‏‮clubs‬‏ ‏‮to‬‏ ‏‮study‬‏ ‏‮groups,‬‏ ‏‮stay‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮date‬‏ ‏‮with‬‏ ‏‮what\'s‬‏ ‏‮happening‬‏ + ‏‮Find‬‏ ‏‮your‬‏ ‏‮school-related‬‏ ‏‮servers‬‏ + ‏‮If‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮is‬‏ ‏‮intended‬‏ ‏‮for‬‏ ‏‮students‬‏ ‏‮only,‬‏ ‏‮just‬‏ ‏‮invite‬‏ ‏‮your‬‏ ‏‮classmates.‬‏ ‏‮They‬‏ ‏‮don\'t‬‏ ‏‮need‬‏ ‏‮a‬‏ ‏‮.edu‬‏ ‏‮address‬‏ ‏‮to‬‏ ‏‮join‬‏ + ‏‮Remove‬‏ ‏‮from‬‏ ‏‮Hub‬‏ + ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮remove‬‏ ‏‮!!‬‏‏‮{guildName}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮this‬‏ ‏‮directory?‬‏ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮official‬‏ ‏‮school‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮sam@college.edu‬‏ ‏‮School‬‏ ‏‮Email‬‏ @@ -4637,7 +4667,7 @@ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮kick‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!?‬‏ ‏‮They‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮able‬‏ ‏‮to‬‏ ‏‮rejoin‬‏ ‏‮again‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮invite.‬‏ ‏‮\'!!‬‏‏‮{user}‬‏‏‮!!\'‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮kicked‬‏ ‏‮from‬‏ ‏‮the‬‏ ‏‮server.‬‏ ‏‮Whoops…‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮kicked.‬‏ ‏‮Please‬‏ ‏‮try‬‏ ‏‮again!‬‏ - ‏‮Kick‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮From‬‏ ‏‮Server‬‏ + ‏‮Kick‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮Server‬‏ ‏‮Kick‬‏ ‏‮\'!!‬‏‏‮{user}‬‏ ‏‮Korean‬‏ ‏‮thz-2021-01-20‬‏ @@ -4844,6 +4874,7 @@ ‏‮Use‬‏ ‏‮custom‬‏ ‏‮and‬‏ ‏‮animated‬‏ ‏‮emoji‬‏ ‏‮anywhere‬‏ ‏‮Up‬‏ ‏‮to‬‏ ‏‮1080p‬‏ ‏‮resolution‬‏ ‏‮and‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮60fps‬‏ ‏‮50‬‏ ‏‮MB‬‏ ‏‮upload‬‏ ‏‮instead‬‏ ‏‮of‬‏ ‏‮100‬‏ ‏‮MB‬‏ + ‏‮Does‬‏ ‏‮not‬‏ ‏‮include‬‏ ‏‮Nitro‬‏ ‏‮sticker‬‏ ‏‮perks‬‏ ‏‮This‬‏ ‏‮link‬‏ ‏‮will‬‏ ‏‮take‬‏ ‏‮you‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{url}‬‏‏‮!!**.‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮go‬‏ ‏‮there?‬‏ ‏‮Cancel‬‏ ‏‮Yep!‬‏ @@ -5083,6 +5114,7 @@ ‏‮Unable‬‏ ‏‮to‬‏ ‏‮launch‬‏ ‏‮{applicationName}‬‏ ‏‮Unable‬‏ ‏‮to‬‏ ‏‮launch‬‏ ‏‮game‬‏ ‏‮We‬‏ ‏‮disabled‬‏ ‏‮voice‬‏ ‏‮activity‬‏ ‏‮detection‬‏ ‏‮to‬‏ ‏‮improve‬‏ ‏‮phone‬‏ ‏‮performance.‬‏ + ‏‮Get‬‏ ‏‮our‬‏ ‏‮mobile‬‏ ‏‮app‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮designate‬‏ ‏‮another‬‏ ‏‮inside‬‏ ‏‮[Server‬‏ ‏‮Settings‬‏ ‏‮>‬‏ ‏‮Community‬‏ ‏‮>‬‏ ‏‮Overview](onClick)‬‏ ‏‮before‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮can‬‏ ‏‮be‬‏ ‏‮deleted.‬‏ ‏‮Enable‬‏ ‏‮Hardware‬‏ ‏‮Scaling‬‏ ‏‮Experimental‬‏ ‏‮feature‬‏ ‏‮that‬‏ ‏‮may‬‏ ‏‮improve‬‏ ‏‮performance‬‏ ‏‮in‬‏ ‏‮video‬‏ ‏‮calls.‬‏ ‏‮Beware,‬‏ ‏‮may‬‏ ‏‮cause‬‏ ‏‮jank.‬‏ @@ -5090,7 +5122,8 @@ ‏‮We‬‏ ‏‮couldn\'t‬‏ ‏‮enable‬‏ ‏‮Krisp‬‏ ‏‮due‬‏ ‏‮to‬‏ ‏‮an‬‏ ‏‮error.‬‏ ‏‮Give‬‏ ‏‮it‬‏ ‏‮another‬‏ ‏‮go‬‏ ‏‮and‬‏ ‏‮try‬‏ ‏‮again.‬‏ ‏‮While‬‏ ‏‮speaking,‬‏ ‏‮filter‬‏ ‏‮out‬‏ ‏‮background‬‏ ‏‮noise‬‏ ‏‮and‬‏ ‏‮showcase‬‏ ‏‮your‬‏ ‏‮wonderful‬‏ ‏‮voice.‬‏ ‏‮Powered‬‏ ‏‮by‬‏ ‏‮Krisp.‬‏ ‏‮Noise‬‏ ‏‮suppression‬‏ - ‏‮Claim‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮before‬‏ ‏‮{endDate}‬‏ + ‏‮Use‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮before‬‏ ‏‮{endDate}‬‏ + ‏‮Claim‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮before‬‏ ‏‮{endDate}‬‏ ‏‮Replying‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{username}‬‏‏‮**‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮who‬‏ ‏‮posted‬‏ ‏‮the‬‏ ‏‮message‬‏ ‏‮you‬‏ ‏‮reported.‬‏ ‏‮Block‬‏ ‏‮them‬‏ ‏‮to‬‏ ‏‮stop‬‏ ‏‮seeing‬‏ ‏‮any‬‏ ‏‮of‬‏ ‏‮their‬‏ ‏‮messages.‬‏ ‏‮More‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮do‬‏ @@ -5125,8 +5158,8 @@ ‏‮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.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ @@ -5278,7 +5311,7 @@ ‏‮What‬‏ ‏‮a‬‏ ‏‮cold,‬‏ ‏‮emotionless‬‏ ‏‮world.‬‏ ‏‮No‬‏ ‏‮Reactions‬‏ ‏‮Start‬‏ ‏‮up‬‏ ‏‮some‬‏ ‏‮conversations,‬‏ ‏‮then‬‏ ‏‮keep‬‏ ‏‮track‬‏ ‏‮of‬‏ ‏‮them‬‏ ‏‮here!‬‏ - ‏‮There’s‬‏ ‏‮no‬‏ ‏‮recent‬‏ ‏‮messages.‬‏ ‏‮Click‬‏ ‏‮here‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮that!‬‏ + ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮recent‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮thread.‬‏ ‏‮No‬‏ ‏‮results‬‏ ‏‮found‬‏ ‏‮This‬‏ ‏‮channel‬‏ ‏‮has‬‏ ‏‮special‬‏ ‏‮permissions.‬‏ ‏‮To‬‏ ‏‮use‬‏ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮in‬‏ ‏‮it,‬‏ ‏‮you\'ll‬‏ ‏‮need‬‏ ‏‮someone,‬‏ ‏‮like‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮moderator‬‏ ‏‮or‬‏ ‏‮admin,‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮permissions.‬‏ ‏‮No‬‏ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮Permission‬‏ @@ -5289,7 +5322,7 @@ ‏‮No‬‏ ‏‮System‬‏ ‏‮Messages‬‏ ‏‮No‬‏ ‏‮No‬‏ ‏‮thanks‬‏ - ‏‮There’s‬‏ ‏‮no‬‏ ‏‮message‬‏ ‏‮yet.‬‏ ‏‮Click‬‏ ‏‮here‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮started!‬‏ + ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮messages‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮thread‬‏ ‏‮yet.‬‏ ‏‮No‬‏ ‏‮Limit‬‏ ‏‮No‬‏ ‏‮Video‬‏ ‏‮Devices‬‏ ‏‮This‬‏ ‏‮channel‬‏ ‏‮has‬‏ ‏‮special‬‏ ‏‮permissions.‬‏ ‏‮To‬‏ ‏‮use‬‏ ‏‮video‬‏ ‏‮in‬‏ ‏‮it,‬‏ ‏‮you\'ll‬‏ ‏‮need‬‏ ‏‮someone,‬‏ ‏‮like‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮moderator‬‏ ‏‮or‬‏ ‏‮admin,‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮permissions.‬‏ @@ -5564,9 +5597,13 @@ ‏‮Update‬‏ ‏‮Discord‬‏ ‏‮We\'ve‬‏ ‏‮got‬‏ ‏‮some‬‏ ‏‮sweet‬‏ ‏‮changes‬‏ ‏‮to‬‏ ‏‮Discord‬‏ ‏‮(and‬‏ ‏‮probably‬‏ ‏‮a‬‏ ‏‮bug‬‏ ‏‮fix‬‏ ‏‮or‬‏ ‏‮two).‬‏ ‏‮Update‬‏ ‏‮to‬‏ ‏‮continue.‬‏ ‏‮You\'re‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮date‬‏ - ‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[Less‬‏ ‏‮Details](toggleShowLegalese)‬‏ - ‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[More‬‏ ‏‮Details](toggleShowLegalese)‬‏ - ‏‮[More‬‏ ‏‮Details](onPress)‬‏ + ‏‮Use‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮before‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[Less‬‏ ‏‮Details](onClickDetails)‬‏ + ‏‮Use‬‏ ‏‮your‬‏ ‏‮code‬‏ ‏‮before‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[More‬‏ ‏‮Details](onClickDetails)‬‏ + ‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[Less‬‏ ‏‮Details](onClickDetails)‬‏ + ‏‮Gift‬‏ ‏‮is‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮claim‬‏ ‏‮until‬‏ ‏‮{endDate}‬‏‏‮.‬‏ ‏‮[More‬‏ ‏‮Details](onClickDetails)‬‏ + ‏‮[Less‬‏ ‏‮Details](onClick)‬‏ + ‏‮[More‬‏ ‏‮Details](onClick)‬‏ + ‏‮See‬‏ ‏‮Code‬‏ ‏‮Outgoing‬‏ ‏‮Friend‬‏ ‏‮Request‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮delete‬‏ ‏‮your‬‏ ‏‮friend‬‏ ‏‮request‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{name}‬‏‏‮!!**?‬‏ ‏‮Outgoing‬‏ ‏‮Friend‬‏ ‏‮Request‬‏ ‏‮to‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ @@ -5806,6 +5843,7 @@ ‏‮This‬‏ ‏‮tag‬‏ ‏‮is‬‏ ‏‮invalid.‬‏ ‏‮Tags‬‏ ‏‮must‬‏ ‏‮be‬‏ ‏‮greater‬‏ ‏‮than‬‏ ‏‮0.‬‏ ‏‮Upload‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮animated‬‏ ‏‮avatars‬‏ ‏‮and‬‏ ‏‮emojis‬‏ ‏‮Share‬‏ ‏‮custom‬‏ ‏‮emojis‬‏ ‏‮across‬‏ ‏‮all‬‏ ‏‮servers‬‏ + ‏‮Use‬‏ ‏‮custom‬‏ ‏‮stickers‬‏ ‏‮anywhere‬‏ ‏‮and‬‏ ‏‮access‬‏ ‏‮300‬‏ ‏‮Nitro-exclusive‬‏ ‏‮stickers‬‏ ‏‮Enjoy‬‏ ‏‮{discount}‬‏‏‮%%‬‏ ‏‮off‬‏ ‏‮additional‬‏ ‏‮Server‬‏ ‏‮Boosts.‬‏ ‏‮[Learn‬‏ ‏‮more.](onLearnMore)‬‏ ‏‮{numFreeGuildSubscriptions}‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ ‏‮for‬‏ ‏‮instant‬‏ ‏‮server‬‏ ‏‮Level‬‏ ‏‮1.‬‏ ‏‮Larger‬‏ ‏‮upload‬‏ ‏‮file‬‏ ‏‮size‬‏ ‏‮from‬‏ ‏‮{maxUploadStandard}‬‏ ‏‮to‬‏ ‏‮{maxUploadPremiumTier2}‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ ‏‮or‬‏ ‏‮{maxUploadPremiumTier1}‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ ‏‮Classic.‬‏ @@ -5816,7 +5854,6 @@ ‏‮Exclusive‬‏ ‏‮Nitro‬‏ ‏‮badge‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮profile‬‏ ‏‮Screen‬‏ ‏‮share‬‏ ‏‮on‬‏ ‏‮PC‬‏ ‏‮in‬‏ ‏‮720p‬‏ ‏‮60fps‬‏ ‏‮or‬‏ ‏‮1080p‬‏ ‏‮30fps‬‏ ‏‮Want‬‏ ‏‮to‬‏ ‏‮keep‬‏ ‏‮it‬‏ ‏‮simple?‬‏ ‏‮Support‬‏ ‏‮Discord‬‏ ‏‮and‬‏ ‏‮get‬‏ ‏‮sweet‬‏ ‏‮chat‬‏ ‏‮perks:‬‏ - ‏‮Exclusive‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮Wumpus‬‏ ‏‮Nitro‬‏ ‏‮Elite‬‏ ‏‮sticker‬‏ ‏‮pack,‬‏ ‏‮free‬‏ ‏‮What’s‬‏ ‏‮Up‬‏ ‏‮Wumpus‬‏ ‏‮sticker‬‏ ‏‮pack,‬‏ ‏‮and‬‏ ‏‮{discount}‬‏‏‮%%‬‏ ‏‮off‬‏ ‏‮all‬‏ ‏‮other‬‏ ‏‮sticker‬‏ ‏‮packs‬‏ ‏‮Better‬‏ ‏‮Go‬‏ ‏‮Live‬‏ ‏‮streams:‬‏ ‏‮Stream‬‏ ‏‮at‬‏ ‏‮source‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ ‏‮or‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮crisp‬‏ ‏‮1080p‬‏ ‏‮60fps‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ ‏‮Classic‬‏ ‏‮Choose‬‏ ‏‮a‬‏ ‏‮Plan‬‏ ‏‮Gift‬‏ ‏‮someone‬‏ ‏‮Nitro‬‏ ‏‮Classic‬‏ ‏‮to‬‏ ‏‮enhance‬‏ ‏‮their‬‏ ‏‮experience‬‏ ‏‮with‬‏ ‏‮super‬‏ ‏‮powered‬‏ ‏‮chat‬‏ ‏‮perks.‬‏ ‏‮[Learn‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮Nitro‬‏ ‏‮Classic.](onClick)‬‏ @@ -6269,10 +6306,13 @@ ‏‮Private‬‏ ‏‮Thread‬‏ ‏‮**View‬‏ ‏‮Channels**‬‏ ‏‮and‬‏ ‏‮**Connect**‬‏ ‏‮permissions‬‏ ‏‮required‬‏ ‏‮to‬‏ ‏‮create‬‏ ‏‮this‬‏ ‏‮private‬‏ ‏‮channel.‬‏ ‏‮Profile‬‏ + ‏‮Upload‬‏ ‏‮your‬‏ ‏‮own‬‏ ‏‮personalized‬‏ ‏‮banner‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!‬‏ ‏‮Profile‬‏ ‏‮Customization‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮limited‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮people.‬‏ + ‏‮Tell‬‏ ‏‮the‬‏ ‏‮world‬‏ ‏‮a‬‏ ‏‮little‬‏ ‏‮about‬‏ ‏‮yourself‬‏ ‏‮Express‬‏ ‏‮yourself‬‏ ‏‮with‬‏ ‏‮an‬‏ ‏‮about‬‏ ‏‮me‬‏ ‏‮and,‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮Nitro,‬‏ ‏‮a‬‏ ‏‮profile‬‏ ‏‮banner!‬‏ ‏‮Got‬‏ ‏‮it‬‏ ‏‮New‬‏ ‏‮Profile‬‏ ‏‮Customization!‬‏ + ‏‮Exclusive‬‏ ‏‮to‬‏ ‏‮Nitro‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮all‬‏ ‏‮set!‬‏ ‏‮Wow‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮is‬‏ ‏‮looking‬‏ ‏‮all‬‏ ‏‮snazzy!‬‏ ‏‮Here‬‏ ‏‮are‬‏ ‏‮a‬‏ ‏‮few‬‏ ‏‮more‬‏ ‏‮things‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮do‬‏ ‏‮with‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮Have‬‏ ‏‮fun!‬‏ ‏‮Step‬‏ ‏‮{step}‬‏ ‏‮of‬‏ ‏‮4‬‏ @@ -6315,6 +6355,7 @@ ‏‮I‬‏ ‏‮agree‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮[Terms‬‏ ‏‮of‬‏ ‏‮Service](‬‏‏‮{tosURL}‬‏‏‮)‬‏ ‏‮and‬‏ ‏‮[Refund‬‏ ‏‮Policy](‬‏‏‮{refundPolicyURL}‬‏‏‮)‬‏ ‏‮Purchase‬‏ ‏‮Ticket‬‏ ‏‮Purple‬‏ + ‏‮Scan‬‏ ‏‮this‬‏ ‏‮QR‬‏ ‏‮code‬‏ ‏‮for‬‏ ‏‮an‬‏ ‏‮easy‬‏ ‏‮download‬‏ ‏‮link‬‏ ‏‮for‬‏ ‏‮our‬‏ ‏‮iOS‬‏ ‏‮or‬‏ ‏‮Android‬‏ ‏‮apps.‬‏ ‏‮Failed‬‏ ‏‮to‬‏ ‏‮scan‬‏ ‏‮Something‬‏ ‏‮went‬‏ ‏‮wrong‬‏ ‏‮when‬‏ ‏‮trying‬‏ ‏‮to‬‏ ‏‮scan.‬‏ ‏‮Rescan‬‏ ‏‮the‬‏ ‏‮QR‬‏ ‏‮code‬‏ ‏‮to‬‏ ‏‮continue‬‏ ‏‮the‬‏ ‏‮login‬‏ ‏‮process.‬‏ @@ -6426,7 +6467,7 @@ ‏‮Remove‬‏ ‏‮Reaction‬‏ ‏‮Remove‬‏ ‏‮!!‬‏‏‮{name}‬‏‏‮!!‬‏ ‏‮Remove‬‏ ‏‮Role‬‏ - ‏‮Remove‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮From‬‏ ‏‮Thread‬‏ + ‏‮Remove‬‏ ‏‮!!‬‏‏‮{user}‬‏‏‮!!‬‏ ‏‮from‬‏ ‏‮Thread‬‏ ‏‮Remove‬‏ ‏‮Vanity‬‏ ‏‮URL‬‏ ‏‮Show‬‏ ‏‮website‬‏ ‏‮preview‬‏ ‏‮info‬‏ ‏‮from‬‏ ‏‮links‬‏ ‏‮pasted‬‏ ‏‮into‬‏ ‏‮chat‬‏ ‏‮Link‬‏ ‏‮Preview‬‏ @@ -6666,9 +6707,9 @@ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮this‬‏ ‏‮channel’s‬‏ ‏‮permissions.‬‏ ‏‮Allow‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮this‬‏ ‏‮channel\'s‬‏ ‏‮permissions.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮this‬‏ ‏‮server’s‬‏ ‏‮name,‬‏ ‏‮switch‬‏ ‏‮regions,‬‏ ‏‮and‬‏ ‏‮add‬‏ ‏‮bots‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮server.‬‏ - ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮rename,‬‏ ‏‮delete,‬‏ ‏‮archive/unarchive,‬‏ ‏‮and‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮slow‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮threads.‬‏ - ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮rename,‬‏ ‏‮delete,‬‏ ‏‮archive/unarchive,‬‏ ‏‮and‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮slow‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮threads‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels.‬‏ - ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮rename,‬‏ ‏‮delete,‬‏ ‏‮archive/unarchive,‬‏ ‏‮and‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮slow‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮threads‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel.‬‏ + ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮rename,‬‏ ‏‮delete,‬‏ ‏‮archive/unarchive,‬‏ ‏‮and‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮slow‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮threads.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮view‬‏ ‏‮private‬‏ ‏‮threads.‬‏ + ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮rename,‬‏ ‏‮delete,‬‏ ‏‮archive/unarchive,‬‏ ‏‮and‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮slow‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮threads‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮view‬‏ ‏‮private‬‏ ‏‮threads.‬‏ + ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮rename,‬‏ ‏‮delete,‬‏ ‏‮archive/unarchive,‬‏ ‏‮and‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮slow‬‏ ‏‮mode‬‏ ‏‮for‬‏ ‏‮threads‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮view‬‏ ‏‮private‬‏ ‏‮threads.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮create,‬‏ ‏‮edit,‬‏ ‏‮or‬‏ ‏‮delete‬‏ ‏‮webhooks,‬‏ ‏‮which‬‏ ‏‮can‬‏ ‏‮post‬‏ ‏‮messages‬‏ ‏‮from‬‏ ‏‮other‬‏ ‏‮apps‬‏ ‏‮or‬‏ ‏‮sites‬‏ ‏‮into‬‏ ‏‮this‬‏ ‏‮server.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮create,‬‏ ‏‮edit,‬‏ ‏‮or‬‏ ‏‮delete‬‏ ‏‮webhooks‬‏ ‏‮in‬‏ ‏‮these‬‏ ‏‮channels,‬‏ ‏‮which‬‏ ‏‮can‬‏ ‏‮post‬‏ ‏‮messages‬‏ ‏‮from‬‏ ‏‮other‬‏ ‏‮apps‬‏ ‏‮or‬‏ ‏‮sites.‬‏ ‏‮Allows‬‏ ‏‮members‬‏ ‏‮to‬‏ ‏‮create,‬‏ ‏‮edit,‬‏ ‏‮or‬‏ ‏‮delete‬‏ ‏‮webhooks‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel,‬‏ ‏‮which‬‏ ‏‮can‬‏ ‏‮post‬‏ ‏‮messages‬‏ ‏‮from‬‏ ‏‮other‬‏ ‏‮apps‬‏ ‏‮or‬‏ ‏‮sites.‬‏ @@ -7303,7 +7344,6 @@ ‏‮Set‬‏ ‏‮the‬‏ ‏‮topic‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮Stage.‬‏ ‏‮Stage‬‏ ‏‮Channel‬‏ ‏‮Start‬‏ - ‏‮Start‬‏ ‏‮a‬‏ ‏‮Thread‬‏ ‏‮Start‬‏ ‏‮Call‬‏ ‏‮Start‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮Start‬‏ ‏‮a‬‏ ‏‮Stage‬‏ @@ -7311,7 +7351,7 @@ ‏‮Members‬‏ ‏‮Only‬‏ ‏‮Start‬‏ ‏‮the‬‏ ‏‮Stage‬‏ ‏‮You‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮a‬‏ ‏‮Speaker‬‏ ‏‮when‬‏ ‏‮the‬‏ ‏‮Stage‬‏ ‏‮opens.‬‏ - ‏‮Write‬‏ ‏‮a‬‏ ‏‮topic‬‏ ‏‮to‬‏ ‏‮announce‬‏ ‏‮your‬‏ ‏‮Stage‬‏ ‏‮is‬‏ ‏‮live.‬‏ + ‏‮Write‬‏ ‏‮a‬‏ ‏‮topic‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮your‬‏ ‏‮Stage.‬‏ ‏‮What‬‏ ‏‮will‬‏ ‏‮you‬‏ ‏‮be‬‏ ‏‮talking‬‏ ‏‮about?‬‏ ‏‮Stage‬‏ ‏‮Topic‬‏ ‏‮The‬‏ ‏‮debate‬‏ ‏‮is‬‏ ‏‮over:‬‏ ‏‮diet‬‏ ‏‮is‬‏ ‏‮better‬‏ ‏‮than‬‏ ‏‮regular‬‏ @@ -7332,17 +7372,17 @@ ‏‮Make‬‏ ‏‮a‬‏ ‏‮[Community‬‏ ‏‮server.](‬‏‏‮{helpdeskArticle}‬‏‏‮)‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮channel.‬‏ ‏‮Come‬‏ ‏‮up‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮great‬‏ ‏‮event.‬‏ - ‏‮Start‬‏ ‏‮and‬‏ ‏‮open‬‏ ‏‮your‬‏ ‏‮Stage!‬‏ + ‏‮Start‬‏ ‏‮your‬‏ ‏‮Stage!‬‏ ‏‮Curious‬‏ ‏‮to‬‏ ‏‮learn‬‏ ‏‮more?‬‏ - ‏‮Learn‬‏ ‏‮how‬‏ ‏‮to‬‏ ‏‮host‬‏ ‏‮a‬‏ ‏‮great‬‏ ‏‮Stage‬‏ + ‏‮Learn‬‏ ‏‮more‬‏ ‏‮about‬‏ ‏‮Stage‬‏ ‏‮channels‬‏ ‏‮You‬‏ ‏‮can\'t‬‏ ‏‮start‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮yet‬‏ - ‏‮Engage‬‏ ‏‮and‬‏ ‏‮grow‬‏ ‏‮your‬‏ ‏‮community‬‏ ‏‮with‬‏ ‏‮Stage‬‏ ‏‮channels.‬‏ - ‏‮Which‬‏ ‏‮community‬‏ ‏‮do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮host‬‏ ‏‮an‬‏ ‏‮audio‬‏ ‏‮event‬‏ ‏‮in?‬‏ + ‏‮Engage‬‏ ‏‮and‬‏ ‏‮grow‬‏ ‏‮your‬‏ ‏‮community‬‏ ‏‮by‬‏ ‏‮hosting‬‏ ‏‮a‬‏ ‏‮live‬‏ ‏‮audio‬‏ ‏‮event‬‏ ‏‮with‬‏ ‏‮Stage‬‏ ‏‮channels.‬‏ + ‏‮Where‬‏ ‏‮do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮host‬‏ ‏‮a‬‏ ‏‮Stage?‬‏ ‏‮Your‬‏ ‏‮Stage‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮hosted‬‏ ‏‮in‬‏ ‏‮$[**!!‬‏‏‮{stageName}‬‏‏‮!!**](stageHook).‬‏ ‏‮$[Change‬‏ ‏‮Channel](changeHook)‬‏ - ‏‮We‬‏ ‏‮will‬‏ ‏‮automatically‬‏ ‏‮create‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮channel‬‏ ‏‮for‬‏ ‏‮you‬‏ ‏‮called‬‏ ‏‮$[**!!‬‏‏‮{stageName}‬‏‏‮!!**](stageHook).‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮the‬‏ ‏‮name‬‏ ‏‮later.‬‏ + ‏‮We‬‏ ‏‮will‬‏ ‏‮create‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮channel‬‏ ‏‮for‬‏ ‏‮you‬‏ ‏‮called‬‏ ‏‮$[**!!‬‏‏‮{stageName}‬‏‏‮!!**](stageHook).‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮the‬‏ ‏‮name‬‏ ‏‮later.‬‏ ‏‮Your‬‏ ‏‮Stage‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮hosted‬‏ ‏‮in‬‏ ‏‮$[**!!‬‏‏‮{stageName}‬‏‏‮!!**](stageHook).‬‏ ‏‮Stage‬‏ ‏‮channel‬‏ - ‏‮Write‬‏ ‏‮a‬‏ ‏‮topic‬‏ ‏‮to‬‏ ‏‮announce‬‏ ‏‮your‬‏ ‏‮Stage‬‏ ‏‮is‬‏ ‏‮live.‬‏ + ‏‮Write‬‏ ‏‮a‬‏ ‏‮topic‬‏ ‏‮to‬‏ ‏‮start‬‏ ‏‮your‬‏ ‏‮Stage.‬‏ ‏‮What‬‏ ‏‮will‬‏ ‏‮you‬‏ ‏‮be‬‏ ‏‮talking‬‏ ‏‮about?‬‏ ‏‮Let\'s‬‏ ‏‮do‬‏ ‏‮it‬‏ ‏‮People‬‏ ‏‮performing‬‏ @@ -7353,7 +7393,6 @@ ‏‮Your‬‏ ‏‮Stage‬‏ ‏‮is‬‏ ‏‮going‬‏ ‏‮public!‬‏ ‏‮Here‬‏ ‏‮are‬‏ ‏‮a‬‏ ‏‮few‬‏ ‏‮things‬‏ ‏‮you‬‏ ‏‮should‬‏ ‏‮know.‬‏ ‏‮Is‬‏ ‏‮your‬‏ ‏‮topic‬‏ ‏‮descriptive‬‏ ‏‮enough?‬‏ ‏‮Make‬‏ ‏‮sure‬‏ ‏‮it\'s‬‏ ‏‮clear‬‏ ‏‮so‬‏ ‏‮that‬‏ ‏‮people‬‏ ‏‮browsing‬‏ ‏‮Stage‬‏ ‏‮Discovery‬‏ ‏‮can‬‏ ‏‮easily‬‏ ‏‮know‬‏ ‏‮what‬‏ ‏‮your‬‏ ‏‮Stage‬‏ ‏‮and‬‏ ‏‮community‬‏ ‏‮is‬‏ ‏‮about.‬‏ - ‏‮Start‬‏ ‏‮Thread‬‏ ‏‮Start‬‏ ‏‮Video‬‏ ‏‮Call‬‏ ‏‮Start‬‏ ‏‮Voice‬‏ ‏‮Call‬‏ ‏‮Starting‬‏ ‏‮at‬‏ @@ -7707,8 +7746,8 @@ ‏‮Archived‬‏ ‏‮{time}‬‏ ‏‮Archived‬‏ ‏‮Created‬‏ ‏‮{time}‬‏ - ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮active‬‏ ‏‮threads‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮yet.‬‏ - ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮archived‬‏ ‏‮threads‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮channel‬‏ ‏‮yet.‬‏ + ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮active‬‏ ‏‮threads.‬‏ + ‏‮There‬‏ ‏‮are‬‏ ‏‮no‬‏ ‏‮archived‬‏ ‏‮threads.‬‏ ‏‮Stay‬‏ ‏‮focused‬‏ ‏‮on‬‏ ‏‮a‬‏ ‏‮conversation‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮thread,‬‏ ‏‮a‬‏ ‏‮temporary‬‏ ‏‮text‬‏ ‏‮channel.‬‏ ‏‮filter‬‏ ‏‮archived‬‏ ‏‮threads‬‏ ‏‮Filter‬‏ ‏‮Settings‬‏ @@ -7727,11 +7766,10 @@ ‏‮{count}‬‏‏‮m‬‏ ‏‮ago‬‏ ‏‮>30d‬‏ ‏‮ago‬‏ ‏‮Threads‬‏ - ‏‮Thread‬‏ ‏‮creator‬‏ ‏‮This‬‏ ‏‮thread‬‏ ‏‮is‬‏ ‏‮archived.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮send‬‏ ‏‮a‬‏ ‏‮message‬‏ ‏‮to‬‏ ‏‮unarchive‬‏ ‏‮it.‬‏ ‏‮Join‬‏ ‏‮this‬‏ ‏‮thread‬‏ ‏‮to‬‏ ‏‮get‬‏ ‏‮notifications‬‏ ‏‮and‬‏ ‏‮to‬‏ ‏‮save‬‏ ‏‮in‬‏ ‏‮your‬‏ ‏‮channel‬‏ ‏‮list.‬‏ - ‏‮This‬‏ ‏‮thread‬‏ ‏‮is‬‏ ‏‮locked‬‏ ‏‮by‬‏ ‏‮a‬‏ ‏‮moderator.‬‏ ‏‮Only‬‏ ‏‮a‬‏ ‏‮moderator‬‏ ‏‮may‬‏ ‏‮unarchive‬‏ ‏‮it.‬‏ - ‏‮No‬‏ ‏‮longer‬‏ ‏‮can‬‏ ‏‮view‬‏ ‏‮the‬‏ ‏‮thread‬‏ + ‏‮This‬‏ ‏‮thread‬‏ ‏‮was‬‏ ‏‮archived‬‏ ‏‮by‬‏ ‏‮a‬‏ ‏‮moderator.‬‏ ‏‮Only‬‏ ‏‮moderators‬‏ ‏‮can‬‏ ‏‮unarchive‬‏ ‏‮it.‬‏ + ‏‮Cannot‬‏ ‏‮view‬‏ ‏‮this‬‏ ‏‮thread‬‏ ‏‮{count}‬‏ ‏‮50+‬‏ ‏‮Messages‬‏ ‏‮›‬‏ ‏‮50+‬‏ ‏‮›‬‏ @@ -7744,7 +7782,7 @@ ‏‮Thread‬‏ ‏‮Settings‬‏ ‏‮Thread‬‏ ‏‮settings‬‏ ‏‮have‬‏ ‏‮been‬‏ ‏‮updated.‬‏ ‏‮Started‬‏ ‏‮by‬‏ ‏‮$[](usernameHook)‬‏ - ‏‮Thread‬‏ ‏‮starter‬‏ ‏‮message‬‏ ‏‮could‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮loaded‬‏ + ‏‮Sorry,‬‏ ‏‮we‬‏ ‏‮couldn\'t‬‏ ‏‮load‬‏ ‏‮the‬‏ ‏‮first‬‏ ‏‮message‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮thread‬‏ ‏‮Original‬‏ ‏‮message‬‏ ‏‮from‬‏ ‏‮channel‬‏ ‏‮Threads‬‏ ‏‮**!!‬‏‏‮{a}‬‏‏‮!!**,‬‏ ‏‮**!!‬‏‏‮{b}‬‏‏‮!!**,‬‏ ‏‮and‬‏ ‏‮**!!‬‏‏‮{c}‬‏‏‮!!**‬‏ ‏‮are‬‏ ‏‮typing…‬‏ @@ -7798,12 +7836,12 @@ ‏‮Toggle‬‏ ‏‮screen‬‏ ‏‮share‬‏ ‏‮This‬‏ ‏‮message‬‏ ‏‮may‬‏ ‏‮contain‬‏ ‏‮a‬‏ ‏‮Discord‬‏ ‏‮authentication‬‏ ‏‮token,‬‏ ‏‮which‬‏ ‏‮can‬‏ ‏‮grant‬‏ ‏‮an‬‏ ‏‮attacker‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮account.‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮send‬‏ ‏‮it?‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮animated‬‏ ‏‮emoji‬‏ ‏‮slots.‬‏ - ‏‮The‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮large‬‏ ‏‮announcement‬‏ ‏‮threads‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮reached.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ + ‏‮This‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮reached‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮active‬‏ ‏‮announcement‬‏ ‏‮threads.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮emoji‬‏ ‏‮slots.‬‏ ‏‮This‬‏ ‏‮thread‬‏ ‏‮has‬‏ ‏‮reached‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮possible‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮members.‬‏ ‏‮Your‬‏ ‏‮reaction‬‏ ‏‮was‬‏ ‏‮not‬‏ ‏‮added‬‏ ‏‮because‬‏ ‏‮there‬‏ ‏‮are‬‏ ‏‮too‬‏ ‏‮many‬‏ ‏‮reactions‬‏ ‏‮on‬‏ ‏‮this‬‏ ‏‮message.‬‏ ‏‮We‬‏ ‏‮appreciate‬‏ ‏‮the‬‏ ‏‮enthusiasm,‬‏ ‏‮but…‬‏ - ‏‮The‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮active‬‏ ‏‮threads‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮reached.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ + ‏‮This‬‏ ‏‮server‬‏ ‏‮has‬‏ ‏‮reached‬‏ ‏‮the‬‏ ‏‮maximum‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮active‬‏ ‏‮threads.‬‏ ‏‮Free‬‏ ‏‮up‬‏ ‏‮space‬‏ ‏‮by‬‏ ‏‮archiving‬‏ ‏‮a‬‏ ‏‮thread.‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮at‬‏ ‏‮the‬‏ ‏‮{quantity}‬‏ ‏‮server‬‏ ‏‮limit.‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮leave‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮first‬‏ ‏‮to‬‏ ‏‮join.‬‏ ‏‮Oh‬‏ ‏‮no!‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮leave‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮first‬‏ ‏‮to‬‏ ‏‮join.‬‏ @@ -7988,7 +8026,7 @@ ‏‮Upload‬‏ ‏‮Emoji‬‏ ‏‮Spice‬‏ ‏‮up‬‏ ‏‮your‬‏ ‏‮chat‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮custom‬‏ ‏‮emoji.‬‏ ‏‮Upload‬‏ ‏‮an‬‏ ‏‮emoji‬‏ - ‏‮Protip:‬‏ ‏‮Just‬‏ ‏‮double‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮+‬‏ + ‏‮Tip:‬‏ ‏‮Double‬‏ ‏‮click‬‏ ‏‮the‬‏ ‏‮$[](icon)‬‏ ‏‮Upload‬‏ ‏‮Image‬‏ ‏‮Is‬‏ ‏‮this‬‏ ‏‮your‬‏ ‏‮card?‬‏ ‏‮Err,‬‏ ‏‮do‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮upload‬‏ ‏‮this‬‏ ‏‮image?‬‏ ‏‮Unable‬‏ ‏‮to‬‏ ‏‮open‬‏ ‏‮file:‬‏ ‏‮{file}‬‏‏‮.‬‏ @@ -8110,7 +8148,7 @@ ‏‮Push‬‏ ‏‮notifications‬‏ ‏‮not‬‏ ‏‮enabled‬‏ ‏‮User‬‏ ‏‮Settings‬‏ ‏‮About‬‏ ‏‮Me‬‏ - ‏‮Write‬‏ ‏‮anything‬‏ ‏‮you’d‬‏ ‏‮like‬‏ ‏‮about‬‏ ‏‮yourself‬‏ ‏‮and‬‏ ‏‮link‬‏ ‏‮whatever‬‏ ‏‮you‬‏ ‏‮want.‬‏ ‏‮Just‬‏ ‏‮keep‬‏ ‏‮it‬‏ ‏‮under‬‏ ‏‮{maxLength}‬‏ ‏‮characters.‬‏ + ‏‮Write‬‏ ‏‮anything‬‏ ‏‮you’d‬‏ ‏‮like‬‏ ‏‮about‬‏ ‏‮yourself‬‏ ‏‮—‬‏ ‏‮as‬‏ ‏‮long‬‏ ‏‮as‬‏ ‏‮you‬‏ ‏‮do‬‏ ‏‮it‬‏ ‏‮in‬‏ ‏‮under‬‏ ‏‮{maxLength}‬‏ ‏‮characters.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮use‬‏ ‏‮markdown‬‏ ‏‮and‬‏ ‏‮links‬‏ ‏‮if‬‏ ‏‮you’d‬‏ ‏‮like.‬‏ ‏‮Your‬‏ ‏‮current‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮is‬‏ ‏‮!!‬‏‏‮{email}‬‏‏‮!!‬‏ ‏‮What‬‏ ‏‮would‬‏ ‏‮you‬‏ ‏‮like‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮it‬‏ ‏‮to?‬‏ ‏‮Enter‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮and‬‏ ‏‮your‬‏ ‏‮existing‬‏ ‏‮password.‬‏ ‏‮Edit‬‏ ‏‮Email‬‏ @@ -8145,7 +8183,9 @@ ‏‮Oh‬‏ ‏‮here‬‏ ‏‮it‬‏ ‏‮is!‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮the‬‏ ‏‮zoom‬‏ ‏‮level‬‏ ‏‮with‬‏ ‏‮{modKey}‬‏ ‏‮+/-‬‏ ‏‮and‬‏ ‏‮reset‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮default‬‏ ‏‮zoom‬‏ ‏‮with‬‏ ‏‮{modKey}‬‏‏‮+0.‬‏ ‏‮Available‬‏ ‏‮Backup‬‏ ‏‮Codes‬‏ - ‏‮The‬‏ ‏‮recommended‬‏ ‏‮minimum‬‏ ‏‮size‬‏ ‏‮is‬‏ ‏‮300x120‬‏ ‏‮and‬‏ ‏‮recommended‬‏ ‏‮aspect‬‏ ‏‮ratio‬‏ ‏‮is‬‏ ‏‮5:2.‬‏ ‏‮Accepted‬‏ ‏‮file‬‏ ‏‮types‬‏ ‏‮include‬‏ ‏‮PNG,‬‏ ‏‮JPG,‬‏ ‏‮and‬‏ ‏‮animated‬‏ ‏‮GIFs‬‏ ‏‮under‬‏ ‏‮10MB.‬‏ + ‏‮Avatar‬‏ + ‏‮Banner‬‏ ‏‮Color‬‏ + ‏‮We‬‏ ‏‮recommend‬‏ ‏‮an‬‏ ‏‮image‬‏ ‏‮of‬‏ ‏‮at‬‏ ‏‮least‬‏ ‏‮600x240.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮upload‬‏ ‏‮a‬‏ ‏‮PNG,‬‏ ‏‮JPG,‬‏ ‏‮or‬‏ ‏‮an‬‏ ‏‮animated‬‏ ‏‮GIF.‬‏ ‏‮Blocked‬‏ ‏‮Users‬‏ ‏‮You‬‏ ‏‮don\'t‬‏ ‏‮have‬‏ ‏‮any‬‏ ‏‮blocked‬‏ ‏‮users‬‏ ‏‮{numberOfBlockedUsers}‬‏ ‏‮Blocked‬‏ ‏‮Users‬‏ @@ -8154,12 +8194,14 @@ ‏‮Close‬‏ ‏‮Button‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮sure‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮logout?‬‏ ‏‮Unlock‬‏ ‏‮with‬‏ ‏‮Nitro‬‏ + ‏‮Customizing‬‏ ‏‮My‬‏ ‏‮Profile‬‏ ‏‮Delete‬‏ ‏‮Avatar‬‏ ‏‮Turning‬‏ ‏‮this‬‏ ‏‮off‬‏ ‏‮may‬‏ ‏‮help‬‏ ‏‮if‬‏ ‏‮your‬‏ ‏‮voice‬‏ ‏‮is‬‏ ‏‮not‬‏ ‏‮being‬‏ ‏‮detected‬‏ ‏‮by‬‏ ‏‮the‬‏ ‏‮automatic‬‏ ‏‮input‬‏ ‏‮sensitivity.‬‏ ‏‮Noise‬‏ ‏‮reduction‬‏ ‏‮is‬‏ ‏‮disabled‬‏ ‏‮while‬‏ ‏‮Noise‬‏ ‏‮Suppression‬‏ ‏‮is‬‏ ‏‮active.‬‏ ‏‮Edit‬‏ ‏‮Account‬‏ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮to‬‏ ‏‮confirm‬‏ ‏‮changes‬‏ ‏‮TAG‬‏ + ‏‮Edit‬‏ ‏‮Profile‬‏ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮to‬‏ ‏‮view‬‏ ‏‮backup‬‏ ‏‮codes.‬‏ ‏‮Location‬‏ ‏‮Add‬‏ ‏‮Install‬‏ ‏‮Location‬‏ @@ -8176,6 +8218,7 @@ ‏‮HypeSquad‬‏ ‏‮Action‬‏ ‏‮Chat‬‏ + ‏‮Default‬‏ ‏‮Keybinds‬‏ ‏‮Keybind‬‏ ‏‮These‬‏ ‏‮shortcuts‬‏ ‏‮work‬‏ ‏‮when‬‏ ‏‮focused‬‏ ‏‮on‬‏ ‏‮a‬‏ ‏‮message.‬‏ ‏‮Messages‬‏ @@ -8211,7 +8254,8 @@ ‏‮Open‬‏ ‏‮Discord‬‏ ‏‮Check‬‏ ‏‮out‬‏ ‏‮our‬‏ ‏‮[Terms‬‏ ‏‮of‬‏ ‏‮Service](‬‏‏‮{termsLink}‬‏‏‮)‬‏ ‏‮and‬‏ ‏‮[Privacy‬‏ ‏‮Policy](‬‏‏‮{privacyLink}‬‏‏‮).‬‏ ‏‮Profile‬‏ ‏‮Banner‬‏ - ‏‮Profile‬‏ ‏‮Customization‬‏ + ‏‮Remove‬‏ ‏‮Avatar‬‏ + ‏‮Remove‬‏ ‏‮Banner‬‏ ‏‮Restart‬‏ ‏‮the‬‏ ‏‮app‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮new‬‏ ‏‮settings‬‏ ‏‮to‬‏ ‏‮take‬‏ ‏‮effect.‬‏ ‏‮Save‬‏ ‏‮Scan‬‏ ‏‮QR‬‏ ‏‮Code‬‏ @@ -8225,7 +8269,9 @@ ‏‮Please‬‏ ‏‮check‬‏ ‏‮your‬‏ ‏‮email‬‏ ‏‮and‬‏ ‏‮follow‬‏ ‏‮the‬‏ ‏‮instructions‬‏ ‏‮to‬‏ ‏‮verify‬‏ ‏‮your‬‏ ‏‮email.‬‏ ‏‮If‬‏ ‏‮you‬‏ ‏‮did‬‏ ‏‮not‬‏ ‏‮receive‬‏ ‏‮an‬‏ ‏‮email‬‏ ‏‮or‬‏ ‏‮if‬‏ ‏‮it‬‏ ‏‮expired,‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮resend‬‏ ‏‮one.‬‏ ‏‮Upload‬‏ ‏‮Avatar‬‏ ‏‮Upload‬‏ ‏‮Banner‬‏ + ‏‮Use‬‏ ‏‮default‬‏ ‏‮Used‬‏ ‏‮Backup‬‏ ‏‮Codes‬‏ + ‏‮User‬‏ ‏‮Profile‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮add‬‏ ‏‮multiple‬‏ ‏‮Push‬‏ ‏‮to‬‏ ‏‮Talk‬‏ ‏‮binds‬‏ ‏‮under‬‏ ‏‮[Keybind‬‏ ‏‮Settings](onClick).‬‏ ‏‮Discord‬‏ ‏‮uses‬‏ ‏‮only‬‏ ‏‮the‬‏ ‏‮best‬‏ ‏‮organic,‬‏ ‏‮locally-sourced‬‏ ‏‮Opus‬‏ ‏‮Voice‬‏ ‏‮codec.‬‏ ‏‮Audio‬‏ ‏‮Codec‬‏ diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 49908a28da..81cb9cb476 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -6738,6 +6738,7 @@ Только для участников Стартирай сцената Ти ще бъдеш говорител, когато подготовката се отвори. + Напиши тема, за да обявиш, че сцената ти е на живо. О чём вы будете говорить? Тема на подготовката Дебатът приключи: диетичната е по-добра от обикновената @@ -6755,11 +6756,17 @@ Создайте [сервер сообщества.]({helpdeskArticle}) Создайте трибуну. Придумайте интересное событие. + Организуйте и откройте свою трибуну! Хотите узнать больше? + Узнайте, как организовать хорошую трибуну Вы пока не можете открыть трибуну + Увеличивайте и развивайте своё сообщество с помощью трибун. + В каком сообществе вы хотите провести голосовое событие? Место проведения вашей трибуны: $[**!!{stageName}!!**](stageHook). $[Изменить канал](changeHook) + Мы автоматически создадим для вас трибуну под названием $[**!!{stageName}!!**](stageHook). Вы можете изменить его позже. Место проведения вашей трибуны: $[**!!{stageName}!!**](stageHook). Трибуна + Опишите тематику вашей трибуны, чтобы объявить о её открытии. О чём вы будете говорить? Сделаем это Выступающие diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a729e058f6..77e02e3ecc 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -6643,6 +6643,7 @@ Pouze členové Otevřít pódium Až se pódium otevře, ty budeš řečník. + Napiš téma a prohlas své pódium za aktivní. O čem se budete bavit? Téma pro pódium Debata je uzavřená: dietní je lepší než obyčejné @@ -6660,11 +6661,17 @@ Založ [komunitní server.]({helpdeskArticle}) Vytvoř řečnický kanál. Vymysli jedinečnou událost. + Otevři a zahaj své pódium! Láká tě dozvědět se víc? + Nauč se moderovat vynikající pódia Zatím nemůžeš otevřít pódium + Bav a rozšiřuj svou komunitu prostřednictvím řečnických kanálů. + V jaké komunitě chceš diskuzi pořádat? Tvé pódium se bude konat v $[**!!{stageName}!!**](stageHook). $[Změnit kanál](changeHook) + Automaticky ti založíme řečnický kanál s názvem $[**!!{stageName}!!**](stageHook). Název můžeš později změnit. Tvé pódium se bude konat v $[**!!{stageName}!!**](stageHook). Řečnický kanál + Napiš téma a prohlas své pódium za aktivní. O čem se budete bavit? Do toho Lidé před publikem diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ca0338f1e9..cddb76b198 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -6520,6 +6520,7 @@ Kun for medlemmer Start podiet Du vil være taleren, når podiet bliver åbnet. + Skriv et emne for at offentliggøre, at dit podie er åbent. Hvad vil du tale om? Podie-emne Debatten er forbi; diæt er bedre end sædvanligt @@ -6537,11 +6538,17 @@ Opret en [Community server.]({helpdeskArticle}) Opret en podiekanal. Find på en fedt event. + Start og åbn dit podie! Nysgerrig efter mere viden? + Mere om at være vært for et fedt podie Du kan ikke starte et podie endnu + Engager og få dit community til at vokse med podiekanaler. + Hvilket community ønsker du at være vært for et lyd-event i? Dit podie vil blive hosted i $[**!!{stageName}!!**](stageHook). $[Skift kanal](changeHook) + Vi opretter automatisk en podiekanal til dig med navnet $[**!!{stageName}!!**](stageHook). Du kan ændre navnet senere. Dit podie vil blive hosted på podiet $[**!!{stageName}!!**](stageHook). Podiekanal + Skriv et emne for at offentliggøre, at dit podie er åbent. Hvad vil du tale om? Lad os gøre det Folk der taler diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dd6a87bbee..2d80a07523 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1022,7 +1022,7 @@ Server -Avatar ändern Benutze auf jedem deiner Server einen anderen Avatar und vieles mehr mit **Discord Nitro!** Änderungsprotokoll - Neue Features {added marginTop}\n======================\n\n* **Deine Freunde finden ist da.** Wir haben eine Option hinzugefügt, die es erleichtert, Freunde auf Discord zu finden. Wenn du die Telefonnummer deines Freundes abgespeichert hast und ihr beide über Entdeckungen gefunden werden könnt, kannst du deinen Freund finden und ihm eine Freundschaftsanfrage senden. Das peinliche Gespräch ist vorprogrammiert: Wenn du \'ne Anfrage von xXSoulzLuverXx#0000 bekommst, bin das ich.\n* **Lieblingsemojis verfügbar.** Tippe ein Emoji im Chat an oder halte die Emoji-Auswahl gedrückt, um Emojis zu deinen Favoriten hinzuzufügen oder von deinen Favoriten zu entfernen. Die Synchronisierung deiner Favoriten mit der Desktop-App ist *noch* nicht möglich, aber immerhin kannst du so rausfinden, welche fünf von deinen 2.459 Emojis du überhaupt benutzt.\n* **Seitennummerierung zur Suchleiste hinzugefügt.** Du musst nie wieder ewig durch die Suchergebnisse scrollen. Ab jetzt kannst du direkt zu einer Seite springen. Endlich hast du den Beweis dafür, dass deine Freunde vor sechs Monaten etwas ganz Bestimmtes gesagt haben, innerhalb von wenigen Sekunden. Du hast recht und das sollen sie ruhig wissen!\n* **Töne für Sprachkanäle hinzugefügt.** Dein Mobilgerät spielt ab jetzt Töne ab, wenn du einem Sprachkanal betrittst, ihn verlässt oder verschoben wirst. Ich kann sie klar und deutlich in meinem Kopf hören. Ba-dum … Ba-da-doo …\n\n\nFehlerbehebungen und Updates {progress}\n======================\n\n* **Keine Benachrichtigungen mehr bei bearbeiteten Antworten!** Wenn du eine Antwort bearbeitest, wird der Autor der ursprünglichen Nachricht meistens nicht noch mal benachrichtigt. Ich hab es einfach satt. Ich wollte nur \'nen kleinen Grammatikfehler ausbügeln und das ist mir jetzt peinlich.\n* **Verbesserungen an Serverordnern.** Jetzt kannst du deine Serverordner als gelesen markieren! Wir haben auch Einstellungen für Serverordner hinzugefügt, damit du Namen und Farben personalisieren kannst.\n* **Erhebliche Verbesserungen und Fehlerbehebungen an der Mitgliedschaftsauswahl.** Du wirst dort endlich nicht mehr hängen bleiben.\n* **Verbesserter Zugriff auf Eingabemodus.** Du kannst deine Einstellungen für Push-to-Talk und Sprachaktivierung jetzt ändern, ohne das Fenster zu verlassen.\n\n\n + Neue Features {added marginTop}\n======================\n\n* **Stage Channel können jetzt entdeckt werden.** Über den neuen Entdeckungen-Tab findest du Communitys, die live on Stage sind – erlebe alle möglichen Audioevents wie Konzerte, Panels, Talentwettbewerbe und andere merkwürdige, aber völlig legale Veranstaltungen. \n* **Deine Freunde finden ist da.** Wir haben eine Option hinzugefügt, die es erleichtert, Freunde auf Discord zu finden. Wenn du die Telefonnummer deines Freundes abgespeichert hast und ihr beide über Entdeckungen gefunden werden könnt, kannst du deinen Freund finden und ihm eine Freundschaftsanfrage senden. Das peinliche Gespräch ist vorprogrammiert: Wenn du \'ne Anfrage von xXSoulzLuverXx#0000 bekommst, bin das ich.\n* **Lieblingsemojis verfügbar.** Tippe ein Emoji im Chat an oder halte die Emoji-Auswahl gedrückt, um Emojis zu deinen Favoriten hinzuzufügen oder von deinen Favoriten zu entfernen. Die Synchronisierung deiner Favoriten mit der Desktop-App ist *noch* nicht möglich, aber immerhin kannst du so rausfinden, welche fünf von deinen 2.459 Emojis du überhaupt benutzt.\n* **Seitennummerierung zur Suchleiste hinzugefügt.** Du musst nie wieder ewig durch die Suchergebnisse scrollen. Ab jetzt kannst du direkt zu einer Seite springen. Endlich hast du den Beweis dafür, dass deine Freunde vor sechs Monaten etwas ganz Bestimmtes gesagt haben, innerhalb von wenigen Sekunden. Du hast recht und das sollen sie ruhig wissen!\n* **Töne für Sprachkanäle hinzugefügt.** Dein Mobilgerät spielt ab jetzt Töne ab, wenn du einem Sprachkanal betrittst, ihn verlässt oder verschoben wirst. Ich kann sie klar und deutlich in meinem Kopf hören. Ba-dum … Ba-da-doo …\n\n\nFehlerbehebungen und Updates {progress}\n======================\n\n* **Keine Benachrichtigungen mehr bei bearbeiteten Antworten!** Wenn du eine Antwort bearbeitest, wird der Autor der ursprünglichen Nachricht meistens nicht noch mal benachrichtigt. Ich hab es einfach satt. Ich wollte nur \'nen kleinen Grammatikfehler ausbügeln und das ist mir jetzt peinlich.\n* **Verbesserungen an Serverordnern.** Jetzt kannst du deine Serverordner als gelesen markieren! Wir haben auch Einstellungen für Serverordner hinzugefügt, damit du Namen und Farben personalisieren kannst.\n* **Erhebliche Verbesserungen und Fehlerbehebungen an der Mitgliedschaftsauswahl.** Du wirst dort endlich nicht mehr hängen bleiben.\n* **Verbesserter Zugriff auf Eingabemodus.** Du kannst deine Einstellungen für Push-to-Talk und Sprachaktivierung jetzt ändern, ohne das Fenster zu verlassen.\n\n\n 2021-06-21 de 1 @@ -6569,6 +6569,7 @@ Nur für Mitglieder Podium erstellen Du wirst ein Sprecher sein, wenn das Podium freigegeben ist. + Gib eine Themenbeschreibung an, um dein Podium freizugeben. Worüber möchtest du reden? Podiumsthema Das Gespräch ist zu Ende: Zuckerfreie Limo ist besser als normale @@ -6586,11 +6587,17 @@ Erstelle einen [Community-Server.]({helpdeskArticle}) Einen Stage Channel erstellen. Plane ein großartiges Event. + Starte und eröffne deine Stage! Willst du mehr erfahren? + Lerne wie du eine großartige Stage hostest Du kannst noch keine Stage beginnen + Befasse dich mit deiner Community und vergrößere sie mit einem Stage Channel. + In welcher Community willst du ein Audioevent hosten? Deine Stage wird in $[**!!{stageName}!!**](stageHook) gehostet. $[Kanal ändern](changeHook) + Wir erstellen für dich automatisch einen Stage Channel mit dem Namen $[**!!{stageName}!!**](stageHook). Du kannst den Namen später ändern. Deine Stage wird in $[**!!{stageName}!!**](stageHook) gehostet. Stage Channel + Schreibe eine Themenbeschreibung, um deine Stage anzukündigen. Worüber möchtest du reden? Los geht’s Auftritte von Personen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1a33d9a0c5..4b78924237 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -6717,6 +6717,7 @@ Μόνο για μέλη Έναρξη σκηνής Θα είσαι Ομιλητής μόλις ανοίξει η Σκηνή. + Γράψε ένα θέμα για να ανακοινώσεις ότι η Σκηνή σου βρίσκεται σε ζωντανή μετάδοση. Για τι θα μιλήσεις; Θέμα σκηνής Η συζήτηση ολοκληρώθηκε: το διαιτητικό είναι καλύτερο από το κανονικό @@ -6734,11 +6735,17 @@ Φτιάξε έναν [Διακομιστή κοινότητας.]({helpdeskArticle}) Δημιούργησε ένα κανάλι σκηνής. Σκέψου μια μοναδική εκδήλωση. + Ξεκίνα και άνοιξε τη σκηνή σου! Θες να μάθεις περισσότερα; + Μάθε πώς να οργανώσεις μια μοναδική σκηνή Δεν μπορείς να ξεκινήσεις μια σκηνή ακόμα + Πάρε μέρος και διεύρυνε την κοινότητά σου με κανάλια σκηνής. + Σε ποια κοινότητα θέλεις να οργανώσεις μια ηχητική εκδήλωση; Η σκηνή σου θα φιλοξενηθεί στη σκηνή $[**!!{stageName}!!**](stageHook). $[Άλλαξε κανάλι](changeHook) + Θα δημιουργήσουμε αυτόματα ένα κανάλι σκηνής για σένα με το όνομα $[**!!{stageName}!!**](stageHook). Μπορείς να αλλάξεις το όνομα αργότερα. Η σκηνή σου θα φιλοξενηθεί στη σκηνή $[**!!{stageName}!!**](stageHook). Κανάλι σκηνής + Γράψε ένα θέμα για να ανακοινώσεις ότι η σκηνή σου βρίσκεται σε ζωντανή μετάδοση. Για τι θα μιλήσεις; Πάμε Άτομα που παρουσιάζουν diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml index 0c7fe5e0b3..99eaa14d42 100644 --- a/app/src/main/res/values-en-rXA/plurals.xml +++ b/app/src/main/res/values-en-rXA/plurals.xml @@ -208,6 +208,10 @@ [»{#}« ḿîñûţé one two] [»{#}« ḿîñûţéš one two] + + [**1** çöḿḿûñîţý one two three] + [**»{numResults}«** çöḿḿûñîţîéš one two three] + [+»{count}« Šþéåķéŕ one two] [+»{count}« Šþéåķéŕš one two] @@ -513,12 +517,12 @@ [, »{#}« ûñŕéåð ḿéñţîöñš one two three] - [Çĥåñĝéð ðéƒåûļţ åûţö-åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţé** one two three four five six] - [Çĥåñĝéð ðéƒåûļţ åûţö-åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţéš** one two three four five six] + [Çĥåñĝéð ðéƒåûļţ åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţé** one two three four five six] + [Çĥåñĝéð ðéƒåûļţ åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţéš** one two three four five six] - [Šéţ ðéƒåûļţ åûţö-åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţé** one two three four five six] - [Šéţ ðéƒåûļţ åûţö-åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţéš** one two three four five six] + [Šéţ ðéƒåûļţ åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţé** one two three four five] + [Šéţ ðéƒåûļţ åŕçĥîVé ðûŕåţîöñ ţö **»{#}« ḿîñûţéš** one two three four five] [å þéŕḿîššîöñ one two] diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 4adc4adcba..acea731dd7 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -701,9 +701,9 @@ [1 Ŵééķ one two] [24 Ĥöûŕš one two] [3 Ðåýš one two] - [Åûţö-åŕçĥîVé åƒţéŕ »{duration}« öƒ îñåçţîVîţý one two three four] + [ÅŕçĥîVé åƒţéŕ »{duration}« öƒ îñåçţîVîţý one two three four] [Åûţö-åŕçĥîVé åţ »{time}« one two three] - [Ţĥîš ţĥŕéåð ŵîļļ åûţö-åŕçĥîVé: »{time}« one two three four] + [Ţĥîš ţĥŕéåð ŵîļļ åŕçĥîVé: »{time}« one two three four] [Šţîçķéŕ Šûĝĝéšţîöñš one two three] [Åļļöŵš šţîçķéŕ šûĝĝéšţîöñš ţö åþþéåŕ ŵĥéñ ţýþîñĝ ḿéššåĝéš. one two three four five six seven] [Åûţöḿåţîçåļļý éñåɓļé/ðîšåɓļé Šţŕéåḿéŕ Ḿöðé îƒ ÖβŠ öŕ ׊þļîţ åŕé ŕûññîñĝ öñ ţĥîš çöḿþûţéŕ. one two three four five six seven eight nine ten] @@ -741,7 +741,7 @@ [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ɓåñ ¡¡»{user}«¡¡¿ Ţĥéý ŵöñ\'ţ ɓé åɓļé ţö ŕéţûŕñ ûñļéšš ýöû ûñɓåñ ţĥéḿ. one two three four five six seven eight nine] [\'¡¡»{user}«¡¡\' ĥåš ɓééñ ɓåññéð ƒŕöḿ ţĥé šéŕVéŕ. one two three four five] [Ŵĥööþš… ¡¡»{user}«¡¡ çöûļð ñöţ ɓé ɓåññéð. Þļéåšé ţŕý åĝåîñ¡ one two three four five six] - [βåñ ¡¡»{user}«¡¡ Fŕöḿ ŠéŕVéŕ one two three] + [βåñ ¡¡»{user}«¡¡ ƒŕöḿ ŠéŕVéŕ one two three] [βåñ \'¡¡»{user}« one two] [βåñš one] [»{bans}«] @@ -760,7 +760,7 @@ [Ŵéļçöḿé ţö ţĥé ɓéĝîññîñĝ öƒ ţĥé **¡¡»{name}«¡¡** ĝŕöûþ. one two three four five six] [Ýöû ŵîļļ åûţöḿåţîçåļļý ļéåVé ţĥîš ĝŕöûþ ŵĥéñ ýöû\'ŕé ðöñé. one two three four five six seven] [Ţĥîš îš ţĥé šţåŕţ öƒ ţĥé ¡¡»{channelName}«¡¡ **þŕîVåţé** çĥåññéļ. €[](ţöþîçĤööķ) one two three four five six seven] - [Ţĥîš ţĥŕéåð ŵîļļ åûţö-åŕçĥîVé åƒţéŕ €[](åûţöÅŕçĥîVéÐûŕåţîöñĤööķ) öƒ îñåçţîVîţý. one two three four five six seven eight nine] + [Ţĥîš ţĥŕéåð ŵîļļ åŕçĥîVé åƒţéŕ €[](åûţöÅŕçĥîVéÐûŕåţîöñĤööķ) öƒ îñåçţîVîţý. one two three four five six seven eight] [βéţå one] [βûļĝåŕîåñ one two] [βîļļîñĝ one two] @@ -839,6 +839,7 @@ [Ñö þåýḿéñţ ḿéţĥöð šåVéð one two three] [Çĥéçķöûţ ƒåšţéŕ ɓý šåVîñĝ å þåýḿéñţ ḿéţĥöð one two three four five] [Þåý ƒöŕ îţ Ŵîţĥ one two three] + [Å šḿåļļ ĥöļð ḿåý ɓé þļåçéð öñ ýöûŕ þåýḿéñţ ḿéţĥöð. [Ļéåŕñ Ḿöŕé](»{helpDeskArticle}«) one two three four five six seven eight nine ten eleven twelve thirteen] [Ţåхéš one] [Ţöţåļ one] [Ţŕåñšåçţîöñ Ĥîšţöŕý one two three] @@ -963,8 +964,8 @@ [Ýöûŕ ḿéššåĝé çöûļð ñöţ ɓé ðéļîVéŕéð. Ţĥîš îš ûšûåļļý ɓéçåûšé ýöû ðöñ\'ţ šĥåŕé å šéŕVéŕ ŵîţĥ ţĥé ŕéçîþîéñţ öŕ ţĥé ŕéçîþîéñţ îš öñļý åççéþţîñĝ ðîŕéçţ ḿéššåĝéš ƒŕöḿ ƒŕîéñðš. Ýöû çåñ šéé ţĥé ƒûļļ ļîšţ öƒ ŕéåšöñš ĥéŕé: »{helpUrl}« one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Ýöûŕ ḿéššåĝé çöûļð ñöţ ɓé ðéļîVéŕéð. Ţĥîš îš ûšûåļļý ɓéçåûšé ýöû ðöñ\'ţ šĥåŕé å šéŕVéŕ ŵîţĥ ţĥé ŕéçîþîéñţ öŕ ţĥé ŕéçîþîéñţ îš öñļý åççéþţîñĝ ðîŕéçţ ḿéššåĝéš ƒŕöḿ ƒŕîéñðš. Ýöû çåñ šéé ţĥé ƒûļļ ļîšţ öƒ ŕéåšöñš [ĥéŕé](»{helpUrl}«) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Šéñðîñĝ ḿéššåĝéš ţö ţĥîš çĥåññéļ ĥåš ɓééñ ţéḿþöŕåŕîļý ðîšåɓļéð. Ţŕý åĝåîñ îñ å ɓîţ. one two three four five six seven eight nine] - [Ýöûŕ ḿéššåĝé çöûļð ñöţ ɓé šéñţ ɓéçåûšé ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ ļåŕĝé åññöûñçéḿéñţ ţĥŕéåðš ĥåš ɓééñ ŕéåçĥéð. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] - [Ýöûŕ ḿéššåĝé çöûļð ñöţ ɓé šéñţ ɓéçåûšé ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ åçţîVé ţĥŕéåðš ĥåš ɓééñ ŕéåçĥéð. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven twelve thirteen] + [Ýöûŕ ḿéššåĝé çöûļð ñöţ ɓé šéñţ ɓéçåûšé ţĥîš šéŕVéŕ ĥåš ŕéåçĥéð ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ åññöûñçéḿéñţ ţĥŕéåðš. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] + [Ýöûŕ ḿéššåĝé çöûļð ñöţ ɓé šéñţ ɓéçåûšé ţĥîš šéŕVéŕ ĥåš ŕéåçĥéð ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ ţĥŕéåðš. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven twelve thirteen] [Ŵöåĥ ţĥéŕé¡ Šöḿéöñé îñ ¡¡»{name}«¡¡ ĥåš ŕéQûéšţéð ţĥåţ Ðîšçöŕð ɓļöçķ åñý ḿéššåĝéš öûŕ ḿöšţļý-åççûŕåţé ŕöɓöţš ðééḿ ţö ɓé éхþļîçîţ, šö ýöûŕ ḿéššåĝé ĥåš ñöţ ɓééñ šéñţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ŵöåĥ ţĥéŕé¡ Ţĥé öŵñéŕ öƒ ¡¡»{name}«¡¡ ĥåš ŕéQûéšţéð ţĥåţ Ðîšçöŕð ɓļöçķ åñý ḿéššåĝéš öûŕ ḿöšţļý-åççûŕåţé ŕöɓöţš ðééḿ ţö ɓé éхþļîçîţ, šö ýöûŕ ḿéššåĝé ĥåš ñöţ ɓééñ šéñţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ýöû ñééð ţö Véŕîƒý ýöûŕ éḿåîļ ɓéƒöŕé ýöû çåñ šéñð ḿéššåĝéš ĥéŕé. one two three four five six seven] @@ -1197,6 +1198,7 @@ [»{mentionCount}«] [¡¡»{author}«¡¡ åţ »{timestamp}«: ¡¡»{content}«¡¡ one two three] [ḿéššåĝé one two] + [¡¡»{author}«¡¡ ŕéþļýîñĝ ţö ¡¡»{repliedAuthor}«¡¡ one two three] [Ûšé ţĥé ûþ åñð ðöŵñ åŕŕöŵ ķéýš ţö ñåVîĝåţé ɓéţŵééñ ḿéššåĝéš Qûîçķļý. Ñéŵ ḿéššåĝéš ŵîļļ ɓé åððéð ţö ţĥé ɓöţţöḿ öƒ ţĥé ļîšţ åš ţĥéý çöḿé îñ. one two three four five six seven eight nine ten eleven twelve thirteen] [Ḿéššåĝéš îñ ¡¡»{channelName}«¡¡ one two three] [ḿéššåĝé ļîšţ one two] @@ -1810,7 +1812,6 @@ [Çŕåšĥ Ţîḿéšţåḿþ: »{timestamp}« one two three] [Ðîšçöŕð ĥåš çŕåšĥéð ûñéхþéçţéðļý. one two three four] [Çŕéåţé one two] - [Çŕéåţé å Ţĥŕéåð one two three] [Çŕéåţé Çåţéĝöŕý one two three] [Çŕéåţé Çĥåññéļ one two three] [Šöḿéţĥîñĝ ŵéñţ ŵŕöñĝ ţŕýîñĝ ţö çŕéåţé å çĥåññéļ. Þļéåšé ţŕý åĝåîñ ļåţéŕ. one two three four five six seven eight] @@ -1881,7 +1882,7 @@ [Þöšţ îḿåĝéš, ĜÎFš, šţîçķéŕš, öþîñîöñš, åñð þûñš one two three four five six seven eight nine ten] [Çŕéåţé Ţĥŕéåð one two] [Šéñð å ḿéššåĝé ţö šţåŕţ å ţĥŕéåð îñ ţĥîš çĥåññéļ¡ one two three four five six] - [Îţ ŵîļļ åûţö-åŕçĥîVé åƒţéŕ €[](ðûŕåţîöñĤööķ) öƒ îñåçţîVîţý. one two three four five six seven] + [Îţ ŵîļļ åŕçĥîVé åƒţéŕ €[](ðûŕåţîöñĤööķ) öƒ îñåçţîVîţý. one two three four five six seven] [Çŕéåţé νöîçé Çĥåññéļ one two three] [Ĥåñĝ öûţ ŵîţĥ Vöîçé, Vîðéö, åñð šçŕééñ šĥåŕîñĝ one two three four five six] [Î\'ḿ ḿåķîñĝ ţĥîš šéŕVéŕ ƒöŕ å çļûɓ öŕ çöḿḿûñîţý. one two three four five six] @@ -2000,6 +2001,10 @@ [Ðéšçŕîþţîöñ one two] [Ýöû ḿûšţ ðéšîĝñåţé åñöţĥéŕ îñšîðé [ŠéŕVéŕ Šéţţîñĝš > Çöḿḿûñîţý > ÖVéŕVîéŵ](öñÇļîçķ) ɓéƒöŕé ţĥîš çĥåññéļ çåñ ɓé ðéļéţéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Ðéšķţöþ Åþþ one two] + [Ḿöŕé ƒéåţûŕéš, ɓéţţéŕ þéŕƒöŕḿåñçé, åñð éåšý åççéšš ţö åļļ ýöûŕ çöñVéŕšåţîöñš. one two three four five six seven eight] + [Ðîšçöŕð ƒöŕ Ļîñûх one two three] + [Ðîšçöŕð ƒöŕ Ḿåç one two three] + [Ðîšçöŕð ƒöŕ Ŵîñðöŵš one two three] [Éñåɓļé Ðéšķţöþ Ñöţîƒîçåţîöñš one two three four] [΃ ýöû\'ŕé ļööķîñĝ ƒöŕ þéŕ-çĥåññéļ öŕ þéŕ-šéŕVéŕ ñöţîƒîçåţîöñš, ŕîĝĥţ-çļîçķ ţĥé ðéšîŕéð šéŕVéŕ îçöñ åñð šéļéçţ Ñöţîƒîçåţîöñ Šéţţîñĝš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] [Åûţöḿåţîçåļļý ðéţéçţ åççöûñţš ƒŕöḿ öţĥéŕ þļåţƒöŕḿš öñ ţĥîš çöḿþûţéŕ. one two three four five six seven eight] @@ -2028,6 +2033,11 @@ [ûñŕéåð, ¡¡»{channelName}«¡¡ (ðîŕéçţ ḿéššåĝé) one two three four] [Ðîŕéçţ Ḿéššåĝéš one two three] [Ðîŕéçţ Ḿéššåĝéš, »{requestCount}« þéñðîñĝ ƒŕîéñð ŕéQûéšţš one two three four five] + [Ðîŕéçţöŕý Éñţŕý Åçţîöñš one two three] + [Ţŕý åñöţĥéŕ šéåŕçĥ öŕ €[åðð å šéŕVéŕ](åððŠéŕVéŕĤööķ). one two three four five six] + [Ñö ḿåţçĥéš ƒöûñð one two three] + [Éхþļöŕé šéŕVéŕš one two three] + [»{numResults}« ƒöŕ **»{query}«** one two] [Ðîšåɓļé one two] [Ðîšåɓļé Åççöûñţ one two three] [Åŕé ýöû šûŕé ţĥåţ ýöû ŵåñţ ţö ðîšåɓļé ýöûŕ åççöûñţ¿ Ţĥîš ŵîļļ îḿḿéðîåţéļý ļöĝ ýöû öûţ åñð ḿåķé ýöûŕ åççöûñţ îñåççéššîɓļé ţö åñýöñé. one two three four five six seven eight nine ten eleven twelve thirteen] @@ -2467,14 +2477,14 @@ [Ðîåĝñöšţîç åûðîö ŕéçöŕðîñĝ îš ûšéð ƒöŕ åñåļýžîñĝ åûðîö þŕöɓļéḿš. Ţĥé ļåšţ ƒîVé ḿîñûţéš öƒ Vöîçé îš šåVéð ţö Vöîçé ḿöðûļé ƒöļðéŕ. one two three four five six seven eight nine ten eleven twelve thirteen] [Åûţöḿåţîçåļļý ḿöVé ḿéḿɓéŕš ţö ţĥîš çĥåññéļ åñð ḿûţé ţĥéḿ ŵĥéñ ţĥéý ĥåVé ɓééñ îðļé ƒöŕ ļöñĝéŕ ţĥåñ ţĥé îñåçţîVé ţîḿéöûţ. Ţĥîš ðöéš ñöţ 僃éçţ ɓŕöŵšéŕš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ļöŵéŕ ţĥé Vöļûḿé öƒ öţĥéŕ åþþļîçåţîöñš ɓý ţĥîš þéŕçéñţ ŵĥéñ šöḿéöñé îš šþéåķîñĝ. Šéţ ţö 0%% ţö çöḿþļéţéļý ðîšåɓļé åţţéñûåţîöñ. one two three four five six seven eight nine ten eleven twelve thirteen] - [Ţĥŕéåðš ŵîļļ åûţöḿåţîçåļļý åŕçĥîVé åƒţéŕ ţĥé šþéçîƒîéð ðûŕåţîöñ öƒ îñåçţîVîţý. one two three four five six seven eight nine] + [Ţĥŕéåðš ŵîļļ åŕçĥîVé åƒţéŕ ţĥé šþéçîƒîéð ðûŕåţîöñ öƒ îñåçţîVîţý. one two three four five six seven] [΃ ţĥé îñðîçåţöŕ îš šöļîð ĝŕééñ ţĥéñ Ðîšçöŕð îš ţŕåñšḿîţţîñĝ ýöûŕ ɓéåûţîƒûļ Vöîçé. one two three four five six seven eight nine] [ÅĻĻ ŢĤÉ βÎŢŠ¡ Ĝöîñĝ åɓöVé »{bitrate}«ķɓþš ḿåý åðVéŕšéļý 僃éçţ þéöþļé öñ þööŕ çöññéçţîöñš. one two three four five six seven eight nine] [Ŵĥîļé ûšîñĝ å Ðîšçöŕð Çéŕţîƒîéð ḿîçŕöþĥöñé çéŕţåîñ Vöîçé þŕöçéššîñĝ ƒéåţûŕéš åŕé ñö ļöñĝéŕ ĥåñðļéð ɓý Ðîšçöŕð îţšéļƒ, ɓûţ ŕåţĥéŕ ţĥé ḿîçŕöþĥöñé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Çĥåñĝé þŕîVåçý šéţţîñĝš åñð çûšţöḿîžé ĥöŵ ḿéḿɓéŕš çåñ îñţéŕåçţ ŵîţĥ ţĥîš çĥåññéļ. one two three four five six seven eight nine] [Ŕéçöŕðš åļļ ŔŢÞ ðåţå ŕéçéîVéð ƒöŕ ţĥé ñéхţ Vöîçé/Vîðéö çöññéçţîöñ ƒöŕ ðéɓûĝĝîñĝ þûŕþöšéš. one two three four five six seven eight nine ten] [ŠåVéš ðéɓûĝ ļöĝš ţö Vöîçé ḿöðûļé ƒöļðéŕ ţĥåţ ýöû çåñ ûþļöåð ţö Ðîšçöŕð Šûþþöŕţ ƒöŕ ţŕöûɓļéšĥööţîñĝ. one two three four five six seven eight nine ten eleven] - [Ñéŵ ţĥŕéåðš ŵîļļ ɓé šéţ ţö åûţö-åŕçĥîVé åƒţéŕ ţĥé šþéçîƒîéð ðûŕåţîöñ öƒ îñåçţîVîţý. one two three four five six seven eight nine] + [Ñéŵ ţĥŕéåðš ŵîļļ ɓé šéţ ţö åŕçĥîVé åƒţéŕ ţĥé šþéçîƒîéð ðûŕåţîöñ öƒ îñåçţîVîţý. one two three four five six seven eight nine] [Ţĥîš ŵîļļ ðéţéŕḿîñé ŵĥéţĥéŕ ḿéḿɓéŕš ŵĥö ĥåVé ñöţ éхþļîçîţļý šéţ ţĥéîŕ ñöţîƒîçåţîöñ šéţţîñĝš ŕéçéîVé å ñöţîƒîçåţîöñ ƒöŕ éVéŕý ḿéššåĝé šéñţ îñ ţĥîš šéŕVéŕ öŕ ñöţ. Ŵé ĥîĝĥļý ŕéçöḿḿéñð šéţţîñĝ ţĥîš ţö öñļý @ḿéñţîöñš ƒöŕ å þûɓļîç Ðîšçöŕð one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Ḿåý ţåķé ûþ ţö 15 ḿîñûţéš ţö ţåķé 郃éçţ. one two three four five] [Ţĥîš îḿåĝé ŵîļļ ɓé ðîšþļåýéð öñ ýöûŕ ÐîšçöVéŕý Ļîšţîñĝ. Ţĥé ŕéçöḿḿéñðéð ḿîñîḿûḿ šîžé îš 1920х1080 åñð ŕéçöḿḿéñðéð åšþéçţ ŕåţîö îš 16:9. one two three four five six seven eight nine ten eleven twelve thirteen] @@ -2675,12 +2685,12 @@ [Ŵĥåţ šĥöûļð éVéŕýöñé çåļļ ýöû¿ one two three four] [Öñļý þéöþļé ýöû îñVîţé åñð ḿöðéŕåţöŕš çåñ šéé ţĥîš ţĥŕéåð. one two three four five six seven] [Ŕéþöŕţš åŕé šéñţ ţö ţĥé Ðîšçöŕð Ţŕûšţ & Šåƒéţý ţéåḿ - **ñöţ ţĥé šéŕVéŕ öŵñéŕ**. Çŕéåţîñĝ ƒåļšé ŕéþöŕţš åñð/öŕ šþåḿḿîñĝ ţĥé ŕéþöŕţ ɓûţţöñ ḿåý ŕéšûļţ îñ å šûšþéñšîöñ öƒ ŕéþöŕţîñĝ åɓîļîţîéš. Ļéåŕñ ḿöŕé ƒŕöḿ ţĥé [Ðîšçöŕð Çöḿḿûñîţý Ĝûîðéļîñéš](»{guidelinesURL}«). Ţĥåñķš ƒöŕ ķééþîñĝ ţĥîñĝš šåƒé åñð šöûñð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight] - [Åûţö-åŕçĥîVé Ńţéŕ ÎñåçţîVîţý one two three four] + [ÅŕçĥîVé Ńţéŕ ÎñåçţîVîţý one two three] [Ñåḿé one] [Ñéŵ Ţĥŕéåð one two] - [Ţĥŕéåð ñåḿé îš ŕéQûîŕéð one two three] + [Ţĥŕéåð Ñåḿé îš ŕéQûîŕéð one two three] [Ýöû çåñ îñVîţé ñéŵ þéöþļé ɓý @ḿéñţîöñîñĝ ţĥéḿ. one two three four five six] - [Öñļý ţĥé îñVîţéð çåñ šéé ţĥîš ţĥŕéåð one two three four five] + [Öñļý þéöþļé ýöû îñVîţé åñð ḿöðéŕåţöŕš çåñ šéé one two three four five] [Éñţéŕ å ḿéššåĝé ţö šţåŕţ ţĥé çöñVéŕšåţîöñ¡ one two three four five] [Šţåŕţéŕ Ḿéššåĝé one two three] [Ýöû ðö ñöţ ĥåVé åñý îñþûţ ðéVîçéš éñåɓļéð. Ýöû ḿûšţ ĝŕåñţ Ðîšçöŕð [åççéšš ţö ýöûŕ ḿîçŕöþĥöñé](öñÉñåɓļéÇļîçķ) îñ öŕðéŕ ţö ɓé åɓļé ţö öɓšéŕVé îñþûţ šéñšîţîVîţý. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight] @@ -3618,6 +3628,7 @@ [νåñîţý ÛŔĻ ƒöŕ ţĥé šéŕVéŕ one two three] [»{bitrate}« Ķɓþš åûðîö Qûåļîţý one two three] [+»{adding}« šéŕVéŕ éḿöĵî šļöţš (ƒöŕ å ţöţåļ öƒ »{total}«) one two three four five] + [+»{adding}« çûšţöḿ šţîçķéŕ šļöţš (ƒöŕ å ţöţåļ öƒ »{total}«) one two three four five] [»{fileSize}« ûþļöåð ļîḿîţ ƒöŕ åļļ ḿéḿɓéŕš one two three four] [βööšţéð šéŕVéŕ þéŕķš îñçļûðé — one two three four] [Ñö öñé ĥåš ɓéšţöŵéð βööšţš ţö ţĥîš šéŕVéŕ ýéţ. Šéé îƒ åñý ḿéḿɓéŕš ŵöûļð ķîñðļý ɓļéšš ýöûŕ šéŕVéŕ ƒöŕ šéŕVéŕ-ŵîðé βööšţ Þéŕķš¡ one two three four five six seven eight nine ten eleven twelve thirteen] @@ -3895,6 +3906,7 @@ [ŴåVé ĥéļļö, šĥåŕé ýöûŕ šçŕééñ, öŕ ĵûšţ çĥåţ. one two three four five] [Çöļļåɓöŕåţé, îðéåţé, åñð šĥöŵ ýöûŕ šţûƒƒ. one two three four five] [Ḿåķé å ĥöḿé, ĥåVé ƒûñ, åñð ĥåñĝ öûţ. one two three four five] + [Ýöûŕ ĥåçķåţĥöñ – åļļ ţöĝéţĥéŕ îñ öñé þļåçé. one two three four five] [Çööŕðîñåţé, šĥåŕé ŕéšöûŕçéš, åñð ĥöšţ éVéñţš. one two three four five] [Šţåý îñ ţöûçĥ öñ åñð öƒƒ ţĥé Ŕîƒţ. one two three four] [Ḿééţ ûþ, öŕĝåñîžé, åñð šţåý îñ ţöûçĥ. one two three four five] @@ -3909,6 +3921,7 @@ [Çŕéåţé ýöûŕ šéŕVéŕ one two three] [Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ ĝŕöûþ one two three four] [Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ ƒŕîéñðš one two three four] + [Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ ĥåçķåţĥöñ one two three four] [Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ çöḿḿûñîţý one two three four] [Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ çöḿḿûñîţý one two three four] [Çŕéåţé å šéŕVéŕ ƒöŕ ýöûŕ çöḿḿûñîţý one two three four] @@ -4050,10 +4063,27 @@ [Ĥéļļö. βééþ. βööþ. ΃ ýöû ŵåññå îñVîţé ƒŕîéñðš ţö ţĥîš šéŕVéŕ, çļîçķ ţĥé šéŕVéŕ ñåḿé îñ ţĥé ţöþ ļéƒţ åñð šéļéçţ ¡¡»{invitePeople}«¡¡. βééþ¡ one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Çŕöåţîåñ one two] [Ĥûñĝåŕîåñ one two] - [Åðð å šéŕVéŕ ţö ţĥîš ĥûɓ one two three] - [ÎñVîţé þéöþļé ţö ţĥîš ĥûɓ one two three] + [Ţĥé šéŕVéŕ ðéšçŕîþţîöñ ŵîļļ åþþéåŕ îñ ţĥé ĥûɓ. Ûšé îţ ţö ĥéļþ šţûðéñţš ðéçîðé ŵĥéţĥéŕ ţö ĵöîñ. one two three four five six seven eight nine ten] + [Ðéšçŕîþţîöñ öƒ çļåšš, þŕöƒéššöŕ, åñð šéŕVéŕ ĝöåļš (šţûðý ĝŕöûþ), éţç. one two three four five six seven eight nine ten eleven twelve thirteen] + [ŠéŕVéŕ Ðéšçŕîþţîöñ one two three] + [Åðð ŠéŕVéŕ one two] + [Çĥööšé å ŕéļéVåñţ šéŕVéŕ ƒŕöḿ ţĥîš ļîšţ öƒ šéŕVéŕš ýöû åŕé åñ åðḿîñ ƒöŕ. Îţ ŵîļļ šţîļļ ɓé åççéššîɓļé ţö þéöþļé öûţšîðé ţĥé ĥûɓ. one two three four five six seven eight nine ten eleven twelve thirteen] + [Åðð å šéŕVéŕ ţö ¡¡»{guildName}«¡¡ one two three] + [Çŕéåţé Ñéŵ ŠéŕVéŕ one two three] + [ĤåVé åñ îðéå ƒöŕ å ñéŵ šéŕVéŕ¿ one two three four] + [Ŵĥéñ ýöû åðð å šéŕVéŕ, îţ ŵîļļ ɓé Vîšîɓļé ţö öţĥéŕ šţûðéñţš åñð ḿéḿɓéŕš, šö ḿåķé šûŕé îţ\'š šçĥööļ åþþŕöþŕîåţé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] + [Ĥéļþ ĝŕöŵ ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡ one two three four] + [Ĥéļþ öţĥéŕ šţûðéñţš ƒîñð ¡¡»{guildName}«¡¡ one two three four] + [Åðð å šéŕVéŕ ţö ţĥîš Ĥûɓ one two three] + [ÎñVîţé þéöþļé ţö ţĥîš Ĥûɓ one two three] [Ýöû\'ŕé öñé öƒ ţĥé ƒîŕšţ þéöþļé ĥéŕé¡ Ļéţ\'š šţåŕţ ɓý åððîñĝ šöḿé šéŕVéŕš åñð ḿéḿɓéŕš. one two three four five six seven eight nine] - [Ŵéļçöḿé ţö ţĥé Ðîšçöŕð ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡ šţûðéñţš one two three four five] + [Ŵéļçöḿé ţö ţĥé Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡ šţûðéñţš one two three four five] + [Ðîšçöŕð Ĥûɓ ƒöŕ ¡¡»{guildName}«¡¡ one two three] + [Fŕöḿ çļûɓš ţö šţûðý ĝŕöûþš, šţåý ûþ ţö ðåţé ŵîţĥ ŵĥåţ\'š ĥåþþéñîñĝ one two three four five six seven] + [Fîñð ýöûŕ šçĥööļ-ŕéļåţéð šéŕVéŕš one two three four] + [΃ ýöûŕ šéŕVéŕ îš îñţéñðéð ƒöŕ šţûðéñţš öñļý, ĵûšţ îñVîţé ýöûŕ çļåššḿåţéš. Ţĥéý ðöñ\'ţ ñééð å .éðû åððŕéšš ţö ĵöîñ one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] + [ŔéḿöVé ƒŕöḿ Ĥûɓ one two three] + [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ŕéḿöVé ¡¡»{guildName}«¡¡ ƒŕöḿ ţĥîš ðîŕéçţöŕý¿ one two three four five six seven] [Éñţéŕ ýöûŕ öƒƒîçîåļ šçĥööļ éḿåîļ åððŕéšš one two three four five] [šåḿ@çöļļéĝé.éðû one two three] [Šçĥööļ Éḿåîļ one two] @@ -4637,7 +4667,7 @@ [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ķîçķ ¡¡»{user}«¡¡¿ Ţĥéý ŵîļļ ɓé åɓļé ţö ŕéĵöîñ åĝåîñ ŵîţĥ å ñéŵ îñVîţé. one two three four five six seven eight nine ten] [\'¡¡»{user}«¡¡\' ĥåš ɓééñ ķîçķéð ƒŕöḿ ţĥé šéŕVéŕ. one two three four five] [Ŵĥööþš… ¡¡»{user}«¡¡ çöûļð ñöţ ɓé ķîçķéð. Þļéåšé ţŕý åĝåîñ¡ one two three four five six] - [Ķîçķ ¡¡»{user}«¡¡ Fŕöḿ ŠéŕVéŕ one two three] + [Ķîçķ ¡¡»{user}«¡¡ ƒŕöḿ ŠéŕVéŕ one two three] [Ķîçķ \'¡¡»{user}« one two] [Ķöŕéåñ one two] [ţĥž-2021-01-20 one two three] @@ -4844,6 +4874,7 @@ [Ûšé çûšţöḿ åñð åñîḿåţéð éḿöĵî åñýŵĥéŕé one two three four five] [Ûþ ţö 1080þ ŕéšöļûţîöñ åñð ûþ ţö 60ƒþš one two three four five] [50 Ḿβ ûþļöåð îñšţéåð öƒ 100 Ḿβ one two three four] + [Ðöéš ñöţ îñçļûðé Ñîţŕö šţîçķéŕ þéŕķš one two three four five] [Ţĥîš ļîñķ ŵîļļ ţåķé ýöû ţö **¡¡»{url}«¡¡**. Åŕé ýöû šûŕé ýöû ŵåñţ ţö ĝö ţĥéŕé¿ one two three four five six seven eight] [Çåñçéļ one two] [Ýéþ¡ one] @@ -5083,6 +5114,7 @@ [Ûñåɓļé ţö ļåûñçĥ »{applicationName}« one two three] [Ûñåɓļé ţö ļåûñçĥ ĝåḿé one two three] [Ŵé ðîšåɓļéð Vöîçé åçţîVîţý ðéţéçţîöñ ţö îḿþŕöVé þĥöñé þéŕƒöŕḿåñçé. one two three four five six seven eight] + [Ĝéţ öûŕ ḿöɓîļé åþþ one two three] [Ýöû ḿûšţ ðéšîĝñåţé åñöţĥéŕ îñšîðé [ŠéŕVéŕ Šéţţîñĝš > Çöḿḿûñîţý > ÖVéŕVîéŵ](öñÇļîçķ) ɓéƒöŕé ţĥîš çĥåññéļ çåñ ɓé ðéļéţéð. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Éñåɓļé Ĥåŕðŵåŕé Šçåļîñĝ one two three] [Éхþéŕîḿéñţåļ ƒéåţûŕé ţĥåţ ḿåý îḿþŕöVé þéŕƒöŕḿåñçé îñ Vîðéö çåļļš. βéŵåŕé, ḿåý çåûšé ĵåñķ. one two three four five six seven eight nine ten] @@ -5090,7 +5122,8 @@ [Ŵé çöûļðñ\'ţ éñåɓļé Ķŕîšþ ðûé ţö åñ éŕŕöŕ. ĜîVé îţ åñöţĥéŕ ĝö åñð ţŕý åĝåîñ. one two three four five six seven eight] [Ŵĥîļé šþéåķîñĝ, ƒîļţéŕ öûţ ɓåçķĝŕöûñð ñöîšé åñð šĥöŵçåšé ýöûŕ ŵöñðéŕƒûļ Vöîçé. Þöŵéŕéð ɓý Ķŕîšþ. one two three four five six seven eight nine ten eleven] [Ñöîšé šûþþŕéššîöñ one two three] - [Çļåîḿ ýöûŕ çöðé ɓéƒöŕé »{endDate}« one two three] + [Ûšé ýöûŕ çöðé ɓéƒöŕé »{endDate}« one two three] + [Çļåîḿ ýöûŕ çöðé ɓéƒöŕé »{endDate}« one two three] [Ŕéþļýîñĝ ţö **»{username}«** one two three] [Ţĥîš îš ŵĥö þöšţéð ţĥé ḿéššåĝé ýöû ŕéþöŕţéð. βļöçķ ţĥéḿ ţö šţöþ šééîñĝ åñý öƒ ţĥéîŕ ḿéššåĝéš. one two three four five six seven eight nine ten] [Ḿöŕé ýöû çåñ ðö one two three] @@ -5125,8 +5158,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] @@ -5278,7 +5311,7 @@ [Ŵĥåţ å çöļð, éḿöţîöñļéšš ŵöŕļð. one two three four] [Ñö Ŕéåçţîöñš one two] [Šţåŕţ ûþ šöḿé çöñVéŕšåţîöñš, ţĥéñ ķééþ ţŕåçķ öƒ ţĥéḿ ĥéŕé¡ one two three four five six seven] - [Ţĥéŕé’š ñö ŕéçéñţ ḿéššåĝéš. Çļîçķ ĥéŕé ţö çĥåñĝé ţĥåţ¡ one two three four five six seven] + [Ţĥéŕé åŕé ñö ŕéçéñţ ḿéššåĝéš îñ ţĥîš ţĥŕéåð. one two three four five] [Ñö ŕéšûļţš ƒöûñð one two three] [Ţĥîš çĥåññéļ ĥåš šþéçîåļ þéŕḿîššîöñš. Ţö ûšé Šçŕééñ Šĥåŕé îñ îţ, ýöû\'ļļ ñééð šöḿéöñé, ļîķé å šéŕVéŕ ḿöðéŕåţöŕ öŕ åðḿîñ, ţö çĥåñĝé ýöûŕ þéŕḿîššîöñš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six] [Ñö Šçŕééñ Šĥåŕé Þéŕḿîššîöñ one two three four] @@ -5289,7 +5322,7 @@ [Ñö Šýšţéḿ Ḿéššåĝéš one two three] [Ñö one] [Ñö ţĥåñķš one two] - [Ţĥéŕé’š ñö ḿéššåĝé ýéţ. Çļîçķ ĥéŕé ţö ĝéţ šţåŕţéð¡ one two three four five six] + [Ţĥéŕé åŕé ñö ḿéššåĝéš îñ ţĥîš ţĥŕéåð ýéţ. one two three four five] [Ñö Ļîḿîţ one two] [Ñö νîðéö ÐéVîçéš one two three] [Ţĥîš çĥåññéļ ĥåš šþéçîåļ þéŕḿîššîöñš. Ţö ûšé Vîðéö îñ îţ, ýöû\'ļļ ñééð šöḿéöñé, ļîķé å šéŕVéŕ ḿöðéŕåţöŕ öŕ åðḿîñ, ţö çĥåñĝé ýöûŕ þéŕḿîššîöñš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four] @@ -5564,9 +5597,13 @@ [Ûþðåţé Ðîšçöŕð one two three] [Ŵé\'Vé ĝöţ šöḿé šŵééţ çĥåñĝéš ţö Ðîšçöŕð (åñð þŕöɓåɓļý å ɓûĝ ƒîх öŕ ţŵö). Ûþðåţé ţö çöñţîñûé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Ýöû\'ŕé öûţ öƒ ðåţé one two three] - [Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ »{endDate}«. [Ļéšš Ðéţåîļš](ţöĝĝļéŠĥöŵĻéĝåļéšé) one two three four five six seven eight] - [Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ »{endDate}«. [Ḿöŕé Ðéţåîļš](ţöĝĝļéŠĥöŵĻéĝåļéšé) one two three four five six seven eight] - [[Ḿöŕé Ðéţåîļš](öñÞŕéšš) one two three] + [Ûšé ýöûŕ çöðé ɓéƒöŕé »{endDate}«. [Ļéšš Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six] + [Ûšé ýöûŕ çöðé ɓéƒöŕé »{endDate}«. [Ḿöŕé Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six] + [Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ »{endDate}«. [Ļéšš Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six seven] + [Ĝîƒţ îš åVåîļåɓļé ţö çļåîḿ ûñţîļ »{endDate}«. [Ḿöŕé Ðéţåîļš](öñÇļîçķÐéţåîļš) one two three four five six seven] + [[Ļéšš Ðéţåîļš](öñÇļîçķ) one two three] + [[Ḿöŕé Ðéţåîļš](öñÇļîçķ) one two three] + [Šéé Çöðé one two] [Öûţĝöîñĝ Fŕîéñð ŔéQûéšţ one two three] [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ðéļéţé ýöûŕ ƒŕîéñð ŕéQûéšţ ţö **¡¡»{name}«¡¡**¿ one two three four five six seven] [Öûţĝöîñĝ Fŕîéñð ŔéQûéšţ ţö ¡¡»{name}«¡¡ one two three four] @@ -5806,6 +5843,7 @@ [Ţĥîš ţåĝ îš îñVåļîð. Ţåĝš ḿûšţ ɓé ĝŕéåţéŕ ţĥåñ 0. one two three four five six] [Ûþļöåð åñð ûšé åñîḿåţéð åVåţåŕš åñð éḿöĵîš one two three four five] [Šĥåŕé çûšţöḿ éḿöĵîš åçŕöšš åļļ šéŕVéŕš one two three four five] + [Ûšé çûšţöḿ šţîçķéŕš åñýŵĥéŕé åñð åççéšš 300 Ñîţŕö-éхçļûšîVé šţîçķéŕš one two three four five six seven eight] [Éñĵöý »{discount}«%% öƒƒ åððîţîöñåļ ŠéŕVéŕ βööšţš. [Ļéåŕñ ḿöŕé.](öñĻéåŕñḾöŕé) one two three four five six seven] [»{numFreeGuildSubscriptions}« ŵîţĥ Ñîţŕö ƒöŕ îñšţåñţ šéŕVéŕ ĻéVéļ 1. one two three four five] [Ļåŕĝéŕ ûþļöåð ƒîļé šîžé ƒŕöḿ »{maxUploadStandard}« ţö »{maxUploadPremiumTier2}« ŵîţĥ Ñîţŕö öŕ »{maxUploadPremiumTier1}« ŵîţĥ Ñîţŕö Çļåššîç. one two three four five six seven eight] @@ -5816,7 +5854,6 @@ [ÉхçļûšîVé Ñîţŕö ɓåðĝé öñ ýöûŕ þŕöƒîļé one two three four five] [Šçŕééñ šĥåŕé öñ ÞÇ îñ 720þ 60ƒþš öŕ 1080þ 30ƒþš one two three four five six seven eight nine ten] [Ŵåñţ ţö ķééþ îţ šîḿþļé¿ Šûþþöŕţ Ðîšçöŕð åñð ĝéţ šŵééţ çĥåţ þéŕķš: one two three four five six seven] - [ÉхçļûšîVé åççéšš ţö Ŵûḿþûš Ñîţŕö Éļîţé šţîçķéŕ þåçķ, ƒŕéé Ŵĥåţ’š Ûþ Ŵûḿþûš šţîçķéŕ þåçķ, åñð »{discount}«%% öƒƒ åļļ öţĥéŕ šţîçķéŕ þåçķš one two three four five six seven eight nine ten eleven twelve] [βéţţéŕ Ĝö ĻîVé šţŕéåḿš: Šţŕéåḿ åţ šöûŕçé ŵîţĥ Ñîţŕö öŕ ûþ ţö å çŕîšþ 1080þ 60ƒþš ŵîţĥ Ñîţŕö Çļåššîç one two three four five six seven eight nine ten eleven] [Çĥööšé å Þļåñ one two] [Ĝîƒţ šöḿéöñé Ñîţŕö Çļåššîç ţö éñĥåñçé ţĥéîŕ éхþéŕîéñçé ŵîţĥ šûþéŕ þöŵéŕéð çĥåţ þéŕķš. [Ļéåŕñ ḿöŕé åɓöûţ Ñîţŕö Çļåššîç.](öñÇļîçķ) one two three four five six seven eight nine ten eleven twelve thirteen] @@ -6269,10 +6306,13 @@ [ÞŕîVåţé Ţĥŕéåð one two three] [**νîéŵ Çĥåññéļš** åñð **Çöññéçţ** þéŕḿîššîöñš ŕéQûîŕéð ţö çŕéåţé ţĥîš þŕîVåţé çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Þŕöƒîļé one two] + [Ûþļöåð ýöûŕ öŵñ þéŕšöñåļîžéð ɓåññéŕ åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡ one two three four five six seven] [Þŕöƒîļé Çûšţöḿîžåţîöñ îš çûŕŕéñţļý åVåîļåɓļé ţö å ļîḿîţéð ñûḿɓéŕ öƒ þéöþļé. one two three four five six seven eight] + [Ţéļļ ţĥé ŵöŕļð å ļîţţļé åɓöûţ ýöûŕšéļƒ one two three four five] [Éхþŕéšš ýöûŕšéļƒ ŵîţĥ åñ åɓöûţ ḿé åñð, îƒ ýöû ĥåVé Ñîţŕö, å þŕöƒîļé ɓåññéŕ¡ one two three four five six seven eight] [Ĝöţ îţ one two] [Ñéŵ Þŕöƒîļé Çûšţöḿîžåţîöñ¡ one two three four] + [ÉхçļûšîVé ţö Ñîţŕö one two three] [Ýöû åŕé åļļ šéţ¡ one two three] [Ŵöŵ ýöûŕ šéŕVéŕ îš ļööķîñĝ åļļ šñåžžý¡ Ĥéŕé åŕé å ƒéŵ ḿöŕé ţĥîñĝš ýöû çåñ ðö ŵîţĥ ýöûŕ šéŕVéŕ. ĤåVé ƒûñ¡ one two three four five six seven eight nine ten eleven] [Šţéþ »{step}« öƒ 4 one two] @@ -6315,6 +6355,7 @@ [Î åĝŕéé ţö ţĥé [Ţéŕḿš öƒ ŠéŕVîçé](»{tosURL}«) åñð [Ŕéƒûñð Þöļîçý](»{refundPolicyURL}«) one two three four five six seven eight nine ten eleven twelve] [Þûŕçĥåšé Ţîçķéţ one two three] [Þûŕþļé one two] + [Šçåñ ţĥîš qŔ çöðé ƒöŕ åñ éåšý ðöŵñļöåð ļîñķ ƒöŕ öûŕ îÖŠ öŕ Åñðŕöîð åþþš. one two three four five six seven eight] [Fåîļéð ţö šçåñ one two three] [Šöḿéţĥîñĝ ŵéñţ ŵŕöñĝ ŵĥéñ ţŕýîñĝ ţö šçåñ. one two three four five] [Ŕéšçåñ ţĥé qŔ çöðé ţö çöñţîñûé ţĥé ļöĝîñ þŕöçéšš. one two three four five six] @@ -6426,7 +6467,7 @@ [ŔéḿöVé Ŕéåçţîöñ one two three] [ŔéḿöVé ¡¡»{name}«¡¡ one two] [ŔéḿöVé Ŕöļé one two] - [ŔéḿöVé ¡¡»{user}«¡¡ Fŕöḿ Ţĥŕéåð one two three] + [ŔéḿöVé ¡¡»{user}«¡¡ ƒŕöḿ Ţĥŕéåð one two three] [ŔéḿöVé νåñîţý ÛŔĻ one two three] [Šĥöŵ ŵéɓšîţé þŕéVîéŵ îñƒö ƒŕöḿ ļîñķš þåšţéð îñţö çĥåţ one two three four five six] [Ļîñķ ÞŕéVîéŵ one two] @@ -6666,9 +6707,9 @@ [Åļļöŵš ḿéḿɓéŕš ţö çĥåñĝé ţĥîš çĥåññéļ’š þéŕḿîššîöñš. one two three four five six] [Åļļöŵ ḿéḿɓéŕš ţö çĥåñĝé ţĥîš çĥåññéļ\'š þéŕḿîššîöñš. one two three four five six] [Åļļöŵš ḿéḿɓéŕš ţö çĥåñĝé ţĥîš šéŕVéŕ’š ñåḿé, šŵîţçĥ ŕéĝîöñš, åñð åðð ɓöţš ţö ţĥîš šéŕVéŕ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] - [Åļļöŵš ḿéḿɓéŕš ţö ŕéñåḿé, ðéļéţé, åŕçĥîVé/ûñåŕçĥîVé, åñð ţûŕñ öñ šļöŵ ḿöðé ƒöŕ ţĥŕéåðš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] - [Åļļöŵš ḿéḿɓéŕš ţö ŕéñåḿé, ðéļéţé, åŕçĥîVé/ûñåŕçĥîVé, åñð ţûŕñ öñ šļöŵ ḿöðé ƒöŕ ţĥŕéåðš îñ ţĥéšé çĥåññéļš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] - [Åļļöŵš ḿéḿɓéŕš ţö ŕéñåḿé, ðéļéţé, åŕçĥîVé/ûñåŕçĥîVé, åñð ţûŕñ öñ šļöŵ ḿöðé ƒöŕ ţĥŕéåðš îñ ţĥîš çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] + [Åļļöŵš ḿéḿɓéŕš ţö ŕéñåḿé, ðéļéţé, åŕçĥîVé/ûñåŕçĥîVé, åñð ţûŕñ öñ šļöŵ ḿöðé ƒöŕ ţĥŕéåðš. Ţĥéý çåñ åļšö Vîéŵ þŕîVåţé ţĥŕéåðš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] + [Åļļöŵš ḿéḿɓéŕš ţö ŕéñåḿé, ðéļéţé, åŕçĥîVé/ûñåŕçĥîVé, åñð ţûŕñ öñ šļöŵ ḿöðé ƒöŕ ţĥŕéåðš îñ ţĥéšé çĥåññéļš. Ţĥéý çåñ åļšö Vîéŵ þŕîVåţé ţĥŕéåðš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four] + [Åļļöŵš ḿéḿɓéŕš ţö ŕéñåḿé, ðéļéţé, åŕçĥîVé/ûñåŕçĥîVé, åñð ţûŕñ öñ šļöŵ ḿöðé ƒöŕ ţĥŕéåðš îñ ţĥîš çĥåññéļ. Ţĥéý çåñ åļšö Vîéŵ þŕîVåţé ţĥŕéåðš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four] [Åļļöŵš ḿéḿɓéŕš ţö çŕéåţé, éðîţ, öŕ ðéļéţé ŵéɓĥööķš, ŵĥîçĥ çåñ þöšţ ḿéššåĝéš ƒŕöḿ öţĥéŕ åþþš öŕ šîţéš îñţö ţĥîš šéŕVéŕ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Åļļöŵš ḿéḿɓéŕš ţö çŕéåţé, éðîţ, öŕ ðéļéţé ŵéɓĥööķš îñ ţĥéšé çĥåññéļš, ŵĥîçĥ çåñ þöšţ ḿéššåĝéš ƒŕöḿ öţĥéŕ åþþš öŕ šîţéš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Åļļöŵš ḿéḿɓéŕš ţö çŕéåţé, éðîţ, öŕ ðéļéţé ŵéɓĥööķš îñ ţĥîš çĥåññéļ, ŵĥîçĥ çåñ þöšţ ḿéššåĝéš ƒŕöḿ öţĥéŕ åþþš öŕ šîţéš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] @@ -7303,7 +7344,6 @@ [Šéţ ţĥé ţöþîç öƒ ýöûŕ Šţåĝé. one two three four] [Šţåĝé Çĥåññéļ one two] [Šţåŕţ one] - [Šţåŕţ å Ţĥŕéåð one two three] [Šţåŕţ Çåļļ one two] [Šţåŕţ å Šţåĝé one two] [Šţåŕţ å Šţåĝé one two] @@ -7311,7 +7351,7 @@ [Ḿéḿɓéŕš Öñļý one two] [Šţåŕţ ţĥé Šţåĝé one two three] [Ýöû ŵîļļ ɓé å Šþéåķéŕ ŵĥéñ ţĥé Šţåĝé öþéñš. one two three four five] - [Ŵŕîţé å ţöþîç ţö åññöûñçé ýöûŕ Šţåĝé îš ļîVé. one two three four five] + [Ŵŕîţé å ţöþîç ţö šţåŕţ ýöûŕ Šţåĝé. one two three four] [Ŵĥåţ ŵîļļ ýöû ɓé ţåļķîñĝ åɓöûţ¿ one two three four] [Šţåĝé Ţöþîç one two] [Ţĥé ðéɓåţé îš öVéŕ: ðîéţ îš ɓéţţéŕ ţĥåñ ŕéĝûļåŕ one two three four five six] @@ -7332,17 +7372,17 @@ [Ḿåķé å [Çöḿḿûñîţý šéŕVéŕ.](»{helpdeskArticle}«) one two three four] [Çŕéåţé å Šţåĝé çĥåññéļ. one two three] [Çöḿé ûþ ŵîţĥ å ĝŕéåţ éVéñţ. one two three four] - [Šţåŕţ åñð öþéñ ýöûŕ Šţåĝé¡ one two three four] + [Šţåŕţ ýöûŕ Šţåĝé¡ one two three] [Çûŕîöûš ţö ļéåŕñ ḿöŕé¿ one two three] - [Ļéåŕñ ĥöŵ ţö ĥöšţ å ĝŕéåţ Šţåĝé one two three four] + [Ļéåŕñ ḿöŕé åɓöûţ Šţåĝé çĥåññéļš one two three four] [Ýöû çåñ\'ţ šţåŕţ å Šţåĝé ýéţ one two three four] - [Éñĝåĝé åñð ĝŕöŵ ýöûŕ çöḿḿûñîţý ŵîţĥ Šţåĝé çĥåññéļš. one two three four five six] - [Ŵĥîçĥ çöḿḿûñîţý ðö ýöû ŵåñţ ţö ĥöšţ åñ åûðîö éVéñţ îñ¿ one two three four five six seven] + [Éñĝåĝé åñð ĝŕöŵ ýöûŕ çöḿḿûñîţý ɓý ĥöšţîñĝ å ļîVé åûðîö éVéñţ ŵîţĥ Šţåĝé çĥåññéļš. one two three four five six seven eight nine] + [Ŵĥéŕé ðö ýöû ŵåñţ ţö ĥöšţ å Šţåĝé¿ one two three four] [Ýöûŕ Šţåĝé ŵîļļ ɓé ĥöšţéð îñ €[**¡¡»{stageName}«¡¡**](šţåĝéĤööķ). €[Çĥåñĝé Çĥåññéļ](çĥåñĝéĤööķ) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] - [Ŵé ŵîļļ åûţöḿåţîçåļļý çŕéåţé å Šţåĝé çĥåññéļ ƒöŕ ýöû çåļļéð €[**¡¡»{stageName}«¡¡**](šţåĝéĤööķ). Ýöû çåñ çĥåñĝé ţĥé ñåḿé ļåţéŕ. one two three four five six seven eight nine ten eleven twelve] + [Ŵé ŵîļļ çŕéåţé å Šţåĝé çĥåññéļ ƒöŕ ýöû çåļļéð €[**¡¡»{stageName}«¡¡**](šţåĝéĤööķ). Ýöû çåñ çĥåñĝé ţĥé ñåḿé ļåţéŕ. one two three four five six seven eight nine ten eleven] [Ýöûŕ Šţåĝé ŵîļļ ɓé ĥöšţéð îñ €[**¡¡»{stageName}«¡¡**](šţåĝéĤööķ). one two three four five six] [Šţåĝé çĥåññéļ one two] - [Ŵŕîţé å ţöþîç ţö åññöûñçé ýöûŕ Šţåĝé îš ļîVé. one two three four five] + [Ŵŕîţé å ţöþîç ţö šţåŕţ ýöûŕ Šţåĝé. one two three four] [Ŵĥåţ ŵîļļ ýöû ɓé ţåļķîñĝ åɓöûţ¿ one two three four] [Ļéţ\'š ðö îţ one two] [Þéöþļé þéŕƒöŕḿîñĝ one two three] @@ -7353,7 +7393,6 @@ [Ýöûŕ Šţåĝé îš ĝöîñĝ þûɓļîç¡ one two three four] [Ĥéŕé åŕé å ƒéŵ ţĥîñĝš ýöû šĥöûļð ķñöŵ. one two three four five] [Κ ýöûŕ ţöþîç ðéšçŕîþţîVé éñöûĝĥ¿ Ḿåķé šûŕé îţ\'š çļéåŕ šö ţĥåţ þéöþļé ɓŕöŵšîñĝ Šţåĝé ÐîšçöVéŕý çåñ éåšîļý ķñöŵ ŵĥåţ ýöûŕ Šţåĝé åñð çöḿḿûñîţý îš åɓöûţ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] - [Šţåŕţ Ţĥŕéåð one two] [Šţåŕţ νîðéö Çåļļ one two three] [Šţåŕţ νöîçé Çåļļ one two three] [Šţåŕţîñĝ åţ one two] @@ -7707,8 +7746,8 @@ [ÅŕçĥîVéð »{time}« one two] [ÅŕçĥîVéð one two] [Çŕéåţéð »{time}« one two] - [Ţĥéŕé åŕé ñö åçţîVé ţĥŕéåðš îñ ţĥîš çĥåññéļ ýéţ. one two three four five six] - [Ţĥéŕé åŕé ñö åŕçĥîVéð ţĥŕéåðš îñ ţĥîš çĥåññéļ ýéţ. one two three four five six] + [Ţĥéŕé åŕé ñö åçţîVé ţĥŕéåðš. one two three four] + [Ţĥéŕé åŕé ñö åŕçĥîVéð ţĥŕéåðš. one two three four] [Šţåý ƒöçûšéð öñ å çöñVéŕšåţîöñ ŵîţĥ å ţĥŕéåð, å ţéḿþöŕåŕý ţéхţ çĥåññéļ. one two three four five six seven eight] [ƒîļţéŕ åŕçĥîVéð ţĥŕéåðš one two three] [Fîļţéŕ Šéţţîñĝš one two three] @@ -7727,11 +7766,10 @@ [»{count}«ḿ åĝö one] [>30ð åĝö one two] [Ţĥŕéåðš one two] - [Ţĥŕéåð çŕéåţöŕ one two three] [Ţĥîš ţĥŕéåð îš åŕçĥîVéð. Ýöû çåñ šéñð å ḿéššåĝé ţö ûñåŕçĥîVé îţ. one two three four five six seven] [Ĵöîñ ţĥîš ţĥŕéåð ţö ĝéţ ñöţîƒîçåţîöñš åñð ţö šåVé îñ ýöûŕ çĥåññéļ ļîšţ. one two three four five six seven eight] - [Ţĥîš ţĥŕéåð îš ļöçķéð ɓý å ḿöðéŕåţöŕ. Öñļý å ḿöðéŕåţöŕ ḿåý ûñåŕçĥîVé îţ. one two three four five six seven eight] - [Ñö ļöñĝéŕ çåñ Vîéŵ ţĥé ţĥŕéåð one two three four] + [Ţĥîš ţĥŕéåð ŵåš åŕçĥîVéð ɓý å ḿöðéŕåţöŕ. Öñļý ḿöðéŕåţöŕš çåñ ûñåŕçĥîVé îţ. one two three four five six seven eight] + [Çåññöţ Vîéŵ ţĥîš ţĥŕéåð one two three] [»{count}«] [50+ Ḿéššåĝéš › one two three] [50+ › one] @@ -7744,7 +7782,7 @@ [Ţĥŕéåð Šéţţîñĝš one two three] [Ţĥŕéåð šéţţîñĝš ĥåVé ɓééñ ûþðåţéð. one two three four] [Šţåŕţéð ɓý €[](ûšéŕñåḿéĤööķ) one two three four] - [Ţĥŕéåð šţåŕţéŕ ḿéššåĝé çöûļð ñöţ ɓé ļöåðéð one two three four five] + [Šöŕŕý, ŵé çöûļðñ\'ţ ļöåð ţĥé ƒîŕšţ ḿéššåĝé îñ ţĥîš ţĥŕéåð one two three four five six seven] [Öŕîĝîñåļ ḿéššåĝé ƒŕöḿ çĥåññéļ one two three four] [Ţĥŕéåðš one two] [**¡¡»{a}«¡¡**, **¡¡»{b}«¡¡**, åñð **¡¡»{c}«¡¡** åŕé ţýþîñĝ… one two three four five six seven eight nine ten] @@ -7798,12 +7836,12 @@ [Ţöĝĝļé šçŕééñ šĥåŕé one two three] [Ţĥîš ḿéššåĝé ḿåý çöñţåîñ å Ðîšçöŕð åûţĥéñţîçåţîöñ ţöķéñ, ŵĥîçĥ çåñ ĝŕåñţ åñ åţţåçķéŕ åççéšš ţö ýöûŕ åççöûñţ. Åŕé ýöû šûŕé ýöû ŵåñţ ţö šéñð îţ¿ one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ýöû åŕé öûţ öƒ åñîḿåţéð éḿöĵî šļöţš. one two three four five] - [Ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ ļåŕĝé åññöûñçéḿéñţ ţĥŕéåðš ĥåš ɓééñ ŕéåçĥéð. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven] + [Ţĥîš šéŕVéŕ ĥåš ŕéåçĥéð ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ åçţîVé åññöûñçéḿéñţ ţĥŕéåðš. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven twelve] [Ýöû åŕé öûţ öƒ éḿöĵî šļöţš. one two three four] [Ţĥîš ţĥŕéåð ĥåš ŕéåçĥéð ţĥé ḿåхîḿûḿ þöššîɓļé ñûḿɓéŕ öƒ ḿéḿɓéŕš. one two three four five six seven] [Ýöûŕ ŕéåçţîöñ ŵåš ñöţ åððéð ɓéçåûšé ţĥéŕé åŕé ţöö ḿåñý ŕéåçţîöñš öñ ţĥîš ḿéššåĝé. one two three four five six seven eight nine] [Ŵé åþþŕéçîåţé ţĥé éñţĥûšîåšḿ, ɓûţ… one two three four] - [Ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ åçţîVé ţĥŕéåðš ĥåš ɓééñ ŕéåçĥéð. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten] + [Ţĥîš šéŕVéŕ ĥåš ŕéåçĥéð ţĥé ḿåхîḿûḿ ñûḿɓéŕ öƒ åçţîVé ţĥŕéåðš. Fŕéé ûþ šþåçé ɓý åŕçĥîVîñĝ å ţĥŕéåð. one two three four five six seven eight nine ten eleven] [Ýöû åŕé åţ ţĥé »{quantity}« šéŕVéŕ ļîḿîţ. Ýöû ḿûšţ ļéåVé å šéŕVéŕ ƒîŕšţ ţö ĵöîñ. one two three four five six seven eight] [Öĥ ñö¡ one two] [Ýöû ḿûšţ ļéåVé å šéŕVéŕ ƒîŕšţ ţö ĵöîñ. one two three four five] @@ -7988,7 +8026,7 @@ [Ûþļöåð Éḿöĵî one two] [Šþîçé ûþ ýöûŕ çĥåţ ŵîţĥ å çûšţöḿ éḿöĵî. one two three four five] [Ûþļöåð åñ éḿöĵî one two three] - [Þŕöţîþ: Ĵûšţ ðöûɓļé çļîçķ ţĥé + one two three four] + [Ţîþ: Ðöûɓļé çļîçķ ţĥé €[](îçöñ) one two three four] [Ûþļöåð Îḿåĝé one two] [Κ ţĥîš ýöûŕ çåŕð¿ Éŕŕ, ðö ýöû ŵåñţ ţö ûþļöåð ţĥîš îḿåĝé¿ one two three four five six seven] [Ûñåɓļé ţö öþéñ ƒîļé: »{file}«. one two three] @@ -8110,7 +8148,7 @@ [Þûšĥ ñöţîƒîçåţîöñš ñöţ éñåɓļéð one two three four] [Ûšéŕ Šéţţîñĝš one two] [Åɓöûţ Ḿé one two] - [Ŵŕîţé åñýţĥîñĝ ýöû’ð ļîķé åɓöûţ ýöûŕšéļƒ åñð ļîñķ ŵĥåţéVéŕ ýöû ŵåñţ. Ĵûšţ ķééþ îţ ûñðéŕ »{maxLength}« çĥåŕåçţéŕš. one two three four five six seven eight nine ten eleven] + [Ŵŕîţé åñýţĥîñĝ ýöû’ð ļîķé åɓöûţ ýöûŕšéļƒ — åš ļöñĝ åš ýöû ðö îţ îñ ûñðéŕ »{maxLength}« çĥåŕåçţéŕš. Ýöû çåñ ûšé ḿåŕķðöŵñ åñð ļîñķš îƒ ýöû’ð ļîķé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] [Ýöûŕ çûŕŕéñţ éḿåîļ åððŕéšš îš ¡¡»{email}«¡¡ Ŵĥåţ ŵöûļð ýöû ļîķé ţö çĥåñĝé îţ ţö¿ one two three four five six seven eight] [Éñţéŕ å ñéŵ éḿåîļ åððŕéšš åñð ýöûŕ éхîšţîñĝ þåššŵöŕð. one two three four five six] [Éðîţ Éḿåîļ one two] @@ -8145,7 +8183,9 @@ [Öĥ ĥéŕé îţ îš¡ one two three] [Ýöû çåñ çĥåñĝé ţĥé žööḿ ļéVéļ ŵîţĥ »{modKey}« +/- åñð ŕéšéţ ţö ţĥé ðéƒåûļţ žööḿ ŵîţĥ »{modKey}«+0. one two three four five six seven eight nine] [ÅVåîļåɓļé βåçķûþ Çöðéš one two three] - [Ţĥé ŕéçöḿḿéñðéð ḿîñîḿûḿ šîžé îš 300х120 åñð ŕéçöḿḿéñðéð åšþéçţ ŕåţîö îš 5:2. Åççéþţéð ƒîļé ţýþéš îñçļûðé ÞÑĜ, ĴÞĜ, åñð åñîḿåţéð ĜÎFš ûñðéŕ 10Ḿβ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five] + [ÅVåţåŕ one two] + [βåññéŕ Çöļöŕ one two] + [Ŵé ŕéçöḿḿéñð åñ îḿåĝé öƒ åţ ļéåšţ 600х240. Ýöû çåñ ûþļöåð å ÞÑĜ, ĴÞĜ, öŕ åñ åñîḿåţéð ĜÎF. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [βļöçķéð Ûšéŕš one two] [Ýöû ðöñ\'ţ ĥåVé åñý ɓļöçķéð ûšéŕš one two three four] [»{numberOfBlockedUsers}« βļöçķéð Ûšéŕš one two three] @@ -8154,12 +8194,14 @@ [Çļöšé βûţţöñ one two] [Åŕé ýöû šûŕé ýöû ŵåñţ ţö ļöĝöûţ¿ one two three four] [Ûñļöçķ ŵîţĥ Ñîţŕö one two three] + [Çûšţöḿîžîñĝ Ḿý Þŕöƒîļé one two three] [Ðéļéţé ÅVåţåŕ one two] [Ţûŕñîñĝ ţĥîš öƒƒ ḿåý ĥéļþ îƒ ýöûŕ Vöîçé îš ñöţ ɓéîñĝ ðéţéçţéð ɓý ţĥé åûţöḿåţîç îñþûţ šéñšîţîVîţý. one two three four five six seven eight nine ten eleven] [Ñöîšé ŕéðûçţîöñ îš ðîšåɓļéð ŵĥîļé Ñöîšé Šûþþŕéššîöñ îš åçţîVé. one two three four five six seven] [Éðîţ Åççöûñţ one two] [Éñţéŕ ýöûŕ þåššŵöŕð ţö çöñƒîŕḿ çĥåñĝéš one two three four five] [ŢÅĜ one] + [Éðîţ Þŕöƒîļé one two] [Éñţéŕ ýöûŕ þåššŵöŕð ţö Vîéŵ ɓåçķûþ çöðéš. one two three four five] [Ļöçåţîöñ one two] [Åðð Îñšţåļļ Ļöçåţîöñ one two three] @@ -8176,6 +8218,7 @@ [ĤýþéŠQûåð one two] [Åçţîöñ one two] [Çĥåţ one] + [Ðéƒåûļţ Ķéýɓîñðš one two three] [Ķéýɓîñð one two] [Ţĥéšé šĥöŕţçûţš ŵöŕķ ŵĥéñ ƒöçûšéð öñ å ḿéššåĝé. one two three four five six] [Ḿéššåĝéš one two] @@ -8211,7 +8254,8 @@ [Öþéñ Ðîšçöŕð one two] [Çĥéçķ öûţ öûŕ [Ţéŕḿš öƒ ŠéŕVîçé](»{termsLink}«) åñð [ÞŕîVåçý Þöļîçý](»{privacyLink}«). one two three four five six seven eight nine ten eleven twelve] [Þŕöƒîļé βåññéŕ one two three] - [Þŕöƒîļé Çûšţöḿîžåţîöñ one two three] + [ŔéḿöVé ÅVåţåŕ one two] + [ŔéḿöVé βåññéŕ one two] [Ŕéšţåŕţ ţĥé åþþ ƒöŕ ýöûŕ ñéŵ šéţţîñĝš ţö ţåķé 郃éçţ. one two three four five six] [ŠåVé one] [Šçåñ qŔ Çöðé one two] @@ -8225,7 +8269,9 @@ [Þļéåšé çĥéçķ ýöûŕ éḿåîļ åñð ƒöļļöŵ ţĥé îñšţŕûçţîöñš ţö Véŕîƒý ýöûŕ éḿåîļ. ΃ ýöû ðîð ñöţ ŕéçéîVé åñ éḿåîļ öŕ îƒ îţ éхþîŕéð, ýöû çåñ ŕéšéñð öñé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ûþļöåð ÅVåţåŕ one two] [Ûþļöåð βåññéŕ one two] + [Ûšé ðéƒåûļţ one two] [Ûšéð βåçķûþ Çöðéš one two three] + [Ûšéŕ Þŕöƒîļé one two] [Ýöû çåñ åðð ḿûļţîþļé Þûšĥ ţö Ţåļķ ɓîñðš ûñðéŕ [Ķéýɓîñð Šéţţîñĝš](öñÇļîçķ). one two three four five six seven eight] [Ðîšçöŕð ûšéš öñļý ţĥé ɓéšţ öŕĝåñîç, ļöçåļļý-šöûŕçéð Öþûš νöîçé çöðéç. one two three four five six seven eight] [Åûðîö Çöðéç one two] diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index ef8a8badef..dd479502e0 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1015,7 +1015,7 @@ Cambiar de avatar de servidor ¡Utiliza un avatar diferente en cada uno de tus servidores y más con **Discord Nitro!** Historial de cambios - Nuevas características {added marginTop}\n======================\n\n* **Ya está aquí Encuentra a tus amigos.** Hemos añadido una forma opcional de encontrar amigos en Discord más fácilmente. Si tenéis el número de teléfono de vuestro amigo y ambos tenéis activada la opción de descubrimiento, podréis encontraros y enviaros una solicitud de amistad, lo que dará origen a esta incómoda conversación: «Si recibes una solicitud de xXSoulzLuverXx#0000, que sepas que soy yo».\n* **Hemos añadido los emojis favoritos.** Tocad un emoji en el chat o mantened pulsado uno en el selector de emojis para empezar a añadir y eliminar emojis de vuestros favoritos. Vuestros favoritos no se sincronizarán con el escritorio (aún), pero podéis empezar a pensar cuáles son los 5 que más usáis de entre los 2459 emojis que hay.\n* **Hemos añadido la paginación a la barra de búsqueda.** Ya no tenéis que navegar durante una eternidad por los resultados de búsqueda. Ahora podéis saltar de una página a otra para encontrar la prueba irrefutable que necesitáis contra vuestro amigo en un intento por demostrar inequívocamente que dijo una cosa hace unos 6 meses, pero que no recordáis, pero que podréis demostrar si os da un minuto para buscarla porque estáis seguros de que lo dijo.\n* **Hemos añadido sonidos a los canales de voz:** ahora vuestro teléfono reproducirá sonidos cuando os unáis a canales de voz, los abandonéis u os muevan a ellos; unos sonidos que puedo repetir en la cabeza con una exactitud estremecedora. Tará..., tarará...\n\n\n\n\nCorrecciones y actualizaciones {progress}\n======================\n\n* **¡Adiós a las menciones al editar!** Al editar una respuesta, ya no se mencionará al autor de la referencia en la mayoría de los casos. Es que..., por favor, yo solo quería arreglar mi pequeño error gramatical y ahora me muero de vergüenza.\n* **Mejoras en las carpetas de servidor.** ¡Ahora podéis marcar vuestras carpetas de servidor como leídas! También hemos añadido ajustes a las carpetas de servidor para que podáis personalizar nombres y colores.\n* **Mejoras y correcciones importantes del Cribado de miembros.** Ya no os quedaréis atascados en estas páginas.\n* **Hemos facilitado el acceso al modo de entrada.** Ahora podéis cambiar los ajustes de pulsar para hablar y de actividad de voz sin salir de la pantalla de llamada.\n\n\n + Nuevas características {added marginTop}\n======================\n\n* **Hemos añadido el Descubrimiento de escenario.** Encontrad comunidades que organicen escenarios en directo (eventos con audio como conciertos, mesas redondas, concursos de talentos o cualquier otro rollo extraño pero legal que se os ocurra) haciendo clic en la nueva pestaña de Descubrimiento. \n* **Ya está aquí Encuentra a tus amigos.** Hemos añadido una forma opcional de encontrar amigos en Discord más fácilmente. Si tenéis el número de teléfono de vuestro amigo y ambos tenéis activada la opción de descubrimiento, podréis encontraros y enviaros una solicitud de amistad, lo que dará origen a esta incómoda conversación: «Si recibes una solicitud de xXSoulzLuverXx#0000, que sepas que soy yo».\n* **Hemos añadido los emojis favoritos.** Tocad un emoji en el chat o mantened pulsado uno en el selector de emojis para empezar a añadir y eliminar emojis de vuestros favoritos. Vuestros favoritos no se sincronizarán con el escritorio (aún), pero podéis empezar a pensar cuáles son los 5 que más usáis de entre los 2459 emojis que hay.\n* **Hemos añadido la paginación a la barra de búsqueda.** Ya no tenéis que navegar durante una eternidad por los resultados de búsqueda. Ahora podéis saltar de una página a otra para encontrar la prueba irrefutable que necesitáis contra vuestro amigo en un intento por demostrar inequívocamente que dijo una cosa hace unos 6 meses, pero que no recordáis, pero que podréis demostrar si os da un minuto para buscarla porque estáis seguros de que lo dijo.\n* **Hemos añadido sonidos a los canales de voz:** ahora vuestro teléfono reproducirá sonidos cuando os unáis a canales de voz, los abandonéis u os muevan a ellos; unos sonidos que puedo repetir en la cabeza con una exactitud estremecedora. Tará..., tarará...\n\n\n\n\nCorrecciones y actualizaciones {progress}\n======================\n\n* **¡Adiós a las menciones al editar!** Al editar una respuesta, ya no se mencionará al autor de la referencia en la mayoría de los casos. Es que..., por favor, yo solo quería arreglar mi pequeño error gramatical y ahora me muero de vergüenza.\n* **Mejoras en las carpetas de servidor.** ¡Ahora podéis marcar vuestras carpetas de servidor como leídas! También hemos añadido ajustes a las carpetas de servidor para que podáis personalizar nombres y colores.\n* **Mejoras y correcciones importantes del Cribado de miembros.** Ya no os quedaréis atascados en estas páginas.\n* **Hemos facilitado el acceso al modo de entrada.** Ahora podéis cambiar los ajustes de pulsar para hablar y de actividad de voz sin salir de la pantalla de llamada.\n\n\n 2021-06-21 es-ES 1 @@ -6460,6 +6460,7 @@ Solo miembros Iniciar el escenario Al abrirse el escenario, serás un orador. + Escribe un tema para anunciar que tu escenario está en directo. ¿De qué vas a hablar? Tema del escenario Se acabó el debate: la cola light es mejor @@ -6477,11 +6478,17 @@ Crea un [servidor de comunidad.]({helpdeskArticle}) Crea un canal de escenario. Prepara un gran evento. + ¡Comienza y abre tu escenario! ¿Quieres más información? + Aprende a celebrar un gran escenario Aún no puedes empezar un escenario + Haz participar y crecer a tu comunidad con los canales de escenario. + ¿En qué comunidad te gustaría celebrar un evento con audio? Tu escenario se celebrará en $[**!!{stageName}!!**](stageHook). $[Cambiar de canal](changeHook) + Crearemos un canal de escenario automático para ti llamado $[**!!{stageName}!!**](stageHook). Podrás cambiar el nombre más tarde. Tu escenario se celebrará en $[**!!{stageName}!!**](stageHook). Canal de escenario + Escribe un tema para anunciar que tu escenario está en directo. ¿De qué vas a hablar? Vamos allá Gente actuando diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index efcac8c5ed..c8b558fd0c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -6630,6 +6630,7 @@ Vain jäsenet Aloita esitys Olet puhuja esityksen avautuessa. + Ilmoita live-esityksesi alkamisesta kirjoittamalla sen aihe. Mistä aiot puhua? Esityksen aihe Kiista on ratkennut: light on normaalia parempi @@ -6647,11 +6648,17 @@ Luo [yhteisöpalvelin]({helpdeskArticle}). Luo esityskanava. Kehittele hieno tapahtuma. + Aloita ja avaa esitys! Haluaisitko lisätietoja? + Opettele, miten hyvä esitys järjestetään Et voi aloittaa esitystä vielä + Sitouta ja kasvata yhteisöäsi esityskanavien avulla. + Missä yhteisössä haluat isännöidä äänitapahtumaa? Esityksesi järjestetään kanavalla $[**!!{stageName}!!**](stageHook). $[Vaihda kanava](changeHook) + Luomme sinulle automaattisesti esityskanavan nimeltä $[**!!{stageName}!!**](stageHook). Voit muuttaa sen nimeä myöhemmin. Esityksesi järjestetään kanavalla $[**!!{stageName}!!**](stageHook). Esityskanava + Ilmoita live-esityksesi alkamisesta kirjoittamalla sen aihe. Mistä aiot puhua? Tehdään niin Esiintyvät henkilöt diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 89ca8337e9..38d81792a3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1044,7 +1044,7 @@ Changer l\'avatar du serveur Avec **Discord Nitro**, utilise un avatar différent sur chacun de tes serveurs et bien plus ! Notes de mise à jour - Nouvelles fonctionnalités {added marginTop}\n======================\n\n* **« Trouver tes amis » fait son entrée.** Nous avons ajouté une option pour te permettre de trouver plus facilement des amis sur Discord. Si tu as le numéro de téléphone de ton ami et que vous avez tous deux choisi d\'être visibles, tu pourras le trouver et lui envoyer une demande d\'ami. Tu pourras aussi le prévenir de cette façon assez gênante : « Si tu reçois une demande de xXSoulzLuverXx#0000, c\'est moi. »\n* **Ajout des favoris pour émojis.** Touche un émoji dans le chat ou reste appuyé longtemps sur l\'un d\'eux dans le sélecteur d\'émojis pour ajouter ou supprimer des émojis de tes favoris. Tes favoris ne seront pas synchronisés avec le bureau *pour l\'instant*, mais tu peux commencer à déterminer quels sont les 5 émojis que tu utilises réellement parmi les 2 459 que tu possèdes.\n* **Ajout d\'une pagination à la barre de recherche.** Plus besoin de faire défiler pendant des heures les résultats de tes recherches. Tu peux maintenant passer d\'une page à l\'autre pour trouver la preuve exacte dont tu as besoin pour convaincre tes amis qu\'ils ont dit telle ou telle chose il y a 6 mois. Tu ne te rappelles plus quoi exactement, mais tu vas trouver dans une minute parce que tu peux jurer qu\'ils l\'ont dit.\n* **Ajout de sons dans les salons vocaux :** Ton téléphone émettra désormais des sons lorsque tu rejoindras/quitteras/te déplaceras dans les salons vocaux. J\'arrive d\'ailleurs à jouer ces sons dans ma tête avec une clarté effrayante. Ba-dum...ba-da-doo...\n\n\n\n\nCorrections et mises à jour {progress}\n======================\n\n* **Plus de mentions de modification !** Modifier une réponse ne mentionnera plus l\'auteur de référence dans la plupart des cas parce que voilà quoi, à la base je voulais juste corriger ma petite faute de grammaire et v\'là-ti pas que je me tape la honte maintenant.\n* **Améliorations des dossiers de serveurs.** Tu peux maintenant marquer tes dossiers de serveurs comme lus ! Nous avons également ajouté des paramètres afin que tu puisses les personnaliser avec des noms et des couleurs.\n* **Améliorations majeures et correction de bugs concernant la gestion des critères de sélection des membres.** Plus aucun risque de rester bloqué sur ces pages.\n* **Accès simplifié à l\'activation du micro.** Tu peux maintenant modifier les paramètres des fonctions Appuyer-pour-parler et Détection de la voix sans quitter l\'écran d\'appel.\n\n\n + Nouvelles fonctionnalités {added marginTop}\n======================\n\n* **Ajout de Découverte de conférences.** En cliquant sur le nouvel onglet Découverte, tu peux jeter un œil aux communautés qui organisent des conférences en direct, c\'est-à-dire des événements audio comme des concerts, des tables rondes, des concours de talents ou tout autre événement bizarre qui te viendrait à l\'esprit, du moment qu\'il reste légal. \n* **« Trouver tes amis » fait son entrée.** Nous avons ajouté une option pour te permettre de trouver plus facilement des amis sur Discord. Si tu as le numéro de téléphone de ton ami et que vous avez tous deux choisi d\'être visibles, tu pourras le trouver et lui envoyer une demande d\'ami. Tu pourras aussi le prévenir de cette façon assez gênante : « Si tu reçois une demande de xXSoulzLuverXx#0000, c\'est moi. »\n* **Ajout des favoris pour émojis.** Touche un émoji dans le chat ou reste appuyé longtemps sur l\'un d\'eux dans le sélecteur d\'émojis pour ajouter ou supprimer des émojis de tes favoris. Tes favoris ne seront pas synchronisés avec le bureau *pour l\'instant*, mais tu peux commencer à déterminer quels sont les 5 émojis que tu utilises réellement parmi les 2 459 que tu possèdes.\n* **Ajout d\'une pagination à la barre de recherche.** Plus besoin de faire défiler pendant des heures les résultats de tes recherches. Tu peux maintenant passer d\'une page à l\'autre pour trouver la preuve exacte dont tu as besoin pour convaincre tes amis qu\'ils ont dit telle ou telle chose il y a 6 mois. Tu ne te rappelles plus quoi exactement, mais tu vas trouver dans une minute parce que tu peux jurer qu\'ils l\'ont dit.\n* **Ajout de sons dans les salons vocaux :** Ton téléphone émettra désormais des sons lorsque tu rejoindras/quitteras/te déplaceras dans les salons vocaux. J\'arrive d\'ailleurs à jouer ces sons dans ma tête avec une clarté effrayante. Ba-dum...ba-da-doo...\n\n\n\n\nCorrections et mises à jour {progress}\n======================\n\n* **Plus de mentions de modification !** Modifier une réponse ne mentionnera plus l\'auteur de référence dans la plupart des cas parce que voilà quoi, à la base je voulais juste corriger ma petite faute de grammaire et v\'là-ti pas que je me tape la honte maintenant.\n* **Améliorations des dossiers de serveurs.** Tu peux maintenant marquer tes dossiers de serveurs comme lus ! Nous avons également ajouté des paramètres afin que tu puisses les personnaliser avec des noms et des couleurs.\n* **Améliorations majeures et correction de bugs concernant la gestion des critères de sélection des membres.** Plus aucun risque de rester bloqué sur ces pages.\n* **Accès simplifié à l\'activation du micro.** Tu peux maintenant modifier les paramètres des fonctions Appuyer-pour-parler et Détection de la voix sans quitter l\'écran d\'appel.\n\n\n 2021-06-21 fr 1 @@ -6605,6 +6605,7 @@ Membres uniquement Commencer la conférence Tu seras locuteur lorsque la conférence sera ouverte. + Écris un sujet pour annoncer que ta conférence commence. De quoi veux-tu discuter ? Sujet de la conférence Fin du débat : un régime équilibré est mieux qu\'un régime normal @@ -6622,11 +6623,17 @@ Crée un [serveur de communauté.]({helpdeskArticle}) Créer un salon de conférence. Conçois un super événement. + Commence et ouvre ta conférence ! Envie d\'en savoir plus ? + Apprends à animer la meilleure conférence possible Tu ne peux pas encore commencer de conférence + Attire l\'attention de ta communauté et fais-la grandir avec les salons de conférence. + Dans quelle communauté veux-tu organiser un événement audio ? Ta conférence aura lieu dans $[**!!{stageName}!!**](stageHook). $[Changer de salon](changeHook) + Nous créerons automatiquement un salon de conférence pour toi appelé $[**!!{stageName}!!**](stageHook). Tu peux changer le nom plus tard. Ta conférence aura lieu dans $[**!!{stageName}!!**](stageHook). Salon de conférence + Écris un sujet pour annoncer que ta conférence commence. De quoi veux-tu discuter ? C\'est parti Personnes qui interviennent dans la conférence diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index b14bfab94e..f12c635c27 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -6737,6 +6737,7 @@ सिर्फ़ मेम्बर्स स्टेज स्टार्ट करें स्टेज खुलने पर आप स्पीकर होंगे. + आपका स्टेज लाइव है, ये बताने के लिए टॉपिक लिखें. आप किस बारे में बात करेंगे? स्टेज का टॉपिक डिबेट का टॉपिक है: डायट नियमित रूप से बेहतर है @@ -6754,11 +6755,17 @@ [कम्युनिटी सर्वर]({helpdeskArticle}) बनाएं. स्टेज चैनल क्रिएट करें. बेहतरीन इवेंट होस्ट करें. + स्टेज स्टार्ट करें और खोलें! ज़्यादा जानना चाहते हैं? + बेहतरीन स्टेज को होस्ट करने की कला सिखें आप अभी भी स्टेज स्टार्ट नहीं कर सकते हैं + स्टेज चैनल्स के साथ अपनी कम्युनिटी में एक्टिव रहें और उसे आगे बढ़ाएं. + किस कम्युनिटी में आप ऑडियो इवेंट होस्ट करना चाहते हैं? आपके स्टेज को $[**!!{stageName}!!**](stageHook) में होस्ट किया जाएगा. $[चैनल बदलें](changeHook) + हम आपके लिए $[**!!{stageName}!!**](stageHook) नाम का स्टेज चैनल अपने आप क्रिएट कर देंगे. आप बाद में नाम बदल सकते हैं. आपके स्टेज को स्टेज $[**!!{stageName}!!**](stageHook) में होस्ट किया जाएगा. स्टेज चैनल + आपका स्टेज लाइव है, ये बताने के लिए टॉपिक लिखें. आप किस बारे में बात करेंगे? आइए इसे करते हैं लोग स्टेज चैनल पर बोल रहे हैं diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index bd452d1cbb..2561d461e2 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -6612,6 +6612,7 @@ Samo za članove Pokreni pozornicu Postat ćeš Govornik kada se Pozornica otvori. + Napiši temu da najaviš da je tvoja pozornica aktivna. O čemu ćete razgovarati? Tema Pozornice Debata je završila: diet je bolja od obične @@ -6629,11 +6630,17 @@ Izradi jedan [Server zajednice.]({helpdeskArticle}) Stvori kanal s pozornicom. Smisli sjajan događaj. + Pokreni i otvori svoju pozornicu! Želiš li više informacija? + Doznaj kako možeš biti domaćin sjajne pozornice Za sada ne možeš pokrenuti pozornicu + Koristi kanale s pozornicom kako bi uključio više članova i povećao svoju zajednicu. + U kojoj zajednici želiš biti domaćin audio događaja? Tvoja pozornica bit će postavljena na $[**!!{stageName}!!**](stageHook). $[Promijeni kanal](changeHook) + Automatski ćemo ti stvoriti Kanal s pozornicom koji se zove $[**!!{stageName}!!**](stageHook). Poslije možeš promijeniti ime. Tvoja pozornica bit će postavljena na $[**!!{stageName}!!**](stageHook). Kanal s pozornicom + Napiši temu da najaviš da je tvoja pozornica aktivna. O čemu ćete razgovarati? Napravimo to Ljudi koji nastupaju diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 36fbd86f02..88d22d4fc9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -6653,6 +6653,7 @@ Csak tagok Pódium indítása Amikor megnyílik a pódium, te leszel a beszélő. + Add meg a témát, amellyel bejelentheted, hogy megnyílt a pódiumod. Miről fogtok beszélgetni? Pódium témája Vita lezárva: a diétás jobb, mint a sima @@ -6670,11 +6671,17 @@ Hozz létre egy [közösségi szervert.]({helpdeskArticle}) Hozz létre egy pódiumcsatornát. Rukkolj elő egy szuper eseménnyel. + Indítsd el és nyisd meg a pódiumodat! Szeretnél többet megtudni? + Ismerd meg, hogyan tudsz szuper pódiumot biztosítani Még nem indíthatsz pódiumot + Tartsd meg és növeld meg közösségedet pódiumcsatornákkal. + Melyik közösségnek szeretnél hangeseményt tartani? A pódiumodat $[**!!{stageName}!!**](stageHook) fogja befogadni. $[Csatorna módosítása](changeHook) + Automatikusan létrehozunk egy pódiumcsatornát neked $[**!!{stageName}!!**](stageHook) névvel. Ezt a nevet a későbbiekben módosíthatod. A pódiumodat $[**!!{stageName}!!**](stageHook) fogja befogadni. Pódiumcsatorna + Add meg a témát, amellyel bejelentheted, hogy megnyílt a pódiumod. Miről fogtok beszélgetni? Vágjunk bele Előadók diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d9d7f469c7..922c508df9 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1035,7 +1035,7 @@ Cambia avatar del server Utilizza un avatar diverso in ognuno dei tuoi server e molto altro ancora con **Discord Nitro!** Registro dei cambiamenti - Nuove funzionalità {added marginTop}\n======================\n\n* **È arrivato Trova i tuoi amici.** Abbiamo aggiunto una modalità attivabile per trovare i tuoi amici su Discord più facilmente. Se hai il numero di telefono del tuo amico ed entrambi avete dato il consenso per essere trovati, potrai trovarlo e inviargli una richiesta di amicizia. Niente più conversazioni imbarazzanti come: \"Se ti arriva una richiesta da xXSoulzLuverXx#0000, sono io.\"\n* **Abbiamo aggiunto gli emoji preferiti.** Tocca un emoji nella chat o tienine premuto uno nel selettore emoji per iniziare ad aggiungere e rimuovere gli emoji dai tuoi preferiti. I preferiti non verranno sincronizzati su desktop *per ora* ma puoi cominciare a pensare a quali 5 dei 2459 emoji a tua disposizione usi davvero.\n* **Aggiunte pagine alla barra di ricerca.** Non devi più scorrere all\'infinito tra i risultati di ricerca. Ora puoi saltare da una pagina all\'altra per trovare esattamente le prove da sbattere in faccia ai tuoi amici che negano di aver detto quella cosa 6 mesi fa ma tu non ti ricordi bene e ora ti basta un minuto per ritrovarla perché non hai nessun dubbio sul fatto che lo abbiano detto.\n* **Abbiamo aggiunto i suoni del canale vocale:** il tuo telefono ora riprodurrà suoni specifici per quando ti unisci/esci/vieni spostato nei canali vocali, tutti suoni che mi passano in testa fin troppo chiaramente. Ba-dum...ba-da-doo...\n\n\nCorrezioni e aggiornamenti {progress}\n======================\n\n* **Niente più ping di modifica!** Modificare una risposta non rimanderà più all\'autore nella maggior parte dei casi perché insomma volevo solo correggere il mio piccolo errore di grammatica e ora mi vergogno da morire.\n* **Miglioramenti delle cartelle server.** Ora puoi segnare le cartelle folder come già lette! Abbiamo aggiunto anche delle impostazioni per le cartelle server e ora puoi impostare nomi e colori personalizzati.\n* **Importanti miglioramenti e correzioni di bug per la Verifica dell\'iscrizione.** Non ti bloccherai più su queste pagine.\n* **Ora è più facile accedere alla modalità dell\'ingresso.** Puoi cambiare le impostazioni di push-to-talk e dell\'attività vocale senza uscire dalla schermata della chiamata.\n\n\n + Nuove funzionalità {added marginTop}\n======================\n\n* **Abbiamo aggiunto Esplora palco.** Dai un\'occhiata alle community che stanno ospitando dei palchi, da eventi audio come concerti, panel, talent show a qualunque altra stranezza ti venga in mente a patto che sia legale, cliccando sulla nuova scheda Esplora. \n* **È arrivato Trova i tuoi amici.** Abbiamo aggiunto una modalità attivabile per trovare i tuoi amici su Discord più facilmente. Se hai il numero di telefono del tuo amico ed entrambi avete dato il consenso per essere trovati, potrai trovarlo e inviargli una richiesta di amicizia. Niente più conversazioni imbarazzanti come: \"Se ti arriva una richiesta da xXSoulzLuverXx#0000, sono io.\"\n* **Abbiamo aggiunto gli emoji preferiti.** Tocca un emoji nella chat o tienine premuto uno nel selettore emoji per iniziare ad aggiungere e rimuovere gli emoji dai tuoi preferiti. I preferiti non verranno sincronizzati su desktop *per ora* ma puoi cominciare a pensare a quali 5 dei 2459 emoji a tua disposizione usi davvero.\n* **Aggiunte pagine alla barra di ricerca.** Non devi più scorrere all\'infinito tra i risultati di ricerca. Ora puoi saltare da una pagina all\'altra per trovare esattamente le prove da sbattere in faccia ai tuoi amici che negano di aver detto quella cosa 6 mesi fa ma tu non ti ricordi bene e ora ti basta un minuto per ritrovarla perché non hai nessun dubbio sul fatto che lo abbiano detto.\n* **Abbiamo aggiunto i suoni del canale vocale:** il tuo telefono ora riprodurrà suoni specifici per quando ti unisci/esci/vieni spostato nei canali vocali, tutti suoni che mi passano in testa fin troppo chiaramente. Ba-dum...ba-da-doo...\n\n\nCorrezioni e aggiornamenti {progress}\n======================\n\n* **Niente più ping di modifica!** Modificare una risposta non rimanderà più all\'autore nella maggior parte dei casi perché insomma volevo solo correggere il mio piccolo errore di grammatica e ora mi vergogno da morire.\n* **Miglioramenti delle cartelle server.** Ora puoi segnare le cartelle folder come già lette! Abbiamo aggiunto anche delle impostazioni per le cartelle server e ora puoi impostare nomi e colori personalizzati.\n* **Importanti miglioramenti e correzioni di bug per la Verifica dell\'iscrizione.** Non ti bloccherai più su queste pagine.\n* **Ora è più facile accedere alla modalità dell\'ingresso.** Puoi cambiare le impostazioni di push-to-talk e dell\'attività vocale senza uscire dalla schermata della chiamata.\n\n\n 2021-06-21 it 1 @@ -6556,6 +6556,7 @@ Solo membri Avvia il palco Sarai un relatore quando il palco aprirà. + Scrivi un argomento per annunciare che il tuo palco è in onda. Di che cosa parlerete? Argomento del palco Il dibattito è concluso: le bevande zero calorie sono meglio delle originali @@ -6573,11 +6574,17 @@ Crea un [server di community]({helpdeskArticle}). Crea un canale palco. Inventa un evento unico. + Avvia e apri il palco! Vuoi saperne di più? + Scopri come ospitare un palco fantastico Non puoi ancora avviare un palco + Coinvolgi e fai crescere la tua community con i canali palco. + In quale community vuoi ospitare un evento audio? Il tuo palco sarà ospitato su $[**!!{stageName}!!**](stageHook). $[Cambia canale](changeHook) + Ti creeremo automaticamente un canale palco chiamato $[**!!{stageName}!!**](stageHook). Più tardi potrai modificarne il nome. Il tuo palco sarà ospitato su $[**!!{stageName}!!**](stageHook). Canale palco + Scrivi un argomento per annunciare che il tuo palco è in onda. Di che cosa parlerete? Facciamolo Persone che si esibiscono diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6548a5eb55..f0f4702c24 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1058,7 +1058,7 @@ サーバー アバターを 変更 サーバーごとに使うアバターを変えることも、**Discord Nitro ならできちゃいます！** 変更履歴 - 新機能{added marginTop}\n======================\n\n* **「フレンドを探す」がやってきました。**Discord をやっている友達を探す作業がもっと簡単になるよう、選べる機能を追加しました。友達の電話番号を知っていて、お互いに「フレンドを探す」を有効にしている場合は、友達が Discord に表示され、フレンドリクエストを送れるようになります。こんなふうにぎこちない会話から始めましょう: xXSoulzLuverXx#0000 からリクエストがあったら、それは私です。\n* **「お気に入りの絵文字」機能を追加しました。**チャットで絵文字をタップするか、任意の絵文字を絵文字ピッカーで長押しすると、お気に入りに追加したり削除したりできます。お気に入りの絵文字は *まだ* デスクトップ版と同期できませんが、全部で 2,459 ある絵文字のうち実際に使っているのが 5 個くらいだという事実をご自分で確かめてみてくださいね。\n* **検索バーでページ分けできるようになりました。**検索結果を永久にスクロールし続ける手間はもういりません。これからはページ間をジャンプして、6 ヶ月前くらいに友達が〇〇って言ったけど正確にいつかは思い出せなくて一瞬だけ時間ちょうだい絶対間違いなく言ってたからすぐに探し出して言質取るから、っていうときに役立てることができます。\n* **ボイスチャンネルに通知音を追加しました。**今後ボイスチャンネルで参加／退出／移動したときには、スマホで通知音がなります。ちなみにこの通知音、脳内で明瞭に再生されまくるのでつらいです。バドゥン……バダドゥ……\n\n\n\nバグ修正と更新{progress}\n======================\n\n* **編集 ping、さようなら！** 一度送った返信を編集しても、返信元メッセージの書き手にメンションが飛ぶことがほぼなくなりました。ちょっとタイポを直したかっただけなのに、そういうの恥ずか死ぬじゃん。\n* **サーバーフォルダーが改善されました。**これからはサーバーフォルダーを既読としてマークできます！ サーバーフォルダー設定も実装したので、カスタム名称や色を設定できるようになりましたよ。\n* **メンバー・スクリーニングを大幅改善しました。**もうスクリーニング関連のページでつまづくことはありません。\n* **入力モードへのアクセスが簡単になりました。**通話スクリーンを閉じることなく、プッシュツートークや音声検出設定を変更できるようになりました。\n\n\n + 新機能{added marginTop}\n======================\n\n* **ステージ発見を追加しました。**コンサートやパネルディスカッション、かくし芸大会、その他の意味不明だけど合法なオーディオイベント――すなわちステージを配信中のコミュニティを探せます。新規実装の「発見」タブをクリックしてみてください。 \n* **「フレンドを探す」がやってきました。**Discord をやっている友達を探す作業がもっと簡単になるよう、選べる機能を追加しました。友達の電話番号を知っていて、お互いに「フレンドを探す」を有効にしている場合は、友達が Discord に表示され、フレンドリクエストを送れるようになります。こんなふうにぎこちない会話から始めましょう: xXSoulzLuverXx#0000 からリクエストがあったら、それは私です。\n* **「お気に入りの絵文字」機能を追加しました。**チャットで絵文字をタップするか、任意の絵文字を絵文字ピッカーで長押しすると、お気に入りに追加したり削除したりできます。お気に入りの絵文字は *まだ* デスクトップ版と同期できませんが、全部で 2,459 ある絵文字のうち実際に使っているのが 5 個くらいだという事実をご自分で確かめてみてくださいね。\n* **検索バーでページ分けできるようになりました。**検索結果を永久にスクロールし続ける手間はもういりません。これからはページ間をジャンプして、6 ヶ月前くらいに友達が〇〇って言ったけど正確にいつかは思い出せなくて一瞬だけ時間ちょうだい絶対間違いなく言ってたからすぐに探し出して言質取るから、っていうときに役立てることができます。\n* **ボイスチャンネルに通知音を追加しました。**今後ボイスチャンネルで参加／退出／移動したときには、スマホで通知音がなります。ちなみにこの通知音、脳内で明瞭に再生されまくるのでつらいです。バドゥン……バダドゥ……\n\n\n\nバグ修正と更新{progress}\n======================\n\n* **編集 ping、さようなら！** 一度送った返信を編集しても、返信元メッセージの書き手にメンションが飛ぶことがほぼなくなりました。ちょっとタイポを直したかっただけなのに、そういうの恥ずか死ぬじゃん。\n* **サーバーフォルダーが改善されました。**これからはサーバーフォルダーを既読としてマークできます！ サーバーフォルダー設定も実装したので、カスタム名称や色を設定できるようになりましたよ。\n* **メンバー・スクリーニングを大幅改善しました。**もうスクリーニング関連のページでつまづくことはありません。\n* **入力モードへのアクセスが簡単になりました。**通話スクリーンを閉じることなく、プッシュツートークや音声検出設定を変更できるようになりました。\n\n\n 2021-06-21 ja 1 @@ -6749,6 +6749,7 @@ メンバー限定 ステージを開始 ステージがオープンすると、あなたがスピーカーに設定されます。 + トピックを記入して、ステージが配信中であることを伝えましょう。 何の話をしますか？ ステージのトピック 最終結論：ローカロリー食品は普通のよりおいしい @@ -6766,11 +6767,17 @@ [コミュニティサーバー]({helpdeskArticle})を立ち上げてください。 ステージチャンネルを作成してください。 素敵なイベントを考えてください。 + あなたのステージをオープンしましょう！ もっと詳しく知りたいですか？ + 素敵なステージをホストするには ステージを開始する条件が揃っていません + ステージチャンネルでコミュニティを惹きつけ、広げましょう。 + どのコミュニティでオーディオイベントをホストしますか？ あなたのステージは $[**!!{stageName}!!**](stageHook) でホストされます。$[チャンネルを変更する](changeHook) + ステージチャンネル $[**!!{stageName}!!**](stageHook) を自動生成します。名前は後から変更できます。 あなたのステージは $[**!!{stageName}!!**](stageHook) でホストされます。 ステージチャンネル + トピックを記入して、ステージが配信中であることを伝えましょう。 何の話をしますか？ やるぞ！ 登壇者 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 521ab5a133..b6682fe25b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1058,7 +1058,7 @@ 서버 아바타 변경하기 **Discord Nitro 구독**으로 참가 중인 서버마다 각기 다른 아바타를 사용해보세요! 변경 사항 - 새 기능 {added marginTop}\n======================\n\n* **친구 찾기를 추가했어요.** Discord에서 친구를 더 쉽게 찾는 방법을 추가했어요. 친구의 전화번호를 알고 있고, 두 사람 모두 친구 찾기 기능에 동의한 상태라면 친구를 찾아서 친구 요청을 보낼 수 있어요. \"혹시 xX영혼의단짝Xx#0000이라는 사람이 요청을 보내면 난 줄 알아.\" 같은 다소 민망한 말로 대화를 시작하게 되겠군요.\n* **이모티콘 즐겨찾기 기능을 추가했어요.** 대화 중 이모티콘을 탭하거나, 이모티콘 선택기에서 이모티콘 하나를 길게 누르면, 해당 이모티콘을 즐겨찾기로 추가하거나 제거할 수 있어요. 가지고 있는 총 2,459개의 이모티콘 중 실제로 사용하는 이모티콘 5개가 무엇인지 슬슬 생각해볼 때가 됐어요. 참, PC 버전과는 *아직* 동기화되지 않아요.\n* **검색 창에 페이지 기능을 추가했어요.** 검색 결과를 뒤져볼 때 더는 손가락 빠지도록 스크롤을 내릴 필요가 없어요. 6개월 전 친구가 뭔가에 관해 무슨 얘기를 했는데 그게 정확히 무엇에 관한 것이었는지 기억이 가물가물하지만 왠지 당장 궁금해서 미칠 거 같을 때, 검색 결과 페이지를 오가며 편하게 그 실마리를 찾아볼 수 있을 거예요.\n* **음성 채널에 알림 사운드를 추가했어요.** 이제부터는 음성 채널에 참가하거나, 채널을 떠나거나, 다른 채널로 이동될 때 휴대폰에서 소리가 날 거예요.\n\n\n\n\n수정 및 업데이트 {progress}\n======================\n\n* **댓글 수정 핑이 사라졌어요!** 이제 댓글을 수정해도 거의 모든 경우에서 원글 작성자에게 멘션이 가지 않아요. 민망한 문법 실수도 몰래 수정하는 게 가능하단 이야기죠.\n* **서버 폴더를 개선했어요.** 이제 서버 폴더를 읽음으로 표시할 수 있어요! 또 서버 폴더 설정에서 폴더에 사용자 정의 이름과 색상을 지정할 수도 있어요.\n* **멤버십 심사 기능을 대폭 개선하고 버그를 수정했어요.** 이제 페이지에 갇혀 오도 가도 못 하는 일은 벌어지지 않을 거예요.\n* **녹음 모드를 더 쉽게 사용할 수 있어요.** 이제 통화 화면을 떠나지 않고도 눌러서 말하기 모드로 전환하거나 음성 활동 설정을 변경할 수 있어요.\n\n\n + 새 기능 {added marginTop}\n======================\n\n* **스테이지 찾기 기능을 추가했어요.** 새로운 찾기 탭을 클릭해 스테이지(콘서트, 토론, 장기 자랑을 포함한 상상할 수 있는 모든 종류의 합법적인 오디오 행사)를 호스팅 중인 커뮤니티를 확인해보세요. \n* **친구 찾기를 추가했어요.** Discord에서 친구를 더 쉽게 찾는 방법을 추가했어요. 친구의 전화번호를 알고 있고, 두 사람 모두 친구 찾기 기능에 동의한 상태라면 친구를 찾아서 친구 요청을 보낼 수 있어요. \"혹시 xX영혼의단짝Xx#0000이라는 사람이 요청을 보내면 난 줄 알아.\" 같은 다소 민망한 말로 대화를 시작하게 되겠군요.\n* **이모티콘 즐겨찾기 기능을 추가했어요.** 대화 중 이모티콘을 탭하거나, 이모티콘 선택기에서 이모티콘 하나를 길게 누르면, 해당 이모티콘을 즐겨찾기로 추가하거나 제거할 수 있어요. 가지고 있는 총 2,459개의 이모티콘 중 실제로 사용하는 이모티콘 5개가 무엇인지 슬슬 생각해볼 때가 됐어요. 참, PC 버전과는 *아직* 동기화되지 않아요.\n* **검색 창에 페이지 기능을 추가했어요.** 검색 결과를 뒤져볼 때 더는 손가락 빠지도록 스크롤을 내릴 필요가 없어요. 6개월 전 친구가 뭔가에 관해 무슨 얘기를 했는데 그게 정확히 무엇에 관한 것이었는지 기억이 가물가물하지만 왠지 당장 궁금해서 미칠 거 같을 때, 검색 결과 페이지를 오가며 편하게 그 실마리를 찾아볼 수 있을 거예요.\n* **음성 채널에 알림 사운드를 추가했어요.** 이제부터는 음성 채널에 참가하거나, 채널을 떠나거나, 다른 채널로 이동될 때 휴대폰에서 소리가 날 거예요.\n\n\n\n\n수정 및 업데이트 {progress}\n======================\n\n* **댓글 수정 핑이 사라졌어요!** 이제 댓글을 수정해도 거의 모든 경우에서 원글 작성자에게 멘션이 가지 않아요. 민망한 문법 실수도 몰래 수정하는 게 가능하단 이야기죠.\n* **서버 폴더를 개선했어요.** 이제 서버 폴더를 읽음으로 표시할 수 있어요! 또 서버 폴더 설정에서 폴더에 사용자 정의 이름과 색상을 지정할 수도 있어요.\n* **멤버십 심사 기능을 대폭 개선하고 버그를 수정했어요.** 이제 페이지에 갇혀 오도 가도 못 하는 일은 벌어지지 않을 거예요.\n* **녹음 모드를 더 쉽게 사용할 수 있어요.** 이제 통화 화면을 떠나지 않고도 눌러서 말하기 모드로 전환하거나 음성 활동 설정을 변경할 수 있어요.\n\n\n 2021-06-21 ko 1 @@ -6736,6 +6736,7 @@ 멤버 전용 스테이지 시작하기 스테이지가 열리면 연설자로 참여하게 됩니다. + 주제를 설명해 스테이지가 열렸다는 걸 알리세요. 무슨 주제로 대화를 나눠볼까요? 스테이지 주제 논란 종결: 역시 닭보다는 알이 먼저죠 @@ -6753,11 +6754,17 @@ [커뮤니티 서버]({helpdeskArticle})를 만드세요. 스테이지 채널을 만들어요. 멋진 이벤트를 구상해요. + 스테이지를 여세요! 더 궁금한 게 있나요? + 멋지게 스테이지 진행하는 법 아직은 스테이지를 시작할 수 없어요 + 스테이지 채널로 커뮤니티를 키우세요. + 어떤 커뮤니티에서 음성 이벤트를 열고 싶나요? 내 스테이지가 $[**!!{stageName}!!**](stageHook)에서 진행됩니다. $[채널 변경](changeHook) + $[**!!{stageName}!!**](stageHook)(이)라는 이름으로 스테이지 채널이 자동 생성됩니다. 이름은 나중에 바꿀 수 있어요. 내 스테이지가 $[**!!{stageName}!!**](stageHook)에서 진행됩니다. 스테이지 채널 + 주제를 설명해 스테이지가 열렸다는 걸 알리세요. 무슨 주제로 대화를 나눠볼까요? 할게요 연설 중인 사람 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 2730a3d5b3..1d7f46b1dc 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -6710,6 +6710,7 @@ Tik nariams Pradėti scenos kanalą Tu būsi kalbėtojas, kai scenos kanalas bus atidarytas. + Parašyk temą, kad praneštum, jog tavo scenos kanalas jau tiesioginiame eteryje. Apie ką kalbėsitės? Scenos kanalo tema Diskusijos baigtos: dietinė yra geresnė už įprastą @@ -6727,11 +6728,17 @@ Sukurk [bendruomenės serverį.]({helpdeskArticle}) Sukurti scenos kanalą. Sugalvoti puikų renginį. + Pradėk ir atidaryk savo Sceną! Nori sužinoti daugiau? + Išmok suorganizuoti puikią Sceną Dar negali pradėti Scenos + Įtrauk ir augink savo bendruomenę su Scenų kanalais. + Kurioje bendruomenėje nori rengti audio renginį? Tavo Scena bus $[**!!{stageName}!!**](stageHook). $[Pakeisti kanalą](changeHook) + Mes automatiškai sukursime tau Scenos kanalą pavadinimu $[**!!{stageName}!!**](stageHook). Vėliau galėsi pakeisti pavadinimą. Tavo Scena bus $[**!!{stageName}!!**](stageHook). Scenos kanalas + Parašyk temą, kad praneštum, jog tavo scenos kanalas jau tiesioginiame eteryje. Apie ką kalbėsitės? Padarykime tai Atliekantys žmonės diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 60fcef2697..eb05102c0b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1015,7 +1015,7 @@ Serveravatar wijzigen Gebruik een andere avatar op al je servers en nog veel meer met **Discord Nitro!** Logboek - Nieuwe functies {added marginTop}\n======================\n\n* **\'Zoek je vrienden\' is nu beschikbaar.** We hebben een optionele manier toegevoegd om makkelijker vrienden te vinden op Discord. Als je het telefoonnummer van een vriend(in) hebt en jullie kiezen er beiden voor om vindbaar te zijn, dan kunnen jullie elkaar vinden en een vriendschapsverzoek sturen. Een mooie kans om een ongemakkelijk gesprek te beginnen, zoals: \"Als je een verzoek krijgt van xXSoulzLuverXx#0000, dan ben ik dat.\"\n* **Favoriete emoji toegevoegd.** Tik op een emoji in de chat of hou hem lang ingedrukt in de emojikiezer om hem aan je favorieten toe te voegen of daaruit te verwijderen. Je favorieten worden *nog* niet gesynchroniseerd op je desktop, maar je kunt wel vast ontdekken welke 5 van je 2459 emoji\'s je daadwerkelijk gebruikt.\n* **Paginering aan de zoekbalk toegevoegd.** Je hoeft niet langer eindeloos door de zoekresultaten te scrollen. Je kunt naar andere pagina\'s springen om het exacte bewijs te vinden dat je nodig hebt om aan je vriend te laten zien dat hij dat ene zes maanden geleden echt heeft gezegd, ook al weet je niet meer wat het was. Dus zoek je het op omdat je zeker weet dat hij dat écht heeft gezegd.\n* **Spraakkanaalgeluiden toegevoegd:** Je telefoon maakt nu geluid wanneer je deelneemt aan een spraakkanaal, er een verlaat of erin verplaatst wordt. Deze geluiden kan ik angstaanjagend goed in mijn hoofd afspelen. Ba-dum... ba-da-doe...\n\n\n\n\nProbleemoplossingen en updates {progress}\n======================\n\n* **Geen pings meer na bewerken!** Wanneer je een reactie bewerkt, ontvangt de auteur van het bericht waar je op reageerde daar in de meeste gevallen geen melding meer van, want ik wilde gewoon ongezien mijn spelfout aanpassen en nu schaam ik me kapot.\n* **Verbeteringen servermap.** Je kunt je servermappen nu als gelezen markeren! We hebben ook servermapinstellingen toegevoegd zodat je aanpasbare namen en kleuren kunt gebruiken.\n* **Grote verbeteringen en probleemoplossingen voor Lidmaatschapscreening.** Je komt niet meer vast te zitten op deze pagina\'s.\n* **Je hebt nu makkelijker toegang tot je invoermodus.** Je kunt je instellingen voor push-to-talk en je spraakactiviteit nu makkelijker wijzigen zonder het oproepscherm te verlaten.\n\n\n + Nieuwe functies {added marginTop}\n======================\n\n* **Podiumontdekking toegevoegd.** Ontdek community\'s die live podiums hosten (audio-evementen zoals concerten, panels, talentenjachten en alle andere vreemde maar legale dingen die je kunt bedenken) door op de nieuwe Ontdekking-tab te tikken. \n* **\'Zoek je vrienden\' is nu beschikbaar.** We hebben een optionele manier toegevoegd om makkelijker vrienden te vinden op Discord. Als je het telefoonnummer van een vriend(in) hebt en jullie kiezen er beiden voor om vindbaar te zijn, dan kunnen jullie elkaar vinden en een vriendschapsverzoek sturen. Een mooie kans om een ongemakkelijk gesprek te beginnen, zoals: \"Als je een verzoek krijgt van xXSoulzLuverXx#0000, dan ben ik dat.\"\n* **Favoriete emoji toegevoegd.** Tik op een emoji in de chat of hou hem lang ingedrukt in de emojikiezer om hem aan je favorieten toe te voegen of daaruit te verwijderen. Je favorieten worden *nog* niet gesynchroniseerd op je desktop, maar je kunt wel vast ontdekken welke 5 van je 2459 emoji\'s je daadwerkelijk gebruikt.\n* **Paginering aan de zoekbalk toegevoegd.** Je hoeft niet langer eindeloos door de zoekresultaten te scrollen. Je kunt naar andere pagina\'s springen om het exacte bewijs te vinden dat je nodig hebt om aan je vriend te laten zien dat hij dat ene zes maanden geleden echt heeft gezegd, ook al weet je niet meer wat het was. Dus zoek je het op omdat je zeker weet dat hij dat écht heeft gezegd.\n* **Spraakkanaalgeluiden toegevoegd:** Je telefoon maakt nu geluid wanneer je deelneemt aan een spraakkanaal, er een verlaat of erin verplaatst wordt. Deze geluiden kan ik angstaanjagend goed in mijn hoofd afspelen. Ba-dum... ba-da-doe...\n\n\n\n\nProbleemoplossingen en updates {progress}\n======================\n\n* **Geen pings meer na bewerken!** Wanneer je een reactie bewerkt, ontvangt de auteur van het bericht waar je op reageerde daar in de meeste gevallen geen melding meer van, want ik wilde gewoon ongezien mijn spelfout aanpassen en nu schaam ik me kapot.\n* **Verbeteringen servermap.** Je kunt je servermappen nu als gelezen markeren! We hebben ook servermapinstellingen toegevoegd zodat je aanpasbare namen en kleuren kunt gebruiken.\n* **Grote verbeteringen en probleemoplossingen voor Lidmaatschapscreening.** Je komt niet meer vast te zitten op deze pagina\'s.\n* **Je hebt nu makkelijker toegang tot je invoermodus.** Je kunt je instellingen voor push-to-talk en je spraakactiviteit nu makkelijker wijzigen zonder het oproepscherm te verlaten.\n\n\n 2021-06-21 nl 1 @@ -6517,6 +6517,7 @@ Alleen voor leden Podium starten Je wordt spreker zodra het podium geopend is. + Schrijf een onderwerp om aan te kondigen dat je podium live is. Waar ga je het over hebben? Podiumonderwerp Het debat is afgelopen: diëten is beter dan gewoon eten @@ -6534,11 +6535,17 @@ Maak een [communityserver.]({helpdeskArticle}) Maak een podiumkanaal. Bedenk een geweldig evenement. + Start en open je Podium! Benieuwd naar meer? + Leer hoe je een geweldig Podium host Je kan nog geen Podium starten + Vergroot je community met Podiumkanalen. + In welke community wil je je audio-evenement hosten? Je Podium wordt gehost in $[**!!{stageName}!!**](stageHook). $[Kanaal veranderen](changeHook) + We maken automatisch een podiumkanaal voor je met de naam $[**!!{stageName}!!**](stageHook). Je kan deze naam later wijzigen. Je Podium wordt gehost in $[**!!{stageName}!!**](stageHook). Podiumkanaal + Schrijf een onderwerp om aan te kondigen dat je podium live is. Waar ga je het over hebben? We gaan ervoor Mensen die optreden diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 52a6b025c0..237af76a03 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -6286,6 +6286,7 @@ Kun medlemmer Start scenen Du er taler når scenen åpnes. + Skriv et emne for å kunngjøre at scenen er åpnet. Hva skal dere snakke om? Scenens emne Debatten er avsluttet: Sukkerfri er bedre enn vanlig @@ -6303,11 +6304,17 @@ Lag en [fellesskapserver.]({helpdeskArticle}) Opprett en scenekanal. Pønsk ut et fantastisk arrangement. + Start og åpne scenen din! Vil du finne ut mer? + Lær deg å bli en utmerket vert for en scene Du kan ikke starte en scene ennå + Engasjer deg og dyrk frem fellesskapet ditt med scenekanaler. + I hvilket fellesskap vil du være vert for et lydarrangement? Scenen din blir arrangert i $[**!!{stageName}!!**](stageHook). $[Bytt kanal](changeHook) + Vi oppretter automatisk en scenekanal for deg kalt $[**!!{stageName}!!**](stageHook). Du kan bytte navnet senere. Scenen din blir arrangert i $[**!!{stageName}!!**](stageHook). Scenekanal + Skriv et emne for å kunngjøre at scenen er åpnet. Hva skal dere snakke om? La oss gjøre det Folk som opptrer diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 15db519eb1..9377dcf159 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1050,7 +1050,7 @@ Zmień awatar na serwerze Używaj innego awatara na każdym ze swoich serwerów i nie tylko dzięki **Discord Nitro!** Dziennik zmian - Nowe funkcje {added marginTop}\n======================\n\n* **Dodano funkcję wyszukiwania znajomych.** Dodaliśmy funkcję umożliwiającą łatwiejsze wyszukiwanie znajomych, którzy zgodzili się na przekazanie danych do aplikacji Discord. Jeśli również przystąpisz do usługi, mając numer telefonu znajomego, łatwo go znajdziesz i wyślesz prośbę o dodanie do listy znajomych. Dzięki temu unikniesz wysyłania krępujących wiadomości takich jak Ta prośba o dodanie do znajomych od xXSoulzLuverXx#0000 jest ode mnie....\n* **Dodano ulubione emoji.** Stuknij emoji na czacie lub naciśnij długo jedno z nich w obszarze wybierania emoji, aby zacząć dodawać i usuwać emoji z ulubionych. Twoje ulubione nie będą synchronizowane z pulpitem *jeszcze*, ale możesz zacząć zastanawiać się, które 5 z posiadanych 2459 emoji rzeczywiście używasz.\n* **Dodano paginację do paska wyszukiwania.** Nie musisz już przewijać w nieskończoność wyników wyszukiwania. Teraz możesz przeskakiwać między stronami, aby znaleźć niezbity dowód, którego potrzebujesz, chcąc udowodnić swojemu znajomemu, że naprawdę coś powiedział 6 miesięcy temu, ale nie możesz sobie przypomnieć, więc poświęcasz trochę czasu, aby to znaleźć, ponieważ przysięgasz, że naprawdę to powiedział.\n* **Dodano dźwięki kanałów głosowych:** Twój telefon będzie teraz odtwarzał dźwięki, gdy dołączysz, opuścisz lub zostaniesz przeniesiony w kanałach głosowych — są to wszystkie dźwięki, które mogą pojawić się w głowie z przerażającą wyrazistością. Ba-dum... ba-da-doo...\n\n\n\n\nPoprawki i aktualizacje {progress}\n======================\n\n* **Koniec z pingami edycji!** Edycja odpowiedzi nie będzie już wspominać autora referencji w większości przypadków (Chciałem tylko poprawić mój mały błąd gramatyczny, a teraz jestem poważnie zakłopotany.)\n* **Ulepszenia folderów serwera.** Teraz możesz oznaczyć foldery serwera jako przeczytane! Dodaliśmy także ustawienia folderów serwera, aby można było ustawić własne nazwy i kolory.\n* **Dużo ulepszeń i poprawek błędów w funkcji sprawdzania członków.** Nie będziesz już na dłużej zatrzymywać się na tych stronach.\n* **Ułatwiono dostęp do trybu wprowadzania danych.** Możesz teraz zmieniać ustawienia funkcji Naciśnij i Mów oraz aktywności głosowej bez opuszczania ekranu połączenia.\n\n\n + Nowe funkcje {added marginTop}\n======================\n\n* **Dodano Wyszukiwanie podiów.** Poznaj społeczności, które organizują podium na żywo — wydarzenia audio, takie jak koncerty, panele, pokazy talentów i wszelkie inne dziwne, ale legalne rzeczy, które mogą Ci przyjść do głowy — wystarczy kliknąć nową zakładkę Wyszukiwanie. \n* **Dodano funkcję wyszukiwania znajomych.** Dodaliśmy funkcję umożliwiającą łatwiejsze wyszukiwanie znajomych, którzy zgodzili się na przekazanie danych do aplikacji Discord. Jeśli również przystąpisz do usługi, mając numer telefonu znajomego, łatwo go znajdziesz i wyślesz prośbę o dodanie do listy znajomych. Dzięki temu unikniesz wysyłania krępujących wiadomości takich jak Ta prośba o dodanie do znajomych od xXSoulzLuverXx#0000 jest ode mnie....\n* **Dodano ulubione emoji.** Stuknij emoji na czacie lub naciśnij długo jedno z nich w obszarze wybierania emoji, aby zacząć dodawać i usuwać emoji z ulubionych. Twoje ulubione nie będą synchronizowane z pulpitem *jeszcze*, ale możesz zacząć zastanawiać się, które 5 z posiadanych 2459 emoji rzeczywiście używasz.\n* **Dodano paginację do paska wyszukiwania.** Nie musisz już przewijać w nieskończoność wyników wyszukiwania. Teraz możesz przeskakiwać między stronami, aby znaleźć niezbity dowód, którego potrzebujesz, chcąc udowodnić swojemu znajomemu, że naprawdę coś powiedział 6 miesięcy temu, ale nie możesz sobie przypomnieć, więc poświęcasz trochę czasu, aby to znaleźć, ponieważ przysięgasz, że naprawdę to powiedział.\n* **Dodano dźwięki kanałów głosowych:** Twój telefon będzie teraz odtwarzał dźwięki, gdy dołączysz, opuścisz lub zostaniesz przeniesiony w kanałach głosowych — są to wszystkie dźwięki, które mogą pojawić się w głowie z przerażającą wyrazistością. Ba-dum... ba-da-doo...\n\n\n\n\nPoprawki i aktualizacje {progress}\n======================\n\n* **Koniec z pingami edycji!** Edycja odpowiedzi nie będzie już wspominać autora referencji w większości przypadków (Chciałem tylko poprawić mój mały błąd gramatyczny, a teraz jestem poważnie zakłopotany.)\n* **Ulepszenia folderów serwera.** Teraz możesz oznaczyć foldery serwera jako przeczytane! Dodaliśmy także ustawienia folderów serwera, aby można było ustawić własne nazwy i kolory.\n* **Dużo ulepszeń i poprawek błędów w funkcji sprawdzania członków.** Nie będziesz już na dłużej zatrzymywać się na tych stronach.\n* **Ułatwiono dostęp do trybu wprowadzania danych.** Możesz teraz zmieniać ustawienia funkcji Naciśnij i Mów oraz aktywności głosowej bez opuszczania ekranu połączenia.\n\n\n 2021-06-21 pl 1 @@ -6649,6 +6649,7 @@ Tylko członkowie Zainicjuj podium Gdy Podium się otworzy, będziesz mówcą. + Określ temat, aby ogłosić, że podium się zaczęło. O czym będziecie rozmawiać? Temat Podium Debata zakończona: napoje dietetyczne są lepsze niż zwykłe @@ -6666,11 +6667,17 @@ Utwórz [serwer społeczności.]({helpdeskArticle}) Utwórz kanał podium. Zaplanuj świetne wydarzenie. + Zainicjuj i otwórz podium! Chcesz dowiedzieć się więcej? + Dowiedz się, jak zorganizować świetne podium Nie możesz jeszcze zainicjować podium + Angażuj i rozwijaj swoją społeczność dzięki kanałom podium. + W której społeczności chcesz zorganizować wydarzenie dźwiękowe? Twoje podium zostanie zorganizowane na kanale $[**!!{stageName}!!**](stageHook). $[Zmień kanał](changeHook) + Automatycznie utworzymy dla Ciebie kanał podium o nazwie $[**!!{stageName}!!**](stageHook). Możesz zmienić tę nazwę później. Twoje podium zostanie zorganizowane na kanale $[**!!{stageName}!!**](stageHook). Kanał podium + Określ temat, aby ogłosić, że podium się zaczęło. O czym będziecie rozmawiać? Zróbmy to Rozmawiające osoby diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a6291c285b..5c8777e85e 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -684,7 +684,7 @@ Bem-vindo (ou vinda) ao começo do grupo **!!{name}!!**. Você sairá automaticamente deste grupo quando tiver terminado. Este é o começo do canal **particular** !!{channelName}!!. $[](topicHook) - Beta + S Búlgaro Cobrança Aceite os Termos de Serviço para continuar @@ -1041,7 +1041,7 @@ Mudar avatar do servidor Use um avatar diferente em cada um dos seus servidores e muito mais com o **Discord Nitro!** Registro de alterações - Novos recursos {added marginTop}\n======================\n\n* **Encontre Seus Amigos chegou.** Nós acrescentamos uma forma prática para você encontrar seus amigos mais facilmente no Discord. Se você tiver o número do seu amigo, e ambos tenham permitido serem encontrados, você poderá encontrá-lo e mandar um pedido de amizade. Já tô até vendo as conversas do tipo: \"Se você receber um pedido de xXReidoChamegoXx#0000, sou eu.\"\n* **Adicionamos emojis favoritos.** Toque em um emoji no chat ou toque e segure no seletor de emojis para adicionar ou remover emojis dos seus favoritos. Esta lista *ainda* não vai sincronizar com seu Desktop, mas você já pode ir decidindo quais 5 dos nossos 2.459 emojis você realmente usa.\n* **Adicionamos paginação à barra de busca.** Você não vai mais precisar rolar infinitamente pelos resultados de busca. Agora você pode pular direto entre páginas para encontrar a prova concreta contra seu amigo, de que ele realmente disse isso, tipo, seis meses atrás, apesar de você não se lembrar direito, mas espera só um minuto para você ir procurar, porque ele disse isso sim e você pode provar.\n* **Adicionamos sons no canal de voz:** Agora, seu telefone fará sons quando você entrar, sair e for movido em canais de voz, e são sons que eu posso ouvir na minha cabeça com clareza assustadora. Du-rum… Di-ru-rum…\n\n\n\n\nCorreções e atualizações {progress}\n======================\n\n* **Chega de menções na edição!** Editar uma resposta não vai mais gerar uma menção ao autor, na maioria das vezes, porque eu só queria consertar meu pequeno erro de gramática e agora estou com muita vergonha.\n* **Melhorias na pasta de servidores.** Agora você pode marcar as pastas do seu servidor como lidas! Também acrescentamos configurações da pasta do servidor para você poder usar nomes e cores personalizados.\n* **Grandes melhorias e correção de erros na Avaliação de Associação.** Você não vai mais encalhar nestas páginas.\n* **Deixamos seu modo de entrada mais fácil de acessar.** Agora você pode alterar suas configurações de aperte para falar e atividade de voz sem sair da tela de chamada.\n\n\n + Novos recursos {added marginTop}\n======================\n\n* **Adicionamos o Descobrir Palcos.** Dê uma olhada nas comunidades com palcos ao vivo — eventos de áudio como shows, painéis, concurso de talentos e muitas outras coisas estranhas, mas completamente legais, em que você possa pensar — clicando na aba Descobrir. \n* **Encontre Seus Amigos chegou.** Nós acrescentamos uma forma prática para você encontrar seus amigos mais facilmente no Discord. Se você tiver o número do seu amigo, e ambos tenham permitido serem encontrados, você poderá encontrá-lo e mandar um pedido de amizade. Já tô até vendo as conversas do tipo: \"Se você receber um pedido de xXReidoChamegoXx#0000, sou eu.\"\n* **Adicionamos emojis favoritos.** Toque em um emoji no chat ou toque e segure no seletor de emojis para adicionar ou remover emojis dos seus favoritos. Esta lista *ainda* não vai sincronizar com seu Desktop, mas você já pode ir decidindo quais 5 dos nossos 2.459 emojis você realmente usa.\n* **Adicionamos paginação à barra de busca.** Você não vai mais precisar rolar infinitamente pelos resultados de busca. Agora você pode pular direto entre páginas para encontrar a prova concreta contra seu amigo, de que ele realmente disse isso, tipo, seis meses atrás, apesar de você não se lembrar direito, mas espera só um minuto para você ir procurar, porque ele disse isso sim e você pode provar.\n* **Adicionamos sons no canal de voz:** Agora, seu telefone fará sons quando você entrar, sair e for movido em canais de voz, e são sons que eu posso ouvir na minha cabeça com clareza assustadora. Du-rum… Di-ru-rum…\n\n\n\n\nCorreções e atualizações {progress}\n======================\n\n* **Chega de menções na edição!** Editar uma resposta não vai mais gerar uma menção ao autor, na maioria das vezes, porque eu só queria consertar meu pequeno erro de gramática e agora estou com muita vergonha.\n* **Melhorias na pasta de servidores.** Agora você pode marcar as pastas do seu servidor como lidas! Também acrescentamos configurações da pasta do servidor para você poder usar nomes e cores personalizados.\n* **Grandes melhorias e correção de erros na Avaliação de Associação.** Você não vai mais encalhar nestas páginas.\n* **Deixamos seu modo de entrada mais fácil de acessar.** Agora você pode alterar suas configurações de aperte para falar e atividade de voz sem sair da tela de chamada.\n\n\n 2021-06-21 pt-BR 1 @@ -6587,6 +6587,7 @@ Apenas membros Começar o palco Você será um(a) orador(a) quando o palco for aberto. + Escreva um tópico para anunciar que seu palco está ao vivo. Sobre o que vocês vão conversar? Tópico do palco Acabou a discussão: diet é melhor do que normal @@ -6604,11 +6605,17 @@ Faça um [servidor da comunidade.]({helpdeskArticle}) Criar um canal palco. Pense em um ótimo evento. + Comece e abra seu palco! Quer aprender mais? + Aprenda a fazer um ótimo palco Você ainda não pode começar um palco + Envolva e expanda sua comunidade com canais palco. + Em qual comunidade você quer fazer um evento de áudio? Seu palco acontecerá em $[**!!{stageName}!!**](stageHook). $[Mudar canal](changeHook) + Um canal palco chamado $[**!!{stageName}!!**](stageHook) será criado automaticamente. Você poderá mudar o nome depois. Seu palco acontecerá em $[**!!{stageName}!!**](stageHook). Canal palco + Escreva um tópico para anunciar que seu palco está ao vivo. Sobre o que vocês vão conversar? Vamos nessa Pessoas se apresentando diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 7d4219060f..0dda2ef18c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -6541,6 +6541,7 @@ Exclusiv pentru membri Deschide podiumul Vei avea rolul de vorbitor la deschiderea podiumului. + Indică un subiect pentru a anunța că podiumul este în direct. Despre ce se va vorbi? Subiect podium Nici nu e loc de discuții: varianta light e mult superioară @@ -6558,11 +6559,17 @@ Creează un [server comunitar.]({helpdeskArticle}) Creează un canal podium. Pregătește un eveniment senzațional. + Deschide-ți podiumul și dă-i drumul! Vrei să afli mai multe? + Află cum să găzduiești un podium extraordinar Încă nu poți deschide un podium + Implică-ți și dezvoltă-ți comunitatea cu ajutorul canalelor podium. + În care comunitate vrei să găzduiești un eveniment audio? Podiumul tău va fi găzduit în $[**!!{stageName}!!**](stageHook). $[Schimbă canalul](changeHook) + Îți vom crea automat un canal podium numit $[**!!{stageName}!!**](stageHook). Îi poți schimba numele mai târziu. Podiumul tău va fi găzduit în $[**!!{stageName}!!**](stageHook). Canal podium + Indică un subiect pentru a anunța că podiumul este în direct. Despre ce se va vorbi? Să-i dăm drumul Persoane la o reprezentație diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8800de7fd9..a1f618dc03 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1034,7 +1034,7 @@ Изменить никнейм друга Сменить значок Список изменений - Новые функции {added marginTop}\n======================\n\n* **Функция «Найдите своих друзей»:** Теперь искать друзей в Discord стало ещё проще. Если вам известен номер телефона друга и вы оба включите у себя эту функцию, то этого будет достаточно, чтобы отправить запрос дружбы. Только не смотрите другу в глаза, когда будете объяснять ему, что xXPozhirayuDushiXx#0000 — это вы.\n* **Добавлены избранные эмодзи.** Коснитесь эмодзи в чате или нажмите и удерживайте эмодзи в соответствующем меню, чтобы добавить его в список избранного или убрать оттуда. Ваши любимые эмодзи *пока* не будут синхронизированы с Discord на компьютере, но вы уже можете прикинуть, какие 5 из 2459 эмодзи вы используете чаще всего.\n* **Добавлена нумерация страниц поиска.** Больше не нужно бесконечно прокручивать результаты поиска. Теперь вы легко сможете победить в споре с друзьями и найти ту фразу, которую они сказали полгода назад, даже если они утверждают, будто такого не было.\n* **Добавлены звуки голосовых каналов:** теперь ваш телефон будет воспроизводить звуки, когда вы присоединяетесь к голосовому каналу, покидаете его или вас туда перемещают. Пара-пара-пам! Фьють!\n\n\n\n\nИсправления и улучшения {progress}\n======================\n\n* **Больше никаких упоминаний из-за редактирования!** При исправлении ответа теперь не будет упоминаться автор исходного сообщения, чтобы избежать ситуаций вроде «я просто хочу исправить небольшую грамматическую ошибку, а теперь мне ужасно стыдно».\n* **Улучшения папок серверов.** Теперь можно отметить папки серверов как прочитанные! Мы также добавили настройки папок серверов, чтобы вы могли использовать для них свои названия и цвета.\n* **Мы значительно улучшили и исправили функцию отбора участников.** Вы больше не застрянете на этих страницах.\n* **Доступ к режиму ввода стал проще.** Теперь можно переключаться с режима рации на активацию по голосу и обратно прямо на экране звонка.\n\n\n + Новые функции {added marginTop}\n======================\n\n* **Добавлено «Путешествие по трибунам».** Щёлкнув по новой вкладке «Путешествие», вы сможете найти сообщества, которые организуют открытые трибуны — голосовые события, такие как концерты, семинары, шоу талантов и множество других странных, но легальных мероприятий, которые только придут вам в голову. \n* **Функция «Найдите своих друзей»:** Теперь искать друзей в Discord стало ещё проще. Если вам известен номер телефона друга и вы оба включите у себя эту функцию, то этого будет достаточно, чтобы отправить запрос дружбы. Только не смотрите другу в глаза, когда будете объяснять ему, что xXPozhirayuDushiXx#0000 — это вы.\n* **Добавлены избранные эмодзи.** Коснитесь эмодзи в чате или нажмите и удерживайте эмодзи в соответствующем меню, чтобы добавить его в список избранного или убрать оттуда. Ваши любимые эмодзи *пока* не будут синхронизированы с Discord на компьютере, но вы уже можете прикинуть, какие 5 из 2459 эмодзи вы используете чаще всего.\n* **Добавлена нумерация страниц поиска.** Больше не нужно бесконечно прокручивать результаты поиска. Теперь вы легко сможете победить в споре с друзьями и найти ту фразу, которую они сказали полгода назад, даже если они утверждают, будто такого не было.\n* **Добавлены звуки голосовых каналов:** теперь ваш телефон будет воспроизводить звуки, когда вы присоединяетесь к голосовому каналу, покидаете его или вас туда перемещают. Пара-пара-пам! Фьють!\n\n\n\n\nИсправления и улучшения {progress}\n======================\n\n* **Больше никаких упоминаний из-за редактирования!** При исправлении ответа теперь не будет упоминаться автор исходного сообщения, чтобы избежать ситуаций вроде «я просто хочу исправить небольшую грамматическую ошибку, а теперь мне ужасно стыдно».\n* **Улучшения папок серверов.** Теперь можно отметить папки серверов как прочитанные! Мы также добавили настройки папок серверов, чтобы вы могли использовать для них свои названия и цвета.\n* **Мы значительно улучшили и исправили функцию отбора участников.** Вы больше не застрянете на этих страницах.\n* **Доступ к режиму ввода стал проще.** Теперь можно переключаться с режима рации на активацию по голосу и обратно прямо на экране звонка.\n\n\n 2021-06-21 ru 1 @@ -6688,6 +6688,7 @@ Присоединиться могут только участники вашего сервера. Открыть трибуну Когда трибуна откроется, вы будете оратором. + Опишите тематику вашей трибуны, чтобы объявить о её открытии. Тематика трибуны Дебаты окончены: диетическая газировка лучше обычной Необходимо указать тематику. Таково наше правило. diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index d5a339092b..d37bed7056 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -1002,7 +1002,7 @@ Ändra serveravatar Använd olika avatarer på var och en av dina servrar och mer med **Discord Nitro!** Ändringslogg - Nya funktioner {added marginTop}\n======================\n\n* **Nu är Hitta dina vänner här.** Vi har lagt till en funktion som låter dig hitta vänner enklare på Discord. Om du har din väns telefonnummer, och ni båda väljer att vara identifierbara, kommer du att kunna hitta honom eller henne och skicka en vänförfrågan. Vad sägs om den här genanta konversationen: Om du får en förfrågan från xXSoulzLuverXx#0000 så är det jag.\n* **Vi har lagt till favoritemojier.** Tryck på en emoji i en chatt eller tryck länge på en i emojiväljaren för att lägga till och ta bort emojier från dina favoriter. Dina favoriter synkas inte med skrivbordet *än* men du kan börja fundera på vilka 5 av de 2 459 emojier du har som du egentligen använder.\n* **Vi har lagt till paginering till sökfältet.** Du behöver inte längre bläddra bland ändlösa sökresultat. Nu kan du hoppa mellan sidor för att hitta precis de bevis du behöver mot en kompis för att påpeka att hon eller han helt säkert sa en sak för sex månader sedan, men du kommer inte riktigt ihåg vad det var och behöver bara en minut för att hitta det som du lovar att hon eller han bergis sa.\n* **Vi har lagt till röstkanalljud:** Nu kommer din telefon att spela upp ljud när du går med/lämnar/flyttas i röstkanaler. Det är ljud som jag med skrämmande klarhet kan spela upp i mitt huvud. Ba-dum...ba-da-doo...\n\n\n\n\nFixar och uppdateringar {progress}\n======================\n\n* **Inget mer redigeringsping!** När du redigerar ett svar kommer referensförfattaren i de flesta fall inte längre att nämnas så nu, när du fixar ett litet grammatikfel, slipper du bli så djupt generad.\n* **Förbättrade servermappar.** Nu kan du markera dina servermappar som lästa! Vi har även lagt till servermappsinställningar där namn och färger ingår.\n* **Stora förbättringar och buggfixar för medlemskapsscreening.** Nu kommer du inte att fastna på de här sidorna längre.\n* **Vi har förenklat inmatningsläget.** Du kan nu ändra dina inställningar för tryck-för-tal och röstaktivitet utan att lämna samtalsskärmen.\n\n\n + Nya funktioner {added marginTop}\n======================\n\n* **Nu har vi lagt till Podieidentifiering.** Kolla in communityn som är värdar för Livesända podier – audioevent som konserter, paneler, talangshower och allt annat knäppt men lagligt som du kan hitta på – genom att klicka på den nya identifieringsfliken. \n* **Nu är Hitta dina vänner här.** Vi har lagt till en funktion som låter dig hitta vänner enklare på Discord. Om du har din väns telefonnummer, och ni båda väljer att vara identifierbara, kommer du att kunna hitta honom eller henne och skicka en vänförfrågan. Vad sägs om den här genanta konversationen: Om du får en förfrågan från xXSoulzLuverXx#0000 så är det jag.\n* **Vi har lagt till favoritemojier.** Tryck på en emoji i en chatt eller tryck länge på en i emojiväljaren för att lägga till och ta bort emojier från dina favoriter. Dina favoriter synkas inte med skrivbordet *än* men du kan börja fundera på vilka 5 av de 2 459 emojier du har som du egentligen använder.\n* **Vi har lagt till paginering till sökfältet.** Du behöver inte längre bläddra bland ändlösa sökresultat. Nu kan du hoppa mellan sidor för att hitta precis de bevis du behöver mot en kompis för att påpeka att hon eller han helt säkert sa en sak för sex månader sedan, men du kommer inte riktigt ihåg vad det var och behöver bara en minut för att hitta det som du lovar att hon eller han bergis sa.\n* **Vi har lagt till röstkanalljud:** Nu kommer din telefon att spela upp ljud när du går med/lämnar/flyttas i röstkanaler. Det är ljud som jag med skrämmande klarhet kan spela upp i mitt huvud. Ba-dum...ba-da-doo...\n\n\n\n\nFixar och uppdateringar {progress}\n======================\n\n* **Inget mer redigeringsping!** När du redigerar ett svar kommer referensförfattaren i de flesta fall inte längre att nämnas så nu, när du fixar ett litet grammatikfel, slipper du bli så djupt generad.\n* **Förbättrade servermappar.** Nu kan du markera dina servermappar som lästa! Vi har även lagt till servermappsinställningar där namn och färger ingår.\n* **Stora förbättringar och buggfixar för medlemskapsscreening.** Nu kommer du inte att fastna på de här sidorna längre.\n* **Vi har förenklat inmatningsläget.** Du kan nu ändra dina inställningar för tryck-för-tal och röstaktivitet utan att lämna samtalsskärmen.\n\n\n 2021-06-21 sv-SE 1 @@ -6401,6 +6401,7 @@ Enbart medlemmar Starta podiet Du kommer att vara en talare när podiet öppnar. + Skriv ett ämne för att visa att podiet är igång. Vad kommer du att prata om? Podiets ämne Slutsnackat: Sockerfritt är bäst @@ -6418,11 +6419,17 @@ Skapa en [communityserver.]({helpdeskArticle}) Skapa en podiekanal. Hitta på ett fantastiskt event. + Starta and öppna ditt podium! Nyfiken och vill veta mer? + Lär dig hur du håller ett fantastiskt podium Du kan inte starta ett podium än + Engagera ditt community och få det att växa med Podiekanaler. + Vilket community vill du hålla ett ljudevent i? Ditt podium kommer att hållas i $[**!!{stageName}!!**](stageHook). $[Ändra kanal](changeHook) + Vi kommer automatiskt att skapa en podiekanal för dig som heter $[**!!{stageName}!!**](stageHook). Du kan ändra namnet senare. Ditt podium kommer att hållas i $[**!!{stageName}!!**](stageHook). Podiekanal + Skriv ett ämne för att visa att podiet är igång. Vad kommer du att prata om? Kör igång Folk som framträder diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index fda9cddfcf..78a3b91cab 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -6733,6 +6733,7 @@ สำหรับสมาชิกเท่านั้น ตั้งเวที คุณจะเป็นผู้พูดเมื่อเวทีเปิด + เขียนหัวข้อเพื่อประกาศว่าเวทีของคุณกำลังถ่ายทอดสด คุณจะพูดเกี่ยวกับอะไร หัวข้อของเวที การโต้วาทีจบลงแล้ว: สูตรไดเอตดีกว่าสูตรปกติ @@ -6750,11 +6751,17 @@ สร้าง [เซิร์ฟเวอร์ชุมชน]({helpdeskArticle}) สร้างช่องเวที นำเสนอกิจกรรมที่ยอดเยี่ยม + เริ่มและเปิดเวทีของคุณ! อยากเรียนรู้เพิ่มเติมใช่ไหม + เรียนรู้การจัดเวทีที่ยอดเยี่ยม คุณยังไม่สามารถเริ่มเวทีได้ + เข้าร่วมและพัฒนาชุมชนของคุณให้เติบโตด้วยช่องเวที + คุณต้องการจัดกิจกรรมเสียงในชุมชนใด เวทีของคุณจะถูกจัดขึ้นใน $[**!!{stageName}!!**](stageHook) $[เปลี่ยนช่อง](changeHook) + เราจะสร้างช่องเวทีสำหรับคุณที่ชื่อว่า $[**!!{stageName}!!**](stageHook) โดยอัตโนมัติ คุณสามารถเปลี่ยนชื่อได้ในภายหลัง เวทีของคุณจะถูกจัดขึ้นใน $[**!!{stageName}!!**](stageHook) ช่องเวที + เขียนหัวข้อเพื่อประกาศว่าเวทีของคุณกำลังถ่ายทอดสด คุณจะพูดเกี่ยวกับอะไร ลองทำดูสิ ผู้ที่แสดง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a2aab199d4..d685a44209 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1048,7 +1048,7 @@ Sunucu Avatarını Değiştir **Discord Nitro!** ile sunucularında farklı avatarlar kullan ve daha fazla özelliğe eriş! Değişim Kaydı - Yeni Özellikler {added marginTop}\n======================\n\n* **Arkadaşlarını Bul özelliği geldi.** Discord\'daki arkadaşlarını daha kolay bulmanın isteğe bağlı olarak kullanılabilecek bir yolunu ekledik. Arkadaşının telefon numarasına sahipsen ve ikiniz de arkadaş bulma sistemine dahilseniz, arkadaşını görüp ona arkadaş talebi gönderebileceksin. \"xXYaRaLI_GoNuLXx#0000\'dan davet aldıysan, o benim,\" minvalindeki muhabbetlere hazır ol.\n* **Favori emoji seçeneği ekledik.** Sohbetteki bir emojiye dokunarak veya emoji seçiciden birine basılı tutarak favorilerine emoji ekleyip çıkarabilirsin. Favorilerin *şimdilik* masaüstüyle senkronize edilmeyecek ama 2.459 emoji arasından gerçekten kullandığın beş tanesini seçmeye başlayabilirsin.\n* **Arama çubuğuna sayfalandırma ekledik.** Artık arama sonuçlarının içinde kaybolmana gerek kalmayacak. Böylece arkadaşının altı ay önce söylediğini iddia ettiğin, onun kesinlikle yalanladığı, ama tam hatırlamasan da senin yüzde yüz emin olduğun şey hakkındaki delili saniyeler içinde bulmak için sayfalar arasında hızlıca geçiş yapabilirsin.\n* **Ses kanalı sesleri ekledik.** Artık telefonun ses kanallarına katıldığında, kanaldan ayrıldığında veya yerin değiştirildiğinde bir ses çalacak. Bu seslerin hepsini zihnimde çalabildiğimi biliyor muydun? Dı-rın... Dı-rı-rın...\n\n\n\n\nDüzeltmeler ve Güncellemeler {progress}\n======================\n\n* **Düzenleme pinglerini kaldırdık!** Bir cevabı düzenlemek artık çoğu zaman ilk yazardan bahsetmeyecek çünkü lütfen yani, sadece ufacık bir yazım hatası gidermek istemiştim ama resmen rezil oldum.\n* **Sunucu klasörü geliştirmeleri.** Artık sunucu klasörlerini okundu olarak işaretleyebilirsin! Özel isim ve renkler atamanı sağlayan sunucu klasörü ayarları da ekledik.\n* **Üye Seçimi\'yle ilgili kapsamlı geliştirmeler ve hata gidermeleri.** Artık bu sayfalarda çakılı kalmayacaksın.\n* **Giriş moduna erişmeyi kolaylaştırdık.** Artık arama ekranından ayrılmadan bas-konuş ve ses etkinliği ayarlarını değiştirebilirsin.\n\n\n + Yeni Özellikler {added marginTop}\n======================\n\n* **Sahne Keşfi ekledik.** Canlı Sahneler düzenleyen topluluklara göz at. Bunların içinde konserler, paneller, yetenek gösterileri gibi sesli etkinlikler veya aklına gelen garip ama yasalara uygun başka şeyler de olabilir. Keşif sekmesine tıklayarak başla. \n* **Arkadaşlarını Bul özelliği geldi.** Discord\'daki arkadaşlarını daha kolay bulmanın isteğe bağlı olarak kullanılabilecek bir yolunu ekledik. Arkadaşının telefon numarasına sahipsen ve ikiniz de arkadaş bulma sistemine dahilseniz, arkadaşını görüp ona arkadaş talebi gönderebileceksin. \"xXYaRaLI_GoNuLXx#0000\'dan davet aldıysan, o benim,\" minvalindeki muhabbetlere hazır ol.\n* **Favori emoji seçeneği ekledik.** Sohbetteki bir emojiye dokunarak veya emoji seçiciden birine basılı tutarak favorilerine emoji ekleyip çıkarabilirsin. Favorilerin *şimdilik* masaüstüyle senkronize edilmeyecek ama 2.459 emoji arasından gerçekten kullandığın beş tanesini seçmeye başlayabilirsin.\n* **Arama çubuğuna sayfalandırma ekledik.** Artık arama sonuçlarının içinde kaybolmana gerek kalmayacak. Böylece arkadaşının altı ay önce söylediğini iddia ettiğin, onun kesinlikle yalanladığı, ama tam hatırlamasan da senin yüzde yüz emin olduğun şey hakkındaki delili saniyeler içinde bulmak için sayfalar arasında hızlıca geçiş yapabilirsin.\n* **Ses kanalı sesleri ekledik.** Artık telefonun ses kanallarına katıldığında, kanaldan ayrıldığında veya yerin değiştirildiğinde bir ses çalacak. Bu seslerin hepsini zihnimde çalabildiğimi biliyor muydun? Dı-rın... Dı-rı-rın...\n\n\n\n\nDüzeltmeler ve Güncellemeler {progress}\n======================\n\n* **Düzenleme pinglerini kaldırdık!** Bir cevabı düzenlemek artık çoğu zaman ilk yazardan bahsetmeyecek çünkü lütfen yani, sadece ufacık bir yazım hatası gidermek istemiştim ama resmen rezil oldum.\n* **Sunucu klasörü geliştirmeleri.** Artık sunucu klasörlerini okundu olarak işaretleyebilirsin! Özel isim ve renkler atamanı sağlayan sunucu klasörü ayarları da ekledik.\n* **Üye Seçimi\'yle ilgili kapsamlı geliştirmeler ve hata gidermeleri.** Artık bu sayfalarda çakılı kalmayacaksın.\n* **Giriş moduna erişmeyi kolaylaştırdık.** Artık arama ekranından ayrılmadan bas-konuş ve ses etkinliği ayarlarını değiştirebilirsin.\n\n\n 2021-06-21 tr 1 @@ -6663,6 +6663,7 @@ Üyelere Özel Sahneyi Başlat Sahne açıldığında Konuşmacı olacaksın. + Sahnenin yayında olduğunu ilan etmek için bir konu yaz. Ne hakkında konuşacaksın? Sahne Konusu Tartışma sona erdi: diyet kola normal koladan daha güzel @@ -6680,11 +6681,17 @@ Bir [Topluluk Sunucusu]({helpdeskArticle}) oluştur. Bir Sahne kanalı oluştur. Harika bir etkinlik tasarla. + Başla ve Sahneyi aç! Daha fazla bilgi edinmek ister misin? + Harika bir Sahne nasıl yönetilir öğren. Henüz bir Sahne başlatamazsın. + Sahne kanallarıyla etkileşim yarat ve topluluğunu büyüt. + Hangi toplulukta sesli etkinlik düzenlemek istiyorsun? Sahnen şurada kurulacak: $[**!!{stageName}!!**](stageHook). $[Kanal değiştir](changeHook) + Senin için otomatik olarak $[**!!{stageName}!!**](stageHook) isimli bir Sahne kanalı oluşturacağız. Bu ismi daha sonra değiştirebilirsin. Sahnen şurada kurulacak: $[**!!{stageName}!!**](stageHook). Sahne kanalı + Sahnenin yayında olduğunu ilan etmek için bir konu yaz. Ne hakkında konuşacaksın? Bunu yapalım Sahnedekiler diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2248baa10d..c865a52df1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -6751,6 +6751,7 @@ Тільки для учасників Розпочати роботу трибуни Після відкриття етапу ти станеш спікером. + Напиши тему, щоб оголосити початок роботи трибуни. Про що будеш говорити? Тема етапу Дискусія закінчилася: краще дієта, ніж звичайне харчування @@ -6768,11 +6769,17 @@ Створи [Сервер спільноти.]({helpdeskArticle}) Створи канал для трибуни. Придумай класну подію. + А тепер починай та відкривай трибуну! Хочеш дізнатися більше? + Дізнайся, як влаштувати класну трибуну Поки що не можна почати трибуну + Розширюй свою спільноту завдяки трибунам на каналі. + У якій спільноті ти хочеш розмістити аудіо подію? Твоя трибуна буде влаштована на $[**!!{stageName}!!**](stageHook). $[Змінити канал](changeHook) + Ми автоматично створимо для тебе канал трибуни з назвою $[**!!{stageName}!!**](stageHook). Назву можна буде змінити пізніше. Твоя трибуна буде влаштована на $[**!!{stageName}!!**](stageHook). Канал трибуни + Напиши тему, щоб оголосити початок роботи трибуни. Про що будеш говорити? Давай зробимо це Люди виступають diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index dec8fbc54c..f863e3d30f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -6533,6 +6533,7 @@ Chỉ dành cho thành viên Bắt đầu Sân Khấu Bạn sẽ là Người nói khi Sân khấu mở. + Viết một chủ đề để thông báo rằng Sân Khấu của bạn đang trực tuyến. Bạn sẽ nói về điều gì? Chủ đề Sân khấu Cuộc tranh luận đã kết thúc: Ăn kiêng tốt hơn ăn thường @@ -6550,11 +6551,17 @@ Tạo một [Máy chủ cộng đồng.]({helpdeskArticle}) Tạo kênh Sân Khấu. Nghĩ ra một sự kiện tuyệt vời. + Bắt đầu và mở cửa Sân Khấu của bạn! Bạn muốn tìm hiểu thêm? + Tìm hiểu cách tổ chức một Sân Khấu tuyệt vời Bạn chưa thể bắt đầu Sân Khấu + Tham gia và phát triển cộng đồng của bạn với các kênh Sân Khấu. + Bạn muốn tổ chức sự kiện âm thanh trong cộng đồng nào? Sân Khấu của bạn sẽ được tổ chức trong $[**!!{stageName}!!**](stageHook). $[Đổi Kênh](changeHook) + Chúng tôi sẽ tự động tạo kênh Sân Khấu cho bạn với tên $[**!!{stageName}!!**](stageHook). Bạn có thể đổi tên sau. Sân Khấu của bạn sẽ được tổ chức trong $[**!!{stageName}!!**](stageHook). Kênh sân khấu + Viết một chủ đề để thông báo rằng Sân Khấu của bạn đang trực tuyến. Bạn sẽ nói về điều gì? Làm thôi nào Mọi người đang biểu diễn diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9637eee3c9..78bb511b3d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -6750,6 +6750,7 @@ 仅限成员 开始讲堂 讲堂开启时，您将成为发言者。 + 撰写一个话题，宣布您的讲堂已开讲。 您想讲些什么？ 讲堂话题 讨论已经结束：控制饮食比常规饮食好 @@ -6767,11 +6768,17 @@ 创建[社区服务器。]({helpdeskArticle}) 创建讲堂频道。 想出一个优秀的活动点子。 + 开始您的讲堂吧！ 有兴趣了解更多吗？ + 学习如何成功地开办讲堂 您尚不能开办讲堂 + 通过讲堂频道来参与并发展您的社区吧。 + 您想在哪个社区举办语音活动？ 您的讲堂将于$[**!!{stageName}!!**](stageHook)开讲。$[变更频道](changeHook) + 我们将会自动为您创建一个名为$[**!!{stageName}!!**](stageHook)的讲堂频道。您随后可变更该名称。 您的讲堂将于$[**!!{stageName}!!**](stageHook)开讲。 讲堂频道 + 撰写一个话题，以此宣布您的讲堂已开讲。 您想讲些什么？ 开始吧 讲授人 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e27f66a17b..959ef525a7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -6750,6 +6750,7 @@ 僅限成員 開啟舞台 舞台開放後，您將會成為發言者。 + 輸入一段主題，讓大家知道您的舞台現正開放中。 您想聊些什麼？ 舞台主題 理性勿戰：零卡可樂比一般可樂好喝啦 @@ -6767,11 +6768,17 @@ 建立[社群伺服器。]({helpdeskArticle}) 建立舞台頻道。 想出個好活動。 + 開始並開啟您的舞台！ 有興趣了解更多？ + 了解主持精彩舞台的方法 您還不能開啟舞台 + 透過舞台頻道接觸您的社群並使其蓬勃發展。 + 您想在哪個社群主持音訊活動？ 您將在 $[**!!{stageName}!!**](stageHook) 舞台上主持。$[變更頻道](changeHook) + 我們會自動為您建立名為 $[**!!{stageName}!!**](stageHook) 的舞台頻道。您可以在稍後變更名稱。 您將在 $[**!!{stageName}!!**](stageHook) 舞台上主持。 舞台頻道 + 輸入一段主題，讓大家知道您的舞台現正直播。 您想聊些什麼？ 開始行動吧 表演者 diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index ada0bc3c64..ee1b3e0700 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -208,6 +208,10 @@ {#} minute {#} minutes + + **1** community + **{numResults}** communities + +{count} Speaker +{count} Speakers @@ -513,12 +517,12 @@ , {#} unread mentions - Changed default auto-archive duration to **{#} minute** - Changed default auto-archive duration to **{#} minutes** + Changed default archive duration to **{#} minute** + Changed default archive duration to **{#} minutes** - Set default auto-archive duration to **{#} minute** - Set default auto-archive duration to **{#} minutes** + Set default archive duration to **{#} minute** + Set default archive duration to **{#} minutes** a permission diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 2d41206d0a..85e3a919b3 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -2673,53 +2673,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4129,822 +4130,825 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6059,2762 +6063,2768 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9364,388 +9374,389 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9844,299 +9855,300 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -14530,7703 +14542,7749 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e7902d62d..5a39e0f9e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -702,9 +702,9 @@ 1 Week 24 Hours 3 Days - Auto-archive after {duration} of inactivity + Archive after {duration} of inactivity Auto-archive at {time} - This thread will auto-archive: {time} + This thread will archive: {time} Sticker Suggestions Allows sticker suggestions to appear when typing messages. Automatically enable/disable Streamer Mode if OBS or XSplit are running on this computer. @@ -742,7 +742,7 @@ Are you sure you want to ban !!{user}!!? They won\'t be able to return unless you unban them. \'!!{user}!!\' has been banned from the server. Whoops… !!{user}!! could not be banned. Please try again! - Ban !!{user}!! From Server + Ban !!{user}!! from Server Ban \'!!{user}!!\' Bans {bans} @@ -761,7 +761,7 @@ Welcome to the beginning of the **!!{name}!!** group. You will automatically leave this group when you\'re done. This is the start of the !!{channelName}!! **private** channel. $[](topicHook) - This thread will auto-archive after $[](autoArchiveDurationHook) of inactivity. + This thread will archive after $[](autoArchiveDurationHook) of inactivity. Beta Bulgarian Billing @@ -840,6 +840,7 @@ No payment method saved Checkout faster by saving a payment method Pay for it With + A small hold may be placed on your payment method. [Learn More]({helpDeskArticle}) Taxes Total Transaction History @@ -964,8 +965,8 @@ Your message could not be delivered. This is usually because you don\'t share a server with the recipient or the recipient is only accepting direct messages from friends. You can see the full list of reasons here: {helpUrl} Your message could not be delivered. This is usually because you don\'t share a server with the recipient or the recipient is only accepting direct messages from friends. You can see the full list of reasons [here]({helpUrl}) Sending messages to this channel has been temporarily disabled. Try again in a bit. - Your message could not be sent because the maximum number of large announcement threads has been reached. Free up space by archiving a thread. - Your message could not be sent because the maximum number of active threads has been reached. Free up space by archiving a thread. + Your message could not be sent because this server has reached the maximum number of announcement threads. Free up space by archiving a thread. + Your message could not be sent because this server has reached the maximum number of threads. Free up space by archiving a thread. Woah there! Someone in !!{name}!! has requested that Discord block any messages our mostly-accurate robots deem to be explicit, so your message has not been sent. Woah there! The owner of !!{name}!! has requested that Discord block any messages our mostly-accurate robots deem to be explicit, so your message has not been sent. You need to verify your email before you can send messages here. @@ -1199,6 +1200,7 @@ {mentionCount} !!{author}!! at {timestamp}: !!{content}!! message + !!{author}!! replying to !!{repliedAuthor}!! Use the up and down arrow keys to navigate between messages quickly. New messages will be added to the bottom of the list as they come in. Messages in !!{channelName}!! message list @@ -1339,7 +1341,7 @@ Presets Select a color Transparency - 6fd0f0ec2e2c4ca6a141db670a1fc4ba + ceb3a36bfac34fe792ff10844c4d22fb Coming Soon Slash command application {applicationName} {applicationName} application @@ -1814,7 +1816,6 @@ Crash Timestamp: {timestamp} Discord has crashed unexpectedly. Create - Create a Thread Create Category Create Channel Something went wrong trying to create a channel. Please try again later. @@ -1885,7 +1886,7 @@ Post images, GIFs, stickers, opinions, and puns Create Thread Send a message to start a thread in this channel! - It will auto-archive after $[](durationHook) of inactivity. + It will archive after $[](durationHook) of inactivity. Create Voice Channel Hang out with voice, video, and screen sharing I\'m making this server for a club or community. @@ -2005,6 +2006,10 @@ Description You must designate another inside [Server Settings > Community > Overview](onClick) before this channel can be deleted. Desktop App + More features, better performance, and easy access to all your conversations. + Discord for Linux + Discord for Mac + Discord for Windows Enable Desktop Notifications If you\'re looking for per-channel or per-server notifications, right-click the desired server icon and select Notification Settings. Automatically detect accounts from other platforms on this computer. @@ -2033,6 +2038,11 @@ unread, !!{channelName}!! (direct message) Direct Messages Direct Messages, {requestCount} pending friend requests + Directory Entry Actions + Try another search or $[add a server](addServerHook). + No matches found + Explore servers + {numResults} for **{query}** Disable Disable Account Are you sure that you want to disable your account? This will immediately log you out and make your account inaccessible to anyone. @@ -2478,14 +2488,14 @@ Diagnostic audio recording is used for analyzing audio problems. The last five minutes of voice is saved to voice module folder. Automatically move members to this channel and mute them when they have been idle for longer than the inactive timeout. This does not affect browsers. Lower the volume of other applications by this percent when someone is speaking. Set to 0%% to completely disable attenuation. - Threads will automatically archive after the specified duration of inactivity. + Threads will archive after the specified duration of inactivity. If the indicator is solid green then Discord is transmitting your beautiful voice. ALL THE BITS! Going above {bitrate}kbps may adversely affect people on poor connections. While using a Discord Certified microphone certain voice processing features are no longer handled by Discord itself, but rather the microphone. Change privacy settings and customize how members can interact with this channel. Records all RTP data received for the next voice/video connection for debugging purposes. Saves debug logs to voice module folder that you can upload to Discord Support for troubleshooting. - New threads will be set to auto-archive after the specified duration of inactivity. + New threads will be set to archive after the specified duration of inactivity. This will determine whether members who have not explicitly set their notification settings receive a notification for every message sent in this server or not. We highly recommend setting this to only @mentions for a public Discord May take up to 15 minutes to take effect. This image will be displayed on your Discovery Listing. The recommended minimum size is 1920x1080 and recommended aspect ratio is 16:9. @@ -2686,12 +2696,12 @@ What should everyone call you? Only people you invite and moderators can see this thread. Reports are sent to the Discord Trust & Safety team - **not the server owner**. Creating false reports and/or spamming the report button may result in a suspension of reporting abilities. Learn more from the [Discord Community Guidelines]({guidelinesURL}). Thanks for keeping things safe and sound. - Auto-archive After Inactivity + Archive After Inactivity Name New Thread - Thread name is required + Thread Name is required You can invite new people by @mentioning them. - Only the invited can see this thread + Only people you invite and moderators can see Enter a message to start the conversation! Starter Message You do not have any input devices enabled. You must grant Discord [access to your microphone](onEnableClick) in order to be able to observe input sensitivity. @@ -3634,6 +3644,7 @@ Vanity URL for the server {bitrate} Kbps audio quality +{adding} server emoji slots (for a total of {total}) + +{adding} custom sticker slots (for a total of {total}) {fileSize} upload limit for all members Boosted server perks include — No one has bestowed Boosts to this server yet. See if any members would kindly bless your server for server-wide Boost Perks! @@ -3911,6 +3922,7 @@ Wave hello, share your screen, or just chat. Collaborate, ideate, and show your stuff. Make a home, have fun, and hang out. + Your hackathon – all together in one place. Coordinate, share resources, and host events. Stay in touch on and off the Rift. Meet up, organize, and stay in touch. @@ -3925,6 +3937,7 @@ Create your server Create a server for your group Create a server for your friends + Create a server for your hackathon Create a server for your community Create a server for your community Create a server for your community @@ -4067,10 +4080,27 @@ Hello. Beep. Boop. If you wanna invite friends to this server, click the server name in the top left and select !!{invitePeople}!!. Beep! Croatian Hungarian - Add a server to this hub - Invite people to this hub + The server description will appear in the hub. Use it to help students decide whether to join. + Description of class, professor, and server goals (study group), etc. + Server Description + Add Server + Choose a relevant server from this list of servers you are an admin for. It will still be accessible to people outside the hub. + Add a server to !!{guildName}!! + Create New Server + Have an idea for a new server? + When you add a server, it will be visible to other students and members, so make sure it\'s school appropriate. + Help grow the Discord Hub for !!{guildName}!! + Help other students find !!{guildName}!! + Add a server to this Hub + Invite people to this Hub You\'re one of the first people here! Let\'s start by adding some servers and members. - Welcome to the Discord hub for !!{guildName}!! students + Welcome to the Discord Hub for !!{guildName}!! students + Discord Hub for !!{guildName}!! + From clubs to study groups, stay up to date with what\'s happening + Find your school-related servers + If your server is intended for students only, just invite your classmates. They don\'t need a .edu address to join + Remove from Hub + Are you sure you want to remove !!{guildName}!! from this directory? Enter your official school email address sam@college.edu School Email @@ -4654,7 +4684,7 @@ Are you sure you want to kick !!{user}!!? They will be able to rejoin again with a new invite. \'!!{user}!!\' has been kicked from the server. Whoops… !!{user}!! could not be kicked. Please try again! - Kick !!{user}!! From Server + Kick !!{user}!! from Server Kick \'!!{user}!!\' Korean thz-2021-01-20 @@ -4862,6 +4892,7 @@ Use custom and animated emoji anywhere Up to 1080p resolution and up to 60fps 50 MB upload instead of 100 MB + Does not include Nitro sticker perks This link will take you to **!!{url}!!**. Are you sure you want to go there? Cancel Yep! @@ -5102,6 +5133,7 @@ Unable to launch {applicationName} Unable to launch game We disabled voice activity detection to improve phone performance. + Get our mobile app You must designate another inside [Server Settings > Community > Overview](onClick) before this channel can be deleted. Enable Hardware Scaling Experimental feature that may improve performance in video calls. Beware, may cause jank. @@ -5109,7 +5141,8 @@ We couldn\'t enable Krisp due to an error. Give it another go and try again. While speaking, filter out background noise and showcase your wonderful voice. Powered by Krisp. Noise suppression - Claim your code before {endDate} + Use your code before {endDate} + Claim your code before {endDate} Replying to **{username}** This is who posted the message you reported. Block them to stop seeing any of their messages. More you can do @@ -5144,8 +5177,8 @@ 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. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications @@ -5300,7 +5333,7 @@ What a cold, emotionless world. No Reactions Start up some conversations, then keep track of them here! - There’s no recent messages. Click here to change that! + There are no recent messages in this thread. No results found This channel has special permissions. To use Screen Share in it, you\'ll need someone, like a server moderator or admin, to change your permissions. No Screen Share Permission @@ -5311,7 +5344,7 @@ No System Messages No No thanks - There’s no message yet. Click here to get started! + There are no messages in this thread yet. No Limit No Video Devices This channel has special permissions. To use video in it, you\'ll need someone, like a server moderator or admin, to change your permissions. @@ -5586,9 +5619,13 @@ Update Discord We\'ve got some sweet changes to Discord (and probably a bug fix or two). Update to continue. You\'re out of date - Gift is available to claim until {endDate}. [Less Details](toggleShowLegalese) - Gift is available to claim until {endDate}. [More Details](toggleShowLegalese) - [More Details](onPress) + Use your code before {endDate}. [Less Details](onClickDetails) + Use your code before {endDate}. [More Details](onClickDetails) + Gift is available to claim until {endDate}. [Less Details](onClickDetails) + Gift is available to claim until {endDate}. [More Details](onClickDetails) + [Less Details](onClick) + [More Details](onClick) + See Code Outgoing Friend Request Are you sure you want to delete your friend request to **!!{name}!!**? Outgoing Friend Request to !!{name}!! @@ -5832,6 +5869,7 @@ This tag is invalid. Tags must be greater than 0. Upload and use animated avatars and emojis Share custom emojis across all servers + Use custom stickers anywhere and access 300 Nitro-exclusive stickers Enjoy {discount}%% off additional Server Boosts. [Learn more.](onLearnMore) {numFreeGuildSubscriptions} with Nitro for instant server Level 1. Larger upload file size from {maxUploadStandard} to {maxUploadPremiumTier2} with Nitro or {maxUploadPremiumTier1} with Nitro Classic. @@ -5842,7 +5880,6 @@ Exclusive Nitro badge on your profile Screen share on PC in 720p 60fps or 1080p 30fps Want to keep it simple? Support Discord and get sweet chat perks: - Exclusive access to Wumpus Nitro Elite sticker pack, free What’s Up Wumpus sticker pack, and {discount}%% off all other sticker packs Better Go Live streams: Stream at source with Nitro or up to a crisp 1080p 60fps with Nitro Classic Choose a Plan Gift someone Nitro Classic to enhance their experience with super powered chat perks. [Learn more about Nitro Classic.](onClick) @@ -6295,10 +6332,13 @@ Private Thread **View Channels** and **Connect** permissions required to create this private channel. Profile + Upload your own personalized banner and more with Discord Nitro! Profile Customization is currently available to a limited number of people. + Tell the world a little about yourself Express yourself with an about me and, if you have Nitro, a profile banner! Got it New Profile Customization! + Exclusive to Nitro You are all set! Wow your server is looking all snazzy! Here are a few more things you can do with your server. Have fun! Step {step} of 4 @@ -6342,6 +6382,7 @@ I agree to the [Terms of Service]({tosURL}) and [Refund Policy]({refundPolicyURL}) Purchase Ticket Purple + Scan this QR code for an easy download link for our iOS or Android apps. Failed to scan Something went wrong when trying to scan. Rescan the QR code to continue the login process. @@ -6453,7 +6494,7 @@ Remove Reaction Remove !!{name}!! Remove Role - Remove !!{user}!! From Thread + Remove !!{user}!! from Thread Remove Vanity URL Show website preview info from links pasted into chat Link Preview @@ -6693,9 +6734,9 @@ Allows members to change this channel’s permissions. Allow members to change this channel\'s permissions. Allows members to change this server’s name, switch regions, and add bots to this server. - Allows members to rename, delete, archive/unarchive, and turn on slow mode for threads. - Allows members to rename, delete, archive/unarchive, and turn on slow mode for threads in these channels. - Allows members to rename, delete, archive/unarchive, and turn on slow mode for threads in this channel. + Allows members to rename, delete, archive/unarchive, and turn on slow mode for threads. They can also view private threads. + Allows members to rename, delete, archive/unarchive, and turn on slow mode for threads in these channels. They can also view private threads. + Allows members to rename, delete, archive/unarchive, and turn on slow mode for threads in this channel. They can also view private threads. Allows members to create, edit, or delete webhooks, which can post messages from other apps or sites into this server. Allows members to create, edit, or delete webhooks in these channels, which can post messages from other apps or sites. Allows members to create, edit, or delete webhooks in this channel, which can post messages from other apps or sites. @@ -7330,7 +7371,6 @@ Set the topic of your Stage. Stage Channel Start - Start a Thread Start Call Start a Stage Start a Stage @@ -7338,7 +7378,7 @@ Members Only Start the Stage You will be a Speaker when the Stage opens. - Write a topic to announce your Stage is live. + Write a topic to start your Stage. What will you be talking about? Stage Topic The debate is over: diet is better than regular @@ -7359,17 +7399,17 @@ Make a [Community server.]({helpdeskArticle}) Create a Stage channel. Come up with a great event. - Start and open your Stage! + Start your Stage! Curious to learn more? - Learn how to host a great Stage + Learn more about Stage channels You can\'t start a Stage yet - Engage and grow your community with Stage channels. - Which community do you want to host an audio event in? + Engage and grow your community by hosting a live audio event with Stage channels. + Where do you want to host a Stage? Your Stage will be hosted in $[**!!{stageName}!!**](stageHook). $[Change Channel](changeHook) - We will automatically create a Stage channel for you called $[**!!{stageName}!!**](stageHook). You can change the name later. + We will create a Stage channel for you called $[**!!{stageName}!!**](stageHook). You can change the name later. Your Stage will be hosted in $[**!!{stageName}!!**](stageHook). Stage channel - Write a topic to announce your Stage is live. + Write a topic to start your Stage. What will you be talking about? Let\'s do it People performing @@ -7380,7 +7420,6 @@ Your Stage is going public! Here are a few things you should know. Is your topic descriptive enough? Make sure it\'s clear so that people browsing Stage Discovery can easily know what your Stage and community is about. - Start Thread Start Video Call Start Voice Call Starting at @@ -7734,8 +7773,8 @@ Archived {time} Archived Created {time} - There are no active threads in this channel yet. - There are no archived threads in this channel yet. + There are no active threads. + There are no archived threads. Stay focused on a conversation with a thread, a temporary text channel. filter archived threads Filter Settings @@ -7754,11 +7793,10 @@ {count}m ago >30d ago Threads - Thread creator This thread is archived. You can send a message to unarchive it. Join this thread to get notifications and to save in your channel list. - This thread is locked by a moderator. Only a moderator may unarchive it. - No longer can view the thread + This thread was archived by a moderator. Only moderators can unarchive it. + Cannot view this thread {count} 50+ Messages › 50+ › @@ -7771,7 +7809,7 @@ Thread Settings Thread settings have been updated. Started by $[](usernameHook) - Thread starter message could not be loaded + Sorry, we couldn\'t load the first message in this thread Original message from channel Threads **!!{a}!!**, **!!{b}!!**, and **!!{c}!!** are typing… @@ -7825,12 +7863,12 @@ Toggle screen share This message may contain a Discord authentication token, which can grant an attacker access to your account. Are you sure you want to send it? You are out of animated emoji slots. - The maximum number of large announcement threads has been reached. Free up space by archiving a thread. + This server has reached the maximum number of active announcement threads. Free up space by archiving a thread. You are out of emoji slots. This thread has reached the maximum possible number of members. Your reaction was not added because there are too many reactions on this message. We appreciate the enthusiasm, but… - The maximum number of active threads has been reached. Free up space by archiving a thread. + This server has reached the maximum number of active threads. Free up space by archiving a thread. You are at the {quantity} server limit. You must leave a server first to join. Oh no! You must leave a server first to join. @@ -8017,7 +8055,7 @@ Upload Emoji Spice up your chat with a custom emoji. Upload an emoji - Protip: Just double click the + + Tip: Double click the $[](icon) Upload Image Is this your card? Err, do you want to upload this image? Unable to open file: {file}. @@ -8139,7 +8177,7 @@ Push notifications not enabled User Settings About Me - Write anything you’d like about yourself and link whatever you want. Just keep it under {maxLength} characters. + Write anything you’d like about yourself — as long as you do it in under {maxLength} characters. You can use markdown and links if you’d like. Your current email address is !!{email}!! What would you like to change it to? Enter a new email address and your existing password. Edit Email @@ -8174,7 +8212,9 @@ Oh here it is! You can change the zoom level with {modKey} +/- and reset to the default zoom with {modKey}+0. Available Backup Codes - The recommended minimum size is 300x120 and recommended aspect ratio is 5:2. Accepted file types include PNG, JPG, and animated GIFs under 10MB. + Avatar + Banner Color + We recommend an image of at least 600x240. You can upload a PNG, JPG, or an animated GIF. Blocked Users You don\'t have any blocked users {numberOfBlockedUsers} Blocked Users @@ -8183,12 +8223,14 @@ Close Button Are you sure you want to logout? Unlock with Nitro + Customizing My Profile Delete Avatar Turning this off may help if your voice is not being detected by the automatic input sensitivity. Noise reduction is disabled while Noise Suppression is active. Edit Account Enter your password to confirm changes TAG + Edit Profile Enter your password to view backup codes. Location Add Install Location @@ -8205,6 +8247,7 @@ HypeSquad Action Chat + Default Keybinds Keybind These shortcuts work when focused on a message. Messages @@ -8240,7 +8283,8 @@ Open Discord Check out our [Terms of Service]({termsLink}) and [Privacy Policy]({privacyLink}). Profile Banner - Profile Customization + Remove Avatar + Remove Banner Restart the app for your new settings to take effect. Save Scan QR Code @@ -8254,7 +8298,9 @@ Please check your email and follow the instructions to verify your email. If you did not receive an email or if it expired, you can resend one. Upload Avatar Upload Banner + Use default Used Backup Codes + User Profile You can add multiple Push to Talk binds under [Keybind Settings](onClick). Discord uses only the best organic, locally-sourced Opus Voice codec. Audio Codec