forked from distok/cutthecord
		
	Revert "9.0.4"
more apktool bugs, I'm afraid.
This reverts commit 16708c42dc.
			
			
This commit is contained in:
		
							parent
							
								
									16708c42dc
								
							
						
					
					
						commit
						ff09c1bcbd
					
				
					 42 changed files with 2 additions and 9808 deletions
				
			
		| 
						 | 
				
			
			@ -1,179 +0,0 @@
 | 
			
		|||
diff -crB com.discord-902-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-902/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
 | 
			
		||||
*** com.discord-902-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-05-23 08:24:33.766790801 +0300
 | 
			
		||||
--- com.discord-902/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-05-23 08:37:50.390709027 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 80,108 ****
 | 
			
		||||
  
 | 
			
		||||
  .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
 | 
			
		||||
      .locals 1
 | 
			
		||||
- 
 | 
			
		||||
-     const-string v0, "meUser"
 | 
			
		||||
- 
 | 
			
		||||
-     .line 95
 | 
			
		||||
-     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->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
 | 
			
		||||
--- 80,85 ----
 | 
			
		||||
Only in com.discord-902/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.orig
 | 
			
		||||
Only in com.discord-902/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.rej
 | 
			
		||||
diff -crB com.discord-902-base/smali/com/discord/stores/StoreExperiments.smali com.discord-902/smali/com/discord/stores/StoreExperiments.smali
 | 
			
		||||
*** com.discord-902-base/smali/com/discord/stores/StoreExperiments.smali	2019-05-23 08:24:33.773457493 +0300
 | 
			
		||||
--- com.discord-902/smali/com/discord/stores/StoreExperiments.smali	2019-05-23 08:34:47.096334318 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 1224,1280 ****
 | 
			
		||||
  .end method
 | 
			
		||||
  
 | 
			
		||||
  .method public final isExperimentalAlpha()Z
 | 
			
		||||
!     .locals 4
 | 
			
		||||
! 
 | 
			
		||||
!     .line 88
 | 
			
		||||
!     iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
 | 
			
		||||
! 
 | 
			
		||||
!     const/4 v1, 0x1
 | 
			
		||||
! 
 | 
			
		||||
!     if-eqz v0, :cond_0
 | 
			
		||||
! 
 | 
			
		||||
!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
 | 
			
		||||
! 
 | 
			
		||||
!     iget-object v0, v0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
 | 
			
		||||
! 
 | 
			
		||||
!     iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
 | 
			
		||||
! 
 | 
			
		||||
!     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
 | 
			
		||||
! 
 | 
			
		||||
!     :cond_0
 | 
			
		||||
!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
 | 
			
		||||
! 
 | 
			
		||||
!     iget-object v0, v0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
 | 
			
		||||
! 
 | 
			
		||||
!     iget-object v0, v0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
 | 
			
		||||
! 
 | 
			
		||||
!     const-string v2, "stream.guilds.guilds"
 | 
			
		||||
! 
 | 
			
		||||
!     invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 | 
			
		||||
! 
 | 
			
		||||
!     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_2
 | 
			
		||||
! 
 | 
			
		||||
!     :cond_1
 | 
			
		||||
!     return v1
 | 
			
		||||
! 
 | 
			
		||||
!     :cond_2
 | 
			
		||||
!     const/4 v0, 0x0
 | 
			
		||||
  
 | 
			
		||||
      return v0
 | 
			
		||||
  .end method
 | 
			
		||||
--- 1224,1231 ----
 | 
			
		||||
  .end method
 | 
			
		||||
  
 | 
			
		||||
  .method public final isExperimentalAlpha()Z
 | 
			
		||||
!     .locals 1
 | 
			
		||||
!     const/4 v0, 0x1
 | 
			
		||||
  
 | 
			
		||||
      return v0
 | 
			
		||||
  .end method
 | 
			
		||||
Only in com.discord-902/smali/com/discord/stores: StoreExperiments.smali.orig
 | 
			
		||||
Only in com.discord-902/smali/com/discord/stores: StoreExperiments.smali.rej
 | 
			
		||||
diff -crB com.discord-902-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-902/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
 | 
			
		||||
*** com.discord-902-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-05-23 08:24:34.436793339 +0300
 | 
			
		||||
--- com.discord-902/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-05-23 08:33:50.496021268 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 77,87 ****
 | 
			
		||||
      const-string v0, "meUser"
 | 
			
		||||
  
 | 
			
		||||
      .line 187
 | 
			
		||||
!     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 | 
			
		||||
! 
 | 
			
		||||
!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 | 
			
		||||
! 
 | 
			
		||||
!     move-result v2
 | 
			
		||||
  
 | 
			
		||||
      const-string v1, "fontScale"
 | 
			
		||||
  
 | 
			
		||||
--- 77,83 ----
 | 
			
		||||
      const-string v0, "meUser"
 | 
			
		||||
  
 | 
			
		||||
      .line 187
 | 
			
		||||
!     const/4 v2, 0x1
 | 
			
		||||
  
 | 
			
		||||
      const-string v1, "fontScale"
 | 
			
		||||
  
 | 
			
		||||
***************
 | 
			
		||||
*** 95,105 ****
 | 
			
		||||
      const-string p3, "isAlphaTesterOrStaff"
 | 
			
		||||
  
 | 
			
		||||
      .line 189
 | 
			
		||||
!     invoke-static {p4, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 | 
			
		||||
! 
 | 
			
		||||
!     invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
 | 
			
		||||
! 
 | 
			
		||||
!     move-result v4
 | 
			
		||||
  
 | 
			
		||||
      .line 190
 | 
			
		||||
      invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 | 
			
		||||
--- 91,97 ----
 | 
			
		||||
      const-string p3, "isAlphaTesterOrStaff"
 | 
			
		||||
  
 | 
			
		||||
      .line 189
 | 
			
		||||
!     const/4 v4, 0x1
 | 
			
		||||
  
 | 
			
		||||
      .line 190
 | 
			
		||||
      invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
 | 
			
		||||
Only in com.discord-902/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.orig
 | 
			
		||||
Only in com.discord-902/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.rej
 | 
			
		||||
diff -crB com.discord-902-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-902/smali/com/discord/widgets/settings/WidgetSettings.smali
 | 
			
		||||
*** com.discord-902-base/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-05-23 08:24:34.440126684 +0300
 | 
			
		||||
--- com.discord-902/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-05-23 08:33:06.439121048 +0300
 | 
			
		||||
***************
 | 
			
		||||
*** 783,791 ****
 | 
			
		||||
      if-eqz p1, :cond_1
 | 
			
		||||
  
 | 
			
		||||
      .line 121
 | 
			
		||||
!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
 | 
			
		||||
! 
 | 
			
		||||
!     move-result v2
 | 
			
		||||
  
 | 
			
		||||
      if-eq v2, v0, :cond_0
 | 
			
		||||
  
 | 
			
		||||
--- 783,789 ----
 | 
			
		||||
      if-eqz p1, :cond_1
 | 
			
		||||
  
 | 
			
		||||
      .line 121
 | 
			
		||||
!     const/4 v2, 0x1
 | 
			
		||||
  
 | 
			
		||||
      if-eq v2, v0, :cond_0
 | 
			
		||||
  
 | 
			
		||||
| 
						 | 
				
			
			@ -37,5 +37,4 @@ Conflicts with pureevil as it's included here.
 | 
			
		|||
- 9.0.1
 | 
			
		||||
- 9.0.2
 | 
			
		||||
- 9.0.3
 | 
			
		||||
- 9.0.4
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue