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

Fixes for Market release

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-14 16:39:15 +01:00
parent 1a06beeda9
commit 91d4163485
6 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.linphone" package="org.linphone"
android:versionCode="2000" android:versionName="2.0" android:installLocation="auto"> android:versionCode="2001" android:versionName="2.0.1" android:installLocation="auto">
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/> <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
<!-- Permissions for Push Notification --> <!-- Permissions for Push Notification -->

2
res/values/non_localizable_custom.xml
View file

@ -49,7 +49,7 @@
<bool name="allow_edit_in_dialer">true</bool> <bool name="allow_edit_in_dialer">true</bool>
<bool name="forbid_self_call">false</bool> <bool name="forbid_self_call">false</bool>
<bool name="disable_chat">false</bool> <bool name="disable_chat">false</bool>
<bool name="disable_all_security_features_for_markets">false</bool> <bool name="disable_all_security_features_for_markets">true</bool>
<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string> <string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
</resources> </resources>

6
src/org/linphone/ContactFragment.java
View file

@ -47,14 +47,16 @@ public class ContactFragment extends Fragment implements OnClickListener {
private OnClickListener dialListener = new OnClickListener() { private OnClickListener dialListener = new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
LinphoneActivity.instance().setAddresGoToDialerAndCall(v.getTag().toString(), contact.getName(), contact.getPhotoUri()); if (LinphoneActivity.isInstanciated())
LinphoneActivity.instance().setAddresGoToDialerAndCall(v.getTag().toString(), contact.getName(), contact.getPhotoUri());
} }
}; };
private OnClickListener chatListener = new OnClickListener() { private OnClickListener chatListener = new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
LinphoneActivity.instance().displayChat(v.getTag().toString()); if (LinphoneActivity.isInstanciated())
LinphoneActivity.instance().displayChat(v.getTag().toString());
} }
}; };

2
src/org/linphone/InCallActivity.java
View file

@ -567,7 +567,7 @@ public class InCallActivity extends FragmentActivity implements
} }
mControls = null; mControls = null;
if (isVideoEnabled) { if (isVideoEnabled && mControlsHandler != null) {
mControlsHandler.postDelayed(mControls = new Runnable() { mControlsHandler.postDelayed(mControls = new Runnable() {
public void run() { public void run() {
hideNumpad(); hideNumpad();

36
src/org/linphone/PreferencesFragment.java
View file

@ -366,24 +366,26 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
} }
private void updateAccountLed(final LedPreference me, final String username, final String domain) { private void updateAccountLed(final LedPreference me, final String username, final String domain) {
for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) { if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
if (lpc.getIdentity().contains(username) && lpc.getIdentity().contains(domain)) { for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) { if (lpc.getIdentity().contains(username) && lpc.getIdentity().contains(domain)) {
me.setLed(R.drawable.led_connected); if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationOk) {
} else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationFailed) { me.setLed(R.drawable.led_connected);
me.setLed(R.drawable.led_error); } else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationFailed) {
} else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationProgress) { me.setLed(R.drawable.led_error);
me.setLed(R.drawable.led_inprogress); } else if (lpc.getState() == LinphoneCore.RegistrationState.RegistrationProgress) {
mHandler.postDelayed(new Runnable() { me.setLed(R.drawable.led_inprogress);
@Override mHandler.postDelayed(new Runnable() {
public void run() { @Override
updateAccountLed(me, username, domain); public void run() {
} updateAccountLed(me, username, domain);
}, 1500); }
} else { }, 1500);
me.setLed(R.drawable.led_disconnected); } else {
me.setLed(R.drawable.led_disconnected);
}
break;
} }
break;
} }
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2817a36f1dd129278489d88acd29c2ee1f5176ff Subproject commit d03b0d01bedf71d153371c58ea3259a3a1cafb11