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

Fix read contacts

Browse source
This commit is contained in:
Erwan Croze 2016-10-18 10:28:52 +02:00
parent f1d3a1bfac
commit 5271e395de
3 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone"
android:versionCode="3120" android:installLocation="auto">
android:versionCode="3200" android:versionName="3.2.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
<!-- Permissions for Push Notification -->
@ -49,7 +49,7 @@
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
<application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:largeHeap="true" android:allowBackup="true">
<application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:largeHeap="true" android:allowBackup="true" android:debuggable="true">
<activity android:name="org.linphone.LinphoneLauncherActivity"
android:label="@string/app_name"

4
res/layout/chat.xml
View file

@ -70,7 +70,7 @@
android:id="@+id/footer"
android:background="@color/colorF"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true">
@ -96,7 +96,7 @@
android:textCursorDrawable="@null"
android:inputType="textShortMessage|textMultiLine"
android:contentDescription="@string/content_description_message"
android:maxLines="50"
android:maxLines="6"
android:padding="5dp"
android:layout_margin="5dp"
android:layout_weight="1"

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

@ -1250,14 +1250,6 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
ContactsManager.getInstance().initializeContactManager(getApplicationContext(), getContentResolver());
}
break;
case PERMISSIONS_REQUEST_CONTACTS:
if (readContactsI >= 0 && grantResults[readContactsI] == PackageManager.PERMISSION_GRANTED) {
ContactsManager.getInstance().enableContactsAccess();
}
checkAndRequestReadPhoneStatePermission();
ContactsManager.getInstance().fetchContactsAsync();
fetchedContactsOnce = true;
break;
case PERMISSIONS_RECORD_AUDIO_ECHO_CANCELLER:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
((SettingsFragment) fragment).startEchoCancellerCalibration();
@ -1266,6 +1258,16 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
}
break;
case PERMISSIONS_READ_EXTERNAL_STORAGE_DEVICE_RINGTONE:
if (readContactsI >= 0 && grantResults[readContactsI] == PackageManager.PERMISSION_GRANTED) {
ContactsManager.getInstance().enableContactsAccess();
}
ContactsManager.getInstance().fetchContactsAsync();
ContactsManager.getInstance().enableContactsAccess();
if (!fetchedContactsOnce) {
ContactsManager.getInstance().enableContactsAccess();
ContactsManager.getInstance().fetchContactsAsync();
fetchedContactsOnce = true;
}
if (permissions[0].compareTo(Manifest.permission.READ_EXTERNAL_STORAGE) != 0)
break;
boolean enableRingtone = (grantResults[0] == PackageManager.PERMISSION_GRANTED);