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

More progress on moving to new Retrofit impl

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-08-11 07:37:02 +02:00
parent 43a1187e3a
commit 63c2063de6
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nextcloud/talk/controllers/SwitchAccountController.java
View File

@ -48,7 +48,6 @@ import com.nextcloud.talk.utils.AccountUtils;
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 java.net.CookieManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -68,9 +67,6 @@ public class SwitchAccountController extends BaseController {
@Inject @Inject
UserUtils userUtils; UserUtils userUtils;
@Inject
CookieManager cookieManager;
@BindView(R.id.recycler_view) @BindView(R.id.recycler_view)
RecyclerView recyclerView; RecyclerView recyclerView;
@ -109,7 +105,6 @@ public class SwitchAccountController extends BaseController {
@Override @Override
public void onNext(UserEntity userEntity) { public void onNext(UserEntity userEntity) {
cookieManager.getCookieStore().removeAll();
userUtils.disableAllUsersWithoutId(userEntity.getId()); userUtils.disableAllUsersWithoutId(userEntity.getId());
if (getActivity() != null) { if (getActivity() != null) {
getActivity().runOnUiThread(new Runnable() { getActivity().runOnUiThread(new Runnable() {

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

@ -83,6 +83,7 @@ public class AccountRemovalWorker extends Worker {
PushConfigurationState.class); PushConfigurationState.class);
PushConfigurationState finalPushConfigurationState = pushConfigurationState; PushConfigurationState finalPushConfigurationState = pushConfigurationState;
ApplicationWideApiHolder.getInstance().removeNcApiInstanceForAccountId(userEntity.getId());
ncApi = ApplicationWideApiHolder.getInstance().getNcApiInstanceForAccountId(userEntity.getId(), null); ncApi = ApplicationWideApiHolder.getInstance().getNcApiInstanceForAccountId(userEntity.getId(), null);
credentials = ApiUtils.getCredentials(userEntity.getUserId(), userEntity.getToken()); credentials = ApiUtils.getCredentials(userEntity.getUserId(), userEntity.getToken());
@ -139,7 +140,6 @@ public class AccountRemovalWorker extends Worker {
@Override @Override
public void onComplete() { public void onComplete() {
} }
@Override @Override

11
app/src/main/java/com/nextcloud/talk/presenters/MentionAutocompletePresenter.java
View File

@ -34,6 +34,7 @@ import com.nextcloud.talk.models.json.mention.Mention;
import com.nextcloud.talk.models.json.mention.MentionOverall; import com.nextcloud.talk.models.json.mention.MentionOverall;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.singletons.ApplicationWideApiHolder;
import com.otaliastudios.autocomplete.RecyclerViewPresenter; import com.otaliastudios.autocomplete.RecyclerViewPresenter;
import java.util.ArrayList; import java.util.ArrayList;
@ -51,8 +52,8 @@ import io.reactivex.schedulers.Schedulers;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention> implements FlexibleAdapter.OnItemClickListener { public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention> implements FlexibleAdapter.OnItemClickListener {
@Inject private NcApi ncApi;
NcApi ncApi; private UserEntity currentUser;
@Inject @Inject
UserUtils userUtils; UserUtils userUtils;
@ -77,6 +78,11 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
} }
private void setupNcApi() {
currentUser = userUtils.getCurrentUser();
ncApi = ApplicationWideApiHolder.getInstance().getNcApiInstanceForAccountId(currentUser.getId(), null);
}
@Override @Override
protected RecyclerView.Adapter instantiateAdapter() { protected RecyclerView.Adapter instantiateAdapter() {
adapter = new FlexibleAdapter<>(abstractFlexibleItemList, context, false); adapter = new FlexibleAdapter<>(abstractFlexibleItemList, context, false);
@ -87,7 +93,6 @@ public class MentionAutocompletePresenter extends RecyclerViewPresenter<Mention>
@Override @Override
protected void onQuery(@Nullable CharSequence query) { protected void onQuery(@Nullable CharSequence query) {
if (!TextUtils.isEmpty(query)) { if (!TextUtils.isEmpty(query)) {
UserEntity currentUser = userUtils.getCurrentUser();
adapter.setFilter(query.toString()); adapter.setFilter(query.toString());
ncApi.getMentionAutocompleteSuggestions(ApiUtils.getCredentials(currentUser.getUserId(), currentUser ncApi.getMentionAutocompleteSuggestions(ApiUtils.getCredentials(currentUser.getUserId(), currentUser

4
app/src/main/java/com/nextcloud/talk/utils/singletons/ApplicationWideApiHolder.java
View File

@ -77,4 +77,8 @@ public class ApplicationWideApiHolder {
return ncApiHashMap.get(accountId); return ncApiHashMap.get(accountId);
} }
public void removeNcApiInstanceForAccountId(long accountId) {
ncApiHashMap.remove(accountId);
}
} }