forked from distok/cutthecord
		
	22-alpha1 (1132)
This commit is contained in:
		
							parent
							
								
									ecdaae17c9
								
							
						
					
					
						commit
						b5d311537d
					
				
					 44 changed files with 59598 additions and 544 deletions
				
			
		
							
								
								
									
										99
									
								
								patches/nonearby/1132.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										99
									
								
								patches/nonearby/1132.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,99 @@
 | 
			
		|||
diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali
 | 
			
		||||
*** from/smali/com/discord/widgets/friends/NearbyManager.smali	2020-03-31 01:08:53.575019356 +0100
 | 
			
		||||
--- to/smali/com/discord/widgets/friends/NearbyManager.smali	2020-03-31 01:10:34.976038743 +0100
 | 
			
		||||
***************
 | 
			
		||||
*** 450,504 ****
 | 
			
		||||
  
 | 
			
		||||
  # virtual methods
 | 
			
		||||
  .method public final activateNearby()V
 | 
			
		||||
!     .locals 9
 | 
			
		||||
  
 | 
			
		||||
-     .line 1
 | 
			
		||||
-     iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient;
 | 
			
		||||
- 
 | 
			
		||||
-     if-eqz v0, :cond_0
 | 
			
		||||
- 
 | 
			
		||||
-     .line 2
 | 
			
		||||
-     iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message;
 | 
			
		||||
- 
 | 
			
		||||
-     if-eqz v1, :cond_0
 | 
			
		||||
- 
 | 
			
		||||
-     .line 3
 | 
			
		||||
-     iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions;
 | 
			
		||||
- 
 | 
			
		||||
-     if-eqz v2, :cond_0
 | 
			
		||||
- 
 | 
			
		||||
-     .line 4
 | 
			
		||||
-     iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener;
 | 
			
		||||
- 
 | 
			
		||||
-     if-eqz v3, :cond_0
 | 
			
		||||
- 
 | 
			
		||||
-     .line 5
 | 
			
		||||
-     iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions;
 | 
			
		||||
- 
 | 
			
		||||
-     if-eqz v4, :cond_0
 | 
			
		||||
- 
 | 
			
		||||
-     .line 6
 | 
			
		||||
-     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;
 | 
			
		||||
- 
 | 
			
		||||
-     invoke-direct {v7, v8}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
 | 
			
		||||
- 
 | 
			
		||||
-     invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;-><init>(Ljava/util/Set;)V
 | 
			
		||||
- 
 | 
			
		||||
-     invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
 | 
			
		||||
- 
 | 
			
		||||
-     .line 7
 | 
			
		||||
-     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/Task;
 | 
			
		||||
- 
 | 
			
		||||
-     .line 8
 | 
			
		||||
-     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/Task;
 | 
			
		||||
- 
 | 
			
		||||
-     :cond_0
 | 
			
		||||
      return-void
 | 
			
		||||
  .end method
 | 
			
		||||
  
 | 
			
		||||
--- 450,457 ----
 | 
			
		||||
  
 | 
			
		||||
  # virtual methods
 | 
			
		||||
  .method public final activateNearby()V
 | 
			
		||||
!     .locals 0
 | 
			
		||||
  
 | 
			
		||||
      return-void
 | 
			
		||||
  .end method
 | 
			
		||||
  
 | 
			
		||||
***************
 | 
			
		||||
*** 594,613 ****
 | 
			
		||||
  .end method
 | 
			
		||||
  
 | 
			
		||||
  .method public final initialize(J)V
 | 
			
		||||
!     .locals 1
 | 
			
		||||
! 
 | 
			
		||||
!     .line 1
 | 
			
		||||
!     invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
 | 
			
		||||
! 
 | 
			
		||||
!     move-result-object v0
 | 
			
		||||
! 
 | 
			
		||||
!     iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long;
 | 
			
		||||
! 
 | 
			
		||||
!     .line 2
 | 
			
		||||
!     invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V
 | 
			
		||||
! 
 | 
			
		||||
!     .line 3
 | 
			
		||||
!     invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V
 | 
			
		||||
  
 | 
			
		||||
      return-void
 | 
			
		||||
  .end method
 | 
			
		||||
--- 547,553 ----
 | 
			
		||||
  .end method
 | 
			
		||||
  
 | 
			
		||||
  .method public final initialize(J)V
 | 
			
		||||
!     .locals 0
 | 
			
		||||
  
 | 
			
		||||
      return-void
 | 
			
		||||
  .end method
 | 
			
		||||
| 
						 | 
				
			
			@ -105,34 +105,8 @@ This patch nulls a bunch of nearby friends features for privacy.
 | 
			
		|||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2-alpha1
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
- 18.0-alpha9
 | 
			
		||||
- 18.0-alpha11
 | 
			
		||||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2-alpha4
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
- 18.0-alpha9
 | 
			
		||||
- 18.0-alpha11
 | 
			
		||||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2-alpha6
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
- 18.0-alpha9
 | 
			
		||||
- 18.0-alpha11
 | 
			
		||||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2-alpha7
 | 
			
		||||
- 21-alpha2
 | 
			
		||||
- 22-alpha1-alpha1
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
| 
						 | 
				
			
			@ -142,4 +116,35 @@ This patch nulls a bunch of nearby friends features for privacy.
 | 
			
		|||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2
 | 
			
		||||
- 22-alpha1-alpha4
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
- 18.0-alpha9
 | 
			
		||||
- 18.0-alpha11
 | 
			
		||||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2
 | 
			
		||||
- 22-alpha1-alpha6
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
- 18.0-alpha9
 | 
			
		||||
- 18.0-alpha11
 | 
			
		||||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2
 | 
			
		||||
- 22-alpha1-alpha7
 | 
			
		||||
- 16
 | 
			
		||||
- 17.0
 | 
			
		||||
- 18.0-alpha1
 | 
			
		||||
- 18.0-alpha9
 | 
			
		||||
- 18.0-alpha11
 | 
			
		||||
- 18.0-alpha12
 | 
			
		||||
- 19.0
 | 
			
		||||
- 20-alpha1
 | 
			
		||||
- 21-alpha2
 | 
			
		||||
- 22-alpha1
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue