cutthecord/patches/experiments/1091.patch

diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2020-04-08 12:57:33.746513239 +0100
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2020-04-08 12:59:55.516019264 +0100
***************
*** 80,110 ****
  
  .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
      .locals 1
  
!     const-string v0, "meUser"
! 
!     .line 2
!     invoke-static {p1, v0}, Ly/u/b/j;->checkExpressionValueIsNotNull(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
! 
!     goto :goto_1
! 
!     :cond_1
!     :goto_0
!     const/4 p1, 0x1
! 
!     :goto_1
!     return p1
  .end method
--- 80,86 ----
  
  .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
      .locals 1
+     const/4 v0, 0x1
  
!     return v0
  .end method
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
*** from/smali/com/discord/stores/StoreExperiments.smali	2020-04-08 12:57:33.748513233 +0100
--- to/smali/com/discord/stores/StoreExperiments.smali	2020-04-08 12:59:55.516019264 +0100
***************
*** 1318,1375 ****
  .end method
  
  .method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
!     .locals 4
  
!     .line 1
!     iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
  
!     const/4 v1, 0x1
! 
!     if-eqz v0, :cond_0
! 
!     .line 2
!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
! 
!     invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
! 
!     move-result-object v0
! 
!     if-eqz v0, :cond_0
! 
!     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
! 
!     move-result v0
! 
!     if-eq v0, v1, :cond_2
! 
!     .line 3
!     :cond_0
!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
! 
!     invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
! 
!     move-result-object v0
! 
!     const-wide v2, 0x2bc056ab0800006L
! 
!     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
! 
!     move-result-object v2
! 
!     invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
! 
!     move-result v0
! 
!     if-eqz v0, :cond_1
! 
!     goto :goto_0
! 
!     :cond_1
!     const/4 v1, 0x0
! 
!     :cond_2
!     :goto_0
!     return v1
  .end method
  
  .method public final isInitialized()Lrx/Observable;
--- 1318,1328 ----
  .end method
  
  .method public final isExperimentalAlpha$app_productionDiscordExternalRelease()Z
!     .locals 1
  
!     const/4 v0, 0x1
  
!     return v0
  .end method
  
  .method public final isInitialized()Lrx/Observable;
diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2020-04-08 12:57:34.210511838 +0100
--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2020-04-08 12:59:55.516019264 +0100
***************
*** 321,327 ****
      if-eqz p3, :cond_4
  
      .line 8
!     invoke-virtual {p3, p1}, Lcom/discord/app/AppActivity;->showKeyboard(Landroid/view/View;)V
  
      goto :goto_1
  
--- 321,329 ----
      if-eqz p3, :cond_4
  
      .line 8
!     # Without this line commented out, tapping on someone's avatar to mention them causes the keyboard to toggle
!     # Why? Because showKeyboard and hideKeyboard have the same function.
!     # invoke-virtual {p3, p1}, Lcom/discord/app/AppActivity;->showKeyboard(Landroid/view/View;)V
  
      goto :goto_1
  
diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2020-04-08 12:57:34.534510859 +0100
--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2020-04-08 12:59:55.516019264 +0100
***************
*** 87,97 ****
  
      if-nez p4, :cond_1
  
!     invoke-static {p1, v1}, Ly/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
! 
!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
! 
!     move-result p4
  
      if-eqz p4, :cond_0
  
--- 87,93 ----
  
      if-nez p4, :cond_1
  
!     const/4 p4, 0x1
  
      if-eqz p4, :cond_0
  
diff -crB from/smali/com/discord/widgets/tabs/TabsFeatureFlag.smali to/smali/com/discord/widgets/tabs/TabsFeatureFlag.smali
*** from/smali/com/discord/widgets/tabs/TabsFeatureFlag.smali	2020-04-08 12:57:34.678510424 +0100
--- to/smali/com/discord/widgets/tabs/TabsFeatureFlag.smali	2020-04-08 13:06:46.234053709 +0100
***************
*** 74,80 ****
      .line 2
      iget-object p1, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->sharedPreferences:Landroid/content/SharedPreferences;
  
!     const/4 v0, -0x1
  
      const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
  
--- 74,80 ----
      .line 2
      iget-object p1, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->sharedPreferences:Landroid/content/SharedPreferences;
  
!     const/4 v0, 0x2
  
      const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
  
***************
*** 275,283 ****
      move-result-object v0
  
      .line 2
!     invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
! 
!     move-result p1
  
      const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
  
--- 275,281 ----
      move-result-object v0
  
      .line 2
!     const/4 p1, 0x2
  
      const-string v1, "CACHE_KEY_TABS_EXPERIMENT_BUCKET"
  
***************
*** 336,357 ****
  .end method
  
  .method public final isEnabled()Z
!     .locals 2
! 
!     .line 1
!     iget v0, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->experimentBucket:I
! 
!     const/4 v1, 0x1
! 
!     if-lt v0, v1, :cond_0
! 
!     goto :goto_0
  
!     :cond_0
!     const/4 v1, 0x0
  
!     :goto_0
!     return v1
  .end method
  
  .method public final prefetchExperimentBeforeRegistration(Lcom/discord/stores/StoreExperiments;)V
--- 334,344 ----
  .end method
  
  .method public final isEnabled()Z
!     .locals 1
  
!     const/4 v0, 0x1
  
!     return v0
  .end method
  
  .method public final prefetchExperimentBeforeRegistration(Lcom/discord/stores/StoreExperiments;)V
***************
*** 399,420 ****
  .end method
  
  .method public final useOverlappingPanels()Z
!     .locals 2
! 
!     .line 1
!     iget v0, p0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->experimentBucket:I
! 
!     const/4 v1, 0x2
! 
!     if-ne v0, v1, :cond_0
  
      const/4 v0, 0x1
  
-     goto :goto_0
- 
-     :cond_0
-     const/4 v0, 0x0
- 
-     :goto_0
      return v0
  .end method
--- 386,394 ----
  .end method
  
  .method public final useOverlappingPanels()Z
!     .locals 1
  
      const/4 v0, 0x1
  
      return v0
  .end method