mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 cec8bdfa68
commit 9e2d680e16
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 {
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(){
InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE);
View view = getCurrentFocus();
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View view = this.getCurrentFocus();
if (imm != null && view != null) {
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
}
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) {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm != null && getCurrentFocus() != null) {
imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
}
saveCreatedAccount(username, password, displayName, domain, transport);
}
public void checkAccount(String username, String password, String displayName, String domain) {
saveCreatedAccount(username, password, displayName, domain, null);
}