Add Datachannel support to Android AppRTCMobile

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

Index: webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
index fd38f9039f63744f733e56cc6f81110025d8d3b9..3ed16c3632e7a0a42b17b3729316c1ce7d4b8c93 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java
@@ -52,6 +52,14 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
   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);
@@ -82,6 +90,14 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
     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()
@@ -125,6 +141,12 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
     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);
@@ -210,6 +232,9 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
     if (key.equals(keyprefStartAudioBitrateType)) {
       setAudioBitrateEnable(sharedPreferences);
     }
+    if (key.equals(keyprefEnableDataChannel)) {
+      setDataChannelEnable(sharedPreferences);
+    }
   }
 
   private void updateSummary(SharedPreferences sharedPreferences, String key) {
@@ -260,4 +285,14 @@ public class SettingsActivity extends Activity implements OnSharedPreferenceChan
       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);
+  }
 }