forked from distok/cutthecord
Port patches to 9.8.6
No builds will happen until I sort out slashcommands, or at least helper utils in it. ETA: Tomorrow. Sorry :/
This commit is contained in:
parent
b7f98a4da8
commit
7193f29239
36 changed files with 56715 additions and 2 deletions
102
patches/nonearby/986.patch
Normal file
102
patches/nonearby/986.patch
Normal file
|
@ -0,0 +1,102 @@
|
|||
diff -crB com.discord-984-base/smali/com/discord/widgets/friends/NearbyManager.smali com.discord-984/smali/com/discord/widgets/friends/NearbyManager.smali
|
||||
*** com.discord-984-base/smali/com/discord/widgets/friends/NearbyManager.smali 2019-11-14 22:32:21.799854804 +0300
|
||||
--- com.discord-984/smali/com/discord/widgets/friends/NearbyManager.smali 2019-11-14 22:36:18.214304764 +0300
|
||||
***************
|
||||
*** 443,514 ****
|
||||
|
||||
# virtual methods
|
||||
.method public final activateNearby()V
|
||||
! .locals 9
|
||||
!
|
||||
! .line 57
|
||||
! 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 58
|
||||
! :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 59
|
||||
! :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 60
|
||||
! :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 61
|
||||
! :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 63
|
||||
! :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;-><init>(Ljava/util/Collection;)V
|
||||
!
|
||||
! check-cast v7, Ljava/util/Set;
|
||||
!
|
||||
! 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 65
|
||||
! 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 66
|
||||
! 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;
|
||||
|
||||
return-void
|
||||
.end method
|
||||
--- 443,449 ----
|
||||
|
||||
# virtual methods
|
||||
.method public final activateNearby()V
|
||||
! .locals 0
|
||||
|
||||
return-void
|
||||
.end method
|
||||
***************
|
||||
*** 609,619 ****
|
||||
.method public final initialize(J)V
|
||||
.locals 0
|
||||
|
||||
- .line 33
|
||||
- invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V
|
||||
-
|
||||
- .line 34
|
||||
- invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V
|
||||
-
|
||||
return-void
|
||||
.end method
|
||||
--- 544,548 ----
|
||||
Only in com.discord-984/smali/com/discord/widgets/friends: NearbyManager.smali.orig
|
||||
Only in com.discord-984/smali/com/discord/widgets/friends: NearbyManager.smali.rej
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue