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

Fix issues with search

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-18 13:08:55 +01:00
parent 5c2be99d71
commit 74cdb018e4
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
View File

@ -389,17 +389,15 @@ public class CallsListController extends BaseController implements SearchView.On
@Override @Override
public boolean onItemClick(int position) { public boolean onItemClick(int position) {
if (callItems.size() > position) { overridePushHandler(new NoOpControllerChangeHandler());
overridePushHandler(new NoOpControllerChangeHandler()); overridePopHandler(new NoOpControllerChangeHandler());
overridePopHandler(new NoOpControllerChangeHandler()); CallItem callItem = adapter.getItem(position);
CallItem callItem = callItems.get(position); Intent callIntent = new Intent(getActivity(), CallActivity.class);
Intent callIntent = new Intent(getActivity(), CallActivity.class); BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
BundleBuilder bundleBuilder = new BundleBuilder(new Bundle()); bundleBuilder.putString("roomToken", callItem.getModel().getToken());
bundleBuilder.putString("roomToken", callItem.getModel().getToken()); bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity)); callIntent.putExtras(bundleBuilder.build());
callIntent.putExtras(bundleBuilder.build()); startActivity(callIntent);
startActivity(callIntent);
}
return true; return true;
} }

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

@ -439,43 +439,41 @@ public class ContactsController extends BaseController implements SearchView.OnQ
@Override @Override
public boolean onItemClick(int position) { public boolean onItemClick(int position) {
if (contactItems.size() > position) { UserItem userItem = adapter.getItem(position);
UserItem userItem = contactItems.get(position); RetrofitBucket retrofitBucket = ApiHelper.getRetrofitBucketForCreateRoom(userEntity.getBaseUrl(), "1",
RetrofitBucket retrofitBucket = ApiHelper.getRetrofitBucketForCreateRoom(userEntity.getBaseUrl(), "1", userItem.getModel().getUserId());
userItem.getModel().getUserId()); ncApi.createRoom(ApiHelper.getCredentials(userEntity.getUsername(), userEntity.getToken()),
ncApi.createRoom(ApiHelper.getCredentials(userEntity.getUsername(), userEntity.getToken()), retrofitBucket.getUrl(), retrofitBucket.getQueryMap())
retrofitBucket.getUrl(), retrofitBucket.getQueryMap()) .subscribeOn(Schedulers.newThread())
.subscribeOn(Schedulers.newThread()) .observeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer<RoomOverall>() {
.subscribe(new Observer<RoomOverall>() { @Override
@Override public void onSubscribe(Disposable d) {
public void onSubscribe(Disposable d) {
} }
@Override @Override
public void onNext(RoomOverall roomOverall) { public void onNext(RoomOverall roomOverall) {
overridePushHandler(new NoOpControllerChangeHandler()); overridePushHandler(new NoOpControllerChangeHandler());
overridePopHandler(new NoOpControllerChangeHandler()); overridePopHandler(new NoOpControllerChangeHandler());
Intent callIntent = new Intent(getActivity(), CallActivity.class); Intent callIntent = new Intent(getActivity(), CallActivity.class);
BundleBuilder bundleBuilder = new BundleBuilder(new Bundle()); BundleBuilder bundleBuilder = new BundleBuilder(new Bundle());
bundleBuilder.putString("roomToken", roomOverall.getOcs().getData().getToken()); bundleBuilder.putString("roomToken", roomOverall.getOcs().getData().getToken());
bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity)); bundleBuilder.putParcelable("userEntity", Parcels.wrap(userEntity));
callIntent.putExtras(bundleBuilder.build()); callIntent.putExtras(bundleBuilder.build());
startActivity(callIntent); startActivity(callIntent);
} }
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
} }
@Override @Override
public void onComplete() { public void onComplete() {
} }
}); });
}
return true; return true;
} }