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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 // If an implicit VIEW intent is launching the app, go directly to that URL. | 134 // If an implicit VIEW intent is launching the app, go directly to that URL. |
135 final Intent intent = getIntent(); | 135 final Intent intent = getIntent(); |
136 if ("android.intent.action.VIEW".equals(intent.getAction()) | 136 if ("android.intent.action.VIEW".equals(intent.getAction()) |
137 && !commandLineRun) { | 137 && !commandLineRun) { |
138 boolean loopback = intent.getBooleanExtra( | 138 boolean loopback = intent.getBooleanExtra( |
139 CallActivity.EXTRA_LOOPBACK, false); | 139 CallActivity.EXTRA_LOOPBACK, false); |
140 int runTimeMs = intent.getIntExtra( | 140 int runTimeMs = intent.getIntExtra( |
141 CallActivity.EXTRA_RUNTIME, 0); | 141 CallActivity.EXTRA_RUNTIME, 0); |
142 String room = sharedPref.getString(keyprefRoom, ""); | 142 String room = sharedPref.getString(keyprefRoom, ""); |
143 connectToRoom(room, true, loopback, runTimeMs); | 143 connectToRoom(room, true, loopback, runTimeMs); |
144 return; | |
145 } | 144 } |
146 | 145 |
147 addFavoriteButton = (FloatingActionButton) findViewById(R.id.add_favorite_bu
tton); | 146 addFavoriteButton = (FloatingActionButton) findViewById(R.id.add_favorite_bu
tton); |
148 addFavoriteButton.setOnClickListener(addFavoriteListener); | 147 addFavoriteButton.setOnClickListener(addFavoriteListener); |
149 } | 148 } |
150 | 149 |
151 @Override | 150 @Override |
152 public boolean onCreateOptionsMenu(Menu menu) { | 151 public boolean onCreateOptionsMenu(Menu menu) { |
153 getMenuInflater().inflate(R.menu.connect_menu, menu); | 152 getMenuInflater().inflate(R.menu.connect_menu, menu); |
154 return true; | 153 return true; |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 } | 437 } |
439 }; | 438 }; |
440 | 439 |
441 private final OnClickListener connectListener = new OnClickListener() { | 440 private final OnClickListener connectListener = new OnClickListener() { |
442 @Override | 441 @Override |
443 public void onClick(View view) { | 442 public void onClick(View view) { |
444 connectToRoom(roomEditText.getText().toString(), false, false, 0); | 443 connectToRoom(roomEditText.getText().toString(), false, false, 0); |
445 } | 444 } |
446 }; | 445 }; |
447 } | 446 } |
OLD | NEW |