99.14 - Beta (99114)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 99113
+        versionCode 99114
-        versionName "99.13 - Beta"
+        versionName "99.14 - Beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

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

app/src/main/java/com/discord/utilities/sms/SmsListener.java

@@ -1,7 +1,7 @@
 package com.discord.utilities.sms;
 
+import android.app.Application;
 import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.IntentFilter;
 import c.c.a.a0.d;
 import c.i.a.f.e.h.j.k0;
@@ -10,6 +10,7 @@ import c.i.a.f.h.b.b;
 import c.i.a.f.h.b.h;
 import c.i.a.f.h.b.j;
 import c0.z.d.m;
+import com.discord.utilities.lifecycle.ApplicationProvider;
 import com.discord.widgets.auth.SmsAuthCodeBroadcastReceiver;
 import com.google.android.gms.common.Feature;
 import kotlin.Unit;
@@ -37,22 +38,23 @@ public final class SmsListener {
             SmsListener.access$setBroadcastReceiver$cp(broadcastReceiver);
         }
 
-        public final void startSmsListener(Context context, Function1<? super String, Unit> function1) {
+        public final void startSmsListener(Function1<? super String, Unit> function1) {
-            m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(function1, "onSuccess");
-            h hVar = new h(context);
+            Application application = ApplicationProvider.INSTANCE.get();
+            h hVar = new h(application);
             p.a aVar = new p.a(null);
             aVar.a = new j(hVar);
             aVar.b = new Feature[]{b.b};
             d.p(true, "execute parameter required");
             hVar.c(new k0(aVar, aVar.b, true));
             setBroadcastReceiver(new SmsAuthCodeBroadcastReceiver(function1));
-            context.registerReceiver(getBroadcastReceiver(), new IntentFilter("com.google.android.gms.auth.api.phone.SMS_RETRIEVED"));
+            application.registerReceiver(getBroadcastReceiver(), new IntentFilter("com.google.android.gms.auth.api.phone.SMS_RETRIEVED"));
         }
 
-        public final void stopSmsListener(Context context) {
+        public final void stopSmsListener() {
-            if (getBroadcastReceiver() != null && context != null) {
+            try {
-                context.unregisterReceiver(getBroadcastReceiver());
+                ApplicationProvider.INSTANCE.get().unregisterReceiver(getBroadcastReceiver());
+            } catch (Exception unused) {
             }
         }
     }

app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java

@@ -215,6 +215,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     }
 
     private final void inputCode(String str) {
+        if (getView() != null) {
             getBinding().f2114c.setOnCodeEntered(WidgetAuthPhoneVerify$inputCode$1.INSTANCE);
             getBinding().f2114c.setCode(str);
             getBinding().f2114c.setOnCodeEntered(new WidgetAuthPhoneVerify$inputCode$2(this));
@@ -222,6 +223,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
             m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
             ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
         }
+    }
 
     private final void resendCode() {
         RestAPI api = RestAPI.Companion.getApi();
@@ -282,7 +284,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
     public void onDestroyView() {
         super.onDestroyView();
-        SmsListener.Companion.stopSmsListener(getContext());
+        SmsListener.Companion.stopSmsListener();
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -337,6 +339,6 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         }
         getBinding().f2114c.setOnCodeEntered(new WidgetAuthPhoneVerify$onViewBound$3(this));
         registerForContextMenu(getBinding().f2114c);
-        SmsListener.Companion.startSmsListener(requireContext(), new WidgetAuthPhoneVerify$onViewBound$4(this));
+        SmsListener.Companion.startSmsListener(new WidgetAuthPhoneVerify$onViewBound$4(this));
     }
 }

app/src/main/java/com/discord/widgets/settings/WidgetSettings.java

@@ -313,7 +313,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
         String string = getString(R.string.app_information);
-        textView.setText(string + " - 99.13 - Beta (99113)");
+        textView.setText(string + " - 99.14 - Beta (99114)");
         binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);

app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java

@@ -2,6 +2,7 @@ package com.discord.widgets.status;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.text.SpannableStringBuilder;
 import android.view.View;
 import android.widget.ImageView;
@@ -166,11 +167,12 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.indicatorText");
         textView.setText(getString(R.string.connecting));
         AnimatedVectorDrawableCompat animatedVectorDrawableCompat = null;
-        if (this.connectingVector == null) {
+        if (this.connectingVector == null && Build.VERSION.SDK_INT != 28) {
             this.connectingVector = AnimatedVectorDrawableCompat.create(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_connecting_animated_vector, 0, 2, (Object) null));
         }
         ImageView imageView = getBinding().h;
         imageView.setVisibility(0);
+        if (Build.VERSION.SDK_INT != 28) {
             AnimatedVectorDrawableCompat animatedVectorDrawableCompat2 = this.connectingVector;
             if (animatedVectorDrawableCompat2 != null) {
                 animatedVectorDrawableCompat2.registerAnimationCallback(this.connectingVectorReplayCallback);
@@ -178,6 +180,9 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
                 animatedVectorDrawableCompat = animatedVectorDrawableCompat2;
             }
             imageView.setImageDrawable(animatedVectorDrawableCompat);
+            return;
+        }
+        imageView.setImageResource(DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_connecting, 0, 2, (Object) null));
     }
 
     private final void setupContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) {

app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$autofillCode$2.java

@@ -0,0 +1,29 @@
+package com.discord.widgets.user.phone;
+
+import c0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetUserPhoneVerify.kt */
+public final class WidgetUserPhoneVerify$autofillCode$2 extends o implements Function1<Long, Unit> {
+    public final /* synthetic */ String $verificationCode;
+    public final /* synthetic */ WidgetUserPhoneVerify this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetUserPhoneVerify$autofillCode$2(WidgetUserPhoneVerify widgetUserPhoneVerify, String str) {
+        super(1);
+        this.this$0 = widgetUserPhoneVerify;
+        this.$verificationCode = 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(Long l) {
+        invoke(l);
+        return Unit.a;
+    }
+
+    public final void invoke(Long l) {
+        WidgetUserPhoneVerify.access$handleCodeEntered(this.this$0, this.$verificationCode);
+    }
+}

app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java

@@ -29,8 +29,10 @@ import com.discord.widgets.user.account.WidgetUserAccountVerifyBase;
 import java.util.concurrent.TimeUnit;
 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: WidgetUserPhoneVerify.kt */
 public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.Z(WidgetUserPhoneVerify.class, "binding", "getBinding()Lcom/discord/databinding/WidgetUserPhoneVerifyBinding;", 0)};
@@ -99,12 +101,15 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     }
 
     private final void autofillCode(String str) {
+        if (getView() != null) {
             WidgetUserPhoneVerifyBinding binding = getBinding();
             binding.d.setOnCodeEntered(WidgetUserPhoneVerify$autofillCode$1$1.INSTANCE);
             binding.d.setCode(str);
             binding.d.setOnCodeEntered(new WidgetUserPhoneVerify$autofillCode$1$2(this));
-        Thread.sleep(TimeUnit.SECONDS.toMillis(5));
+            Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
-        handleCodeEntered(str);
+            m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetUserPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserPhoneVerify$autofillCode$2(this, str), 62, (Object) null);
+        }
     }
 
     private final WidgetUserPhoneVerifyBinding getBinding() {
@@ -139,7 +144,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
         imageView.setVisibility(isForced() ? 8 : 0);
         binding.b.setOnClickListener(new WidgetUserPhoneVerify$onViewBound$$inlined$with$lambda$1(this));
         if (GrowthTeamFeatures.INSTANCE.isAndroidSmsAutofillEnabled()) {
-            SmsListener.Companion.startSmsListener(requireContext(), new WidgetUserPhoneVerify$onViewBound$2(this));
+            SmsListener.Companion.startSmsListener(new WidgetUserPhoneVerify$onViewBound$2(this));
         }
     }
 }

app/src/main/res/drawable-anydpi-v24/ic_network_connecting.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="12dp" android:width="12dp" android:viewportWidth="11" android:viewportHeight="12">
+    <path android:fillColor="#36393f" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#36393f" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#36393f" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:name="three" android:fillColor="#faa61a" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0" android:fillType="evenOdd"/>
+    <path android:name="two" android:fillColor="#faa61a" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:name="one" android:fillColor="#faa61a" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_network_connecting_light.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="12dp" android:width="12dp" android:viewportWidth="11" android:viewportHeight="12">
+    <path android:fillColor="#c7ccd1" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#c7ccd1" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#c7ccd1" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:name="three" android:fillColor="#faa61a" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0" android:fillType="evenOdd"/>
+    <path android:name="two" android:fillColor="#faa61a" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:name="one" android:fillColor="#faa61a" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+</vector>

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

@@ -2037,6 +2037,8 @@
     </attr>
     <attr name="ic_network_airplane_mode" format="reference|string|integer|boolean|color|float|dimension|fraction">
     </attr>
+    <attr name="ic_network_connecting" format="reference|string|integer|boolean|color|float|dimension|fraction">
+    </attr>
     <attr name="ic_network_connecting_animated_vector" format="reference|string|integer|boolean|color|float|dimension|fraction">
     </attr>
     <attr name="ic_network_offline" format="reference|string|integer|boolean|color|float|dimension|fraction">

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

@@ -1446,7 +1446,7 @@
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887527_com_crashlytics_android_build_id">9f45f29e17d04aad8bb9d426a4b04aa4</string>
+    <string name="res_2131887527_com_crashlytics_android_build_id">b86bdb9196cd47e0b0751dcfd1ac9f19</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>

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

@@ -399,6 +399,7 @@
         <item name="ic_more">@drawable/ic_more_primary100_24dp</item>
         <item name="ic_navigate_next">@drawable/ic_navigate_next_white_a60_24dp</item>
         <item name="ic_network_airplane_mode">@drawable/ic_network_airplane_mode</item>
+        <item name="ic_network_connecting">@drawable/ic_network_connecting</item>
         <item name="ic_network_connecting_animated_vector">@drawable/ic_network_connecting_animated_vector</item>
         <item name="ic_network_offline">@drawable/ic_network_offline</item>
         <item name="ic_notifications_a60">@drawable/ic_notifications_settings_white_a60_24dp</item>
@@ -662,6 +663,7 @@
         <item name="ic_more">@drawable/ic_more_primary900_24dp</item>
         <item name="ic_navigate_next">@drawable/ic_navigate_next_grey_a60_24dp</item>
         <item name="ic_network_airplane_mode">@drawable/ic_network_airplane_mode_light</item>
+        <item name="ic_network_connecting">@drawable/ic_network_connecting_light</item>
         <item name="ic_network_connecting_animated_vector">@drawable/ic_network_connecting_animated_vector_light</item>
         <item name="ic_network_offline">@drawable/ic_network_offline_light</item>
         <item name="ic_notifications_a60">@drawable/ic_notifications_settings_grey_a60_24dp</item>