Add Datachannel support to Android AppRTCMobile

webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 63 matching lines @@
   private String keyprefDisableBuiltInAgc;
   private String keyprefDisableBuiltInNs;
   private String keyprefEnableLevelControl;
   private String keyprefDisplayHud;
   private String keyprefTracing;
   private String keyprefRoomServerUrl;
   private String keyprefRoom;
   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) {
     super.onCreate(savedInstanceState);
 
     // Get setting keys.
     PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
     sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
     keyprefVideoCallEnabled = getString(R.string.pref_videocall_key);
     keyprefCamera2 = getString(R.string.pref_camera2_key);
@@ skipping 13 matching lines @@
     keyprefOpenSLES = getString(R.string.pref_opensles_key);
     keyprefDisableBuiltInAec = getString(R.string.pref_disable_built_in_aec_key);
     keyprefDisableBuiltInAgc = getString(R.string.pref_disable_built_in_agc_key);
     keyprefDisableBuiltInNs = getString(R.string.pref_disable_built_in_ns_key);
     keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key);
     keyprefDisplayHud = getString(R.string.pref_displayhud_key);
     keyprefTracing = getString(R.string.pref_tracing_key);
     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);
 
     roomEditText = (EditText) findViewById(R.id.room_edittext);
     roomEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
       @Override
       public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
         if (i == EditorInfo.IME_ACTION_DONE) {
           addFavoriteButton.performClick();
           return true;
@@ skipping 327 matching lines @@
       intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC);
       intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS);
       intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelControl);
       intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate);
       intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec);
       intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud);
       intent.putExtra(CallActivity.EXTRA_TRACING, tracing);
       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-statement to mirror with the
other settings. Also, you should read the defaults from resources like rest of
the settings. You can use existing helper methods to do that
(sharedPrefGetString / sharedPrefGetBoolean).

[hekra01, 2016/11/10 14:16:53]

Done.
I re-added the pref_data_protocol_default in the strings.xml and
preferences.xml.
Empty string "" seems a valid default value for data protocol as stated in
org.webrtc.DataChannel.Init and
https://developer.mozilla.org/fr/docs/Web/API/RTCDataChannel

[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 =
               getIntent().getStringExtra(CallActivity.EXTRA_VIDEO_FILE_AS_CAMERA);
           intent.putExtra(CallActivity.EXTRA_VIDEO_FILE_AS_CAMERA, videoFileAsCamera);
         }
 
         if (getIntent().hasExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE)) {
           String saveRemoteVideoToFile =
               getIntent().getStringExtra(CallActivity.EXTRA_SAVE_REMOTE_VIDEO_TO_FILE);
@@ skipping 57 matching lines @@
     }
   };
 
   private final OnClickListener connectListener = new OnClickListener() {
     @Override
     public void onClick(View view) {
       connectToRoom(roomEditText.getText().toString(), false, false, false, 0);
     }
   };
 }