Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tests crash and fix video call pause button

Browse source
This commit is contained in:
Margaux Clerc 2016-02-16 10:32:55 +01:00
parent cf63f3fe0c
commit 095d562ed0
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/CallActivity.java
View file

@ -489,6 +489,8 @@ public class CallActivity extends Activity implements OnClickListener, SensorEve
} else { } else {
video.setImageResource(R.drawable.camera_default); video.setImageResource(R.drawable.camera_default);
} }
} else {
video.setImageResource(R.drawable.camera_default);
} }
} }

15
src/org/linphone/assistant/AssistantActivity.java
View file

@ -199,9 +199,11 @@ public class AssistantActivity extends Activity implements OnClickListener {
} }
public void hideKeyboard(){ public void hideKeyboard(){
InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE); InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View view = getCurrentFocus(); View view = this.getCurrentFocus();
imm.hideSoftInputFromWindow(view.getWindowToken(), 0); if (imm != null && view != null) {
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
} }
private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) { private void launchEchoCancellerCalibration(boolean sendEcCalibrationResult) {
@ -219,14 +221,9 @@ public class AssistantActivity extends Activity implements OnClickListener {
} }
private void logIn(String username, String password, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) { private void logIn(String username, String password, String displayName, String domain, TransportType transport, boolean sendEcCalibrationResult) {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm != null && getCurrentFocus() != null) {
imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
}
saveCreatedAccount(username, password, displayName, domain, transport); saveCreatedAccount(username, password, displayName, domain, transport);
} }
public void checkAccount(String username, String password, String displayName, String domain) { public void checkAccount(String username, String password, String displayName, String domain) {
saveCreatedAccount(username, password, displayName, domain, null); saveCreatedAccount(username, password, displayName, domain, null);
} }