gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases 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

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

@ -940,9 +940,6 @@ public class CallActivity extends AppCompatActivity {
ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId); ApplicationWideCurrentRoomHolder.getInstance().setCurrentRoomId(roomId);
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true); ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(userEntity); ApplicationWideCurrentRoomHolder.getInstance().setUserInRoom(userEntity);
} else {
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
}
ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken)) ncApi.pingCall(credentials, ApiUtils.getUrlForCallPing(baseUrl, roomToken))
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
@ -971,6 +968,9 @@ public class CallActivity extends AppCompatActivity {
dispose(pingDisposable); dispose(pingDisposable);
} }
}); });
} else {
ApplicationWideCurrentRoomHolder.getInstance().setInCall(true);
}
// Start pulling signaling messages // Start pulling signaling messages
String urlToken = null; String urlToken = null;

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

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