mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-21 12:39:58 +01:00
Clean up
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
dfedbc26f9
commit
efbc88045b
@ -131,7 +131,6 @@ public class CallNotificationController extends BaseController {
|
|||||||
@BindView(R.id.incomingTextRelativeLayout)
|
@BindView(R.id.incomingTextRelativeLayout)
|
||||||
RelativeLayout incomingTextRelativeLayout;
|
RelativeLayout incomingTextRelativeLayout;
|
||||||
|
|
||||||
private List<Disposable> disposablesList = new ArrayList<>();
|
|
||||||
private Bundle originalBundle;
|
private Bundle originalBundle;
|
||||||
private String roomId;
|
private String roomId;
|
||||||
private UserEntity userBeingCalled;
|
private UserEntity userBeingCalled;
|
||||||
@ -204,7 +203,6 @@ public class CallNotificationController extends BaseController {
|
|||||||
.subscribe(new Observer<ParticipantsOverall>() {
|
.subscribe(new Observer<ParticipantsOverall>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSubscribe(Disposable d) {
|
public void onSubscribe(Disposable d) {
|
||||||
disposablesList.add(d);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -254,7 +252,6 @@ public class CallNotificationController extends BaseController {
|
|||||||
.subscribe(new Observer<RoomsOverall>() {
|
.subscribe(new Observer<RoomsOverall>() {
|
||||||
@Override
|
@Override
|
||||||
public void onSubscribe(Disposable d) {
|
public void onSubscribe(Disposable d) {
|
||||||
disposablesList.add(d);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -490,17 +487,7 @@ public class CallNotificationController extends BaseController {
|
|||||||
handler.removeCallbacksAndMessages(null);
|
handler.removeCallbacksAndMessages(null);
|
||||||
handler = null;
|
handler = null;
|
||||||
}
|
}
|
||||||
dispose();
|
|
||||||
endMediaAndVibratorNotifications();
|
endMediaAndVibratorNotifications();
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void dispose() {
|
|
||||||
Disposable disposable;
|
|
||||||
for (int i = 0; i < disposablesList.size(); i++) {
|
|
||||||
if (!(disposable = disposablesList.get(i)).isDisposed()) {
|
|
||||||
disposable.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user