From 02f0df1ddf23376bd659a6f5ec69fbf0413822cc Mon Sep 17 00:00:00 2001 From: Krocks Date: Mon, 7 Aug 2017 16:48:16 +0300 Subject: [PATCH 1/4] maybe fixed issue with speaker, need to test --- .../mobile/communicator/ui/activities/calls/CallActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java index ae8f879311..f530464f79 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java @@ -122,6 +122,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal private void initVideo() { videoViewLayout.setVisibility(View.VISIBLE); + turnSpeaker(); videoLocal.setZOrderMediaOverlay(true); mCameraManager = Voximplant.getCameraManager(this); @@ -205,6 +206,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal if (on) { isVideoEnabled = false; initAudio(); + turnSpeaker(); } else { isVideoEnabled = true; initVideo(); -- GitLab From 3909eeea543e6629e718c7a7341694fb6f533517 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 8 Aug 2017 16:31:58 +0300 Subject: [PATCH 2/4] fixed bugs with speaker and video --- .../mobile/communicator/ui/activities/calls/CallActivity.java | 4 +++- .../ninja/mobile/communicator/utils/vox/VoxClientManager.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java index f530464f79..06b05a6ade 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java @@ -8,6 +8,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.constraint.ConstraintLayout; +import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -122,7 +123,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal private void initVideo() { videoViewLayout.setVisibility(View.VISIBLE); - turnSpeaker(); + if (!mIsSpeakerPhoneEnabled) turnSpeaker(); //in case of starting call after callback videoLocal.setZOrderMediaOverlay(true); mCameraManager = Voximplant.getCameraManager(this); @@ -181,6 +182,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal speakerImage.setVisibility(View.GONE); } Voximplant.getAudioDeviceManager().enableLoudspeaker(on); + Log.e("VOX", "STATE " + on); } @Override public void onMute(boolean audioWorking) { diff --git a/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java b/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java index 50058cacc9..a6dc342546 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java +++ b/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java @@ -136,7 +136,7 @@ public class VoxClientManager implements IClientSessionListener, IClientLoginLis @Override public void onConnectionFailed(String error) { mCurrentState = DISCONNECTED; - Log.wtf("VOX", "Connection failed " + error.toString()); + Log.e("VOX", "Connection failed " + error.toString()); Intent connectionFailedIntent = new Intent(VOX_INTENT); connectionFailedIntent.putExtra(EVENT, CONNECTION_FAILED); mBroadcastManager.sendBroadcast(connectionFailedIntent); @@ -145,7 +145,7 @@ public class VoxClientManager implements IClientSessionListener, IClientLoginLis @Override public void onConnectionClosed() { mCurrentState = DISCONNECTED; - Log.wtf("VOX", "Connection closed"); + Log.e("VOX", "Connection closed"); Intent disconnectedIntent = new Intent(VOX_INTENT); disconnectedIntent.putExtra(EVENT, DISCONNECTED); mBroadcastManager.sendBroadcast(disconnectedIntent); -- GitLab From fa7ed3d1ddc2dff9864be630be525ce572c85316 Mon Sep 17 00:00:00 2001 From: Krocks Date: Tue, 8 Aug 2017 16:50:03 +0300 Subject: [PATCH 3/4] fix to starting call --- .../mvp/presenters/CallPresenter.java | 1 + .../ui/activities/calls/CallActivity.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java index 3728377457..fd0cb66070 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java @@ -94,6 +94,7 @@ public class CallPresenter extends BasePresenter implements ICallListe } else { if (mCall != null) { mCall.start(null); + Log.e("VOX", "start call " + mCall); } } } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java index 06b05a6ade..d0a7951685 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java @@ -229,14 +229,6 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal } private void requestPermissions() { - VoxPermissions.requestAudioPermission(this, aBoolean -> { - if (!aBoolean && !isVideoEnabled) { - DialogFactory.showAlert(CallActivity.this, "Please grant audio permission", "Error", dialog -> CallActivity.this.finish()); - } else { - startCall(); - } - }); - if (isVideoEnabled) { VoxPermissions.requestCameraPermission(this, aBoolean -> { if (!aBoolean) { @@ -245,6 +237,14 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal startCall(); } }); + } else { + VoxPermissions.requestAudioPermission(this, aBoolean -> { + if (!aBoolean) { + DialogFactory.showAlert(CallActivity.this, "Please grant audio permission", "Error", dialog -> CallActivity.this.finish()); + } else { + startCall(); + } + }); } } -- GitLab From e5bd50ff7dd016c7c2c189e725ddc4c94e94dd8a Mon Sep 17 00:00:00 2001 From: Krocks Date: Thu, 10 Aug 2017 16:05:22 +0300 Subject: [PATCH 4/4] changed logs -> timber --- .../mobile/communicator/mvp/presenters/CallPresenter.java | 6 ++---- .../communicator/mvp/presenters/IncomeCallPresenter.java | 6 +++--- .../communicator/ui/activities/calls/CallActivity.java | 3 +-- .../mobile/communicator/utils/vox/VoxClientManager.java | 7 ++++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java index fd0cb66070..db922aa83f 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/CallPresenter.java @@ -1,7 +1,5 @@ package com.ninja.mobile.communicator.mvp.presenters; -import android.util.Log; - import com.arellomobile.mvp.InjectViewState; import com.ninja.mobile.communicator.data.models.mqtt.Response; import com.ninja.mobile.communicator.mvp.view.CallView; @@ -89,12 +87,12 @@ public class CallPresenter extends BasePresenter implements ICallListe mCall.answer(null, null); } } catch (CallException e) { - Log.e("SDKDemoApplication", "CallActivity: startCall exception: " + e); + Timber.e("SDKDemoApplication", "CallActivity: startCall exception: " + e); } } else { if (mCall != null) { mCall.start(null); - Log.e("VOX", "start call " + mCall); + Timber.e("VOX", "start call " + mCall); } } } diff --git a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/IncomeCallPresenter.java b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/IncomeCallPresenter.java index 046ca07f39..5c0862c97f 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/IncomeCallPresenter.java +++ b/app/src/main/java/com/ninja/mobile/communicator/mvp/presenters/IncomeCallPresenter.java @@ -1,7 +1,5 @@ package com.ninja.mobile.communicator.mvp.presenters; -import android.util.Log; - import com.arellomobile.mvp.InjectViewState; import com.ninja.mobile.communicator.data.models.mqtt.Response; import com.ninja.mobile.communicator.mvp.view.IncomeCallView; @@ -13,6 +11,8 @@ import com.voximplant.sdk.call.IVideoStream; import java.util.Map; +import timber.log.Timber; + @InjectViewState public class IncomeCallPresenter extends BasePresenter implements ICallListener { private VoxCallManager mCallManager = mDataManager.getVoxCallManager(); @@ -40,7 +40,7 @@ public class IncomeCallPresenter extends BasePresenter implement mCall.removeCallListener(this); } } catch (CallException e) { - Log.e("VoxImplantSDKDemo", "exception on reject call ", e); + Timber.e("VoxImplantSDKDemo", "exception on reject call ", e); } mCallManager.removeCall(mCall.getCallId()); getViewState().onCallDisconnected(); diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java index d0a7951685..fa5b0c2be6 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/activities/calls/CallActivity.java @@ -8,7 +8,6 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.support.constraint.ConstraintLayout; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -182,7 +181,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal speakerImage.setVisibility(View.GONE); } Voximplant.getAudioDeviceManager().enableLoudspeaker(on); - Log.e("VOX", "STATE " + on); + Timber.e("VOX", "STATE " + on); } @Override public void onMute(boolean audioWorking) { diff --git a/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java b/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java index a6dc342546..245c1e9ca7 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java +++ b/app/src/main/java/com/ninja/mobile/communicator/utils/vox/VoxClientManager.java @@ -7,7 +7,6 @@ package com.ninja.mobile.communicator.utils.vox; import android.content.Context; import android.content.Intent; import android.support.v4.content.LocalBroadcastManager; -import android.util.Log; import com.voximplant.sdk.client.AuthParams; import com.voximplant.sdk.client.IClient; @@ -17,6 +16,8 @@ import com.voximplant.sdk.client.LoginError; import java.util.ArrayList; +import timber.log.Timber; + import static com.ninja.mobile.communicator.utils.vox.Constants.CONNECTION_FAILED; import static com.ninja.mobile.communicator.utils.vox.Constants.DISPLAY_NAME; import static com.ninja.mobile.communicator.utils.vox.Constants.ERROR_CODE; @@ -136,7 +137,7 @@ public class VoxClientManager implements IClientSessionListener, IClientLoginLis @Override public void onConnectionFailed(String error) { mCurrentState = DISCONNECTED; - Log.e("VOX", "Connection failed " + error.toString()); + Timber.e("VOX", "Connection failed " + error.toString()); Intent connectionFailedIntent = new Intent(VOX_INTENT); connectionFailedIntent.putExtra(EVENT, CONNECTION_FAILED); mBroadcastManager.sendBroadcast(connectionFailedIntent); @@ -145,7 +146,7 @@ public class VoxClientManager implements IClientSessionListener, IClientLoginLis @Override public void onConnectionClosed() { mCurrentState = DISCONNECTED; - Log.e("VOX", "Connection closed"); + Timber.e("VOX", "Connection closed"); Intent disconnectedIntent = new Intent(VOX_INTENT); disconnectedIntent.putExtra(EVENT, DISCONNECTED); mBroadcastManager.sendBroadcast(disconnectedIntent); -- GitLab