From c122365d741e9d37823f73a8ef9f0adadc7bea8d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 13 Sep 2015 16:45:37 +0200 Subject: [PATCH 01/27] update belle-sip and linphone to start testing refactoring of states in linphone-android --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 91ae7c164..b1707d976 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 91ae7c164d9d20fd36657943a0aba807b4dfeb4f +Subproject commit b1707d976a90afa8079655ac1f9f0eef23dc5709 diff --git a/submodules/linphone b/submodules/linphone index e7dd35efa..f89578d2b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e7dd35efa0f0d250db66fadb11994b4f48e088b1 +Subproject commit f89578d2b82219be4be6bce123ab6a768c2899ca From 75c5221c01ff4727fe212884c958eddf9af9aae4 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 13 Sep 2015 16:47:46 +0200 Subject: [PATCH 02/27] update linphone (fixe android compilation issues) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index f89578d2b..5257d25ca 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f89578d2b82219be4be6bce123ab6a768c2899ca +Subproject commit 5257d25cabe8b049962dd555ef62e7b199d5b788 From c15c575baa98a43f466fd656d9c01e798d5cae9b Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 14 Sep 2015 12:18:34 +0200 Subject: [PATCH 03/27] .gitmodules: change opus repository URL to git.linphone.org since git.opus-codec.org is down for 3 days now --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 21d5755ff..2bb7af215 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,7 +73,7 @@ url = git://git.linphone.org/polarssl.git [submodule "submodules/externals/opus"] path = submodules/externals/opus - url = git://git.opus-codec.org/opus.git + url = git://git.linphone.org/opus.git [submodule "submodules/mswebrtc"] path = submodules/mswebrtc url = git://git.linphone.org/mswebrtc.git From 9e0d995cb584e3c023b5c38440ede8927e272b3c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 17 Sep 2015 17:34:53 +0200 Subject: [PATCH 04/27] linphone:fix ms2 sdk compilation issue on android --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 5257d25ca..ede84b4ad 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5257d25cabe8b049962dd555ef62e7b199d5b788 +Subproject commit ede84b4ad100f44cc70285c4926c15440242fb7c From 5077bc81da4e184d5d172f2d40e6a4f7f1ad68e8 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Fri, 18 Sep 2015 15:11:59 +0200 Subject: [PATCH 05/27] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ede84b4ad..570ebc6b0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ede84b4ad100f44cc70285c4926c15440242fb7c +Subproject commit 570ebc6b006100f8f4d6302bfadc9d83cad65051 From 4405857c7204a7bc50e0da1ca37a8cd29bb38b1e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 25 Sep 2015 11:53:20 +0200 Subject: [PATCH 06/27] update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index b1707d976..07233a793 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit b1707d976a90afa8079655ac1f9f0eef23dc5709 +Subproject commit 07233a793594081d5aafc0c6bb14d389dffbfac0 diff --git a/submodules/linphone b/submodules/linphone index 570ebc6b0..46547098c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 570ebc6b006100f8f4d6302bfadc9d83cad65051 +Subproject commit 46547098cc1f24a394d6aa7c4e7823226ecab0fe From af3df3f00d9453a22607c86b3f958b5b7156ff7f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 27 Sep 2015 11:29:10 +0200 Subject: [PATCH 07/27] update to bc_tester obsoleting --config option. --- liblinphone_tester/src/org/linphone/tester/LogsActivity.java | 2 +- liblinphone_tester/src/org/linphone/tester/TestUnit.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java index 02df05446..97a6ef0dc 100644 --- a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java @@ -25,7 +25,7 @@ public class LogsActivity extends Activity { public void run() { String path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files"; tester = new TesterLogger(mLogsActivity); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--config", path})); + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", path})); list.addAll(Arrays.asList(mArgs)); String[] array = list.toArray(new String[list.size()]); tester.run(array); diff --git a/liblinphone_tester/src/org/linphone/tester/TestUnit.java b/liblinphone_tester/src/org/linphone/tester/TestUnit.java index d33211495..5683995e3 100644 --- a/liblinphone_tester/src/org/linphone/tester/TestUnit.java +++ b/liblinphone_tester/src/org/linphone/tester/TestUnit.java @@ -80,7 +80,7 @@ public class TestUnit extends AndroidTestCase { protected void runTest() { String path = getContext().getFilesDir().getPath()+"/config_files"; Tester tester = new Tester(); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--config", path, "--suite", mSuite, "--test", mTest})); + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", path, "--suite", mSuite, "--test", mTest})); String[] array = list.toArray(new String[list.size()]); Assert.assertTrue(tester.run(array) == 0); } From 75673e549957559808208d38a33d354e8c15149a Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 28 Sep 2015 10:42:58 +0200 Subject: [PATCH 08/27] submodules: update belle-sip and linphone and fix liblinphone tester --- .gitignore | 4 +++ .../src/org/linphone/tester/LogsActivity.java | 13 +++++---- .../src/org/linphone/tester/TestUnit.java | 28 ++++++++++--------- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 5 files changed, 28 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 2c6cd49a5..a62397e46 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ tests/*$py.class tests/build.xml tests/project.properties ant_password.properties +liblinphone_tester/liblinphonetester_* +liblinphone_tester/tests.output +tests/linphonetester_* +tests/tests.output diff --git a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java index 97a6ef0dc..40c7062cf 100644 --- a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java @@ -23,9 +23,10 @@ public class LogsActivity extends Activity { @Override public void run() { - String path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files"; + String res_path = mLogsActivity.getFilesDir().getAbsolutePath()+"/config_files"; + String write_path = mLogsActivity.getCacheDir().getPath(); tester = new TesterLogger(mLogsActivity); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", path})); + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", res_path, "--writable-dir", write_path})); list.addAll(Arrays.asList(mArgs)); String[] array = list.toArray(new String[list.size()]); tester.run(array); @@ -37,7 +38,7 @@ public class LogsActivity extends Activity { }); } } - + private static String join(String [] array, String separator) { String ret = ""; for(int i = 0; i < array.length; ++i) { @@ -48,7 +49,7 @@ public class LogsActivity extends Activity { } return ret; } - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -75,7 +76,7 @@ public class LogsActivity extends Activity { getMenuInflater().inflate(R.menu.activity_logs, menu); return true; } - + public void addLog(int level, String message) { mLogs += message; ((TextView)findViewById(R.id.textView1)).append(message); @@ -86,7 +87,7 @@ public class LogsActivity extends Activity { finish(); } } - + public void done() { } } diff --git a/liblinphone_tester/src/org/linphone/tester/TestUnit.java b/liblinphone_tester/src/org/linphone/tester/TestUnit.java index 5683995e3..2e2f00707 100644 --- a/liblinphone_tester/src/org/linphone/tester/TestUnit.java +++ b/liblinphone_tester/src/org/linphone/tester/TestUnit.java @@ -16,28 +16,28 @@ public class TestUnit extends AndroidTestCase { private String mSuite; private String mTest; static Boolean isAssetCopied=false; - + public TestUnit(String suite, String test) { mSuite = suite; mTest = test; setName(suite + "/" + test); } - + public TestUnit(String name) { - String[] tab = name.split("/"); + String[] tab = name.split("/"); mSuite = tab[0]; mTest = tab[1]; setName(name); } - + static public void copyAssetsFromPackage(Context ctx) throws IOException { copyAssetsFromPackage(ctx,"config_files"); } - - + + public static void copyAssetsFromPackage(Context ctx,String fromPath) throws IOException { new File(ctx.getFilesDir().getPath()+"/"+fromPath).mkdir(); - + for (String f :ctx.getAssets().list(fromPath)) { String current_name=fromPath+"/"+f; InputStream lInputStream; @@ -50,8 +50,8 @@ public class TestUnit extends AndroidTestCase { continue; } FileOutputStream lOutputStream = new FileOutputStream(new File(ctx.getFilesDir().getPath()+"/"+current_name));//ctx.openFileOutput (fromPath+"/"+f, 0); - - + + int readByte; byte[] buff = new byte[8048]; while (( readByte = lInputStream.read(buff)) != -1) { @@ -75,13 +75,15 @@ public class TestUnit extends AndroidTestCase { protected void tearDown() throws Exception { super.tearDown(); } - + @Override protected void runTest() { - String path = getContext().getFilesDir().getPath()+"/config_files"; + String res_path = getContext().getFilesDir().getPath()+"/config_files"; + String write_path = getContext().getCacheDir().getPath(); Tester tester = new Tester(); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", path, "--suite", mSuite, "--test", mTest})); + + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--resource-dir", res_path, "--writable-dir", write_path, "--suite", mSuite, "--test", mTest})); String[] array = list.toArray(new String[list.size()]); Assert.assertTrue(tester.run(array) == 0); } -} \ No newline at end of file +} diff --git a/submodules/belle-sip b/submodules/belle-sip index 07233a793..6e76dabb7 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 07233a793594081d5aafc0c6bb14d389dffbfac0 +Subproject commit 6e76dabb7632e0f58e9c43b2cc86ada5f486c761 diff --git a/submodules/linphone b/submodules/linphone index 46547098c..9244a0173 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 46547098cc1f24a394d6aa7c4e7823226ecab0fe +Subproject commit 9244a017373d9ddec9170257fec324fb82cb0800 From 8a62352b511163f614393cb1eff611f9687996fe Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 28 Sep 2015 14:09:17 +0200 Subject: [PATCH 09/27] set correct git uris, so that they can work if protocol is switched to http --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2bb7af215..851689637 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "linphone"] path = submodules/linphone - url = git://git.linphone.org/linphone + url = git://git.linphone.org/linphone.git [submodule "submodules/externals/gsm"] path = submodules/externals/gsm url = git://git.linphone.org/gsm.git [submodule "submodules/externals/speex"] path = submodules/externals/speex - url = git://git.linphone.org/speex + url = git://git.linphone.org/speex.git [submodule "submodules/msilbc"] path = submodules/msilbc url = git://git.linphone.org/msilbc.git @@ -52,13 +52,13 @@ url = git://git.linphone.org/bcg729.git [submodule "submodules/belle-sip"] path = submodules/belle-sip - url = git://git.linphone.org/belle-sip + url = git://git.linphone.org/belle-sip.git [submodule "submodules/externals/antlr3"] path = submodules/externals/antlr3 url = git://git.linphone.org/antlr3.git [submodule "submodules/externals/libxml2"] path = submodules/externals/libxml2 - url = git://git.gnome.org/libxml2 + url = git://git.gnome.org/libxml2.git [submodule "submodules/externals/libupnp"] path = submodules/externals/libupnp url = git://git.linphone.org/libupnp.git From bc1641101053c0c7dfba88cc0ae4e5bc73034c9e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 28 Sep 2015 17:42:24 +0200 Subject: [PATCH 10/27] fix msamr.git --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 851689637..03f8848b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr - url = git://git.linphone.org/msamr + url = git://git.linphone.org/msamr.git [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx url = https://chromium.googlesource.com/webm/libvpx From 8f26f9b2dd93e66d3b9d8628b0b0655c06730328 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 29 Sep 2015 10:54:36 +0200 Subject: [PATCH 11/27] tests: detect instrumentation fail as crash --- liblinphone_tester/custom_rules.xml | 1 + tests/custom_rules.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/liblinphone_tester/custom_rules.xml b/liblinphone_tester/custom_rules.xml index 9adcb8c2f..f05b9eb06 100644 --- a/liblinphone_tester/custom_rules.xml +++ b/liblinphone_tester/custom_rules.xml @@ -43,6 +43,7 @@ + diff --git a/tests/custom_rules.xml b/tests/custom_rules.xml index a8100b078..87abcd905 100644 --- a/tests/custom_rules.xml +++ b/tests/custom_rules.xml @@ -35,6 +35,7 @@ + From b18d854e4c9515e01a6ce6424673be3d9485f9d0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 29 Sep 2015 15:40:17 +0200 Subject: [PATCH 12/27] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 9244a0173..c5461d7b6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9244a017373d9ddec9170257fec324fb82cb0800 +Subproject commit c5461d7b6fa3c0cece38ce0a682c6833f0ba528f From d4b10cf52aff692620133a59df43d4cdb1362286 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 2 Oct 2015 15:42:49 +0200 Subject: [PATCH 13/27] Updated submodules --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 6e76dabb7..333c42735 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 6e76dabb7632e0f58e9c43b2cc86ada5f486c761 +Subproject commit 333c427353ee224882e579c3303630a73cba0176 diff --git a/submodules/linphone b/submodules/linphone index c5461d7b6..6f44bbcc5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c5461d7b6fa3c0cece38ce0a682c6833f0ba528f +Subproject commit 6f44bbcc56a477489013bca7244805e371095f4d From e5ba329a2bf924c17eda29c4b162c62c14b6da6c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 2 Oct 2015 16:03:22 +0200 Subject: [PATCH 14/27] Updated linphone to fix compil --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6f44bbcc5..640f9e20a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6f44bbcc56a477489013bca7244805e371095f4d +Subproject commit 640f9e20ac8d82e7d2ce403165c00a900742d537 From e72f3211038a0f019bc51a51787ecc284d20bec0 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sat, 3 Oct 2015 11:30:16 +0200 Subject: [PATCH 15/27] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 640f9e20a..1052ffc61 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 640f9e20ac8d82e7d2ce403165c00a900742d537 +Subproject commit 1052ffc6108f503d536b910ac6a59389943c97ba From 4c3ec3757d4785677946e9b09ff63b84f1ed30a0 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 4 Oct 2015 21:54:00 +0200 Subject: [PATCH 16/27] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 1052ffc61..caa0ce610 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1052ffc6108f503d536b910ac6a59389943c97ba +Subproject commit caa0ce61095641770ba97c4d2e659f8301d6a13d From 1cbc646b6d1686af9457208fb40fc95b6702a9ba Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 5 Oct 2015 11:35:46 +0200 Subject: [PATCH 17/27] update bzrtp that was pretty old --- submodules/bzrtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/bzrtp b/submodules/bzrtp index 4a4f757f6..253e1543f 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 4a4f757f66b02cf8834fd8d7a939bf54b245ad7e +Subproject commit 253e1543f13576be66fb4ed5396c0b99eeb08fb4 From 9ec85929a1599b13dd5886886efaccfecdd25286 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 7 Oct 2015 13:13:34 +0200 Subject: [PATCH 18/27] complete dependency list --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 960700b70..90da5a6cf 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ To build liblinphone for Android, you must: ------------------------------------------- 0) download the Android sdk with platform-tools and tools updated to latest revision (at least API 16 is needed), then add both 'tools' and 'platform-tools' folders in your path. 1) download the Android ndk (=r10c) from google and add it to your path (no symlink !!!). -2) install yasm, nasm, curl, ant, rsync and the autotools: autoconf, automake, aclocal, libtoolize, pkgconfig +2) install yasm, nasm, curl, ant, rsync, autoconf, automake, aclocal, libtool, pkgconfig, bc, perl-LWP-Protocol-https, patch, vim-common On 64 bits linux systems you'll need the ia32-libs package With the latest Debian (multiarch), you need this: dpkg --add-architecture i386 From f2afbf84f5f8a9dfc1a15213b0c6ef27fe976259 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 7 Oct 2015 13:34:44 +0200 Subject: [PATCH 19/27] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 333c42735..e2aec4481 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 333c427353ee224882e579c3303630a73cba0176 +Subproject commit e2aec4481a86b00fc987050ff540f20545e52fe5 diff --git a/submodules/linphone b/submodules/linphone index caa0ce610..62c627111 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit caa0ce61095641770ba97c4d2e659f8301d6a13d +Subproject commit 62c627111fe5458b2a11e84117dffdc0d0c18565 From c1c045b4b1670efd4d4b9ed97c7ca9d18209cceb Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Wed, 7 Oct 2015 14:28:35 +0200 Subject: [PATCH 20/27] Fix download image bug and update linphone --- src/org/linphone/ui/BubbleChat.java | 50 ++++++++++++++++------------- submodules/linphone | 2 +- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java index f686f3e9a..60971aee3 100644 --- a/src/org/linphone/ui/BubbleChat.java +++ b/src/org/linphone/ui/BubbleChat.java @@ -134,29 +134,33 @@ public class BubbleChat implements LinphoneChatMessage.LinphoneChatMessageListen if (externalBodyUrl != null || fileTransferContent != null) { Button download = (Button) view.findViewById(R.id.download); ImageView imageView = (ImageView) view.findViewById(R.id.image); - + String appData = message.getAppData(); - if (appData == null || (!LinphoneManager.getInstance().isMessagePending(nativeMessage) && - !nativeMessage.isOutgoing() && appData.contains(context.getString(R.string.temp_photo_name_with_date).split("%s")[0]))) { + if(appData != null && !LinphoneManager.getInstance().isMessagePending(nativeMessage) && + !nativeMessage.isOutgoing() && appData.contains(context.getString(R.string.temp_photo_name_with_date).split("%s")[0])){ + appData = null; + } + + if (appData == null ){ LinphoneManager.addListener(this); - download.setVisibility(View.VISIBLE); - download.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - v.setEnabled(false); - spinner.setVisibility(View.VISIBLE); - v.setVisibility(View.GONE); - String filename = context.getString(R.string.temp_photo_name_with_date).replace("%s", String.valueOf(System.currentTimeMillis())); - File file = new File(Environment.getExternalStorageDirectory(), filename); - nativeMessage.setListener(LinphoneManager.getInstance()); - nativeMessage.setFileTransferFilepath(file.getPath()); - nativeMessage.downloadFile(); - nativeMessage.setAppData(filename); - LinphoneManager.getInstance().addDownloadMessagePending(nativeMessage); - } - }); - } else { - if(LinphoneManager.getInstance().isMessagePending(nativeMessage)){ + download.setVisibility(View.VISIBLE); + download.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + v.setEnabled(false); + v.setVisibility(View.GONE); + spinner.setVisibility(View.VISIBLE); + String filename = context.getString(R.string.temp_photo_name_with_date).replace("%s", String.valueOf(System.currentTimeMillis())); + File file = new File(Environment.getExternalStorageDirectory(), filename); + nativeMessage.setAppData(filename); + LinphoneManager.getInstance().addDownloadMessagePending(nativeMessage); + nativeMessage.setListener(LinphoneManager.getInstance()); + nativeMessage.setFileTransferFilepath(file.getPath()); + nativeMessage.downloadFile(); + } + }); + } else { + if (LinphoneManager.getInstance().isMessagePending(nativeMessage)) { LinphoneManager.addListener(this); download.setEnabled(false); ProgressBar spinner = (ProgressBar) view.findViewById(R.id.spinner); @@ -165,9 +169,11 @@ public class BubbleChat implements LinphoneChatMessage.LinphoneChatMessageListen } else { LinphoneManager.removeListener(this); imageView.setVisibility(View.VISIBLE); + download.setVisibility(View.GONE); + spinner.setVisibility(View.GONE); loadBitmap(appData, imageView); } - } + } } else { TextView msgView = (TextView) view.findViewById(R.id.message); if (msgView != null) { diff --git a/submodules/linphone b/submodules/linphone index 62c627111..68829aef4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 62c627111fe5458b2a11e84117dffdc0d0c18565 +Subproject commit 68829aef4d4162fc9e9dcbecc86c6380d9999e39 From 9ca7208a4bd01e9f90d35395bcf3c5f48347a9c9 Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Wed, 7 Oct 2015 16:26:08 +0200 Subject: [PATCH 21/27] Fix crash bubble chat --- src/org/linphone/ui/BubbleChat.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java index 60971aee3..25b1a4c51 100644 --- a/src/org/linphone/ui/BubbleChat.java +++ b/src/org/linphone/ui/BubbleChat.java @@ -170,7 +170,6 @@ public class BubbleChat implements LinphoneChatMessage.LinphoneChatMessageListen LinphoneManager.removeListener(this); imageView.setVisibility(View.VISIBLE); download.setVisibility(View.GONE); - spinner.setVisibility(View.GONE); loadBitmap(appData, imageView); } } From 389062e42054f76046e5486894b8113394588519 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 8 Oct 2015 11:42:34 +0200 Subject: [PATCH 22/27] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 68829aef4..db3c81595 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 68829aef4d4162fc9e9dcbecc86c6380d9999e39 +Subproject commit db3c8159566b75f64fe0d89fc178bd9181d3f7b1 From 48636b9ef716be50e320e9b6e929d6dfe48683d5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 8 Oct 2015 14:28:36 +0200 Subject: [PATCH 23/27] update belle-sip and linphone for ICE restart problem --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index e2aec4481..2902d668b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e2aec4481a86b00fc987050ff540f20545e52fe5 +Subproject commit 2902d668bd6876089999c3c24f26237f998adbfb diff --git a/submodules/linphone b/submodules/linphone index db3c81595..b025abb63 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit db3c8159566b75f64fe0d89fc178bd9181d3f7b1 +Subproject commit b025abb63a65c3194661038c0b0a7ef4ea950c59 From 88852a4e47c463b59a2d90253ea038b14e520ac2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 8 Oct 2015 15:01:05 +0200 Subject: [PATCH 24/27] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index b025abb63..4e3ea86c9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b025abb63a65c3194661038c0b0a7ef4ea950c59 +Subproject commit 4e3ea86c90cf125f1348dc4f296540d1696e5851 From 05df4cc6b3fbe80d96c4f9c5d0cace2e805a1b4d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 13 Oct 2015 09:39:24 +0200 Subject: [PATCH 25/27] update belle-sip and linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 2902d668b..fbb27d34f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 2902d668bd6876089999c3c24f26237f998adbfb +Subproject commit fbb27d34f9134812876da5bccee0bf5b80aa5f77 diff --git a/submodules/linphone b/submodules/linphone index 4e3ea86c9..709ce29b0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4e3ea86c90cf125f1348dc4f296540d1696e5851 +Subproject commit 709ce29b0bd5965cd538fbc8815d675df4016b68 From b3dda49ec72bdf170f8abac97b33cc9046bf63e0 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 14 Oct 2015 15:39:19 +0200 Subject: [PATCH 26/27] update belle-sip --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index fbb27d34f..1ced63785 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit fbb27d34f9134812876da5bccee0bf5b80aa5f77 +Subproject commit 1ced637855bb052f2475847c867f648338b84376 From 7aee28f8a1e73b30a04d6af68b21101fde43f878 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 14 Oct 2015 22:15:44 +0200 Subject: [PATCH 27/27] update linphone submodule for socket refresh feature --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 709ce29b0..d3bd19d39 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 709ce29b0bd5965cd538fbc8815d675df4016b68 +Subproject commit d3bd19d39ddeee28505c12b9013088d0c3a67204