Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java

Issue 2464243002: Add Datachannel support to Android AppRTCMobile (Closed)
Patch Set: xml ordering Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
index 80ea90f93a1f7a392b036115d21ea77c414c1793..1fba66819cd7899c71c275f0cf2e2bd3e0815905 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
@@ -81,6 +81,13 @@ public class ConnectActivity extends Activity {
private String keyprefRoomList;
private ArrayList<String> roomList;
private ArrayAdapter<String> adapter;
+ private String keyprefEnableDataChannel;
+ private String keyprefOrdered;
+ private String keyprefMaxRetransmitTimeMs;
+ private String keyprefMaxRetransmits;
+ private String keyprefDataProtocol;
+ private String keyprefNegotiated;
+ private String keyprefDataId;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -114,6 +121,13 @@ public class ConnectActivity extends Activity {
keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key);
keyprefRoom = getString(R.string.pref_room_key);
keyprefRoomList = getString(R.string.pref_room_list_key);
+ keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key);
+ keyprefOrdered = getString(R.string.pref_ordered_key);
+ keyprefMaxRetransmitTimeMs = getString(R.string.pref_max_retransmit_time_ms_key);
+ keyprefMaxRetransmits = getString(R.string.pref_max_retransmits_key);
+ keyprefDataProtocol = getString(R.string.pref_data_protocol_key);
+ keyprefNegotiated = getString(R.string.pref_negotiated_key);
+ keyprefDataId = getString(R.string.pref_data_id_key);
setContentView(R.layout.activity_connect);
@@ -461,6 +475,26 @@ public class ConnectActivity extends Activity {
intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun);
intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs);
+ //Get datachannel options
sakal 2016/11/10 08:31:42 nit: space after //
sakal 2016/11/10 08:31:42 Please move reading the preferences out of the if-
hekra01 2016/11/10 14:16:53 Done. I re-added the pref_data_protocol_default in
hekra01 2016/11/10 14:16:53 Done.
hekra01 2016/11/10 14:16:53 Done.
+ boolean dataChannelEnabled = sharedPref.getBoolean(keyprefEnableDataChannel, true);
+ intent.putExtra(CallActivity.EXTRA_DATA_CHANNEL_ENABLED, dataChannelEnabled);
+
+ if (dataChannelEnabled) {
+ boolean ordered = sharedPref.getBoolean(keyprefOrdered, true);
+ boolean negotiated = sharedPref.getBoolean(keyprefNegotiated, false);
+ int maxRetrMs = Integer.parseInt(sharedPref.getString(keyprefMaxRetransmitTimeMs, "-1"));
+ int maxRetr = Integer.parseInt(sharedPref.getString(keyprefMaxRetransmits, "-1"));
+ int id = Integer.parseInt(sharedPref.getString(keyprefDataId, "-1"));
+ String protocol = sharedPref.getString(keyprefDataProtocol, "");
+ intent.putExtra(CallActivity.EXTRA_ORDERED, ordered);
+ intent.putExtra(CallActivity.EXTRA_MAX_RETRANSMITS_MS, maxRetrMs);
+ intent.putExtra(CallActivity.EXTRA_MAX_RETRANSMITS, maxRetr);
+ intent.putExtra(CallActivity.EXTRA_PROTOCOL, protocol);
+ intent.putExtra(CallActivity.EXTRA_NEGOTIATED, negotiated);
+ intent.putExtra(CallActivity.EXTRA_ID, id);
+ }
+
+
if (useValuesFromIntent) {
if (getIntent().hasExtra(CallActivity.EXTRA_VIDEO_FILE_AS_CAMERA)) {
String videoFileAsCamera =

Powered by Google App Engine
This is Rietveld 408576698