From 66877d552eb53544fdda7843eaf027e87020062a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 19 Jul 2016 15:32:01 +0200
Subject: [PATCH] Ask for record audio permission in assistant only if going to
 calibrate echo canceller

---
 src/org/linphone/SettingsFragment.java        |  2 +-
 .../linphone/assistant/AssistantActivity.java | 39 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/org/linphone/SettingsFragment.java b/src/org/linphone/SettingsFragment.java
index 1964e057f..4ea2381be 100644
--- a/src/org/linphone/SettingsFragment.java
+++ b/src/org/linphone/SettingsFragment.java
@@ -239,7 +239,7 @@ public class SettingsFragment extends PreferencesListFragment {
 	}
 
 	private void setPreferenceDefaultValueAndSummary(int pref, String value) {
-		if(value != null) {
+		if (value != null) {
 			EditTextPreference etPref = (EditTextPreference) findPreference(getString(pref));
 			etPref.setText(value);
 			etPref.setSummary(value);
diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java
index 03a1f4db4..bb129d045 100644
--- a/src/org/linphone/assistant/AssistantActivity.java
+++ b/src/org/linphone/assistant/AssistantActivity.java
@@ -112,7 +112,7 @@ private static AssistantActivity instance;
 						if (state == RegistrationState.RegistrationOk) {
 							if (progress != null) progress.dismiss();
 							if (LinphoneManager.getLc().getDefaultProxyConfig() != null) {
-								launchEchoCancellerCalibration(true);
+								success();
 							}
 						} else if (state == RegistrationState.RegistrationFailed) {
 							if (progress != null) progress.dismiss();
@@ -252,26 +252,24 @@ private static AssistantActivity instance;
 			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
 				launchEchoCancellerCalibration(true);
 			} else {
-				success();
+				goToLinphoneActivity();
 			}
 		} else {
-			success();
+			goToLinphoneActivity();
 		}
 	}
 
 	private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) {
-		if (getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName()) == PackageManager.PERMISSION_GRANTED) {
-			boolean needsEchoCalibration = LinphoneManager.getLc().needsEchoCalibration();
-			if (needsEchoCalibration && mPrefs.isFirstLaunch()) {
-				EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment();
-				fragment.enableEcCalibrationResultSending(sendEcCalibrationResult);
-				changeFragment(fragment);
-				currentFragment = AssistantFragmentsEnum.ECHO_CANCELLER_CALIBRATION;
-				back.setVisibility(View.VISIBLE);
-				cancel.setEnabled(false);
-			} else {
-				success();
-			}
+		int recordAudio = getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getPackageName());
+		Log.i("[Permission] Record audio permission is " + (recordAudio == PackageManager.PERMISSION_GRANTED ? "granted" : "denied"));
+		
+		if (recordAudio == PackageManager.PERMISSION_GRANTED) {
+			EchoCancellerCalibrationFragment fragment = new EchoCancellerCalibrationFragment();
+			fragment.enableEcCalibrationResultSending(sendEcCalibrationResult);
+			changeFragment(fragment);
+			currentFragment = AssistantFragmentsEnum.ECHO_CANCELLER_CALIBRATION;
+			back.setVisibility(View.VISIBLE);
+			cancel.setEnabled(false);
 		} else {
 			checkAndRequestAudioPermission();
 		}
@@ -494,7 +492,7 @@ private static AssistantActivity instance;
 	}
 
 	public void isEchoCalibrationFinished() {
-		success();
+		goToLinphoneActivity();
 	}
 
 	public Dialog createErrorDialog(LinphoneProxyConfig proxy, String message){
@@ -521,6 +519,15 @@ private static AssistantActivity instance;
 	}
 	
 	public void success() {
+		boolean needsEchoCalibration = LinphoneManager.getLc().needsEchoCalibration();
+		if (needsEchoCalibration && mPrefs.isFirstLaunch()) {
+			launchEchoCancellerCalibration(true);
+		} else {
+			goToLinphoneActivity();
+		}
+	}
+	
+	private void goToLinphoneActivity() {
 		mPrefs.firstLaunchSuccessful();
 		startActivity(new Intent().setClass(this, LinphoneActivity.class).putExtra("isNewProxyConfig", true));
 		finish();