Add Datachannel support to Android AppRTCMobile

webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.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 34 matching lines @@
   private String keyprefDisableBuiltInAEC;
   private String keyprefDisableBuiltInAGC;
   private String keyprefDisableBuiltInNS;
   private String keyprefEnableLevelControl;
   private String keyprefSpeakerphone;
 
   private String keyPrefRoomServerUrl;
   private String keyPrefDisplayHud;
   private String keyPrefTracing;
 
+  private String keyprefEnableDataChannel;
+  private String keyprefOrdered;
+  private String keyprefMaxRetransmitTimeMs;
+  private String keyprefMaxRetransmits;
+  private String keyprefDataProtocol;
+  private String keyprefNegotiated;
+  private String keyprefDataId;
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     keyprefVideoCall = getString(R.string.pref_videocall_key);
     keyprefCamera2 = getString(R.string.pref_camera2_key);
     keyprefResolution = getString(R.string.pref_resolution_key);
     keyprefFps = getString(R.string.pref_fps_key);
     keyprefCaptureQualitySlider = getString(R.string.pref_capturequalityslider_key);
     keyprefMaxVideoBitrateType = getString(R.string.pref_maxvideobitrate_key);
     keyprefMaxVideoBitrateValue = getString(R.string.pref_maxvideobitratevalue_key);
@@ skipping 10 matching lines @@
     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);
     keyprefSpeakerphone = getString(R.string.pref_speakerphone_key);
 
     keyPrefRoomServerUrl = getString(R.string.pref_room_server_url_key);
     keyPrefDisplayHud = getString(R.string.pref_displayhud_key);
     keyPrefTracing = getString(R.string.pref_tracing_key);
 
+    keyprefEnableDataChannel = getString(R.string.pref_enable_datachannel_key);

[sakal, 2016/11/10 08:31:42]

nit: move before keyPrefRoomServerUrl to match order in the settings

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

Done.

+    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);
+
     // Display the fragment as the main content.
     settingsFragment = new SettingsFragment();
     getFragmentManager()
         .beginTransaction()
         .replace(android.R.id.content, settingsFragment)
         .commit();
   }
 
   @Override
   protected void onResume() {
@@ skipping 23 matching lines @@
     updateSummaryB(sharedPreferences, keyprefOpenSLES);
     updateSummaryB(sharedPreferences, keyprefDisableBuiltInAEC);
     updateSummaryB(sharedPreferences, keyprefDisableBuiltInAGC);
     updateSummaryB(sharedPreferences, keyprefDisableBuiltInNS);
     updateSummaryB(sharedPreferences, keyprefEnableLevelControl);
     updateSummaryList(sharedPreferences, keyprefSpeakerphone);
 
     updateSummary(sharedPreferences, keyPrefRoomServerUrl);
     updateSummaryB(sharedPreferences, keyPrefDisplayHud);
     updateSummaryB(sharedPreferences, keyPrefTracing);
+    updateSummaryB(sharedPreferences, keyprefEnableDataChannel);
+

[sakal, 2016/11/10 08:31:42]

nit: remove space and move all settings before keyPrefRoomServerUrl

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

Done.

+    updateSummary(sharedPreferences, keyprefMaxRetransmits);
+    updateSummary(sharedPreferences, keyprefMaxRetransmitTimeMs);
+    updateSummary(sharedPreferences, keyprefDataId);
+    updateSummary(sharedPreferences, keyprefDataProtocol);
 
     if (!Camera2Enumerator.isSupported(this)) {
       Preference camera2Preference = settingsFragment.findPreference(keyprefCamera2);
 
       camera2Preference.setSummary(getString(R.string.pref_camera2_not_supported));
       camera2Preference.setEnabled(false);
     }
 
     // Disable forcing WebRTC based AEC so it won't affect our value.
     // Otherwise, if it was enabled, isAcousticEchoCancelerSupported would always return false.
@@ skipping 65 matching lines @@
     } else if (key.equals(keyprefSpeakerphone)) {
       updateSummaryList(sharedPreferences, key);
     }
     // clang-format on
     if (key.equals(keyprefMaxVideoBitrateType)) {
       setVideoBitrateEnable(sharedPreferences);
     }
     if (key.equals(keyprefStartAudioBitrateType)) {
       setAudioBitrateEnable(sharedPreferences);
     }
+    if (key.equals(keyprefEnableDataChannel)) {
+      setDataChannelEnable(sharedPreferences);
+    }
   }
 
   private void updateSummary(SharedPreferences sharedPreferences, String key) {
     Preference updatedPref = settingsFragment.findPreference(key);
     // Set summary to be the user-description for the selected value
     updatedPref.setSummary(sharedPreferences.getString(key, ""));
   }
 
   private void updateSummaryBitrate(SharedPreferences sharedPreferences, String key) {
     Preference updatedPref = settingsFragment.findPreference(key);
@@ skipping 30 matching lines @@
         settingsFragment.findPreference(keyprefStartAudioBitrateValue);
     String bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_default);
     String bitrateType =
         sharedPreferences.getString(keyprefStartAudioBitrateType, bitrateTypeDefault);
     if (bitrateType.equals(bitrateTypeDefault)) {
       bitratePreferenceValue.setEnabled(false);
     } else {
       bitratePreferenceValue.setEnabled(true);
     }
   }
+
+  private void setDataChannelEnable(SharedPreferences sharedPreferences) {
+    boolean enabled = sharedPreferences.getBoolean(keyprefEnableDataChannel, true);
+    settingsFragment.findPreference(keyprefOrdered).setEnabled(enabled);
+    settingsFragment.findPreference(keyprefMaxRetransmitTimeMs).setEnabled(enabled);
+    settingsFragment.findPreference(keyprefMaxRetransmits).setEnabled(enabled);
+    settingsFragment.findPreference(keyprefDataProtocol).setEnabled(enabled);
+    settingsFragment.findPreference(keyprefNegotiated).setEnabled(enabled);
+    settingsFragment.findPreference(keyprefDataId).setEnabled(enabled);
+  }
 }