diff --git a/patches/customtheme/833.patch b/patches/customtheme/833.patch new file mode 100644 index 0000000..8be575f --- /dev/null +++ b/patches/customtheme/833.patch @@ -0,0 +1,134 @@ +diff -crB -x dist -x build com.discord-832-base/res/values/colors.xml com.discord-832/res/values/colors.xml +*** com.discord-832-base/res/values/colors.xml 2019-01-19 04:41:50.669762506 +0300 +--- com.discord-832/res/values/colors.xml 2019-01-20 01:29:57.358553097 +0300 +*************** +*** 61,68 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 + #ff3f51b5 + #ff303f9f +--- 61,68 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 + #ff3f51b5 + #ff303f9f +*************** +*** 98,106 **** + #0d4f545c + #4d4f545c + #994f545c +! #ff282b30 +! #ff2e3136 +! #ff1e2124 + #ff8a8e94 + #6680cbc4 + #66009688 +--- 98,106 ---- + #0d4f545c + #4d4f545c + #994f545c +! #ff000000 +! #ff000000 +! #ff000000 + #ff8a8e94 + #6680cbc4 + #66009688 +*************** +*** 109,123 **** + #ff45ddc0 + #ff93a5af + #ff021f25 +! #fff2fbfe +! #ffcceffd +! #ff99dffb +! #ff33c0f6 +! #ff00b0f4 +! #ff0078a6 +! #ff004662 +! #ff003549 +! #ff00090c + #ff37474f + #ff263238 + #ff21272b +--- 109,123 ---- + #ff45ddc0 + #ff93a5af + #ff021f25 +! #ff8cf687 +! #ff7df577 +! #ff6ef368 +! #ff5ff258 +! #ff50f148 +! #ff41f038 +! #ff32ef28 +! #ff23ed19 +! #ff1be411 + #ff37474f + #ff263238 + #ff21272b +*************** +*** 159,176 **** + #4d7d8187 + #997d8187 + #e67d8187 +! #ff4f545c +! #4d4f545c +! #994f545c +! #e64f545c +! #ff36393f +! #4d36393f +! #9936393f +! #e636393f +! #ff2f3136 +! #4d2f3136 +! #992f3136 +! #e62f3136 + #ff202225 + #4d202225 + #99202225 +--- 159,176 ---- + #4d7d8187 + #997d8187 + #e67d8187 +! #ff0f0f0f +! #4d0f0f0f +! #990f0f0f +! #e60f0f0f +! #ff000000 +! #4d000000 +! #99000000 +! #e6000000 +! #ff000000 +! #4d000000 +! #99000000 +! #e6000000 + #ff202225 + #4d202225 + #99202225 +*************** +*** 191,198 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 + #ff697ec4 + #ffc9d2f0 + #ff5161ff +--- 191,198 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 + #ff697ec4 + #ffc9d2f0 + #ff5161ff diff --git a/patches/customversion/833.patch b/patches/customversion/833.patch new file mode 100644 index 0000000..71b3375 --- /dev/null +++ b/patches/customversion/833.patch @@ -0,0 +1,20 @@ +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali +*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-01-19 04:41:50.846430038 +0300 +--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-01-20 22:08:30.905273603 +0300 +*************** +*** 1304,1310 **** + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +! const-string v0, " - 8.3.3 (833)" + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +--- 1302,1308 ---- + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +! const-string v0, " - 8.3.3 (833), with Cutthecord patches" + + invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + diff --git a/patches/experiments/833.patch b/patches/experiments/833.patch new file mode 100644 index 0000000..b1e682d --- /dev/null +++ b/patches/experiments/833.patch @@ -0,0 +1,152 @@ +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali +*** com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-01-19 04:41:50.793096443 +0300 +--- com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-01-20 02:25:56.947114965 +0300 +*************** +*** 81,108 **** + .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z + .locals 1 + +- const-string v0, "meUser" +- +- .line 93 +- invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +- +- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +- +- move-result p1 +- +- if-nez p1, :cond_1 +- +- if-eqz p2, :cond_0 +- +- goto :goto_0 +- +- :cond_0 +- const/4 p1, 0x0 +- +- return p1 +- +- :cond_1 +- :goto_0 + const/4 p1, 0x1 + + return p1 +--- 81,86 ---- +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali +*** com.discord-832-base/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-01-19 04:41:50.793096443 +0300 +--- com.discord-832/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-01-20 02:30:18.981896059 +0300 +*************** +*** 77,90 **** + .method public final call(Lcom/discord/models/domain/ModelUser;)Z + .locals 1 + +! const-string v0, "it" +! +! .line 78 +! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +! +! move-result p1 + + return p1 + .end method +--- 77,83 ---- + .method public final call(Lcom/discord/models/domain/ModelUser;)Z + .locals 1 + +! const/4 p1, 0x1 + + return p1 + .end method +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/stores/StoreExperiments.smali com.discord-832/smali/com/discord/stores/StoreExperiments.smali +*** com.discord-832-base/smali/com/discord/stores/StoreExperiments.smali 2019-01-19 04:41:50.796429793 +0300 +--- com.discord-832/smali/com/discord/stores/StoreExperiments.smali 2019-01-20 02:21:41.862372281 +0300 +*************** +*** 1247,1255 **** + + if-eqz v0, :cond_0 + +! invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->isStaff()Z +! +! move-result v0 + + if-eq v0, v1, :cond_1 + +--- 1247,1253 ---- + + if-eqz v0, :cond_0 + +! const/4 v0, 0x1 + + if-eq v0, v1, :cond_1 + +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali +*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-01-19 04:41:50.846430038 +0300 +--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-01-20 02:28:45.741380899 +0300 +*************** +*** 71,83 **** + + check-cast v0, Landroid/view/View; + +! const-string v1, "it" +! +! invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +! +! move-result p1 + + invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V + +--- 71,77 ---- + + check-cast v0, Landroid/view/View; + +! const/4 p1, 0x1 + + invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V + +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali +*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-01-19 04:41:50.846430038 +0300 +--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-01-20 02:30:08.458504584 +0300 +*************** +*** 707,715 **** + if-eqz p1, :cond_1 + + .line 109 +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +! +! move-result v2 + + if-eq v2, v1, :cond_0 + +--- 707,713 ---- + if-eqz p1, :cond_1 + + .line 109 +! const/4 v2, 0x1 + + if-eq v2, v1, :cond_0 + +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali +*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali 2019-01-19 04:41:50.849763388 +0300 +--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem.smali 2019-01-20 02:17:36.007680584 +0300 +*************** +*** 80,87 **** + .method public final isStaffOrTester()Z + .locals 1 + +! .line 102 +! iget-boolean v0, p0, Lcom/discord/widgets/settings/WidgetSettingsUserConnections$UserConnectionItem;->isStaffOrTester:Z + + return v0 + .end method +--- 80,86 ---- + .method public final isStaffOrTester()Z + .locals 1 + +! const/4 v0, 0x1 + + return v0 + .end method diff --git a/patches/mutant/833.patch b/patches/mutant/833.patch new file mode 100644 index 0000000..f4d5b15 --- /dev/null +++ b/patches/mutant/833.patch @@ -0,0 +1,1608 @@ +*** com.discord-832-base/assets/data/emojis.json 2019-01-19 04:41:50.983097375 +0300 +--- com.discord-832/assets/data/emojis.json 2019-01-22 23:29:58.633342294 +0300 +*************** +*** 549,554 **** +--- 549,568 ---- + }, + { + "names": [ ++ "raised_hands_paw" ++ ], ++ "surrogates": "๐Ÿ™Œ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "raised_hands_claw" ++ ], ++ "surrogates": "๐Ÿ™Œ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "clap" + ], + "surrogates": "๐Ÿ‘", +*************** +*** 556,561 **** +--- 570,589 ---- + }, + { + "names": [ ++ "clap_paw" ++ ], ++ "surrogates": "๐Ÿ‘๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "clap_claw" ++ ], ++ "surrogates": "๐Ÿ‘๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "wave" + ], + "surrogates": "๐Ÿ‘‹", +*************** +*** 563,568 **** +--- 591,610 ---- + }, + { + "names": [ ++ "wave_paw" ++ ], ++ "surrogates": "๐Ÿ‘‹๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "wave_claw" ++ ], ++ "surrogates": "๐Ÿ‘‹๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "thumbsup", + "+1", + "thumbup" +*************** +*** 572,577 **** +--- 614,637 ---- + }, + { + "names": [ ++ "thumbsup_paw", ++ "+1_paw", ++ "thumbup_paw" ++ ], ++ "surrogates": "๐Ÿ‘๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "thumbsup_claw", ++ "+1_claw", ++ "thumbup_claw" ++ ], ++ "surrogates": "๐Ÿ‘๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "thumbsdown", + "-1", + "thumbdown" +*************** +*** 581,586 **** +--- 641,664 ---- + }, + { + "names": [ ++ "thumbsdown_paw", ++ "-1_paw", ++ "thumbdown_paw" ++ ], ++ "surrogates": "๐Ÿ‘Ž๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "thumbsdown_claw", ++ "-1_claw", ++ "thumbdown_claw" ++ ], ++ "surrogates": "๐Ÿ‘Ž๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "punch" + ], + "surrogates": "๐Ÿ‘Š", +*************** +*** 588,593 **** +--- 666,685 ---- + }, + { + "names": [ ++ "punch_paw" ++ ], ++ "surrogates": "๐Ÿ‘Š๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "punch_claw" ++ ], ++ "surrogates": "๐Ÿ‘Š๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "fist" + ], + "surrogates": "โœŠ", +*************** +*** 595,600 **** +--- 687,706 ---- + }, + { + "names": [ ++ "fist_paw" ++ ], ++ "surrogates": "โœŠ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "fist_claw" ++ ], ++ "surrogates": "โœŠ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "v" + ], + "surrogates": "โœŒ", +*************** +*** 602,607 **** +--- 708,727 ---- + }, + { + "names": [ ++ "v_paw" ++ ], ++ "surrogates": "โœŒ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "v_claw" ++ ], ++ "surrogates": "โœŒ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "ok_hand" + ], + "surrogates": "๐Ÿ‘Œ", +*************** +*** 609,614 **** +--- 729,748 ---- + }, + { + "names": [ ++ "ok_hand_paw" ++ ], ++ "surrogates": "๐Ÿ‘Œ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "ok_hand_claw" ++ ], ++ "surrogates": "๐Ÿ‘Œ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "raised_hand" + ], + "surrogates": "โœ‹", +*************** +*** 616,621 **** +--- 750,769 ---- + }, + { + "names": [ ++ "raised_hand_paw" ++ ], ++ "surrogates": "โœ‹๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "raised_hand_claw" ++ ], ++ "surrogates": "โœ‹๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "open_hands" + ], + "surrogates": "๐Ÿ‘", +*************** +*** 623,628 **** +--- 771,790 ---- + }, + { + "names": [ ++ "open_hands_paw" ++ ], ++ "surrogates": "๐Ÿ‘๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "open_hands_claw" ++ ], ++ "surrogates": "๐Ÿ‘๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "muscle" + ], + "surrogates": "๐Ÿ’ช", +*************** +*** 630,635 **** +--- 792,811 ---- + }, + { + "names": [ ++ "muscle_paw" ++ ], ++ "surrogates": "๐Ÿ’ช๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "muscle_claw" ++ ], ++ "surrogates": "๐Ÿ’ช๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "pray" + ], + "surrogates": "๐Ÿ™", +*************** +*** 637,642 **** +--- 813,832 ---- + }, + { + "names": [ ++ "pray_paw" ++ ], ++ "surrogates": "๐Ÿ™๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "pray_claw" ++ ], ++ "surrogates": "๐Ÿ™๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "point_up" + ], + "surrogates": "โ˜", +*************** +*** 644,649 **** +--- 834,853 ---- + }, + { + "names": [ ++ "point_up_paw" ++ ], ++ "surrogates": "โ˜๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "point_up_claw" ++ ], ++ "surrogates": "โ˜๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "point_up_2" + ], + "surrogates": "๐Ÿ‘†", +*************** +*** 651,656 **** +--- 855,874 ---- + }, + { + "names": [ ++ "point_up_2_paw" ++ ], ++ "surrogates": "๐Ÿ‘†๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "point_up_2_claw" ++ ], ++ "surrogates": "๐Ÿ‘†๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "point_down" + ], + "surrogates": "๐Ÿ‘‡", +*************** +*** 658,663 **** +--- 876,895 ---- + }, + { + "names": [ ++ "point_down_paw" ++ ], ++ "surrogates": "๐Ÿ‘‡๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "point_down_claw" ++ ], ++ "surrogates": "๐Ÿ‘‡๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "point_left" + ], + "surrogates": "๐Ÿ‘ˆ", +*************** +*** 665,670 **** +--- 897,916 ---- + }, + { + "names": [ ++ "point_left_paw" ++ ], ++ "surrogates": "๐Ÿ‘ˆ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "point_left_claw" ++ ], ++ "surrogates": "๐Ÿ‘ˆ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "point_right" + ], + "surrogates": "๐Ÿ‘‰", +*************** +*** 672,677 **** +--- 918,937 ---- + }, + { + "names": [ ++ "point_right_paw" ++ ], ++ "surrogates": "๐Ÿ‘‰๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "point_right_claw" ++ ], ++ "surrogates": "๐Ÿ‘‰๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "middle_finger", + "reversed_hand_with_middle_finger_extended" + ], +*************** +*** 680,685 **** +--- 940,961 ---- + }, + { + "names": [ ++ "middle_finger_paw", ++ "reversed_hand_with_middle_finger_extended_paw" ++ ], ++ "surrogates": "๐Ÿ–•๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "middle_finger_claw", ++ "reversed_hand_with_middle_finger_extended_claw" ++ ], ++ "surrogates": "๐Ÿ–•๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "hand_splayed", + "raised_hand_with_fingers_splayed" + ], +*************** +*** 688,693 **** +--- 964,977 ---- + }, + { + "names": [ ++ "hand_splayed_claw", ++ "raised_hand_with_fingers_splayed_claw" ++ ], ++ "surrogates": "๐Ÿ–๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "metal", + "sign_of_the_horns" + ], +*************** +*** 696,701 **** +--- 980,1001 ---- + }, + { + "names": [ ++ "metal_paw", ++ "sign_of_the_horns_paw" ++ ], ++ "surrogates": "๐Ÿค˜๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "metal_claw", ++ "sign_of_the_horns_claw" ++ ], ++ "surrogates": "๐Ÿค˜๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "vulcan", + "raised_hand_with_part_between_middle_and_ring_fingers" + ], +*************** +*** 704,709 **** +--- 1004,1025 ---- + }, + { + "names": [ ++ "vulcan_paw", ++ "raised_hand_with_part_between_middle_and_ring_fingers_paw" ++ ], ++ "surrogates": "๐Ÿ––๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "vulcan_claw", ++ "raised_hand_with_part_between_middle_and_ring_fingers_claw" ++ ], ++ "surrogates": "๐Ÿ––๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "writing_hand" + ], + "surrogates": "โœ", +*************** +*** 711,716 **** +--- 1027,1046 ---- + }, + { + "names": [ ++ "writing_hand_paw" ++ ], ++ "surrogates": "โœ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "writing_hand_claw" ++ ], ++ "surrogates": "โœ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "nail_care" + ], + "surrogates": "๐Ÿ’…", +*************** +*** 718,723 **** +--- 1048,1067 ---- + }, + { + "names": [ ++ "nail_care_paw" ++ ], ++ "surrogates": "๐Ÿ’…๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "nail_care_claw" ++ ], ++ "surrogates": "๐Ÿ’…๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "lips" + ], + "surrogates": "๐Ÿ‘„" +*************** +*** 1417,1422 **** +--- 1761,1780 ---- + }, + { + "names": [ ++ "selfie_paw" ++ ], ++ "surrogates": "๐Ÿคณ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "selfie_claw" ++ ], ++ "surrogates": "๐Ÿคณ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "man_dancing", + "male_dancer" + ], +*************** +*** 1433,1438 **** +--- 1791,1812 ---- + }, + { + "names": [ ++ "call_me_paw", ++ "call_me_hand_paw" ++ ], ++ "surrogates": "๐Ÿค™๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "call_me_claw", ++ "call_me_hand_claw" ++ ], ++ "surrogates": "๐Ÿค™๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "raised_back_of_hand", + "back_of_hand" + ], +*************** +*** 1441,1446 **** +--- 1815,1836 ---- + }, + { + "names": [ ++ "raised_back_of_hand_paw", ++ "back_of_hand_paw" ++ ], ++ "surrogates": "๐Ÿคš๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "raised_back_of_hand_claw", ++ "back_of_hand_claw" ++ ], ++ "surrogates": "๐Ÿคš๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "left_facing_fist", + "left_fist" + ], +*************** +*** 1449,1454 **** +--- 1839,1860 ---- + }, + { + "names": [ ++ "left_facing_fist_paw", ++ "left_fist_paw" ++ ], ++ "surrogates": "๐Ÿค›๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "left_facing_fist_claw", ++ "left_fist_claw" ++ ], ++ "surrogates": "๐Ÿค›๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "right_facing_fist", + "right_fist" + ], +*************** +*** 1457,1462 **** +--- 1863,1884 ---- + }, + { + "names": [ ++ "right_facing_fist_paw", ++ "right_fist_paw" ++ ], ++ "surrogates": "๐Ÿคœ๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "right_facing_fist_claw", ++ "right_fist_claw" ++ ], ++ "surrogates": "๐Ÿคœ๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ + "handshake", + "shaking_hands" + ], +*************** +*** 1464,1474 **** +--- 1886,2100 ---- + }, + { + "names": [ ++ "handshake_paw", ++ "shaking_hands_paw" ++ ], ++ "surrogates": "๐Ÿค๔™" ++ }, ++ { ++ "names": [ ++ "handshake_claw", ++ "shaking_hands_claw" ++ ], ++ "surrogates": "๐Ÿค๔™‘" ++ }, ++ { ++ "names": [ + "fingers_crossed", + "hand_with_index_and_middle_finger_crossed" + ], + "surrogates": "๐Ÿคž", + "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "fingers_crossed_paw", ++ "hand_with_index_and_middle_finger_crossed_paw" ++ ], ++ "surrogates": "๐Ÿคž๔™", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "fingers_crossed_claw", ++ "hand_with_index_and_middle_finger_crossed_claw" ++ ], ++ "surrogates": "๐Ÿคž๔™‘", ++ "hasDiversity": true ++ }, ++ { ++ "names": [ ++ "pilot" ++ ], ++ "surrogates": "๐Ÿง‘โœˆ" ++ }, ++ { ++ "names": [ ++ "health_worker" ++ ], ++ "surrogates": "๐Ÿง‘โš•" ++ }, ++ { ++ "names": [ ++ "firefighter" ++ ], ++ "surrogates": "๐Ÿง‘๐Ÿฅข" ++ }, ++ { ++ "names": [ ++ "astronaut" ++ ], ++ "surrogates": "๐Ÿง‘๐Ÿš€" ++ }, ++ { ++ "names": [ ++ "scientist" ++ ], ++ "surrogates": "๐Ÿง‘๐Ÿ”ฌ" ++ }, ++ { ++ "names": [ ++ "mechanic" ++ ], ++ "surrogates": "๐Ÿง‘๐Ÿ”ง" ++ }, ++ { ++ "names": [ ++ "technologist" ++ ], ++ "surrogates": "๐Ÿง‘๐Ÿ’ป" ++ }, ++ { ++ "names": [ ++ "chef" ++ ], ++ "surrogates": "๐Ÿง‘๐Ÿณ" ++ }, ++ { ++ "names": [ ++ "monocle" ++ ], ++ "surrogates": "๐Ÿง" ++ }, ++ { ++ "names": [ ++ "pleading" ++ ], ++ "surrogates": "๐Ÿฅบ" ++ }, ++ { ++ "names": [ ++ "cold" ++ ], ++ "surrogates": "๐Ÿฅถ" ++ }, ++ { ++ "names": [ ++ "hot" ++ ], ++ "surrogates": "๐Ÿฅต" ++ }, ++ { ++ "names": [ ++ "woozy" ++ ], ++ "surrogates": "๐Ÿฅด" ++ }, ++ { ++ "names": [ ++ "party_face" ++ ], ++ "surrogates": "๐Ÿฅณ" ++ }, ++ { ++ "names": [ ++ "smile_hearts" ++ ], ++ "surrogates": "๐Ÿฅฐ" ++ }, ++ { ++ "names": [ ++ "mind_blown" ++ ], ++ "surrogates": "๐Ÿคฏ" ++ }, ++ { ++ "names": [ ++ "vomiting" ++ ], ++ "surrogates": "๐Ÿคฎ" ++ }, ++ { ++ "names": [ ++ "hand_over_mouth" ++ ], ++ "surrogates": "๐Ÿคญ" ++ }, ++ { ++ "names": [ ++ "swearing" ++ ], ++ "surrogates": "๐Ÿคฌ" ++ }, ++ { ++ "names": [ ++ "shush" ++ ], ++ "surrogates": "๐Ÿคซ" ++ }, ++ { ++ "names": [ ++ "crazy" ++ ], ++ "surrogates": "๐Ÿคช" ++ }, ++ { ++ "names": [ ++ "starry_eyes" ++ ], ++ "surrogates": "๐Ÿคฉ" ++ }, ++ { ++ "names": [ ++ "raised_eyebrow" ++ ], ++ "surrogates": "๐Ÿคจ" ++ }, ++ { ++ "names": [ ++ "detective" ++ ], ++ "surrogates": "๐Ÿ•ต๔˜ซ" ++ }, ++ { ++ "names": [ ++ "massage" ++ ], ++ "surrogates": "๐Ÿ’†๔˜ซ" ++ }, ++ { ++ "names": [ ++ "tipping_hand" ++ ], ++ "surrogates": "๐Ÿ’๔˜ซ" ++ }, ++ { ++ "names": [ ++ "hot_shit" ++ ], ++ "surrogates": "๔š" ++ }, ++ { ++ "names": [ ++ "headpats" ++ ], ++ "surrogates": "๔š—" ++ }, ++ { ++ "names": [ ++ "merperson" ++ ], ++ "surrogates": "๐Ÿงœ" + } + ], + "nature": [ +*************** +*** 2453,2458 **** +--- 3079,3140 ---- + "squid" + ], + "surrogates": "๐Ÿฆ‘" ++ }, ++ { ++ "names": [ ++ "furry_pride", ++ "rainbow_paw" ++ ], ++ "surrogates": "๔š›๐ŸŒˆ" ++ }, ++ { ++ "names": [ ++ "paw" ++ ], ++ "surrogates": "๔š›" ++ }, ++ { ++ "names": [ ++ "awoo" ++ ], ++ "surrogates": "๔š˜" ++ }, ++ { ++ "names": [ ++ "dont_awoo", ++ "no_awoo" ++ ], ++ "surrogates": "๔š™" ++ }, ++ { ++ "names": [ ++ "elf" ++ ], ++ "surrogates": "๐Ÿง" ++ }, ++ { ++ "names": [ ++ "raccoon" ++ ], ++ "surrogates": "๐Ÿฆ" ++ }, ++ { ++ "names": [ ++ "parrot" ++ ], ++ "surrogates": "๐Ÿฆœ" ++ }, ++ { ++ "names": [ ++ "peacock" ++ ], ++ "surrogates": "๐Ÿฆš" ++ }, ++ { ++ "names": [ ++ "demon" ++ ], ++ "surrogates": "๔™ฆ" + } + ], + "food": [ +*************** +*** 2980,2985 **** +--- 3662,3673 ---- + "pancakes" + ], + "surrogates": "๐Ÿฅž" ++ }, ++ { ++ "names": [ ++ "cannabis_leaf" ++ ], ++ "surrogates": "๔š‘" + } + ], + "activity": [ +*************** +*** 5271,5276 **** +--- 5959,6018 ---- + "shopping_trolley" + ], + "surrogates": "๐Ÿ›’" ++ }, ++ { ++ "names": [ ++ "toilet_paper" ++ ], ++ "surrogates": "๐Ÿงป" ++ }, ++ { ++ "names": [ ++ "brick" ++ ], ++ "surrogates": "๐Ÿงฑ" ++ }, ++ { ++ "names": [ ++ "firecracker" ++ ], ++ "surrogates": "๐Ÿงจ" ++ }, ++ { ++ "names": [ ++ "bone" ++ ], ++ "surrogates": "๐Ÿฆด" ++ }, ++ { ++ "names": [ ++ "d20" ++ ], ++ "surrogates": "๔š–" ++ }, ++ { ++ "names": [ ++ "d12" ++ ], ++ "surrogates": "๔š•" ++ }, ++ { ++ "names": [ ++ "d10" ++ ], ++ "surrogates": "๔š”" ++ }, ++ { ++ "names": [ ++ "d8" ++ ], ++ "surrogates": "๔š“" ++ }, ++ { ++ "names": [ ++ "d4" ++ ], ++ "surrogates": "๔š’" + } + ], + "symbols": [ +*************** +*** 7082,7087 **** +--- 7824,7934 ---- + "regional_indicator_a" + ], + "surrogates": "๐Ÿ‡ฆ" ++ }, ++ { ++ "names": [ ++ "queer_100" ++ ], ++ "surrogates": "๐Ÿ’ฏ๐ŸŒˆ" ++ }, ++ { ++ "names": [ ++ "dont_at", ++ "no_at", ++ "no_mention", ++ "dont_mention" ++ ], ++ "surrogates": "๔šš" ++ }, ++ { ++ "names": [ ++ "neuter_symbol" ++ ], ++ "surrogates": "โšฒ" ++ }, ++ { ++ "names": [ ++ "androgyne_symbol" ++ ], ++ "surrogates": "โšจ" ++ }, ++ { ++ "names": [ ++ "transgender_symbol" ++ ], ++ "surrogates": "โšง" ++ }, ++ { ++ "names": [ ++ "male_female_symbol" ++ ], ++ "surrogates": "โšฅ" ++ }, ++ { ++ "names": [ ++ "male_and_female_symbol" ++ ], ++ "surrogates": "โšค" ++ }, ++ { ++ "names": [ ++ "two_male_symbols" ++ ], ++ "surrogates": "โšฃ" ++ }, ++ { ++ "names": [ ++ "two_female_symbols" ++ ], ++ "surrogates": "โšข" ++ }, ++ { ++ "names": [ ++ "red_heart" ++ ], ++ "surrogates": "โ™ด" ++ }, ++ { ++ "names": [ ++ "male_symbol" ++ ], ++ "surrogates": "โ™‚" ++ }, ++ { ++ "names": [ ++ "female_symbol" ++ ], ++ "surrogates": "โ™€" ++ }, ++ { ++ "names": [ ++ "orange_heart" ++ ], ++ "surrogates": "๐Ÿงก" ++ }, ++ { ++ "names": [ ++ "labrys_symbol" ++ ], ++ "surrogates": "๔š…" ++ }, ++ { ++ "names": [ ++ "bisexual_triangles" ++ ], ++ "surrogates": "๔š„" ++ }, ++ { ++ "names": [ ++ "black_triangle" ++ ], ++ "surrogates": "๔šƒ" ++ }, ++ { ++ "names": [ ++ "pink_triangle" ++ ], ++ "surrogates": "๔š‚" + } + ], + "flags": [ +*************** +*** 8633,8638 **** + "rainbow_flag" + ], + "surrogates": "๐Ÿณ๏ธโ€๐ŸŒˆ" + } + ] +! } +\ No newline at end of file +--- 9480,9917 ---- + "rainbow_flag" + ], + "surrogates": "๐Ÿณ๏ธโ€๐ŸŒˆ" ++ }, ++ { ++ "names": [ ++ "pirate_flag" ++ ], ++ "surrogates": "๐Ÿด๏ธ" ++ }, ++ { ++ "names": [ ++ "transgender_flag" ++ ], ++ "surrogates": "๔š" ++ }, ++ { ++ "names": [ ++ "polysexual_flag" ++ ], ++ "surrogates": "๔š€" ++ }, ++ { ++ "names": [ ++ "polyamory_flag" ++ ], ++ "surrogates": "๔™ฟ" ++ }, ++ { ++ "names": [ ++ "pansexual_flag" ++ ], ++ "surrogates": "๔™พ" ++ }, ++ { ++ "names": [ ++ "nonbinary_flag" ++ ], ++ "surrogates": "๔™ฝ" ++ }, ++ { ++ "names": [ ++ "neutrois_flag" ++ ], ++ "surrogates": "๔™ผ" ++ }, ++ { ++ "names": [ ++ "intersex_flag" ++ ], ++ "surrogates": "๔™ป" ++ }, ++ { ++ "names": [ ++ "genderqueer_flag" ++ ], ++ "surrogates": "๔™บ" ++ }, ++ { ++ "names": [ ++ "genderfluid_flag" ++ ], ++ "surrogates": "๔™น" ++ }, ++ { ++ "names": [ ++ "deminonbinary_flag" ++ ], ++ "surrogates": "๔™ธ" ++ }, ++ { ++ "names": [ ++ "demigirl_flag" ++ ], ++ "surrogates": "๔™ท" ++ }, ++ { ++ "names": [ ++ "demiguy_flag" ++ ], ++ "surrogates": "๔™ถ" ++ }, ++ { ++ "names": [ ++ "bisexual_flag" ++ ], ++ "surrogates": "๔™ต" ++ }, ++ { ++ "names": [ ++ "bigender_flag" ++ ], ++ "surrogates": "๔™ด" ++ }, ++ { ++ "names": [ ++ "bear_flag" ++ ], ++ "surrogates": "๔™ณ" ++ }, ++ { ++ "names": [ ++ "asexual_flag" ++ ], ++ "surrogates": "๔™ฒ" ++ }, ++ { ++ "names": [ ++ "aromantic_flag" ++ ], ++ "surrogates": "๔™ฑ" ++ }, ++ { ++ "names": [ ++ "agender_flag" ++ ], ++ "surrogates": "๔™ฐ" ++ }, ++ { ++ "names": [ ++ "lesbian_flag" ++ ], ++ "surrogates": "๔š†" ++ }, ++ { ++ "names": [ ++ "paw-modifier" ++ ], ++ "surrogates": "๔™" ++ }, ++ { ++ "names": [ ++ "claw-modifier" ++ ], ++ "surrogates": "๔™‘" ++ }, ++ { ++ "names": [ ++ "skin-tone-1" ++ ], ++ "surrogates": "๐Ÿป" ++ }, ++ { ++ "names": [ ++ "skin-tone-2" ++ ], ++ "surrogates": "๐Ÿผ" ++ }, ++ { ++ "names": [ ++ "skin-tone-3" ++ ], ++ "surrogates": "๐Ÿฝ" ++ }, ++ { ++ "names": [ ++ "skin-tone-4" ++ ], ++ "surrogates": "๐Ÿพ" ++ }, ++ { ++ "names": [ ++ "skin-tone-5" ++ ], ++ "surrogates": "๐Ÿฟ" ++ }, ++ { ++ "names": [ ++ "skin-tone-6" ++ ], ++ "surrogates": "๔˜€" ++ }, ++ { ++ "names": [ ++ "skin-tone-7" ++ ], ++ "surrogates": "๔˜" ++ }, ++ { ++ "names": [ ++ "skin-tone-8" ++ ], ++ "surrogates": "๔˜‚" ++ }, ++ { ++ "names": [ ++ "skin-tone-9" ++ ], ++ "surrogates": "๔˜ƒ" ++ }, ++ { ++ "names": [ ++ "skin-tone-10" ++ ], ++ "surrogates": "๔˜„" ++ }, ++ { ++ "names": [ ++ "skin-tone-11" ++ ], ++ "surrogates": "๔˜…" ++ }, ++ { ++ "names": [ ++ "skin-tone-12" ++ ], ++ "surrogates": "๔˜†" ++ }, ++ { ++ "names": [ ++ "skin-tone-13" ++ ], ++ "surrogates": "๔˜‡" ++ }, ++ { ++ "names": [ ++ "skin-tone-14" ++ ], ++ "surrogates": "๔˜ˆ" ++ }, ++ { ++ "names": [ ++ "skin-tone-15" ++ ], ++ "surrogates": "๔˜‰" ++ }, ++ { ++ "names": [ ++ "skin-tone-16" ++ ], ++ "surrogates": "๔˜Š" ++ }, ++ { ++ "names": [ ++ "skin-tone-17" ++ ], ++ "surrogates": "๔˜‹" ++ }, ++ { ++ "names": [ ++ "skin-tone-18" ++ ], ++ "surrogates": "๔˜Œ" ++ }, ++ { ++ "names": [ ++ "skin-tone-19" ++ ], ++ "surrogates": "๔˜" ++ }, ++ { ++ "names": [ ++ "skin-tone-20" ++ ], ++ "surrogates": "๔˜Ž" ++ }, ++ { ++ "names": [ ++ "skin-tone-21" ++ ], ++ "surrogates": "๔˜" ++ }, ++ { ++ "names": [ ++ "skin-tone-22" ++ ], ++ "surrogates": "๔˜" ++ }, ++ { ++ "names": [ ++ "skin-tone-23" ++ ], ++ "surrogates": "๔˜‘" ++ }, ++ { ++ "names": [ ++ "skin-tone-24" ++ ], ++ "surrogates": "๔˜’" ++ }, ++ { ++ "names": [ ++ "skin-tone-25" ++ ], ++ "surrogates": "๔˜“" ++ }, ++ { ++ "names": [ ++ "skin-tone-26" ++ ], ++ "surrogates": "๔˜”" ++ }, ++ { ++ "names": [ ++ "skin-tone-27" ++ ], ++ "surrogates": "๔˜•" ++ }, ++ { ++ "names": [ ++ "skin-tone-28" ++ ], ++ "surrogates": "๔˜–" ++ }, ++ { ++ "names": [ ++ "skin-tone-29" ++ ], ++ "surrogates": "๔˜—" ++ }, ++ { ++ "names": [ ++ "skin-tone-30" ++ ], ++ "surrogates": "๔˜˜" ++ }, ++ { ++ "names": [ ++ "skin-tone-31" ++ ], ++ "surrogates": "๔˜™" ++ }, ++ { ++ "names": [ ++ "skin-tone-32" ++ ], ++ "surrogates": "๔˜š" ++ }, ++ { ++ "names": [ ++ "skin-tone-33" ++ ], ++ "surrogates": "๔˜›" ++ }, ++ { ++ "names": [ ++ "skin-tone-34" ++ ], ++ "surrogates": "๔˜œ" ++ }, ++ { ++ "names": [ ++ "skin-tone-35" ++ ], ++ "surrogates": "๔˜" ++ }, ++ { ++ "names": [ ++ "skin-tone-36" ++ ], ++ "surrogates": "๔˜ž" ++ }, ++ { ++ "names": [ ++ "skin-tone-37" ++ ], ++ "surrogates": "๔˜Ÿ" ++ }, ++ { ++ "names": [ ++ "skin-tone-38" ++ ], ++ "surrogates": "๔˜ " ++ }, ++ { ++ "names": [ ++ "skin-tone-39" ++ ], ++ "surrogates": "๔˜ก" ++ }, ++ { ++ "names": [ ++ "skin-tone-40" ++ ], ++ "surrogates": "๔˜ข" ++ }, ++ { ++ "names": [ ++ "skin-tone-41" ++ ], ++ "surrogates": "๔˜ฃ" ++ }, ++ { ++ "names": [ ++ "skin-tone-42" ++ ], ++ "surrogates": "๔˜ค" ++ }, ++ { ++ "names": [ ++ "skin-tone-43" ++ ], ++ "surrogates": "๔˜ฅ" ++ }, ++ { ++ "names": [ ++ "skin-tone-44" ++ ], ++ "surrogates": "๔˜ฆ" ++ }, ++ { ++ "names": [ ++ "skin-tone-45" ++ ], ++ "surrogates": "๔˜ง" ++ }, ++ { ++ "names": [ ++ "skin-tone-46" ++ ], ++ "surrogates": "๔˜จ" ++ }, ++ { ++ "names": [ ++ "skin-tone-47" ++ ], ++ "surrogates": "๔˜ฉ" ++ }, ++ { ++ "names": [ ++ "skin-tone-48" ++ ], ++ "surrogates": "๔˜ช" ++ }, ++ { ++ "names": [ ++ "skin-tone-49" ++ ], ++ "surrogates": "๔˜ซ" ++ }, ++ { ++ "names": [ ++ "skin-tone-50" ++ ], ++ "surrogates": "๔˜ฌ" + } + ] +! } diff --git a/patches/nonearby/833.patch b/patches/nonearby/833.patch new file mode 100644 index 0000000..2b49f25 --- /dev/null +++ b/patches/nonearby/833.patch @@ -0,0 +1,87 @@ + +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/friends/NearbyManager.smali com.discord-832/smali/com/discord/widgets/friends/NearbyManager.smali +*** com.discord-832-base/smali/com/discord/widgets/friends/NearbyManager.smali 2019-01-19 04:41:50.826429940 +0300 +--- com.discord-832/smali/com/discord/widgets/friends/NearbyManager.smali 2019-01-20 22:04:14.444090824 +0300 +*************** +*** 440,512 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 +! +! .line 58 +! iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +! +! if-nez v0, :cond_0 +! +! return-void +! +! .line 59 +! :cond_0 +! iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +! +! if-nez v1, :cond_1 +! +! return-void +! +! .line 60 +! :cond_1 +! iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +! +! if-nez v2, :cond_2 +! +! return-void +! +! .line 61 +! :cond_2 +! iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +! +! if-nez v3, :cond_3 +! +! return-void +! +! .line 62 +! :cond_3 +! iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +! +! if-nez v4, :cond_4 +! +! return-void +! +! .line 64 +! :cond_4 +! iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +! +! new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +! +! new-instance v7, Ljava/util/HashSet; +! +! iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +! +! check-cast v8, Ljava/util/Collection; +! +! invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +! +! check-cast v7, Ljava/util/Set; +! +! invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +! +! invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +! +! .line 66 +! invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/g; +! +! .line 67 +! invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->a(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/g; +! + return-void + .end method + +--- 440,446 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + return-void + .end method + \ No newline at end of file diff --git a/patches/notrack/833.patch b/patches/notrack/833.patch new file mode 100644 index 0000000..ffc085b --- /dev/null +++ b/patches/notrack/833.patch @@ -0,0 +1,1683 @@ +diff -crB -x dist -x build com.discord-832-base/AndroidManifest.xml com.discord-832/AndroidManifest.xml +*** com.discord-832-base/AndroidManifest.xml 2019-01-19 04:41:50.513095071 +0300 +--- com.discord-832/AndroidManifest.xml 2019-01-20 23:28:49.824409998 +0300 +*************** +*** 98,105 **** + + + +! +! + + + +--- 98,105 ---- + + + +! +! + + + +*************** +*** 181,187 **** + + + +- + + + +\ No newline at end of file +--- 181,186 ---- +diff -crB -x dist -x build com.discord-832-base/res/values/strings.xml com.discord-832/res/values/strings.xml +*** com.discord-832-base/res/values/strings.xml 2019-01-19 04:41:50.669762506 +0300 +--- com.discord-832/res/values/strings.xml 2019-01-20 23:27:37.827404188 +0300 +*************** +*** 874,880 **** + Unable to sync cloud saves + OR + Collapse Category +! 158ac3fa-63f9-4e26-9d04-d84f4da398f0 + Coming Soon + Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. + COMING SOON! +--- 874,880 ---- + Unable to sync cloud saves + OR + Collapse Category +! 00000000-0000-0000-0000-000000000000 + Coming Soon + Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. + COMING SOON! +diff -crB -x dist -x build com.discord-832-base/smali/com/crashlytics/android/answers/ab.smali com.discord-832/smali/com/crashlytics/android/answers/ab.smali +*** com.discord-832-base/smali/com/crashlytics/android/answers/ab.smali 2019-01-19 04:41:50.863096786 +0300 +--- com.discord-832/smali/com/crashlytics/android/answers/ab.smali 2019-01-20 23:27:37.834070886 +0300 +*************** +*** 38,207 **** + + # virtual methods + .method public final h(Ljava/util/List;)Z +! .locals 9 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/util/List<", +! "Ljava/io/File;", +! ">;)Z" +! } +! .end annotation +! +! .line 34 +! invoke-virtual {p0}, Lcom/crashlytics/android/answers/ab;->wK()Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-CLIENT-TYPE" +! +! const-string v2, "android" +! +! .line 38 +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-CLIENT-VERSION" +! +! iget-object v2, p0, Lcom/crashlytics/android/answers/ab;->nF:Lio/fabric/sdk/android/i; +! +! .line 39 +! invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-KEY" +! +! iget-object v2, p0, Lcom/crashlytics/android/answers/ab;->oF:Ljava/lang/String; +! +! .line 40 +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! .line 44 +! invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator; +! +! move-result-object v1 +! +! const/4 v2, 0x0 +! +! const/4 v3, 0x0 +! +! :goto_0 +! invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v4 +! +! const/4 v5, 0x1 +! +! if-eqz v4, :cond_0 +! +! invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v4 +! +! check-cast v4, Ljava/io/File; +! +! const-string v6, "session_analytics_file_" +! +! .line 45 +! invoke-static {v3}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v7 +! +! invoke-virtual {v6, v7}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v6 +! +! invoke-virtual {v4}, Ljava/io/File;->getName()Ljava/lang/String; +! +! move-result-object v7 +! +! const-string v8, "application/vnd.crashlytics.android.events" +! +! invoke-virtual {v0, v6, v7, v8, v4}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d; +! +! add-int/2addr v3, v5 +! +! goto :goto_0 +! +! .line 49 +! :cond_0 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v3, "Answers" +! +! new-instance v4, Ljava/lang/StringBuilder; +! +! const-string v6, "Sending " +! +! invoke-direct {v4, v6}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! .line 50 +! invoke-interface {p1}, Ljava/util/List;->size()I +! +! move-result p1 +! +! invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; +! +! const-string p1, " analytics files to " +! +! invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! .line 1100 +! iget-object p1, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String; +! +! .line 50 +! invoke-virtual {v4, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object p1 +! +! .line 49 +! invoke-interface {v1, v3, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 51 +! invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xx()I +! +! move-result p1 +! +! .line 52 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v0 +! +! const-string v1, "Answers" +! +! const-string v3, "Response code for analytics file send is " +! +! invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-virtual {v3, v4}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-interface {v0, v1, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 55 +! invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I +! +! move-result p1 +! +! if-nez p1, :cond_1 +! +! return v5 +! +! :cond_1 +! return v2 + .end method +--- 38,43 ---- + + # virtual methods + .method public final h(Ljava/util/List;)Z +! .locals 0 +! return-void + .end method +diff -crB -x dist -x build com.discord-832-base/smali/com/crashlytics/android/core/ah.smali com.discord-832/smali/com/crashlytics/android/core/ah.smali +*** com.discord-832-base/smali/com/crashlytics/android/core/ah.smali 2019-01-19 04:41:50.863096786 +0300 +--- com.discord-832/smali/com/crashlytics/android/core/ah.smali 2019-01-20 23:27:37.837404235 +0300 +*************** +*** 347,485 **** + + # virtual methods + .method public final a(Lcom/crashlytics/android/core/u;)Z +! .locals 5 +! +! .line 36 +! invoke-virtual {p0}, Lcom/crashlytics/android/core/ah;->wK()Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! .line 39 +! iget-object v1, p1, Lcom/crashlytics/android/core/u;->oF:Ljava/lang/String; +! +! const-string v2, "User-Agent" +! +! .line 3052 +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "Crashlytics Android SDK/" +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! iget-object v4, p0, Lcom/crashlytics/android/core/ah;->nF:Lio/fabric/sdk/android/i; +! +! .line 3054 +! invoke-virtual {v4}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v3 +! +! .line 3053 +! invoke-virtual {v0, v2, v3}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v2 +! +! const-string v3, "X-CRASHLYTICS-API-CLIENT-TYPE" +! +! const-string v4, "android" +! +! .line 3055 +! invoke-virtual {v2, v3, v4}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v2 +! +! const-string v3, "X-CRASHLYTICS-API-CLIENT-VERSION" +! +! iget-object v4, p0, Lcom/crashlytics/android/core/ah;->nF:Lio/fabric/sdk/android/i; +! +! .line 3056 +! invoke-virtual {v4}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-virtual {v2, v3, v4}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v2 +! +! const-string v3, "X-CRASHLYTICS-API-KEY" +! +! .line 3057 +! invoke-virtual {v2, v3, v1}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! .line 40 +! iget-object p1, p1, Lcom/crashlytics/android/core/u;->qQ:Lcom/crashlytics/android/core/aq; +! +! invoke-static {v0, p1}, Lcom/crashlytics/android/core/ah;->a(Lio/fabric/sdk/android/a/e/d;Lcom/crashlytics/android/core/aq;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object p1 +! +! .line 42 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v0 +! +! const-string v1, "CrashlyticsCore" +! +! new-instance v2, Ljava/lang/StringBuilder; +! +! const-string v3, "Sending report to: " +! +! invoke-direct {v2, v3}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! .line 3100 +! iget-object v3, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String; +! +! .line 42 +! invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 44 +! invoke-virtual {p1}, Lio/fabric/sdk/android/a/e/d;->xx()I +! +! move-result p1 +! +! .line 46 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v0 +! +! const-string v1, "CrashlyticsCore" +! +! const-string v2, "Result was: " +! +! invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-virtual {v2, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 48 +! invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I +! +! move-result p1 +! +! if-nez p1, :cond_0 +! +! const/4 p1, 0x1 +! +! return p1 +! +! :cond_0 +! const/4 p1, 0x0 +! +! return p1 + .end method +--- 347,352 ---- + + # virtual methods + .method public final a(Lcom/crashlytics/android/core/u;)Z +! .locals 0 +! return-void + .end method +diff -crB -x dist -x build com.discord-832-base/smali/com/crashlytics/android/core/x.smali com.discord-832/smali/com/crashlytics/android/core/x.smali +*** com.discord-832-base/smali/com/crashlytics/android/core/x.smali 2019-01-19 04:41:50.866430136 +0300 +--- com.discord-832/smali/com/crashlytics/android/core/x.smali 2019-01-20 23:27:37.840737584 +0300 +*************** +*** 31,383 **** + + # virtual methods + .method public final a(Lcom/crashlytics/android/core/u;)Z +! .locals 12 +! +! .line 59 +! invoke-virtual {p0}, Lcom/crashlytics/android/core/x;->wK()Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-KEY" +! +! .line 3075 +! iget-object v2, p1, Lcom/crashlytics/android/core/u;->oF:Ljava/lang/String; +! +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-CLIENT-TYPE" +! +! const-string v2, "android" +! +! .line 3076 +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-CLIENT-VERSION" +! +! iget-object v2, p0, Lcom/crashlytics/android/core/x;->nF:Lio/fabric/sdk/android/i; +! +! .line 3077 +! invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! .line 3080 +! iget-object v1, p1, Lcom/crashlytics/android/core/u;->qQ:Lcom/crashlytics/android/core/aq; +! +! invoke-interface {v1}, Lcom/crashlytics/android/core/aq;->cP()Ljava/util/Map; +! +! move-result-object v1 +! +! .line 3082 +! invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set; +! +! move-result-object v1 +! +! invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator; +! +! move-result-object v1 +! +! :goto_0 +! invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z +! +! move-result v2 +! +! if-eqz v2, :cond_0 +! +! invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; +! +! move-result-object v2 +! +! check-cast v2, Ljava/util/Map$Entry; +! +! .line 3868 +! invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object; +! +! move-result-object v3 +! +! check-cast v3, Ljava/lang/String; +! +! invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; +! +! move-result-object v2 +! +! check-cast v2, Ljava/lang/String; +! +! invoke-virtual {v0, v3, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! goto :goto_0 +! +! .line 61 +! :cond_0 +! iget-object p1, p1, Lcom/crashlytics/android/core/u;->qQ:Lcom/crashlytics/android/core/aq; +! +! const-string v1, "report[identifier]" +! +! .line 4089 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String; +! +! move-result-object v2 +! +! const/4 v3, 0x0 +! +! .line 4530 +! invoke-virtual {v0, v1, v3, v2}, Lio/fabric/sdk/android/a/e/d;->o(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! .line 4091 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cO()[Ljava/io/File; +! +! move-result-object v1 +! +! array-length v1, v1 +! +! const/4 v2, 0x0 +! +! const/4 v3, 0x1 +! +! if-ne v1, v3, :cond_1 +! +! .line 4092 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v4, "CrashlyticsCore" +! +! new-instance v5, Ljava/lang/StringBuilder; +! +! const-string v6, "Adding single file " +! +! invoke-direct {v5, v6}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getFileName()Ljava/lang/String; +! +! move-result-object v6 +! +! invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! const-string v6, " to report " +! +! invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! .line 4093 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String; +! +! move-result-object v6 +! +! invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v5 +! +! .line 4092 +! invoke-interface {v1, v4, v5}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v1, "report[file]" +! +! .line 4094 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getFileName()Ljava/lang/String; +! +! move-result-object v4 +! +! const-string v5, "application/octet-stream" +! +! .line 4095 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cN()Ljava/io/File; +! +! move-result-object p1 +! +! .line 4094 +! invoke-virtual {v0, v1, v4, v5, p1}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! goto :goto_2 +! +! .line 4099 +! :cond_1 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->cO()[Ljava/io/File; +! +! move-result-object v1 +! +! array-length v4, v1 +! +! const/4 v5, 0x0 +! +! const/4 v6, 0x0 +! +! :goto_1 +! if-ge v5, v4, :cond_2 +! +! aget-object v7, v1, v5 +! +! .line 4100 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v8 +! +! const-string v9, "CrashlyticsCore" +! +! new-instance v10, Ljava/lang/StringBuilder; +! +! const-string v11, "Adding file " +! +! invoke-direct {v10, v11}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! invoke-virtual {v7}, Ljava/io/File;->getName()Ljava/lang/String; +! +! move-result-object v11 +! +! invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! const-string v11, " to report " +! +! invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! .line 4101 +! invoke-interface {p1}, Lcom/crashlytics/android/core/aq;->getIdentifier()Ljava/lang/String; +! +! move-result-object v11 +! +! invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v10}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v10 +! +! .line 4100 +! invoke-interface {v8, v9, v10}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 4102 +! new-instance v8, Ljava/lang/StringBuilder; +! +! const-string v9, "report[file" +! +! invoke-direct {v8, v9}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! invoke-virtual {v8, v6}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; +! +! const-string v9, "]" +! +! invoke-virtual {v8, v9}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v8}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v8 +! +! invoke-virtual {v7}, Ljava/io/File;->getName()Ljava/lang/String; +! +! move-result-object v9 +! +! const-string v10, "application/octet-stream" +! +! invoke-virtual {v0, v8, v9, v10, v7}, Lio/fabric/sdk/android/a/e/d;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lio/fabric/sdk/android/a/e/d; +! +! add-int/2addr v6, v3 +! +! add-int/lit8 v5, v5, 0x1 +! +! goto :goto_1 +! +! .line 63 +! :cond_2 +! :goto_2 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object p1 +! +! const-string v1, "CrashlyticsCore" +! +! new-instance v4, Ljava/lang/StringBuilder; +! +! const-string v5, "Sending report to: " +! +! invoke-direct {v4, v5}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! .line 5100 +! iget-object v5, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String; +! +! .line 63 +! invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-interface {p1, v1, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 65 +! invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xx()I +! +! move-result p1 +! +! .line 67 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v4, "CrashlyticsCore" +! +! new-instance v5, Ljava/lang/StringBuilder; +! +! const-string v6, "Create report request ID: " +! +! invoke-direct {v5, v6}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! const-string v6, "X-REQUEST-ID" +! +! .line 68 +! invoke-virtual {v0, v6}, Lio/fabric/sdk/android/a/e/d;->dk(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v0 +! +! invoke-virtual {v5, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v5}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v0 +! +! .line 67 +! invoke-interface {v1, v4, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 69 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v0 +! +! const-string v1, "CrashlyticsCore" +! +! const-string v4, "Result was: " +! +! invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v5 +! +! invoke-virtual {v4, v5}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-interface {v0, v1, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 71 +! invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I +! +! move-result p1 +! +! if-nez p1, :cond_3 +! +! return v3 +! +! :cond_3 +! return v2 + .end method +--- 31,36 ---- + + # virtual methods + .method public final a(Lcom/crashlytics/android/core/u;)Z +! .locals 0 +! return-void + .end method +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali com.discord-832/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali +*** com.discord-832-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2019-01-19 04:41:50.756429597 +0300 +--- com.discord-832/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali 2019-01-20 23:27:37.820737490 +0300 +*************** +*** 407,466 **** + + .method public static synthetic setTrackingData$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;ZILjava/lang/Object;)V + .locals 0 +- +- and-int/lit8 p3, p3, 0x2 +- +- if-eqz p3, :cond_0 +- +- const/4 p2, 0x0 +- +- .line 141 +- :cond_0 +- invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->setTrackingData(Ljava/lang/String;Z)V +- + return-void + .end method + + .method public static synthetic track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V + .locals 0 +- +- and-int/lit8 p3, p3, 0x2 +- +- if-eqz p3, :cond_0 +- +- .line 166 +- invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; +- +- move-result-object p2 +- +- :cond_0 +- invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V +- + return-void + .end method + + .method public static synthetic track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;ILjava/lang/Object;)V + .locals 0 +- +- and-int/lit8 p5, p4, 0x2 +- +- if-eqz p5, :cond_0 +- +- .line 157 +- invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; +- +- move-result-object p2 +- +- :cond_0 +- and-int/lit8 p4, p4, 0x4 +- +- if-eqz p4, :cond_1 +- +- const/4 p3, 0x0 +- +- :cond_1 +- invoke-virtual {p0, p1, p2, p3}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;)V +- + return-void + .end method + +--- 407,422 ---- +*************** +*** 636,797 **** + .end method + + .method public final track(Ljava/lang/String;Ljava/util/Map;)V +! .locals 2 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/lang/String;", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;)V" +! } +! .end annotation +! +! const-string v0, "event" +! +! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string v0, "properties" +! +! invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 167 +! iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->eventsQueue:Ljava/util/concurrent/ConcurrentLinkedQueue; +! +! new-instance v1, Lcom/discord/restapi/RestAPIParams$Track$Event; +! +! invoke-direct {v1, p1, p2}, Lcom/discord/restapi/RestAPIParams$Track$Event;->(Ljava/lang/String;Ljava/util/Map;)V +! +! invoke-virtual {v0, v1}, Ljava/util/concurrent/ConcurrentLinkedQueue;->add(Ljava/lang/Object;)Z +! +! .line 169 +! sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; +! +! const-wide/16 v0, 0x5dc +! +! invoke-static {v0, v1, p1}, Lrx/Observable;->g(JLjava/util/concurrent/TimeUnit;)Lrx/Observable; +! +! move-result-object p1 +! +! .line 170 +! new-instance p2, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1; +! +! invoke-direct {p2, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker$track$1;->(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V +! +! check-cast p2, Lrx/functions/Action1; +! +! invoke-virtual {p1, p2}, Lrx/Observable;->b(Lrx/functions/Action1;)Lrx/Subscription; +! + return-void + .end method + + .method public final track(Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;)V +! .locals 7 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Lkotlin/Pair<", +! "Ljava/lang/String;", +! "Ljava/lang/Long;", +! ">;", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;", +! "Ljava/lang/Long;", +! ")V" +! } +! .end annotation +! +! const-string v0, "throttleKey" +! +! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string v0, "properties" +! +! invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V +! +! const/4 v4, 0x0 +! +! const/4 v5, 0x4 +! +! const/4 v6, 0x0 +! +! move-object v1, p0 +! +! move-object v2, p1 +! +! move-object v3, p3 +! +! .line 158 +! invoke-static/range {v1 .. v6}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->isEventThrottled$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Lkotlin/Pair;Ljava/lang/Long;ZILjava/lang/Object;)Z +! +! move-result p3 +! +! if-eqz p3, :cond_0 +! +! return-void +! +! .line 1000 +! :cond_0 +! iget-object p1, p1, Lkotlin/Pair;->first:Ljava/lang/Object; +! +! .line 162 +! check-cast p1, Ljava/lang/String; +! +! .line 163 +! invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V +! + return-void + .end method + + .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V +! .locals 1 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/lang/String;", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;)V" +! } +! .end annotation +! +! const-string v0, "event" +! +! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V +! +! const-string v0, "properties" +! +! invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V +! +! .line 177 +! new-instance v0, Landroid/os/Bundle; +! +! invoke-direct {v0}, Landroid/os/Bundle;->()V +! +! invoke-direct {p0, v0, p2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->putMap(Landroid/os/Bundle;Ljava/util/Map;)Landroid/os/Bundle; +! +! move-result-object p2 +! +! .line 178 +! sget-object v0, Lcom/discord/utilities/analytics/AnalyticsUtils;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsUtils; +! +! invoke-static {v0}, Lcom/discord/utilities/analytics/AnalyticsUtils;->access$getFireBaseInstance$p(Lcom/discord/utilities/analytics/AnalyticsUtils;)Lcom/google/firebase/analytics/FirebaseAnalytics; +! +! move-result-object v0 +! +! if-eqz v0, :cond_0 +! +! invoke-virtual {v0, p1, p2}, Lcom/google/firebase/analytics/FirebaseAnalytics;->b(Ljava/lang/String;Landroid/os/Bundle;)V +! +! return-void +! +! :cond_0 + return-void + .end method +--- 592,607 ---- + .end method + + .method public final track(Ljava/lang/String;Ljava/util/Map;)V +! .locals 0 + return-void + .end method + + .method public final track(Lkotlin/Pair;Ljava/util/Map;Ljava/lang/Long;)V +! .locals 0 + return-void + .end method + + .method public final trackFireBase(Ljava/lang/String;Ljava/util/Map;)V +! .locals 0 + return-void + .end method +diff -crB -x dist -x build com.discord-832-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali com.discord-832/smali_classes2/io/fabric/sdk/android/a/b/a.smali +*** com.discord-832-base/smali_classes2/io/fabric/sdk/android/a/b/a.smali 2019-01-19 04:41:50.943097178 +0300 +--- com.discord-832/smali_classes2/io/fabric/sdk/android/a/b/a.smali 2019-01-20 23:27:37.840737584 +0300 +*************** +*** 174,180 **** + + const-string v0, "X-CRASHLYTICS-DEVELOPER-TOKEN" + +! const-string v1, "470fa2b4ae81cd56ecbcda9735803434cec591fa" + + .line 142 + invoke-virtual {p1, v0, v1}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +--- 174,180 ---- + + const-string v0, "X-CRASHLYTICS-DEVELOPER-TOKEN" + +! const-string v1, "blamelunapoopoopeepeepoopoopeepblameluna" + + .line 142 + invoke-virtual {p1, v0, v1}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +diff -crB -x dist -x build com.discord-832-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali com.discord-832/smali_classes2/io/fabric/sdk/android/a/g/a.smali +*** com.discord-832-base/smali_classes2/io/fabric/sdk/android/a/g/a.smali 2019-01-19 04:41:50.943097178 +0300 +--- com.discord-832/smali_classes2/io/fabric/sdk/android/a/g/a.smali 2019-01-20 23:27:37.840737584 +0300 +*************** +*** 345,581 **** + + # virtual methods + .method public a(Lio/fabric/sdk/android/a/g/d;)Z +! .locals 5 +! +! .line 74 +! invoke-virtual {p0}, Lio/fabric/sdk/android/a/g/a;->wK()Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-KEY" +! +! .line 3098 +! iget-object v2, p1, Lio/fabric/sdk/android/a/g/d;->oF:Ljava/lang/String; +! +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-CLIENT-TYPE" +! +! const-string v2, "android" +! +! .line 3099 +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! const-string v1, "X-CRASHLYTICS-API-CLIENT-VERSION" +! +! iget-object v2, p0, Lio/fabric/sdk/android/a/g/a;->nF:Lio/fabric/sdk/android/i; +! +! .line 3102 +! invoke-virtual {v2}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String; +! +! move-result-object v2 +! +! .line 3101 +! invoke-virtual {v0, v1, v2}, Lio/fabric/sdk/android/a/e/d;->W(Ljava/lang/String;Ljava/lang/String;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! .line 76 +! invoke-direct {p0, v0, p1}, Lio/fabric/sdk/android/a/g/a;->a(Lio/fabric/sdk/android/a/e/d;Lio/fabric/sdk/android/a/g/d;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v0 +! +! .line 78 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v2, "Fabric" +! +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "Sending app info to " +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! .line 4100 +! iget-object v4, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String; +! +! .line 78 +! invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 79 +! iget-object v1, p1, Lio/fabric/sdk/android/a/g/d;->bas:Lio/fabric/sdk/android/a/g/n; +! +! if-eqz v1, :cond_0 +! +! .line 80 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v2, "Fabric" +! +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "App icon hash is " +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bas:Lio/fabric/sdk/android/a/g/n; +! +! iget-object v4, v4, Lio/fabric/sdk/android/a/g/n;->Wk:Ljava/lang/String; +! +! invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-interface {v1, v2, v3}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 82 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v2, "Fabric" +! +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "App icon size is " +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! iget-object v4, p1, Lio/fabric/sdk/android/a/g/d;->bas:Lio/fabric/sdk/android/a/g/n; +! +! iget v4, v4, Lio/fabric/sdk/android/a/g/n;->width:I +! +! invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; +! +! const-string v4, "x" +! +! invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! iget-object p1, p1, Lio/fabric/sdk/android/a/g/d;->bas:Lio/fabric/sdk/android/a/g/n; +! +! iget p1, p1, Lio/fabric/sdk/android/a/g/n;->height:I +! +! invoke-virtual {v3, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; +! +! invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object p1 +! +! invoke-interface {v1, v2, p1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 86 +! :cond_0 +! invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xx()I +! +! move-result p1 +! +! const-string v1, "POST" +! +! .line 4929 +! invoke-virtual {v0}, Lio/fabric/sdk/android/a/e/d;->xw()Ljava/net/HttpURLConnection; +! +! move-result-object v2 +! +! invoke-virtual {v2}, Ljava/net/HttpURLConnection;->getRequestMethod()Ljava/lang/String; +! +! move-result-object v2 +! +! .line 87 +! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z +! +! move-result v1 +! +! if-eqz v1, :cond_1 +! +! const-string v1, "Create" +! +! goto :goto_0 +! +! :cond_1 +! const-string v1, "Update" +! +! .line 90 +! :goto_0 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v2 +! +! const-string v3, "Fabric" +! +! new-instance v4, Ljava/lang/StringBuilder; +! +! invoke-direct {v4}, Ljava/lang/StringBuilder;->()V +! +! invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! const-string v1, " app request ID: " +! +! invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! const-string v1, "X-REQUEST-ID" +! +! .line 91 +! invoke-virtual {v0, v1}, Lio/fabric/sdk/android/a/e/d;->dk(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v0 +! +! invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v0 +! +! .line 90 +! invoke-interface {v2, v3, v0}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 92 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v0 +! +! const-string v1, "Fabric" +! +! const-string v2, "Result was " +! +! invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-virtual {v2, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-interface {v0, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 94 +! invoke-static {p1}, Lio/fabric/sdk/android/a/b/u;->cH(I)I +! +! move-result p1 +! +! if-nez p1, :cond_2 +! +! const/4 p1, 0x1 +! +! return p1 +! +! :cond_2 +! const/4 p1, 0x0 +! +! return p1 + .end method +--- 345,350 ---- + + # virtual methods + .method public a(Lio/fabric/sdk/android/a/g/d;)Z +! .locals 0 +! return-void + .end method +diff -crB -x dist -x build com.discord-832-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali com.discord-832/smali_classes2/io/fabric/sdk/android/a/g/l.smali +*** com.discord-832-base/smali_classes2/io/fabric/sdk/android/a/g/l.smali 2019-01-19 04:41:50.943097178 +0300 +--- com.discord-832/smali_classes2/io/fabric/sdk/android/a/g/l.smali 2019-01-20 23:27:37.844070933 +0300 +*************** +*** 117,520 **** + + # virtual methods + .method public final a(Lio/fabric/sdk/android/a/g/w;)Lorg/json/JSONObject; +! .locals 6 +! +! const/4 v0, 0x0 +! +! .line 1140 +! :try_start_0 +! new-instance v1, Ljava/util/HashMap; +! +! invoke-direct {v1}, Ljava/util/HashMap;->()V +! +! const-string v2, "build_version" +! +! .line 1141 +! iget-object v3, p1, Lio/fabric/sdk/android/a/g/w;->ban:Ljava/lang/String; +! +! invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! +! const-string v2, "display_version" +! +! .line 1142 +! iget-object v3, p1, Lio/fabric/sdk/android/a/g/w;->bam:Ljava/lang/String; +! +! invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! +! const-string v2, "source" +! +! .line 1143 +! iget v3, p1, Lio/fabric/sdk/android/a/g/w;->bap:I +! +! invoke-static {v3}, Ljava/lang/Integer;->toString(I)Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! +! .line 1145 +! iget-object v2, p1, Lio/fabric/sdk/android/a/g/w;->bbp:Ljava/lang/String; +! +! if-eqz v2, :cond_0 +! +! const-string v2, "icon_hash" +! +! .line 1146 +! iget-object v3, p1, Lio/fabric/sdk/android/a/g/w;->bbp:Ljava/lang/String; +! +! invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! +! .line 1149 +! :cond_0 +! iget-object v2, p1, Lio/fabric/sdk/android/a/g/w;->bbo:Ljava/lang/String; +! +! .line 1150 +! invoke-static {v2}, Lio/fabric/sdk/android/a/b/i;->Q(Ljava/lang/String;)Z +! +! move-result v3 +! +! if-nez v3, :cond_1 +! +! const-string v3, "instance" +! +! .line 1151 +! invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +! +! .line 82 +! :cond_1 +! invoke-virtual {p0, v1}, Lio/fabric/sdk/android/a/g/l;->p(Ljava/util/Map;)Lio/fabric/sdk/android/a/e/d; +! +! move-result-object v2 +! :try_end_0 +! .catch Lio/fabric/sdk/android/a/e/d$c; {:try_start_0 .. :try_end_0} :catch_1 +! .catchall {:try_start_0 .. :try_end_0} :catchall_0 +! +! :try_start_1 +! const-string v3, "X-CRASHLYTICS-API-KEY" +! +! .line 1160 +! iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->oF:Ljava/lang/String; +! +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "X-CRASHLYTICS-API-CLIENT-TYPE" +! +! const-string v4, "android" +! +! .line 1161 +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "X-CRASHLYTICS-API-CLIENT-VERSION" +! +! .line 1163 +! iget-object v4, p0, Lio/fabric/sdk/android/a/g/l;->nF:Lio/fabric/sdk/android/i; +! +! invoke-virtual {v4}, Lio/fabric/sdk/android/i;->getVersion()Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "Accept" +! +! const-string v4, "application/json" +! +! .line 1164 +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "X-CRASHLYTICS-DEVICE-MODEL" +! +! .line 1166 +! iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->ph:Ljava/lang/String; +! +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "X-CRASHLYTICS-OS-BUILD-VERSION" +! +! .line 1167 +! iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->bbm:Ljava/lang/String; +! +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "X-CRASHLYTICS-OS-DISPLAY-VERSION" +! +! .line 1168 +! iget-object v4, p1, Lio/fabric/sdk/android/a/g/w;->bbn:Ljava/lang/String; +! +! invoke-static {v2, v3, v4}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! const-string v3, "X-CRASHLYTICS-INSTALLATION-ID" +! +! .line 1169 +! iget-object p1, p1, Lio/fabric/sdk/android/a/g/w;->pd:Ljava/lang/String; +! +! invoke-static {v2, v3, p1}, Lio/fabric/sdk/android/a/g/l;->a(Lio/fabric/sdk/android/a/e/d;Ljava/lang/String;Ljava/lang/String;)V +! +! .line 85 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object p1 +! +! const-string v3, "Fabric" +! +! new-instance v4, Ljava/lang/StringBuilder; +! +! const-string v5, "Requesting settings from " +! +! invoke-direct {v4, v5}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! .line 2100 +! iget-object v5, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String; +! +! .line 85 +! invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-interface {p1, v3, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 86 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object p1 +! +! const-string v3, "Fabric" +! +! const-string v4, "Settings query params were: " +! +! invoke-static {v1}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String; +! +! move-result-object v1 +! +! invoke-virtual {v4, v1}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v1 +! +! invoke-interface {p1, v3, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 2104 +! invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->xx()I +! +! move-result p1 +! +! .line 2105 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v3, "Fabric" +! +! const-string v4, "Settings result was: " +! +! invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; +! +! move-result-object v5 +! +! invoke-virtual {v4, v5}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v4 +! +! invoke-interface {v1, v3, v4}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! const/16 v1, 0xc8 +! +! if-eq p1, v1, :cond_3 +! +! const/16 v1, 0xc9 +! +! if-eq p1, v1, :cond_3 +! +! const/16 v1, 0xca +! +! if-eq p1, v1, :cond_3 +! +! const/16 v1, 0xcb +! +! if-ne p1, v1, :cond_2 +! +! goto :goto_0 +! +! :cond_2 +! const/4 p1, 0x0 +! +! goto :goto_1 +! +! :cond_3 +! :goto_0 +! const/4 p1, 0x1 +! +! :goto_1 +! if-eqz p1, :cond_4 +! +! .line 2109 +! invoke-virtual {v2}, Lio/fabric/sdk/android/a/e/d;->xy()Ljava/lang/String; +! +! move-result-object p1 +! +! invoke-direct {p0, p1}, Lio/fabric/sdk/android/a/g/l;->do(Ljava/lang/String;)Lorg/json/JSONObject; +! +! move-result-object p1 +! +! move-object v0, p1 +! +! goto :goto_2 +! +! .line 2111 +! :cond_4 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object p1 +! +! const-string v1, "Fabric" +! +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "Failed to retrieve settings from " +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! .line 3100 +! iget-object v4, p0, Lio/fabric/sdk/android/a/b/a;->url:Ljava/lang/String; +! +! .line 2111 +! invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v3 +! +! invoke-interface {p1, v1, v3}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;)V +! :try_end_1 +! .catch Lio/fabric/sdk/android/a/e/d$c; {:try_start_1 .. :try_end_1} :catch_0 +! .catchall {:try_start_1 .. :try_end_1} :catchall_1 +! +! :goto_2 +! if-eqz v2, :cond_5 +! +! .line 94 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object p1 +! +! const-string v1, "Fabric" +! +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "Settings request ID: " +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! :goto_3 +! const-string v4, "X-REQUEST-ID" +! +! .line 95 +! invoke-virtual {v2, v4}, Lio/fabric/sdk/android/a/e/d;->dk(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v2 +! +! .line 94 +! invoke-interface {p1, v1, v2}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! goto :goto_5 +! +! :catch_0 +! move-exception p1 +! +! goto :goto_4 +! +! :catchall_0 +! move-exception p1 +! +! move-object v2, v0 +! +! goto :goto_6 +! +! :catch_1 +! move-exception p1 +! +! move-object v2, v0 +! +! .line 90 +! :goto_4 +! :try_start_2 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v1 +! +! const-string v3, "Fabric" +! +! const-string v4, "Settings request failed." +! +! invoke-interface {v1, v3, v4, p1}, Lio/fabric/sdk/android/l;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V +! :try_end_2 +! .catchall {:try_start_2 .. :try_end_2} :catchall_1 +! +! if-eqz v2, :cond_5 +! +! .line 94 +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object p1 +! +! const-string v1, "Fabric" +! +! new-instance v3, Ljava/lang/StringBuilder; +! +! const-string v4, "Settings request ID: " +! +! invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! goto :goto_3 +! +! :cond_5 +! :goto_5 +! return-object v0 +! +! :catchall_1 +! move-exception p1 +! +! :goto_6 +! if-eqz v2, :cond_6 +! +! invoke-static {}, Lio/fabric/sdk/android/c;->wx()Lio/fabric/sdk/android/l; +! +! move-result-object v0 +! +! new-instance v1, Ljava/lang/StringBuilder; +! +! const-string v3, "Settings request ID: " +! +! invoke-direct {v1, v3}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V +! +! const-string v3, "X-REQUEST-ID" +! +! .line 95 +! invoke-virtual {v2, v3}, Lio/fabric/sdk/android/a/e/d;->dk(Ljava/lang/String;)Ljava/lang/String; +! +! move-result-object v2 +! +! invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; +! +! invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; +! +! move-result-object v1 +! +! const-string v2, "Fabric" +! +! .line 94 +! invoke-interface {v0, v2, v1}, Lio/fabric/sdk/android/l;->d(Ljava/lang/String;Ljava/lang/String;)V +! +! .line 97 +! :cond_6 +! throw p1 +! + return-void + .end method +--- 117,122 ---- + + # virtual methods + .method public final a(Lio/fabric/sdk/android/a/g/w;)Lorg/json/JSONObject; +! .locals 0 + return-void + .end method diff --git a/patches/pureevil/833.patch b/patches/pureevil/833.patch new file mode 100644 index 0000000..bc67484 --- /dev/null +++ b/patches/pureevil/833.patch @@ -0,0 +1,26 @@ +diff -crB -x dist -x build com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali +*** com.discord-832-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-01-19 04:41:50.846430038 +0300 +--- com.discord-832/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-01-20 02:28:45.741380899 +0300 +*************** +*** 71,83 **** + + check-cast v0, Landroid/view/View; + +! const-string v1, "it" +! +! invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +! +! move-result p1 + + invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V + +--- 71,77 ---- + + check-cast v0, Landroid/view/View; + +! const/4 p1, 0x1 + + invoke-static {v0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V + \ No newline at end of file