mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-26 06:55:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix bugs"

Browse source 
This reverts commit a88aaf5e66b9fba8d9ec5ba5f3e147fa041d570b.
This commit is contained in:
Mario Danic 2018-05-29 14:09:47 +02:00
parent acdf936acb
commit 0aa79f4940
2 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View file

@ -289,7 +289,7 @@ public class CallActivity extends AppCompatActivity {
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();
} else {
initViews();
@ -940,38 +940,38 @@ public class CallActivity extends AppCompatActivity {
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(userEntity);
ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken))
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.repeatWhen(observable -> observable.delay(5000, TimeUnit.MILLISECONDS))
.takeWhile(observable -> inCall)
.retry(3, observable -> inCall)
.subscribe(new Observer<GenericOverall>() {
@Override
public void onSubscribe(Disposable d) {
pingDisposable = d;
}
@Override
public void onNext(GenericOverall genericOverall) {
}
@Override
public void onError(Throwable e) {
dispose(pingDisposable);
}
@Override
public void onComplete() {
dispose(pingDisposable);
}
});
} else {
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
}
ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken))
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.repeatWhen(observable -> observable.delay(5000, TimeUnit.MILLISECONDS))
.takeWhile(observable -> inCall)
.retry(3, observable -> inCall)
.subscribe(new Observer<GenericOverall>() {
@Override
public void onSubscribe(Disposable d) {
pingDisposable = d;
}
@Override
public void onNext(GenericOverall genericOverall) {
}
@Override
public void onError(Throwable e) {
dispose(pingDisposable);
}
@Override
public void onComplete() {
dispose(pingDisposable);
}
});
// Start pulling signaling messages
String urlToken = null;
if (isMultiSession) {

2
app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java
View file

@ -110,7 +110,7 @@ public class NotificationJob extends Job {
.getInstance().getUserInRoom());
boolean shouldShowNotification = decryptedPushMessage.getApp().equals("spreed") &&
(!isInTheSameRoomAsNotification || decryptedPushMessage.getType().equals("call"));
!(isInTheSameRoomAsNotification && !decryptedPushMessage.getType().equals("call"));
if (shouldShowNotification) {
int smallIcon;