Another attempt at fixing that audio crap

fix #77, #65
grishka · Feb 21, 2021 · b127ee5 · b127ee5
1 parent 7021773
commit b127ee5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Houseclub/build.gradle b/Houseclub/build.gradle
@@ -7,8 +7,8 @@ android {
 		applicationId "me.grishka.houseclub"
 		minSdkVersion 24
 		targetSdkVersion 30
-		versionCode 6
-		versionName "1.0.5"
+		versionCode 7
+		versionName "1.0.6"
 	}
 	buildTypes {
 		release {

diff --git a/Houseclub/src/main/java/me/grishka/houseclub/VoiceService.java b/Houseclub/src/main/java/me/grishka/houseclub/VoiceService.java
@@ -92,7 +92,6 @@ public void onCreate(){
 			return;
 		}
 
-		engine.setChannelProfile(Constants.CHANNEL_PROFILE_LIVE_BROADCASTING);
 		engine.setDefaultAudioRoutetoSpeakerphone(true);
 		engine.enableAudioVolumeIndication(500, 3, false);
 		engine.muteLocalAudioStream(true);
@@ -134,6 +133,7 @@ public int onStartCommand(Intent intent, int flags, int startId){
 	}
 
 	private void doJoinChannel(){
+		engine.setChannelProfile(isSelfSpeaker ? Constants.CHANNEL_PROFILE_COMMUNICATION : Constants.CHANNEL_PROFILE_LIVE_BROADCASTING);
 		engine.joinChannel(channel.token, channel.channel, "", Integer.parseInt(ClubhouseSession.userID));
 		uiHandler.postDelayed(pinger, 30000);
 		for(ChannelEventListener l:listeners)
@@ -228,6 +228,7 @@ public void leaveChannel(){
 
 	public void rejoinChannel(){
 		engine.leaveChannel();
+		pubnub.unsubscribeAll();
 		new LeaveChannel(channel.channel)
 				.setCallback(new Callback<BaseResponse>(){
 					@Override