gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-04 02:25:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix more bugs

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-06-04 22:13:50 +02:00
parent 6bc0a64c73
commit 0ca28326cd
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -16,7 +16,7 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
versionCode 39 versionCode 39
versionName "2.0.0" versionName "2.0.0beta6"
flavorDimensions "default" flavorDimensions "default"

22
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -273,10 +273,13 @@ public class CallActivity extends AppCompatActivity {
credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken()); credentials = ApiUtils.getCredentials(userEntity.getUsername(), userEntity.getToken());
isVoiceOnlyCall = getIntent().getExtras().getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false); isVoiceOnlyCall = getIntent().getExtras().getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false);
if (getIntent().getExtras().containsKey(BundleKeys.KEY_MODIFIED_BASE_URL)) { if (userEntity.getUserId().equals("-1")) {
credentials = null; credentials = null;
baseUrl = getIntent().getExtras().getString(BundleKeys.KEY_MODIFIED_BASE_URL); }
} else {
baseUrl = getIntent().getExtras().getString(BundleKeys.KEY_MODIFIED_BASE_URL, "");
if (TextUtils.isEmpty(baseUrl)) {
baseUrl = userEntity.getBaseUrl(); baseUrl = userEntity.getBaseUrl();
} }
@ -289,7 +292,7 @@ public class CallActivity extends AppCompatActivity {
Log.e(TAG, "Failed to evict cache"); Log.e(TAG, "Failed to evict cache");
} }
if (getIntent().getExtras().containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) { if (getIntent().getExtras().containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
handleFromNotification(); handleFromNotification();
} else { } else {
initViews(); initViews();
@ -498,14 +501,7 @@ public class CallActivity extends AppCompatActivity {
cameraVideoCapturer.switchCamera(new CameraVideoCapturer.CameraSwitchHandler() { cameraVideoCapturer.switchCamera(new CameraVideoCapturer.CameraSwitchHandler() {
@Override @Override
public void onCameraSwitchDone(boolean b) { public void onCameraSwitchDone(boolean b) {
if (b && cameraSwitchCount != -1) { pipVideoView.setMirror(false);
if (cameraSwitchCount == camerasCount) {
cameraSwitchCount = 0;
pipVideoView.setMirror(false);
} else {
pipVideoView.setMirror(true);
}
}
} }
@Override @Override
@ -580,7 +576,7 @@ public class CallActivity extends AppCompatActivity {
} }
// setting this to true because it's not shown by default // setting this to true because it's not shown by default
pipVideoView.setMirror(true); pipVideoView.setMirror(false);
pipVideoView.init(rootEglBase.getEglBaseContext(), null); pipVideoView.init(rootEglBase.getEglBaseContext(), null);
pipVideoView.setZOrderMediaOverlay(true); pipVideoView.setZOrderMediaOverlay(true);
// disabled because it causes some devices to crash // disabled because it causes some devices to crash

2
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -338,7 +338,7 @@ public class SettingsController extends BaseController {
dbQueryDisposable = userUtils.createOrUpdateUser(null, dbQueryDisposable = userUtils.createOrUpdateUser(null,
null, null,
null, displayName, null, true, null, displayName, null, null,
userProfileOverall.getOcs().getData().getUserId(), userEntity.getId(), null, null) userProfileOverall.getOcs().getData().getUserId(), userEntity.getId(), null, null)
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())