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 16588861f64ff18a784d1b02a0752f8e56fdb84f..7eb03356ae003d3e9d5fbc0618e4b88c8ca6340a 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 272e4ecdb267cd066b4e3465e44d9816ab9a4d6a..8770ed630fe61891f8380ec58895ee512f1d537d 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(); } }