gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-05 02:55:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better ncApi handling for contacts

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-11 00:32:34 +02:00
parent d5476f83ec
commit bd70363a43
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -68,6 +68,7 @@ import com.nextcloud.talk.models.json.sharees.ShareesOverall;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.bundle.BundleKeys;
import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.singletons.ApplicationWideApiHolder;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
@ -118,8 +119,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Inject @Inject
UserUtils userUtils; UserUtils userUtils;
@Inject @Inject
NcApi ncApi;
@Inject
EventBus eventBus; EventBus eventBus;
@BindView(R.id.recycler_view) @BindView(R.id.recycler_view)
RecyclerView recyclerView; RecyclerView recyclerView;
@ -130,6 +129,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@BindView(R.id.fast_scroller) @BindView(R.id.fast_scroller)
FastScroller fastScroller; FastScroller fastScroller;
private NcApi ncApi;
private String credentials;
private UserEntity currentUser; private UserEntity currentUser;
private Disposable contactsQueryDisposable; private Disposable contactsQueryDisposable;
private Disposable cacheQueryDisposable; private Disposable cacheQueryDisposable;
@ -194,7 +195,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ
} }
} }
currentUser = userUtils.getCurrentUser();
} }
@Override @Override
@ -205,19 +205,16 @@ public class ContactsController extends BaseController implements SearchView.OnQ
FlipView.resetLayoutAnimationDelay(true, 1000L); FlipView.resetLayoutAnimationDelay(true, 1000L);
FlipView.stopLayoutAnimation(); FlipView.stopLayoutAnimation();
currentUser = userUtils.getCurrentUser();
if (currentUser == null &&
getParentController() != null && getParentController().getRouter() != null) {
getParentController().getRouter().setRoot((RouterTransaction.with(new ServerSelectionController())
.pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler())));
}
if (adapter == null) { if (adapter == null) {
adapter = new FlexibleAdapter<>(contactItems, getActivity(), false); adapter = new FlexibleAdapter<>(contactItems, getActivity(), false);
currentUser = userUtils.getCurrentUser();
if (currentUser != null) { if (currentUser != null) {
ncApi = ApplicationWideApiHolder.getInstance().getNcApiInstanceForAccountId(currentUser.getId(), null);
credentials = ApiUtils.getCredentials(currentUser.getUserId(), currentUser.getToken());
fetchData(true); fetchData(true);
} }
} }
@ -253,7 +250,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
if (!isPublicCall && adapter.getSelectedPositions().size() == 1) { if (!isPublicCall && adapter.getSelectedPositions().size() == 1) {
RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(), "1", RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(), "1",
((UserItem) adapter.getItem(adapter.getSelectedPositions().get(0))).getModel().getUserId(), null); ((UserItem) adapter.getItem(adapter.getSelectedPositions().get(0))).getModel().getUserId(), null);
ncApi.createRoom(ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), ncApi.createRoom(credentials,
retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@ -443,7 +440,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
modifiedQueryMap.put("page", page); modifiedQueryMap.put("page", page);
modifiedQueryMap.put("perPage", 100); modifiedQueryMap.put("perPage", 100);
ncApi.getContactsWithSearchParam( ncApi.getContactsWithSearchParam(
ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), credentials,
retrofitBucket.getUrl(), modifiedQueryMap) retrofitBucket.getUrl(), modifiedQueryMap)
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@ -785,7 +782,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
UserItem userItem = (UserItem) adapter.getItem(position); UserItem userItem = (UserItem) adapter.getItem(position);
RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(), "1", RetrofitBucket retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(), "1",
userItem.getModel().getUserId(), null); userItem.getModel().getUserId(), null);
ncApi.createRoom(ApiUtils.getCredentials(currentUser.getUsername(), currentUser.getToken()), ncApi.createRoom(credentials,
retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
.subscribeOn(Schedulers.newThread()) .subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())