diff --git a/liblinphone_tester/AndroidManifest.xml b/liblinphone_tester/AndroidManifest.xml index be725f20f..91848ce78 100644 --- a/liblinphone_tester/AndroidManifest.xml +++ b/liblinphone_tester/AndroidManifest.xml @@ -20,7 +20,9 @@ android:theme="@style/AppTheme" > + android:label="@string/app_name" + android:screenOrientation="nosensor" + android:launchMode="singleTask"> @@ -29,11 +31,15 @@ + android:label="@string/title_activity_logs" + android:screenOrientation="nosensor" + android:launchMode="singleTask"> + android:label="@string/title_activity_suites" + android:screenOrientation="nosensor" + android:launchMode="singleTask"> diff --git a/liblinphone_tester/res/raw/marie_early_rc b/liblinphone_tester/res/raw/marie_early_rc new file mode 100644 index 000000000..bb603a738 --- /dev/null +++ b/liblinphone_tester/res/raw/marie_early_rc @@ -0,0 +1,45 @@ +[sip] +sip_port=5082 +sip_tcp_port=5082 +sip_tls_port=5083 +default_proxy=0 +ping_with_options=0 +register_only_when_network_is_up=0 +incoming_calls_early_media=1 + +[auth_info_0] +username=marie +userid=marie +passwd=secret +realm="sip.example.org" + + +[proxy_0] +reg_proxy=sip2.linphone.org;transport=tcp +reg_route=sip2.linphone.org;transport=tcp;lr +reg_identity=sip:marie@sip.example.org +reg_expires=3600 +reg_sendregister=1 +publish=0 +dial_escape_plus=0 + +[friend_0] +url="Paupoche" +pol=accept +subscribe=0 + + +[rtp] +audio_rtp_port=8070 +video_rtp_port=8072 + +[video] +display=0 +capture=0 +show_local=0 +size=vga +enabled=0 +self_view=0 +automatically_initiate=0 +automatically_accept=0 +device=StaticImage: Static picture diff --git a/liblinphone_tester/res/raw/marie_rc b/liblinphone_tester/res/raw/marie_rc index 760db76ba..d8b74a1e1 100644 --- a/liblinphone_tester/res/raw/marie_rc +++ b/liblinphone_tester/res/raw/marie_rc @@ -44,4 +44,4 @@ enabled=0 self_view=0 automatically_initiate=0 automatically_accept=0 -device=StaticImage: Static picture \ No newline at end of file +device=StaticImage: Static picture diff --git a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java index 2e20a15fa..0a8e6120d 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(); tester = new TesterLogger(mLogsActivity); - List list = new LinkedList(Arrays.asList(new String[]{"tester", "--config", path})); + List list = new LinkedList(Arrays.asList(new String[]{"tester", "--verbose", "--config", 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/MainActivity.java b/liblinphone_tester/src/org/linphone/tester/MainActivity.java index 374cbbf18..baa576783 100644 --- a/liblinphone_tester/src/org/linphone/tester/MainActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/MainActivity.java @@ -36,6 +36,7 @@ public class MainActivity extends Activity { try { copyFromPackage(R.raw.laure_rc, new File("laure_rc").getName()); copyFromPackage(R.raw.marie_rc, new File("marie_rc").getName()); + copyFromPackage(R.raw.marie_early_rc, new File("marie_early_rc").getName()); copyFromPackage(R.raw.multi_account_lrc, new File("multi_account_lrc").getName()); copyFromPackage(R.raw.pauline_rc, new File("pauline_rc").getName()); } catch (IOException e) { @@ -47,7 +48,7 @@ public class MainActivity extends Activity { TesterList suitesTest = new TesterList(); suitesTest.run(new String[]{"tester", "--list-suites"}); LinearLayout layout = ((LinearLayout)findViewById(R.id.suites_list)); - layout.removeAllViewsInLayout(); + layout.removeAllViews(); addButton(layout, "All", null); for(String str: suitesTest.getList()) { str = str.trim(); diff --git a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java index c8d0a8a25..975d85813 100644 --- a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java @@ -22,7 +22,7 @@ public class SuitesActivity extends Activity { TesterList suitesTest = new TesterList(); suitesTest.run(new String[]{"tester", "--list-tests", mSuite}); LinearLayout layout = ((LinearLayout)findViewById(R.id.tests_list)); - layout.removeAllViewsInLayout(); + layout.removeAllViews(); addButton(layout, "All", null); for(String str: suitesTest.getList()) { str = str.trim();