From c4997bdcb63896d7766e52a2ad36d48b3dd0635c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 20 May 2020 17:41:10 -0400
Subject: [PATCH] blacklist: use child fragment manager
Change-Id: I299efc7f572754453e2e8206363df914afe3bdfb
---
.../src/main/java/cx/ring/account/AccountEditionFragment.java | 2 +-
.../main/java/cx/ring/contactrequests/BlackListPresenter.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java b/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java
index 16588861f..7eb03356a 100644
--- a/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/account/AccountEditionFragment.java
@@ -171,7 +171,7 @@ public class AccountEditionFragment extends BaseSupportFragment<AccountEditionPr
Bundle args = new Bundle();
args.putString(ACCOUNT_ID_KEY, accountId);
blackListFragment.setArguments(args);
- requireFragmentManager().beginTransaction()
+ getChildFragmentManager().beginTransaction()
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.addToBackStack(BlackListFragment.TAG)
.replace(R.id.fragment_container, blackListFragment, BlackListFragment.TAG)
diff --git a/ring-android/libringclient/src/main/java/cx/ring/contactrequests/BlackListPresenter.java b/ring-android/libringclient/src/main/java/cx/ring/contactrequests/BlackListPresenter.java
index 272e4ecdb..8770ed630 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/contactrequests/BlackListPresenter.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/contactrequests/BlackListPresenter.java
@@ -81,7 +81,7 @@ public class BlackListPresenter extends RootPresenter<BlackListView> {
mCompositeDisposable.add(mAccountService
.getAccountSingle(accountID)
.flatMapObservable(Account::getBannedContactsUpdates)
- .subscribeOn(mUiScheduler)
+ .observeOn(mUiScheduler)
.subscribe(this::updateList, e -> Log.e(TAG, "Error showing blacklist", e)));
mAccountID = accountID;
}
@@ -89,6 +89,5 @@ public class BlackListPresenter extends RootPresenter<BlackListView> {
public void unblockClicked(CallContact contact) {
String contactId = contact.getPhones().get(0).getNumber().getRawRingId();
mAccountService.addContact(mAccountID, contactId);
- //updateList();
}
}
--
GitLab