diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default index 6ced4c1b6..a1437cbef 100644 --- a/res/raw/linphonerc_default +++ b/res/raw/linphonerc_default @@ -17,7 +17,6 @@ size=qvga tunnel=disabled push_notification=1 auto_start=1 -debug=0 [tunnel] host= @@ -25,4 +24,4 @@ port=443 [misc] log_collection_upload_server_url=https://www.linphone.org:444/lft.php -file_transfer_server_url=https://www.linphone.org:444/lft.php \ No newline at end of file +file_transfer_server_url=https://www.linphone.org:444/lft.php diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 3736384aa..f183e3de8 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -1167,7 +1167,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } private boolean willContactsPermissionBeAsked() { - return LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_CONTACTS) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_CONTACTS); + return LinphonePreferences.instance().firstTimeAskingForPermission(Manifest.permission.READ_CONTACTS, false) || ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.READ_CONTACTS); } public void checkAndRequestWriteContactsPermission() { diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 5840cd4af..568194d83 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -1326,13 +1326,21 @@ public class LinphonePreferences { } public boolean firstTimeAskingForPermission(String permission) { + return firstTimeAskingForPermission(permission, true); + } + + public boolean firstTimeAskingForPermission(String permission, boolean toggle) { boolean firstTime = getConfig().getBool("app", permission, true); - if (firstTime) { - getConfig().setBool("app", permission, false); + if (toggle) { + permissionHasBeenAsked(permission); } return firstTime; } + public void permissionHasBeenAsked(String permission) { + getConfig().setBool("app", permission, false); + } + public boolean isDeviceRingtoneEnabled() { int readExternalStorage = mContext.getPackageManager().checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, mContext.getPackageName()); return getConfig().getBool("app", "device_ringtone", true) && readExternalStorage == PackageManager.PERMISSION_GRANTED;