From a7449bb46b0e1e04232b56254a340fb6d4971199 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Tue, 2 Oct 2012 10:28:08 +0200
Subject: [PATCH] Improved call stats updater + updated liblinphone

---
 AndroidManifest.xml                  |   2 +-
 src/org/linphone/StatusFragment.java | 115 ++++++++++++++-------------
 submodules/linphone                  |   2 +-
 3 files changed, 60 insertions(+), 59 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7e8d30e7b..6362bcfa3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,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:debuggable="true" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true">
+    <application android:label="@string/app_name" android:debuggable= "true" android:icon="@drawable/logo_linphone_57x57" android:largeHeap="true">
 
 		<activity android:name="org.linphone.LinphoneLauncherActivity"
 		    android:label="@string/app_name"
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index 08324bbaa..929611c05 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -70,6 +70,8 @@ public class StatusFragment extends Fragment {
 	private Toast zrtpToast;
 	private CountDownTimer zrtpHack;
 	private boolean hideZrtpToast = false;
+	private Timer mTimer;
+	private TimerTask mTask;
 	
 	@Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, 
@@ -159,7 +161,7 @@ public class StatusFragment extends Fragment {
 			sliderContentAccounts.setVisibility(View.GONE);
 			callStats.setVisibility(View.GONE);
 			
-			if (isInCall && getResources().getBoolean(R.bool.display_call_stats)) {
+			if (isInCall && isAttached && getResources().getBoolean(R.bool.display_call_stats)) {
 				callStats.setVisibility(View.VISIBLE);
 				LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
 				initCallStatsRefresher(call, callStats);
@@ -445,68 +447,67 @@ public class StatusFragment extends Fragment {
 	}
 	
 	private void initCallStatsRefresher(final LinphoneCall call, final View view) {
-		new Thread(new Runnable() {
+		if (mTimer != null && mTask != null) {
+			return;
+		}
+		
+	    mTimer = new Timer();
+		mTask = new TimerTask() {
 			@Override
 			public void run() {
-			    final Timer timer = new Timer();
-				TimerTask lTask = new TimerTask() {
-					@Override
-					public void run() {
-						if (call == null) {
-							timer.cancel();
-							return;
-						}
+				if (call == null) {
+					mTimer.cancel();
+					return;
+				}
 
-						final TextView title = (TextView) view.findViewById(R.id.call_stats_title);
-						final TextView codec = (TextView) view.findViewById(R.id.codec);
-						final TextView dl = (TextView) view.findViewById(R.id.downloadBandwith);
-						final TextView ul = (TextView) view.findViewById(R.id.uploadBandwith);
-						final TextView ice = (TextView) view.findViewById(R.id.ice);
-						if (codec == null || dl == null || ul == null || ice == null) {
-							timer.cancel();
-							return;
-						}
-						
-						if (call.getCurrentParamsCopy().getVideoEnabled()) {
-							final LinphoneCallStats videoStats = call.getVideoStats();
-							if (videoStats != null) {
-								mHandler.post(new Runnable() {
-									@Override
-									public void run() {
-										title.setText("Audio");
-										PayloadType payload = call.getCurrentParamsCopy().getUsedVideoCodec();
-										if (payload != null) {
-											codec.setText(payload.getMime());
-										}
-										dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " kbits/s");
-										ul.setText(String.valueOf((int) videoStats.getUploadBandwidth()) + " kbits/s");
-										ice.setText(videoStats.getIceState().toString());
-									}
-								});
+				final TextView title = (TextView) view.findViewById(R.id.call_stats_title);
+				final TextView codec = (TextView) view.findViewById(R.id.codec);
+				final TextView dl = (TextView) view.findViewById(R.id.downloadBandwith);
+				final TextView ul = (TextView) view.findViewById(R.id.uploadBandwith);
+				final TextView ice = (TextView) view.findViewById(R.id.ice);
+				if (codec == null || dl == null || ul == null || ice == null) {
+					mTimer.cancel();
+					return;
+				}
+				
+				if (call.getCurrentParamsCopy().getVideoEnabled()) {
+					final LinphoneCallStats videoStats = call.getVideoStats();
+					if (videoStats != null) {
+						mHandler.post(new Runnable() {
+							@Override
+							public void run() {
+								title.setText("Video");
+								PayloadType payload = call.getCurrentParamsCopy().getUsedVideoCodec();
+								if (payload != null) {
+									codec.setText(payload.getMime());
+								}
+								dl.setText(String.valueOf((int) videoStats.getDownloadBandwidth()) + " kbits/s");
+								ul.setText(String.valueOf((int) videoStats.getUploadBandwidth()) + " kbits/s");
+								ice.setText(videoStats.getIceState().toString());
 							}
-						} else {
-							final LinphoneCallStats audioStats = call.getAudioStats();
-							if (audioStats != null) {
-								mHandler.post(new Runnable() {
-									@Override
-									public void run() {
-										title.setText("Video");
-										PayloadType payload = call.getCurrentParamsCopy().getUsedAudioCodec();
-										if (payload != null) {
-											codec.setText(payload.getMime());
-										}
-										dl.setText(String.valueOf((int) audioStats.getDownloadBandwidth()) + " kbits/s");
-										ul.setText(String.valueOf((int) audioStats.getUploadBandwidth()) + " kbits/s");
-										ice.setText(audioStats.getIceState().toString());
-									}
-								});
-							}
-						}
+						});
 					}
-				};
-				timer.scheduleAtFixedRate(lTask, 0, 1500);
+				} else {
+					final LinphoneCallStats audioStats = call.getAudioStats();
+					if (audioStats != null) {
+						mHandler.post(new Runnable() {
+							@Override
+							public void run() {
+								title.setText("Audio");
+								PayloadType payload = call.getCurrentParamsCopy().getUsedAudioCodec();
+								if (payload != null) {
+									codec.setText(payload.getMime());
+								}
+								dl.setText(String.valueOf((int) audioStats.getDownloadBandwidth()) + " kbits/s");
+								ul.setText(String.valueOf((int) audioStats.getUploadBandwidth()) + " kbits/s");
+								ice.setText(audioStats.getIceState().toString());
+							}
+						});
+					}
+				}
 			}
-		}).start();
+		};
+		mTimer.scheduleAtFixedRate(mTask, 0, 1500);
 	}
 	
 	class AccountsListAdapter extends BaseAdapter {
diff --git a/submodules/linphone b/submodules/linphone
index e6d835fa7..438a8f4f7 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit e6d835fa745550a043e18a3b850d0cb353ef9ae8
+Subproject commit 438a8f4f73e54aa53cd9ac349f354601704a5862