Merge branch 'feature/lime_v2' of git.linphone.org:linphone-android into obiane_new

.gitmodules

@@ -120,9 +120,9 @@
 [submodule "submodules/externals/zxing-cpp"]
 	path = submodules/externals/zxing-cpp
 	url = git://git.linphone.org/zxing-cpp.git
-[submodule "submodules/externals/decaf"]
-	path = submodules/externals/decaf
-	url = git://git.linphone.org/decaf.git
 [submodule "submodules/lime"]
 	path = submodules/lime
 	url = gitosis@git.linphone.org:lime.git
+[submodule "submodules/externals/decaf"]
+	path = submodules/externals/decaf
+	url = git://git.linphone.org/decaf.git

liblinphone-sdk/build.gradle

@@ -94,7 +94,7 @@ android {
         packaged {
             initWith release
             signingConfig null
-            matchingFallbacks = ['debug', 'release']
+            //matchingFallbacks = ['debug', 'release']
         }
     }
 

src/android/org/linphone/LinphoneManager.java

@@ -1,21 +1,3 @@
-/*
-LinphoneManager.java
-Copyright (C) 2010  Belledonne Communications, Grenoble, France
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
 package org.linphone;
 
 /*
@@ -1774,4 +1756,14 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 			mUnreadChatsPerRoom.put(key, 1);
 		}
 	}
+
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
 }

src/android/org/linphone/assistant/AssistantActivity.java

@@ -762,6 +762,16 @@ private static AssistantActivity instance;
 
 	}
 
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
+
 	public CountryListAdapter getCountryListAdapter() {
 		return countryListAdapter;
 	}

src/android/org/linphone/assistant/CreateAccountActivationFragment.java

@@ -123,4 +123,14 @@ public class CreateAccountActivationFragment extends Fragment implements OnClick
 	public void onUpdateAccount(AccountCreator accountCreator, AccountCreator.Status status, String resp) {
 
 	}
+
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
 }

src/android/org/linphone/assistant/CreateAccountCodeActivationFragment.java

@@ -210,4 +210,14 @@ public class CreateAccountCodeActivationFragment extends Fragment implements Acc
 	public void onUpdateAccount(AccountCreator accountCreator, AccountCreator.Status status, String resp) {
 
 	}
+
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
 }

src/android/org/linphone/assistant/CreateAccountFragment.java

@@ -705,4 +705,14 @@ public class CreateAccountFragment extends Fragment implements CompoundButton.On
 	public void onUpdateAccount(AccountCreator accountCreator, Status status, String resp) {
 
 	}
+
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
 }

src/android/org/linphone/assistant/LinphoneLoginFragment.java

@@ -399,4 +399,14 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 	public void onUpdateAccount(AccountCreator accountCreator, AccountCreator.Status status, String resp) {
 
 	}
+
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
 }

src/android/org/linphone/call/CallActivity.java

@@ -142,6 +142,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 	private HashMap<String, String> mEncoderTexts;
 	private HashMap<String, String> mDecoderTexts;
 	private CallListenerStub mCallListener;
+	private Call mCallDisplayedInStats;
 
 	private boolean oldIsSpeakerEnabled = false;
 
@@ -1816,9 +1817,16 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 	}
 
 	public void initCallStatsRefresher(final Call call, final View view) {
+		if (mCallDisplayedInStats == call) return;
+	
 		if (mTimer != null && mTask != null) {
-			return;
+			mTimer.cancel();
+			mTimer = null;
+			mTask = null;
 		}
+		mCallDisplayedInStats = call;
+		
+		if (call == null) return;
 
 		final TextView titleAudio = (TextView) view.findViewById(R.id.call_stats_audio);
 		final TextView titleVideo = (TextView) view.findViewById(R.id.call_stats_video);
@@ -1883,7 +1891,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 					public void run() {
 						if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() == null) return;
 						synchronized(LinphoneManager.getLc()) {
-							if (LinphoneActivity.isInstanciated()) {
+							if (LinphoneActivity.isInstanciated() && call.getState() != Call.State.Released) {
 								CallParams params = call.getCurrentParams();
 								if (params != null) {
 									CallStats audioStats = call.getStats(StreamType.Audio);

src/android/org/linphone/fragments/AccountPreferencesFragment.java

@@ -678,4 +678,14 @@ public class AccountPreferencesFragment extends PreferencesListFragment implemen
 			LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), LinphoneActivity.instance());
 		}
 	}
+
+	@Override
+	public void onGetConfirmationKey(AccountCreator ac, AccountCreator.Status status, String key) {
+
+	}
+
+	@Override
+	public void onDeleteAccount(AccountCreator ac, AccountCreator.Status status, String resp) {
+
+	}
 }

submodules/bctoolbox

@@ -1 +1 @@
-Subproject commit ed53ae3c9da4fb15c13454153383014b3257939a
+Subproject commit 4dab4917c02456a1a0ccb2988b57dc98475077b7

submodules/bzrtp

@@ -1 +1 @@
-Subproject commit c4625d00204c2d5f3cd21de7a89f0e5ddd39c667
+Subproject commit 94f0d8d3a267f899e9604604c74e876baba26306

submodules/lime

@@ -0,0 +1 @@
+Subproject commit 619bb91077cdbf3e2e3922588b80a1b053bc2809

submodules/linphone

@@ -1 +1 @@
-Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202
+Subproject commit 4a677d8a0feb43369b94b690306a1f4c12741b70

submodules/mediastreamer2

@@ -1 +1 @@
-Subproject commit 7865111207850fb53856fe500ae7b60d2cce379b
+Subproject commit db95e67bef9084b5ea7cd8ff53ff717299933223