Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ask for record audio permission when calibrating echo canceller from the settings

Browse source
This commit is contained in:
Sylvain Berfini 2016-07-19 14:30:54 +02:00
parent ee19177a0c
commit e5baec4d20
2 changed files with 60 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/org/linphone/LinphoneActivity.java
View file

@ -104,6 +104,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
private static final int PERMISSIONS_REQUEST_OVERLAY = 206;
private static final int PERMISSIONS_REQUEST_SYNC = 207;
private static final int PERMISSIONS_REQUEST_CONTACTS = 208;
private static final int PERMISSIONS_RECORD_AUDIO_ECHO_CANCELLER = 209;
private static LinphoneActivity instance;
@ -114,6 +115,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
private RelativeLayout mTopBar;
private ImageView cancel;
private FragmentsAvailable pendingFragmentTransaction, currentFragment, nextFragment;
private Fragment fragment;
private List<FragmentsAvailable> fragmentsHistory;
private Fragment.SavedState dialerSavedState;
private boolean newProxyConfig;
@ -346,69 +348,69 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
} catch (Exception e) {
}
}
Fragment newFragment = null;
fragment = null;
switch (newFragmentType) {
case HISTORY_LIST:
newFragment = new HistoryListFragment();
fragment = new HistoryListFragment();
if (isTablet()) {
((HistoryListFragment) newFragment).displayFirstLog();
((HistoryListFragment) fragment).displayFirstLog();
}
break;
case HISTORY_DETAIL:
newFragment = new HistoryDetailFragment();
fragment = new HistoryDetailFragment();
break;
case CONTACTS_LIST:
checkAndRequestReadContactsPermission();
newFragment = new ContactsListFragment();
fragment = new ContactsListFragment();
if (isTablet()) {
((ContactsListFragment) newFragment).displayFirstContact();
((ContactsListFragment) fragment).displayFirstContact();
}
break;
case CONTACT_DETAIL:
newFragment = new ContactDetailsFragment();
fragment = new ContactDetailsFragment();
break;
case CONTACT_EDITOR:
newFragment = new ContactEditorFragment();
fragment = new ContactEditorFragment();
break;
case DIALER:
newFragment = new DialerFragment();
fragment = new DialerFragment();
if (extras == null) {
newFragment.setInitialSavedState(dialerSavedState);
fragment.setInitialSavedState(dialerSavedState);
}
break;
case SETTINGS:
newFragment = new SettingsFragment();
fragment = new SettingsFragment();
break;
case ACCOUNT_SETTINGS:
newFragment = new AccountPreferencesFragment();
fragment = new AccountPreferencesFragment();
break;
case ABOUT:
newFragment = new AboutFragment();
fragment = new AboutFragment();
break;
case EMPTY:
newFragment = new EmptyFragment();
fragment = new EmptyFragment();
break;
case CHAT_LIST:
newFragment = new ChatListFragment();
fragment = new ChatListFragment();
if (isTablet()) {
((ChatListFragment) newFragment).displayFirstChat();
((ChatListFragment) fragment).displayFirstChat();
}
break;
case CHAT:
newFragment = new ChatFragment();
fragment = new ChatFragment();
break;
default:
break;
}
if (newFragment != null) {
newFragment.setArguments(extras);
if (fragment != null) {
fragment.setArguments(extras);
if (isTablet()) {
changeFragmentForTablets(newFragment, newFragmentType, withoutAnimation);
changeFragmentForTablets(fragment, newFragmentType, withoutAnimation);
} else {
changeFragment(newFragment, newFragmentType, withoutAnimation);
changeFragment(fragment, newFragmentType, withoutAnimation);
}
}
}
@ -1186,6 +1188,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
checkAndRequestPermission(Manifest.permission.WRITE_CONTACTS, 0);
}
public void checkAndRequestRecordAudioPermissionForEchoCanceller() {
checkAndRequestPermission(Manifest.permission.RECORD_AUDIO, PERMISSIONS_RECORD_AUDIO_ECHO_CANCELLER);
}
public void checkAndRequestPermissionsToSendImage() {
ArrayList<String> permissionsList = new ArrayList<String>();
@ -1250,6 +1256,13 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
fetchedContactsOnce = true;
}
break;
case PERMISSIONS_RECORD_AUDIO_ECHO_CANCELLER:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
((SettingsFragment) fragment).startEchoCancellerCalibration();
} else {
((SettingsFragment) fragment).echoCalibrationFail();
}
break;
}
}

31
src/org/linphone/SettingsFragment.java
View file

@ -39,7 +39,9 @@ import org.linphone.purchase.InAppPurchaseActivity;
import org.linphone.ui.LedPreference;
import org.linphone.ui.PreferencesListFragment;
import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Handler;
import android.preference.CheckBoxPreference;
@ -73,7 +75,7 @@ public class SettingsFragment extends PreferencesListFragment {
setListeners();
hideSettings();
mListener = new LinphoneCoreListenerBase(){
mListener = new LinphoneCoreListenerBase() {
@Override
public void ecCalibrationStatus(LinphoneCore lc, final EcCalibratorStatus status, final int delayMs, Object data) {
LinphoneManager.getInstance().routeAudioToReceiver();
@ -99,7 +101,7 @@ public class SettingsFragment extends PreferencesListFragment {
}
private void removePreviousPreferencesFile() {
File dir = new File(LinphoneActivity.instance().getFilesDir().getAbsolutePath() + "shared_prefs");
File dir = new File(getContext().getFilesDir().getAbsolutePath() + "shared_prefs");
dir.delete();
}
@ -573,17 +575,32 @@ public class SettingsFragment extends PreferencesListFragment {
@Override
public boolean onPreferenceClick(Preference preference) {
synchronized (SettingsFragment.this) {
try {
LinphoneManager.getInstance().startEcCalibration(mListener);
preference.setSummary(R.string.ec_calibrating);
} catch (LinphoneCoreException e) {
Log.w(e, "Cannot calibrate EC");
preference.setSummary(R.string.ec_calibrating);
int recordAudio = getContext().getPackageManager().checkPermission(Manifest.permission.RECORD_AUDIO, getContext().getPackageName());
if (recordAudio == PackageManager.PERMISSION_GRANTED) {
startEchoCancellerCalibration();
} else {
LinphoneActivity.instance().checkAndRequestRecordAudioPermissionForEchoCanceller();
}
}
return true;
}
});
}
public void startEchoCancellerCalibration() {
try {
LinphoneManager.getInstance().startEcCalibration(mListener);
} catch (LinphoneCoreException e) {
Log.e(e);
}
}
public void echoCalibrationFail() {
Preference echoCancellerCalibration = findPreference(getString(R.string.pref_echo_canceller_calibration_key));
echoCancellerCalibration.setSummary(R.string.failed);
}
private void initVideoSettings() {
initializePreferredVideoSizePreferences((ListPreference) findPreference(getString(R.string.pref_preferred_video_size_key)));