84.13 - Beta (84113)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 84112
+        versionCode 84113
-        versionName "84.12 - Beta"
+        versionName "84.13 - 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="84112" android:versionName="84.12 - 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="84113" android:versionName="84.13 - 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/assets/data/canadian-provinces.json

@@ -1 +0,0 @@
-[{"label":"Alberta","value":"AB"},{"label":"British Columbia","value":"BC"},{"label":"Manitoba","value":"MB"},{"label":"New Brunswick","value":"NB"},{"label":"Newfoundland and Labrador","value":"NL"},{"label":"Nova Scotia","value":"NS"},{"label":"Ontario","value":"ON"},{"label":"Prince Edward Island","value":"PE"},{"label":"Quebec","value":"QC"},{"label":"Saskatchewan","value":"SK"},{"label":"Northwest Territories","value":"NT"},{"label":"Nunavut","value":"NU"},{"label":"Yukon","value":"YT"}]

app/src/main/assets/data/emoji-shortcuts.json

@@ -1,255 +0,0 @@
-[
-  {
-    "emoji": "angry",
-    "shortcuts": [
-      ">:(",
-      ">:-(",
-      ">=(",
-      ">=-("
-    ]
-  },
-  {
-    "emoji": "blush",
-    "shortcuts": [
-      ":\")",
-      ":-\")",
-      "=\")",
-      "=-\")"
-    ]
-  },
-  {
-    "emoji": "broken_heart",
-    "shortcuts": [
-      "</3",
-      "<\\3"
-    ]
-  },
-  {
-    "emoji": "confused",
-    "shortcuts": [
-      ":-\\",
-      ":-/",
-      "=-\\",
-      "=-/"
-    ]
-  },
-  {
-    "emoji": "cry",
-    "shortcuts": [
-      ":'(",
-      ":'-(",
-      ":,(",
-      ":,-(",
-      "='(",
-      "='-(",
-      "=,(",
-      "=,-("
-    ]
-  },
-  {
-    "emoji": "frowning",
-    "shortcuts": [
-      ":(",
-      ":-(",
-      "=(",
-      "=-("
-    ]
-  },
-  {
-    "emoji": "heart",
-    "shortcuts": [
-      "<3",
-      "♡"
-    ]
-  },
-  {
-    "emoji": "imp",
-    "shortcuts": [
-      "]:(",
-      "]:-(",
-      "]=(",
-      "]=-("
-    ]
-  },
-  {
-    "emoji": "innocent",
-    "shortcuts": [
-      "o:)",
-      "O:)",
-      "o:-)",
-      "O:-)",
-      "0:)",
-      "0:-)",
-      "o=)",
-      "O=)",
-      "o=-)",
-      "O=-)",
-      "0=)",
-      "0=-)"
-    ]
-  },
-  {
-    "emoji": "joy",
-    "shortcuts": [
-      ":')",
-      ":'-)",
-      ":,)",
-      ":,-)",
-      ":'D",
-      ":'-D",
-      ":,D",
-      ":,-D",
-      "=')",
-      "='-)",
-      "=,)",
-      "=,-)",
-      "='D",
-      "='-D",
-      "=,D",
-      "=,-D"
-    ]
-  },
-  {
-    "emoji": "kissing",
-    "shortcuts": [
-      ":*",
-      ":-*",
-      "=*",
-      "=-*"
-    ]
-  },
-  {
-    "emoji": "laughing",
-    "shortcuts": [
-      "x-)",
-      "X-)"
-    ]
-  },
-  {
-    "emoji": "neutral_face",
-    "shortcuts": [
-      ":|",
-      ":-|",
-      "=|",
-      "=-|"
-    ]
-  },
-  {
-    "emoji": "open_mouth",
-    "shortcuts": [
-      ":o",
-      ":-o",
-      ":O",
-      ":-O",
-      "=o",
-      "=-o",
-      "=O",
-      "=-O"
-    ]
-  },
-  {
-    "emoji": "rage",
-    "shortcuts": [
-      ":@",
-      ":-@",
-      "=@",
-      "=-@"
-    ]
-  },
-  {
-    "emoji": "smile",
-    "shortcuts": [
-      ":D",
-      ":-D",
-      "=D",
-      "=-D"
-    ]
-  },
-  {
-    "emoji": "slight_smile",
-    "shortcuts": [
-      ":)",
-      ":-)",
-      "=)",
-      "=-)"
-    ]
-  },
-  {
-    "emoji": "smiling_imp",
-    "shortcuts": [
-      "]:)",
-      "]:-)",
-      "]=)",
-      "]=-)"
-    ]
-  },
-  {
-    "emoji": "sob",
-    "shortcuts": [
-      ":,'(",
-      ":,'-(",
-      ";(",
-      ";-(",
-      "=,'(",
-      "=,'-("
-    ]
-  },
-  {
-    "emoji": "stuck_out_tongue",
-    "shortcuts": [
-      ":P",
-      ":-P",
-      "=P",
-      "=-P"
-    ]
-  },
-  {
-    "emoji": "sunglasses",
-    "shortcuts": [
-      "8-)",
-      "B-)"
-    ]
-  },
-  {
-    "emoji": "sweat",
-    "shortcuts": [
-      ",:(",
-      ",:-(",
-      ",=(",
-      ",=-("
-    ]
-  },
-  {
-    "emoji": "sweat_smile",
-    "shortcuts": [
-      ",:)",
-      ",:-)",
-      ",=)",
-      ",=-)"
-    ]
-  },
-  {
-    "emoji": "unamused",
-    "shortcuts": [
-      ":s",
-      ":-S",
-      ":z",
-      ":-Z",
-      ":$",
-      ":-$",
-      "=s",
-      "=-S",
-      "=z",
-      "=-Z",
-      "=$",
-      "=-$"
-    ]
-  },
-  {
-    "emoji": "wink",
-    "shortcuts": [
-      ";)",
-      ";-)"
-    ]
-  }
-]

app/src/main/assets/data/states.json

@@ -1 +0,0 @@
-[{"label":"Alabama","value":"AL"},{"label":"Alaska","value":"AK"},{"label":"American Samoa","value":"AS"},{"label":"Arizona","value":"AZ"},{"label":"Arkansas","value":"AR"},{"label":"Armed Forces: Americas","value":"AA"},{"label":"Armed Forces: Europe","value":"AE"},{"label":"Armed Forces: Pacific","value":"AP"},{"label":"California","value":"CA"},{"label":"Colorado","value":"CO"},{"label":"Connecticut","value":"CT"},{"label":"Delaware","value":"DE"},{"label":"District Of Columbia","value":"DC"},{"label":"Federated States Of Micronesia","value":"FM"},{"label":"Florida","value":"FL"},{"label":"Georgia","value":"GA"},{"label":"Guam","value":"GU"},{"label":"Hawaii","value":"HI"},{"label":"Idaho","value":"ID"},{"label":"Illinois","value":"IL"},{"label":"Indiana","value":"IN"},{"label":"Iowa","value":"IA"},{"label":"Kansas","value":"KS"},{"label":"Kentucky","value":"KY"},{"label":"Louisiana","value":"LA"},{"label":"Maine","value":"ME"},{"label":"Marshall Islands","value":"MH"},{"label":"Maryland","value":"MD"},{"label":"Massachusetts","value":"MA"},{"label":"Michigan","value":"MI"},{"label":"Minnesota","value":"MN"},{"label":"Mississippi","value":"MS"},{"label":"Missouri","value":"MO"},{"label":"Montana","value":"MT"},{"label":"Nebraska","value":"NE"},{"label":"Nevada","value":"NV"},{"label":"New Hampshire","value":"NH"},{"label":"New Jersey","value":"NJ"},{"label":"New Mexico","value":"NM"},{"label":"New York","value":"NY"},{"label":"North Carolina","value":"NC"},{"label":"North Dakota","value":"ND"},{"label":"Northern Mariana Islands","value":"MP"},{"label":"Ohio","value":"OH"},{"label":"Oklahoma","value":"OK"},{"label":"Oregon","value":"OR"},{"label":"Palau","value":"PW"},{"label":"Pennsylvania","value":"PA"},{"label":"Puerto Rico","value":"PR"},{"label":"Rhode Island","value":"RI"},{"label":"South Carolina","value":"SC"},{"label":"South Dakota","value":"SD"},{"label":"Tennessee","value":"TN"},{"label":"Texas","value":"TX"},{"label":"Utah","value":"UT"},{"label":"Vermont","value":"VT"},{"label":"Virgin Islands","value":"VI"},{"label":"Virginia","value":"VA"},{"label":"Washington","value":"WA"},{"label":"West Virginia","value":"WV"},{"label":"Wisconsin","value":"WI"},{"label":"Wyoming","value":"WY"}]

app/src/main/assets/hcaptcha-form.html

@@ -1,162 +0,0 @@
-<html>
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
-    <style>
-        * {
-            padding: 0;
-            margin: 0;
-        }
-        body {
-            display: table;
-            width: 100%;
-            height: 100%;
-            text-align: center;
-        }
-        #hcaptcha-container {
-            margin-top: 5px;
-            display: table-cell;
-            vertical-align: middle;
-        }
-        /* overwrite hCaptcha iframe overlay which adds a #FFF background with opacity 0.05 */
-        div > div:nth-child(2) {
-            opacity: 0 !important;
-        }
-    </style>
-</head>
-<body>
-
-<div id="hcaptcha-container"></div>
-
-<script type="text/javascript">
-    // Android will inject this bridge object as `JSInterface`
-    // Browser is missing it so we mock it
-    var BridgeObject = window.JSInterface || {
-        getConfig: function getConfig() {
-            return JSON.stringify({
-                siteKey: '10000000-ffff-ffff-ffff-000000000001',
-                locale: 'ro',
-                size: 'compact',
-                theme: 'dark',
-                sentry: true,
-                rqdata: null,
-                apiEndpoint: 'https://hcaptcha.com/1/api.js',
-                endpoint: null,
-                assethost: null,
-                imghost: null,
-                reportapi: null
-            });
-        },
-        onPass: function onPass(token) {
-            return console.log("pass: token ".concat(token));
-        },
-        onError: function onError(errCode) {
-            return console.log("error: code ".concat(errCode));
-        },
-        onLoaded: function onLoaded() {
-            return console.log('cb: challenge or checkbox is visible');
-        }
-    };
-    var bridgeConfig = JSON.parse(BridgeObject.getConfig());
-
-    function getRenderConfig() {
-        return {
-            sitekey: bridgeConfig.siteKey,
-            size: bridgeConfig.size,
-            theme: bridgeConfig.theme,
-            'callback': function callback(token) {
-                return BridgeObject.onPass(token);
-            },
-            'expired-callback': function expiredCallback() {
-                return BridgeObject.onError(15);
-            },
-            'chalexpired-callback': function chalexpiredCallback() {
-                return BridgeObject.onError(15);
-            },
-            'close-callback': function closeCallback() {
-                return BridgeObject.onError(30);
-            },
-            'error-callback': function errorCallback() {
-                return BridgeObject.onError(31);
-            },
-            'open-callback': function openCallback() {
-                return BridgeObject.onLoaded();
-            }
-        };
-    }
-
-    function onHcaptchaLoaded() {
-        try {
-            var renderConfig = getRenderConfig();
-            var rqdata = bridgeConfig.rqdata;
-            var hCaptchaID = hcaptcha.render('hcaptcha-container', renderConfig);
-
-            if (rqdata) {
-                hcaptcha.setData(hCaptchaID, {
-                    rqdata: rqdata
-                });
-            }
-
-            if (renderConfig.size === 'invisible') {
-                hcaptcha.execute(hCaptchaID);
-            } else {
-                BridgeObject.onLoaded();
-            }
-        } catch (e) {
-            console.error(e);
-            BridgeObject.onError(29);
-        }
-    }
-
-    function addQueryParamIfDefined(url, queryName, queryValue) {
-        if (queryValue !== undefined && queryValue !== null) {
-            var link = url.indexOf('?') !== -1 ? '&' : '?';
-            return url + link + queryName + '=' + encodeURIComponent(queryValue);
-        }
-
-        return url;
-    }
-
-    function loadApi() {
-        var siteKey = bridgeConfig.siteKey;
-        var locale = bridgeConfig.locale;
-        var sentry = bridgeConfig.sentry;
-        var apiEndpoint = bridgeConfig.apiEndpoint;
-        var endpoint = bridgeConfig.endpoint;
-        var assethost = bridgeConfig.assethost;
-        var imghost = bridgeConfig.imghost;
-        var reportapi = bridgeConfig.reportapi;
-        var host = siteKey + '.android-sdk.hcaptcha.com';
-        var scriptSrc = apiEndpoint + '?render=explicit&onload=' + onHcaptchaLoaded.name;
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'recaptchacompat', 'off');
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'hl', locale);
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'host', host);
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'sentry', sentry);
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'endpoint', endpoint);
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'assethost', assethost);
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'imghost', imghost);
-        scriptSrc = addQueryParamIfDefined(scriptSrc, 'reportapi', reportapi);
-        var script = document.createElement('script');
-        script.async = true;
-        script.src = scriptSrc;
-
-        script.onerror = function () {
-            // network issue
-            BridgeObject.onError(7);
-        };
-
-        document.head.appendChild(script);
-    }
-
-    document.body.onclick = function () {
-        if (window.hcaptcha) {
-            window.hcaptcha.close();
-        } else {
-            BridgeObject.onError(30);
-        }
-    };
-
-    loadApi();
-
-</script>
-</body>
-</html>

app/src/main/assets/where_did_the_cat_go.txt

@@ -1 +0,0 @@
-https://www.reddit.com/r/discordapp/comments/dlkvza/theres_a_cute_catdog_image_hidden_inside_the/

app/src/main/java/c/a/t/a/i.java

@@ -20,7 +20,7 @@ public final class i {
 
     /* compiled from: JavaScript.kt */
     public static final class a<RC> extends Node.a<RC> {
-        public static final Pattern a = Pattern.compile("^(var|let|const)(\\s+[a-zA-Z_$](?:[a-zA-Z0-9_$])*?)", 32);
+        public static final Pattern a = Pattern.compile("^(var|let|const)(\\s+[a-zA-Z_$](?:[a-zA-Z0-9_$])*)", 32);
         public static final C0041a b = new C0041a(null);
 
         /* compiled from: JavaScript.kt */

app/src/main/java/com/discord/app/App.java

@@ -172,7 +172,7 @@ public class App extends Application {
         loggingProvider.init(appLog);
         c.i.c.c.e(this);
         String str = null;
-        if (BuildUtils.INSTANCE.isValidBuildVersionName("84.12 - Beta")) {
+        if (BuildUtils.INSTANCE.isValidBuildVersionName("84.13 - Beta")) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true);
         } else {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);

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<Boolean, Boolean> clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE));
-    private final int clientVersion = 84112;
+    private final int clientVersion = 84113;
 
     public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) {
         storeClientVersion.setClientMinVersion(i);

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/84112"), o.to("client_build_number", 84112), o.to("client_version", "84.12 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
+        updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/84113"), o.to("client_build_number", 84113), o.to("client_version", "84.13 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null))));
     }
 
     private final void setSuperProperties(Map<String, ? extends Object> map) {

app/src/main/java/com/discord/utilities/rest/RestAPI.java

@@ -179,7 +179,7 @@ public final class RestAPI implements RestAPIInterface {
 
         @Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider
         public String getUserAgent() {
-            return "Discord-Android/84112";
+            return "Discord-Android/84113";
         }
     }
 

app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java

@@ -100,7 +100,7 @@ public final class WidgetFatalCrash extends AppFragment {
         textView2.setText(b.j(this, 2131887897, objArr2, null, 4));
         TextView textView3 = getBinding().b;
         m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion");
-        textView3.setText(b.j(this, 2131887890, new Object[]{"84.12 - Beta"}, null, 4));
+        textView3.setText(b.j(this, 2131887890, new Object[]{"84.13 - Beta"}, null, 4));
         TextView textView4 = getBinding().d;
         m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion");
         textView4.setText(b.j(this, 2131887893, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4));

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

@@ -344,7 +344,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
         String string = getString(2131886360);
-        textView.setText(string + " - 84.12 - Beta (84112)");
+        textView.setText(string + " - 84.13 - Beta (84113)");
         binding.f1938z.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);