mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 19:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Last fix before beta

Browse source
This commit is contained in:
Erwan Croze 2018-07-20 14:57:50 +02:00
parent 577fc450d9
commit c584e1eab4
5 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -4,4 +4,4 @@ RELEASE_STORE_PASSWORD=
RELEASE_KEY_ALIAS=
RELEASE_KEY_PASSWORD=
#source:https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

9
res/layout-sw533dp/chatlist_cell.xml
View file

@ -101,6 +101,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/lastMessageStatus"
android:layout_width="11dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical|center_horizontal|center"
android:foregroundGravity="center"
android:src="@drawable/chat_read"
android:visibility="gone"/>
<TextView
android:id="@+id/lastMessageSender"
android:layout_width="wrap_content"

2
res/values/non_localizable_custom.xml
View file

@ -55,7 +55,7 @@
<!-- Push notification settings -->
<bool name="enable_push_id">true</bool>
<string name="push_sender_id">929724111839</string><!--firebase 929724111839 !! gcm 622464153529 -->
<string name="push_sender_id">442681843408</string><!--firebase 929724111839 !! gcm 622464153529 -->
<string name="push_type">firebase</string>
<!-- Call -->

15
src/android/org/linphone/LinphoneManager.java
View file

@ -73,6 +73,7 @@ import org.linphone.core.CallStats;
import org.linphone.core.ChatMessage;
import org.linphone.core.ChatRoom;
import org.linphone.core.ChatRoomCapabilities;
import org.linphone.core.Config;
import org.linphone.core.Content;
import org.linphone.core.Core;
import org.linphone.core.AuthMethod;
@ -128,6 +129,7 @@ import java.util.TimerTask;
import static android.media.AudioManager.MODE_RINGTONE;
import static android.media.AudioManager.STREAM_RING;
import static android.media.AudioManager.STREAM_VOICE_CALL;
import static android.os.SystemClock.sleep;
/**
*
@ -1090,6 +1092,15 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
if (state == GlobalState.On){
try {
Log.e("LinphoneManager"," onGlobalStateChanged ON");
// TODO workaround multiple proxy
ProxyConfig prx = lc.getProxyConfigList()[0];
for (ProxyConfig tmp : lc.getProxyConfigList()) {
lc.removeProxyConfig(tmp);
}
if (prx != null) lc.addProxyConfig(prx);
//TODO
initLiblinphone(lc);
}catch(IllegalArgumentException iae){
@ -1648,9 +1659,9 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
}
}
});
builder.show();
if (builder != null) builder.show();
}
}, 1000);
}, 2000);
}
}

2
src/android/org/linphone/activities/LinphoneActivity.java
View file

@ -311,7 +311,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
break;
}
if (LinphoneManager.isInstanciated()) {
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
LinphoneManager.getLc().setDeviceRotation(rotation);
}
mAlwaysChangingPhoneAngle = rotation;