High quality audio

00xkhaled · Apr 4, 2021 · e22e003 · e22e003
1 parent 0ced7f7
commit e22e003
Showing 1 changed file with 27 additions and 19 deletions.
diff --git a/Houseclub/src/main/java/me/grishka/houseclub/VoiceService.java b/Houseclub/src/main/java/me/grishka/houseclub/VoiceService.java
@@ -13,8 +13,6 @@
 import android.os.Looper;
 import android.util.Log;
 
-import androidx.annotation.Nullable;
-
 import com.google.gson.JsonObject;
 import com.pubnub.api.PNConfiguration;
 import com.pubnub.api.PubNub;
@@ -34,6 +32,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import androidx.annotation.Nullable;
 import io.agora.rtc.Constants;
 import io.agora.rtc.IRtcEngineEventHandler;
 import io.agora.rtc.RtcEngine;
@@ -111,7 +110,7 @@ public void onDestroy(){
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId){
 		if(engine!=null){
-			String id=intent.getStringExtra("channel");
+			String id = intent.getStringExtra("channel");
 			channel=DataProvider.getChannel(id);
 			updateChannel(channel);
 
@@ -241,10 +240,13 @@ public void leaveChannel(){
 		uiHandler.removeCallbacks(pinger);
 		pubnub.unsubscribeAll();
 		pubnub.destroy();
+
 		uiHandler.post(() -> {
-			for(ChannelEventListener l:listeners)
-				l.onSelfLeft();
-		});
+			                      for(ChannelEventListener l:listeners)
+			                      	l.onSelfLeft();
+			              });
+
+
 	}
 
 	public void leaveCurrentChannel(){
@@ -391,15 +393,18 @@ private void onUserLeft(JsonObject msg){
 		if(!ch.equals(channel.channel))
 			return;
 		int id=msg.get("user_id").getAsInt();
-		uiHandler.post(()->{
-			for(ChannelUser user:channel.users){
-				if(user.userId==id){
-					channel.users.remove(user);
-					break;
+		uiHandler.post(new Runnable(){
+			@Override
+			public void run(){
+				for(ChannelUser user:channel.users){
+					if(user.userId==id){
+						channel.users.remove(user);
+						break;
+					}
 				}
+				for(ChannelEventListener l:listeners)
+					l.onUserLeft(id);
 			}
-			for(ChannelEventListener l:listeners)
-				l.onUserLeft(id);
 		});
 	}
 
@@ -426,6 +431,7 @@ public interface ChannelEventListener{
 		void onSpeakingUsersChanged(List<Integer> ids);
 		void onChannelEnded();
 		void onSelfLeft();
+
 	}
 
 	private class RtcEngineEventHandler extends IRtcEngineEventHandler{
@@ -442,11 +448,14 @@ public void onError(int err){
 		@Override
 		public void onAudioVolumeIndication(AudioVolumeInfo[] speakers, int totalVolume){
 //			Log.d(TAG, "onAudioVolumeIndication() called with: speakers = ["+Arrays.toString(speakers)+"], totalVolume = ["+totalVolume+"]");
-			uiHandler.post(()->{
-				int selfID=Integer.parseInt(ClubhouseSession.userID);
-				List<Integer> uids=Arrays.stream(speakers).map(s->s.uid==0 ? selfID : s.uid).collect(Collectors.toList());
-				for(ChannelEventListener l:listeners)
-					l.onSpeakingUsersChanged(uids);
+			uiHandler.post(new Runnable(){
+				@Override
+				public void run(){
+					int selfID=Integer.parseInt(ClubhouseSession.userID);
+					List<Integer> uids=Arrays.stream(speakers).map(s -> s.uid==0 ? selfID : s.uid).collect(Collectors.toList());
+					for(ChannelEventListener l:listeners)
+						l.onSpeakingUsersChanged(uids);
+				}
 			});
 		}
 
@@ -465,7 +474,6 @@ public void run(){
 					for(ChannelEventListener l:listeners)
 						l.onUserMuteChanged(uid, muted);
 				}
-
 			});
 		}
 	}