OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key
); | 111 keyprefEnableLevelControl = getString(R.string.pref_enable_level_control_key
); |
112 keyprefDisplayHud = getString(R.string.pref_displayhud_key); | 112 keyprefDisplayHud = getString(R.string.pref_displayhud_key); |
113 keyprefTracing = getString(R.string.pref_tracing_key); | 113 keyprefTracing = getString(R.string.pref_tracing_key); |
114 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); | 114 keyprefRoomServerUrl = getString(R.string.pref_room_server_url_key); |
115 keyprefRoom = getString(R.string.pref_room_key); | 115 keyprefRoom = getString(R.string.pref_room_key); |
116 keyprefRoomList = getString(R.string.pref_room_list_key); | 116 keyprefRoomList = getString(R.string.pref_room_list_key); |
117 | 117 |
118 setContentView(R.layout.activity_connect); | 118 setContentView(R.layout.activity_connect); |
119 | 119 |
120 roomEditText = (EditText) findViewById(R.id.room_edittext); | 120 roomEditText = (EditText) findViewById(R.id.room_edittext); |
121 roomEditText.setOnEditorActionListener( | 121 roomEditText.setOnEditorActionListener(new TextView.OnEditorActionListener()
{ |
122 new TextView.OnEditorActionListener() { | 122 @Override |
123 @Override | 123 public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent)
{ |
124 public boolean onEditorAction( | 124 if (i == EditorInfo.IME_ACTION_DONE) { |
125 TextView textView, int i, KeyEvent keyEvent) { | 125 addFavoriteButton.performClick(); |
126 if (i == EditorInfo.IME_ACTION_DONE) { | 126 return true; |
127 addFavoriteButton.performClick(); | |
128 return true; | |
129 } | |
130 return false; | |
131 } | 127 } |
| 128 return false; |
| 129 } |
132 }); | 130 }); |
133 roomEditText.requestFocus(); | 131 roomEditText.requestFocus(); |
134 | 132 |
135 roomListView = (ListView) findViewById(R.id.room_listview); | 133 roomListView = (ListView) findViewById(R.id.room_listview); |
136 roomListView.setEmptyView(findViewById(android.R.id.empty)); | 134 roomListView.setEmptyView(findViewById(android.R.id.empty)); |
137 roomListView.setOnItemClickListener(roomListClickListener); | 135 roomListView.setOnItemClickListener(roomListClickListener); |
138 registerForContextMenu(roomListView); | 136 registerForContextMenu(roomListView); |
139 connectButton = (ImageButton) findViewById(R.id.connect_button); | 137 connectButton = (ImageButton) findViewById(R.id.connect_button); |
140 connectButton.setOnClickListener(connectListener); | 138 connectButton.setOnClickListener(connectListener); |
141 addFavoriteButton = (ImageButton) findViewById(R.id.add_favorite_button); | 139 addFavoriteButton = (ImageButton) findViewById(R.id.add_favorite_button); |
142 addFavoriteButton.setOnClickListener(addFavoriteListener); | 140 addFavoriteButton.setOnClickListener(addFavoriteListener); |
143 | 141 |
144 // If an implicit VIEW intent is launching the app, go directly to that URL. | 142 // If an implicit VIEW intent is launching the app, go directly to that URL. |
145 final Intent intent = getIntent(); | 143 final Intent intent = getIntent(); |
146 if ("android.intent.action.VIEW".equals(intent.getAction()) | 144 if ("android.intent.action.VIEW".equals(intent.getAction()) && !commandLineR
un) { |
147 && !commandLineRun) { | 145 boolean loopback = intent.getBooleanExtra(CallActivity.EXTRA_LOOPBACK, fal
se); |
148 boolean loopback = intent.getBooleanExtra( | 146 int runTimeMs = intent.getIntExtra(CallActivity.EXTRA_RUNTIME, 0); |
149 CallActivity.EXTRA_LOOPBACK, false); | |
150 int runTimeMs = intent.getIntExtra( | |
151 CallActivity.EXTRA_RUNTIME, 0); | |
152 String room = sharedPref.getString(keyprefRoom, ""); | 147 String room = sharedPref.getString(keyprefRoom, ""); |
153 connectToRoom(room, true, loopback, runTimeMs); | 148 connectToRoom(room, true, loopback, runTimeMs); |
154 } | 149 } |
155 } | 150 } |
156 | 151 |
157 @Override | 152 @Override |
158 public boolean onCreateOptionsMenu(Menu menu) { | 153 public boolean onCreateOptionsMenu(Menu menu) { |
159 getMenuInflater().inflate(R.menu.connect_menu, menu); | 154 getMenuInflater().inflate(R.menu.connect_menu, menu); |
160 return true; | 155 return true; |
161 } | 156 } |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 if (roomListJson != null) { | 218 if (roomListJson != null) { |
224 try { | 219 try { |
225 JSONArray jsonArray = new JSONArray(roomListJson); | 220 JSONArray jsonArray = new JSONArray(roomListJson); |
226 for (int i = 0; i < jsonArray.length(); i++) { | 221 for (int i = 0; i < jsonArray.length(); i++) { |
227 roomList.add(jsonArray.get(i).toString()); | 222 roomList.add(jsonArray.get(i).toString()); |
228 } | 223 } |
229 } catch (JSONException e) { | 224 } catch (JSONException e) { |
230 Log.e(TAG, "Failed to load room list: " + e.toString()); | 225 Log.e(TAG, "Failed to load room list: " + e.toString()); |
231 } | 226 } |
232 } | 227 } |
233 adapter = new ArrayAdapter<String>( | 228 adapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1
, roomList); |
234 this, android.R.layout.simple_list_item_1, roomList); | |
235 roomListView.setAdapter(adapter); | 229 roomListView.setAdapter(adapter); |
236 if (adapter.getCount() > 0) { | 230 if (adapter.getCount() > 0) { |
237 roomListView.requestFocus(); | 231 roomListView.requestFocus(); |
238 roomListView.setItemChecked(0, true); | 232 roomListView.setItemChecked(0, true); |
239 } | 233 } |
240 } | 234 } |
241 | 235 |
242 @Override | 236 @Override |
243 protected void onActivityResult( | 237 protected void onActivityResult(int requestCode, int resultCode, Intent data)
{ |
244 int requestCode, int resultCode, Intent data) { | |
245 if (requestCode == CONNECTION_REQUEST && commandLineRun) { | 238 if (requestCode == CONNECTION_REQUEST && commandLineRun) { |
246 Log.d(TAG, "Return: " + resultCode); | 239 Log.d(TAG, "Return: " + resultCode); |
247 setResult(resultCode); | 240 setResult(resultCode); |
248 commandLineRun = false; | 241 commandLineRun = false; |
249 finish(); | 242 finish(); |
250 } | 243 } |
251 } | 244 } |
252 | 245 |
253 private void connectToRoom( | 246 private void connectToRoom( |
254 String roomId, boolean commandLineRun, boolean loopback, int runTimeMs) { | 247 String roomId, boolean commandLineRun, boolean loopback, int runTimeMs) { |
255 this.commandLineRun = commandLineRun; | 248 this.commandLineRun = commandLineRun; |
256 | 249 |
257 // roomId is random for loopback. | 250 // roomId is random for loopback. |
258 if (loopback) { | 251 if (loopback) { |
259 roomId = Integer.toString((new Random()).nextInt(100000000)); | 252 roomId = Integer.toString((new Random()).nextInt(100000000)); |
260 } | 253 } |
261 | 254 |
262 String roomUrl = sharedPref.getString( | 255 String roomUrl = sharedPref.getString( |
263 keyprefRoomServerUrl, | 256 keyprefRoomServerUrl, getString(R.string.pref_room_server_url_default)); |
264 getString(R.string.pref_room_server_url_default)); | |
265 | 257 |
266 // Video call enabled flag. | 258 // Video call enabled flag. |
267 boolean videoCallEnabled = sharedPref.getBoolean(keyprefVideoCallEnabled, | 259 boolean videoCallEnabled = sharedPref.getBoolean( |
268 Boolean.valueOf(getString(R.string.pref_videocall_default))); | 260 keyprefVideoCallEnabled, Boolean.valueOf(getString(R.string.pref_videoca
ll_default))); |
269 | 261 |
270 // Use Camera2 option. | 262 // Use Camera2 option. |
271 boolean useCamera2 = sharedPref.getBoolean(keyprefCamera2, | 263 boolean useCamera2 = sharedPref.getBoolean( |
272 Boolean.valueOf(getString(R.string.pref_camera2_default))); | 264 keyprefCamera2, Boolean.valueOf(getString(R.string.pref_camera2_default)
)); |
273 | 265 |
274 // Get default codecs. | 266 // Get default codecs. |
275 String videoCodec = sharedPref.getString(keyprefVideoCodec, | 267 String videoCodec = |
276 getString(R.string.pref_videocodec_default)); | 268 sharedPref.getString(keyprefVideoCodec, getString(R.string.pref_videocod
ec_default)); |
277 String audioCodec = sharedPref.getString(keyprefAudioCodec, | 269 String audioCodec = |
278 getString(R.string.pref_audiocodec_default)); | 270 sharedPref.getString(keyprefAudioCodec, getString(R.string.pref_audiocod
ec_default)); |
279 | 271 |
280 // Check HW codec flag. | 272 // Check HW codec flag. |
281 boolean hwCodec = sharedPref.getBoolean(keyprefHwCodecAcceleration, | 273 boolean hwCodec = sharedPref.getBoolean( |
282 Boolean.valueOf(getString(R.string.pref_hwcodec_default))); | 274 keyprefHwCodecAcceleration, Boolean.valueOf(getString(R.string.pref_hwco
dec_default))); |
283 | 275 |
284 // Check Capture to texture. | 276 // Check Capture to texture. |
285 boolean captureToTexture = sharedPref.getBoolean(keyprefCaptureToTexture, | 277 boolean captureToTexture = sharedPref.getBoolean(keyprefCaptureToTexture, |
286 Boolean.valueOf(getString(R.string.pref_capturetotexture_default))); | 278 Boolean.valueOf(getString(R.string.pref_capturetotexture_default))); |
287 | 279 |
288 // Check Disable Audio Processing flag. | 280 // Check Disable Audio Processing flag. |
289 boolean noAudioProcessing = sharedPref.getBoolean( | 281 boolean noAudioProcessing = sharedPref.getBoolean(keyprefNoAudioProcessingPi
peline, |
290 keyprefNoAudioProcessingPipeline, | |
291 Boolean.valueOf(getString(R.string.pref_noaudioprocessing_default))); | 282 Boolean.valueOf(getString(R.string.pref_noaudioprocessing_default))); |
292 | 283 |
293 // Check Disable Audio Processing flag. | 284 // Check Disable Audio Processing flag. |
294 boolean aecDump = sharedPref.getBoolean( | 285 boolean aecDump = sharedPref.getBoolean( |
295 keyprefAecDump, | 286 keyprefAecDump, Boolean.valueOf(getString(R.string.pref_aecdump_default)
)); |
296 Boolean.valueOf(getString(R.string.pref_aecdump_default))); | |
297 | 287 |
298 // Check OpenSL ES enabled flag. | 288 // Check OpenSL ES enabled flag. |
299 boolean useOpenSLES = sharedPref.getBoolean( | 289 boolean useOpenSLES = sharedPref.getBoolean( |
300 keyprefOpenSLES, | 290 keyprefOpenSLES, Boolean.valueOf(getString(R.string.pref_opensles_defaul
t))); |
301 Boolean.valueOf(getString(R.string.pref_opensles_default))); | |
302 | 291 |
303 // Check Disable built-in AEC flag. | 292 // Check Disable built-in AEC flag. |
304 boolean disableBuiltInAEC = sharedPref.getBoolean( | 293 boolean disableBuiltInAEC = sharedPref.getBoolean(keyprefDisableBuiltInAec, |
305 keyprefDisableBuiltInAec, | |
306 Boolean.valueOf(getString(R.string.pref_disable_built_in_aec_default))); | 294 Boolean.valueOf(getString(R.string.pref_disable_built_in_aec_default))); |
307 | 295 |
308 // Check Disable built-in AGC flag. | 296 // Check Disable built-in AGC flag. |
309 boolean disableBuiltInAGC = sharedPref.getBoolean( | 297 boolean disableBuiltInAGC = sharedPref.getBoolean(keyprefDisableBuiltInAgc, |
310 keyprefDisableBuiltInAgc, | |
311 Boolean.valueOf(getString(R.string.pref_disable_built_in_agc_default))); | 298 Boolean.valueOf(getString(R.string.pref_disable_built_in_agc_default))); |
312 | 299 |
313 // Check Disable built-in NS flag. | 300 // Check Disable built-in NS flag. |
314 boolean disableBuiltInNS = sharedPref.getBoolean( | 301 boolean disableBuiltInNS = sharedPref.getBoolean(keyprefDisableBuiltInNs, |
315 keyprefDisableBuiltInNs, | |
316 Boolean.valueOf(getString(R.string.pref_disable_built_in_ns_default))); | 302 Boolean.valueOf(getString(R.string.pref_disable_built_in_ns_default))); |
317 | 303 |
318 // Check Enable level control. | 304 // Check Enable level control. |
319 boolean enableLevelControl = sharedPref.getBoolean( | 305 boolean enableLevelControl = sharedPref.getBoolean(keyprefEnableLevelControl
, |
320 keyprefEnableLevelControl, | |
321 Boolean.valueOf(getString(R.string.pref_enable_level_control_key))); | 306 Boolean.valueOf(getString(R.string.pref_enable_level_control_key))); |
322 | 307 |
323 // Get video resolution from settings. | 308 // Get video resolution from settings. |
324 int videoWidth = 0; | 309 int videoWidth = 0; |
325 int videoHeight = 0; | 310 int videoHeight = 0; |
326 String resolution = sharedPref.getString(keyprefResolution, | 311 String resolution = |
327 getString(R.string.pref_resolution_default)); | 312 sharedPref.getString(keyprefResolution, getString(R.string.pref_resoluti
on_default)); |
328 String[] dimensions = resolution.split("[ x]+"); | 313 String[] dimensions = resolution.split("[ x]+"); |
329 if (dimensions.length == 2) { | 314 if (dimensions.length == 2) { |
330 try { | 315 try { |
331 videoWidth = Integer.parseInt(dimensions[0]); | 316 videoWidth = Integer.parseInt(dimensions[0]); |
332 videoHeight = Integer.parseInt(dimensions[1]); | 317 videoHeight = Integer.parseInt(dimensions[1]); |
333 } catch (NumberFormatException e) { | 318 } catch (NumberFormatException e) { |
334 videoWidth = 0; | 319 videoWidth = 0; |
335 videoHeight = 0; | 320 videoHeight = 0; |
336 Log.e(TAG, "Wrong video resolution setting: " + resolution); | 321 Log.e(TAG, "Wrong video resolution setting: " + resolution); |
337 } | 322 } |
338 } | 323 } |
339 | 324 |
340 // Get camera fps from settings. | 325 // Get camera fps from settings. |
341 int cameraFps = 0; | 326 int cameraFps = 0; |
342 String fps = sharedPref.getString(keyprefFps, | 327 String fps = sharedPref.getString(keyprefFps, getString(R.string.pref_fps_de
fault)); |
343 getString(R.string.pref_fps_default)); | |
344 String[] fpsValues = fps.split("[ x]+"); | 328 String[] fpsValues = fps.split("[ x]+"); |
345 if (fpsValues.length == 2) { | 329 if (fpsValues.length == 2) { |
346 try { | 330 try { |
347 cameraFps = Integer.parseInt(fpsValues[0]); | 331 cameraFps = Integer.parseInt(fpsValues[0]); |
348 } catch (NumberFormatException e) { | 332 } catch (NumberFormatException e) { |
349 Log.e(TAG, "Wrong camera fps setting: " + fps); | 333 Log.e(TAG, "Wrong camera fps setting: " + fps); |
350 } | 334 } |
351 } | 335 } |
352 | 336 |
353 // Check capture quality slider flag. | 337 // Check capture quality slider flag. |
354 boolean captureQualitySlider = sharedPref.getBoolean(keyprefCaptureQualitySl
ider, | 338 boolean captureQualitySlider = sharedPref.getBoolean(keyprefCaptureQualitySl
ider, |
355 Boolean.valueOf(getString(R.string.pref_capturequalityslider_default))); | 339 Boolean.valueOf(getString(R.string.pref_capturequalityslider_default))); |
356 | 340 |
357 // Get video and audio start bitrate. | 341 // Get video and audio start bitrate. |
358 int videoStartBitrate = 0; | 342 int videoStartBitrate = 0; |
359 String bitrateTypeDefault = getString( | 343 String bitrateTypeDefault = getString(R.string.pref_maxvideobitrate_default)
; |
360 R.string.pref_maxvideobitrate_default); | 344 String bitrateType = sharedPref.getString(keyprefVideoBitrateType, bitrateTy
peDefault); |
361 String bitrateType = sharedPref.getString( | |
362 keyprefVideoBitrateType, bitrateTypeDefault); | |
363 if (!bitrateType.equals(bitrateTypeDefault)) { | 345 if (!bitrateType.equals(bitrateTypeDefault)) { |
364 String bitrateValue = sharedPref.getString(keyprefVideoBitrateValue, | 346 String bitrateValue = sharedPref.getString( |
365 getString(R.string.pref_maxvideobitratevalue_default)); | 347 keyprefVideoBitrateValue, getString(R.string.pref_maxvideobitratevalue
_default)); |
366 videoStartBitrate = Integer.parseInt(bitrateValue); | 348 videoStartBitrate = Integer.parseInt(bitrateValue); |
367 } | 349 } |
368 int audioStartBitrate = 0; | 350 int audioStartBitrate = 0; |
369 bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_default); | 351 bitrateTypeDefault = getString(R.string.pref_startaudiobitrate_default); |
370 bitrateType = sharedPref.getString( | 352 bitrateType = sharedPref.getString(keyprefAudioBitrateType, bitrateTypeDefau
lt); |
371 keyprefAudioBitrateType, bitrateTypeDefault); | |
372 if (!bitrateType.equals(bitrateTypeDefault)) { | 353 if (!bitrateType.equals(bitrateTypeDefault)) { |
373 String bitrateValue = sharedPref.getString(keyprefAudioBitrateValue, | 354 String bitrateValue = sharedPref.getString( |
374 getString(R.string.pref_startaudiobitratevalue_default)); | 355 keyprefAudioBitrateValue, getString(R.string.pref_startaudiobitrateval
ue_default)); |
375 audioStartBitrate = Integer.parseInt(bitrateValue); | 356 audioStartBitrate = Integer.parseInt(bitrateValue); |
376 } | 357 } |
377 | 358 |
378 // Check statistics display option. | 359 // Check statistics display option. |
379 boolean displayHud = sharedPref.getBoolean(keyprefDisplayHud, | 360 boolean displayHud = sharedPref.getBoolean( |
380 Boolean.valueOf(getString(R.string.pref_displayhud_default))); | 361 keyprefDisplayHud, Boolean.valueOf(getString(R.string.pref_displayhud_de
fault))); |
381 | 362 |
382 boolean tracing = sharedPref.getBoolean( | 363 boolean tracing = sharedPref.getBoolean( |
383 keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_defa
ult))); | 364 keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_default)
)); |
384 | 365 |
385 // Start AppRTCMobile activity. | 366 // Start AppRTCMobile activity. |
386 Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl); | 367 Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl); |
387 if (validateUrl(roomUrl)) { | 368 if (validateUrl(roomUrl)) { |
388 Uri uri = Uri.parse(roomUrl); | 369 Uri uri = Uri.parse(roomUrl); |
389 Intent intent = new Intent(this, CallActivity.class); | 370 Intent intent = new Intent(this, CallActivity.class); |
390 intent.setData(uri); | 371 intent.setData(uri); |
391 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId); | 372 intent.putExtra(CallActivity.EXTRA_ROOMID, roomId); |
392 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); | 373 intent.putExtra(CallActivity.EXTRA_LOOPBACK, loopback); |
393 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); | 374 intent.putExtra(CallActivity.EXTRA_VIDEO_CALL, videoCallEnabled); |
394 intent.putExtra(CallActivity.EXTRA_CAMERA2, useCamera2); | 375 intent.putExtra(CallActivity.EXTRA_CAMERA2, useCamera2); |
395 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); | 376 intent.putExtra(CallActivity.EXTRA_VIDEO_WIDTH, videoWidth); |
396 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); | 377 intent.putExtra(CallActivity.EXTRA_VIDEO_HEIGHT, videoHeight); |
397 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); | 378 intent.putExtra(CallActivity.EXTRA_VIDEO_FPS, cameraFps); |
398 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, | 379 intent.putExtra(CallActivity.EXTRA_VIDEO_CAPTUREQUALITYSLIDER_ENABLED, cap
tureQualitySlider); |
399 captureQualitySlider); | |
400 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); | 380 intent.putExtra(CallActivity.EXTRA_VIDEO_BITRATE, videoStartBitrate); |
401 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); | 381 intent.putExtra(CallActivity.EXTRA_VIDEOCODEC, videoCodec); |
402 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); | 382 intent.putExtra(CallActivity.EXTRA_HWCODEC_ENABLED, hwCodec); |
403 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); | 383 intent.putExtra(CallActivity.EXTRA_CAPTURETOTEXTURE_ENABLED, captureToText
ure); |
404 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, | 384 intent.putExtra(CallActivity.EXTRA_NOAUDIOPROCESSING_ENABLED, noAudioProce
ssing); |
405 noAudioProcessing); | |
406 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); | 385 intent.putExtra(CallActivity.EXTRA_AECDUMP_ENABLED, aecDump); |
407 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); | 386 intent.putExtra(CallActivity.EXTRA_OPENSLES_ENABLED, useOpenSLES); |
408 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); | 387 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AEC, disableBuiltInAEC
); |
409 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); | 388 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_AGC, disableBuiltInAGC
); |
410 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); | 389 intent.putExtra(CallActivity.EXTRA_DISABLE_BUILT_IN_NS, disableBuiltInNS); |
411 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro
l); | 390 intent.putExtra(CallActivity.EXTRA_ENABLE_LEVEL_CONTROL, enableLevelContro
l); |
412 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); | 391 intent.putExtra(CallActivity.EXTRA_AUDIO_BITRATE, audioStartBitrate); |
413 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); | 392 intent.putExtra(CallActivity.EXTRA_AUDIOCODEC, audioCodec); |
414 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); | 393 intent.putExtra(CallActivity.EXTRA_DISPLAY_HUD, displayHud); |
415 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); | 394 intent.putExtra(CallActivity.EXTRA_TRACING, tracing); |
416 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); | 395 intent.putExtra(CallActivity.EXTRA_CMDLINE, commandLineRun); |
417 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); | 396 intent.putExtra(CallActivity.EXTRA_RUNTIME, runTimeMs); |
418 | 397 |
419 startActivityForResult(intent, CONNECTION_REQUEST); | 398 startActivityForResult(intent, CONNECTION_REQUEST); |
420 } | 399 } |
421 } | 400 } |
422 | 401 |
423 private boolean validateUrl(String url) { | 402 private boolean validateUrl(String url) { |
424 if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url)) { | 403 if (URLUtil.isHttpsUrl(url) || URLUtil.isHttpUrl(url)) { |
425 return true; | 404 return true; |
426 } | 405 } |
427 | 406 |
428 new AlertDialog.Builder(this) | 407 new AlertDialog.Builder(this) |
429 .setTitle(getText(R.string.invalid_url_title)) | 408 .setTitle(getText(R.string.invalid_url_title)) |
430 .setMessage(getString(R.string.invalid_url_text, url)) | 409 .setMessage(getString(R.string.invalid_url_text, url)) |
431 .setCancelable(false) | 410 .setCancelable(false) |
432 .setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() { | 411 .setNeutralButton(R.string.ok, |
433 public void onClick(DialogInterface dialog, int id) { | 412 new DialogInterface.OnClickListener() { |
434 dialog.cancel(); | 413 public void onClick(DialogInterface dialog, int id) { |
435 } | 414 dialog.cancel(); |
436 }).create().show(); | 415 } |
| 416 }) |
| 417 .create() |
| 418 .show(); |
437 return false; | 419 return false; |
438 } | 420 } |
439 | 421 |
440 private final AdapterView.OnItemClickListener | 422 private final AdapterView.OnItemClickListener roomListClickListener = |
441 roomListClickListener = new AdapterView.OnItemClickListener() { | 423 new AdapterView.OnItemClickListener() { |
442 @Override | 424 @Override |
443 public void onItemClick(AdapterView<?> adapterView, View view, int i, long l
) { | 425 public void onItemClick(AdapterView<?> adapterView, View view, int i, lo
ng l) { |
444 String roomId = ((TextView) view).getText().toString(); | 426 String roomId = ((TextView) view).getText().toString(); |
445 connectToRoom(roomId, false, false, 0); | 427 connectToRoom(roomId, false, false, 0); |
446 } | 428 } |
447 }; | 429 }; |
448 | 430 |
449 private final OnClickListener addFavoriteListener = new OnClickListener() { | 431 private final OnClickListener addFavoriteListener = new OnClickListener() { |
450 @Override | 432 @Override |
451 public void onClick(View view) { | 433 public void onClick(View view) { |
452 String newRoom = roomEditText.getText().toString(); | 434 String newRoom = roomEditText.getText().toString(); |
453 if (newRoom.length() > 0 && !roomList.contains(newRoom)) { | 435 if (newRoom.length() > 0 && !roomList.contains(newRoom)) { |
454 adapter.add(newRoom); | 436 adapter.add(newRoom); |
455 adapter.notifyDataSetChanged(); | 437 adapter.notifyDataSetChanged(); |
456 } | 438 } |
457 } | 439 } |
458 }; | 440 }; |
459 | 441 |
460 private final OnClickListener connectListener = new OnClickListener() { | 442 private final OnClickListener connectListener = new OnClickListener() { |
461 @Override | 443 @Override |
462 public void onClick(View view) { | 444 public void onClick(View view) { |
463 connectToRoom(roomEditText.getText().toString(), false, false, 0); | 445 connectToRoom(roomEditText.getText().toString(), false, false, 0); |
464 } | 446 } |
465 }; | 447 }; |
466 } | 448 } |
OLD | NEW |