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

Minor fixes

Browse source
This commit is contained in:
Sylvain Berfini 2012-11-14 09:49:31 +01:00
parent 6753a5d777
commit 6ef1545029
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -510,7 +510,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
sendNotification(IC_LEVEL_ORANGE, R.string.notification_registered); sendNotification(IC_LEVEL_ORANGE, R.string.notification_registered);
} }
if (state == RegistrationState.RegistrationFailed || state == RegistrationState.RegistrationCleared) { if ((state == RegistrationState.RegistrationFailed || state == RegistrationState.RegistrationCleared) && (LinphoneManager.getLc().getDefaultProxyConfig() == null || !LinphoneManager.getLc().getDefaultProxyConfig().isRegistered())) {
sendNotification(IC_LEVEL_OFFLINE, R.string.notification_register_failure); sendNotification(IC_LEVEL_OFFLINE, R.string.notification_register_failure);
} }

13
src/org/linphone/StatusFragment.java
View file

@ -34,6 +34,7 @@ import org.linphone.ui.SlidingDrawer;
import org.linphone.ui.SlidingDrawer.OnDrawerOpenListener; import org.linphone.ui.SlidingDrawer.OnDrawerOpenListener;
import android.app.Activity; import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.os.CountDownTimer; import android.os.CountDownTimer;
@ -240,15 +241,19 @@ public class StatusFragment extends Fragment {
} }
private String getStatusIconText(LinphoneCore.RegistrationState state) { private String getStatusIconText(LinphoneCore.RegistrationState state) {
Context context = getActivity();
if (!isAttached)
context = LinphoneActivity.instance();
try { try {
if (state == RegistrationState.RegistrationOk && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getDefaultProxyConfig().isRegistered()) { if (state == RegistrationState.RegistrationOk && LinphoneManager.getLcIfManagerNotDestroyedOrNull().getDefaultProxyConfig().isRegistered()) {
return getString(R.string.status_connected); return context.getString(R.string.status_connected);
} else if (state == RegistrationState.RegistrationProgress) { } else if (state == RegistrationState.RegistrationProgress) {
return getString(R.string.status_in_progress); return context.getString(R.string.status_in_progress);
} else if (state == RegistrationState.RegistrationFailed) { } else if (state == RegistrationState.RegistrationFailed) {
return getString(R.string.status_error); return context.getString(R.string.status_error);
} else { } else {
return getString(R.string.status_not_connected); return context.getString(R.string.status_not_connected);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();