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 372837745715f9270fbbfb81348796ba38948f60..db922aa83fc1aa2ccc5ca967a1662998faca6d59 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,11 +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); + 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 046ca07f39f633b6f7f0af15115e168d2852ff14..5c0862c97fdebe980c18baf9b7d66bbccc558f91 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 ae8f87931165258bb73b0bda53581593e0eac2c8..fa5b0c2be61d9fbb1c0340972bdd197347ad85a4 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); + if (!mIsSpeakerPhoneEnabled) turnSpeaker(); //in case of starting call after callback videoLocal.setZOrderMediaOverlay(true); mCameraManager = Voximplant.getCameraManager(this); @@ -180,6 +181,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal speakerImage.setVisibility(View.GONE); } Voximplant.getAudioDeviceManager().enableLoudspeaker(on); + Timber.e("VOX", "STATE " + on); } @Override public void onMute(boolean audioWorking) { @@ -205,6 +207,7 @@ public class CallActivity extends BaseActivity implements IEndpointListener, Cal if (on) { isVideoEnabled = false; initAudio(); + turnSpeaker(); } else { isVideoEnabled = true; initVideo(); @@ -225,14 +228,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) { @@ -241,6 +236,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(); + } + }); } } 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 50058cacc94399315c021a95493de584d9206c1c..245c1e9ca7d17240cf1f5fa711d8e718922ab106 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.wtf("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.wtf("VOX", "Connection closed"); + Timber.e("VOX", "Connection closed"); Intent disconnectedIntent = new Intent(VOX_INTENT); disconnectedIntent.putExtra(EVENT, DISCONNECTED); mBroadcastManager.sendBroadcast(disconnectedIntent);