From d5476f83ecb35ae0bf0b6d39f0daff3231ed6f8a Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sat, 11 Aug 2018 00:16:31 +0200 Subject: [PATCH] Improve CallNotificationController ncapi usage Signed-off-by: Mario Danic --- .../controllers/CallNotificationController.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index edcab8a98..d8061946b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -76,6 +76,7 @@ import com.nextcloud.talk.utils.MagicFlipView; import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.glide.GlideApp; import com.nextcloud.talk.utils.preferences.AppPreferences; +import com.nextcloud.talk.utils.singletons.ApplicationWideApiHolder; import com.nextcloud.talk.utils.singletons.AvatarStatusCodeHolder; import org.greenrobot.eventbus.EventBus; @@ -96,15 +97,13 @@ import io.reactivex.Observer; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import okhttp3.Cache; @AutoInjector(NextcloudTalkApplication.class) public class CallNotificationController extends BaseController { private static final String TAG = "CallNotificationController"; - @Inject - NcApi ncApi; + private NcApi ncApi; @Inject AppPreferences appPreferences; @@ -130,9 +129,6 @@ public class CallNotificationController extends BaseController { @BindView(R.id.incomingTextRelativeLayout) RelativeLayout incomingTextRelativeLayout; - @Inject - Cache cache; - private List disposablesList = new ArrayList<>(); private Bundle originalBundle; private String roomId; @@ -302,11 +298,7 @@ public class CallNotificationController extends BaseController { if (handler == null) { handler = new Handler(); - try { - cache.evictAll(); - } catch (IOException e) { - Log.e(TAG, "Failed to evict cache"); - } + ncApi = ApplicationWideApiHolder.getInstance().getNcApiInstanceForAccountId(userBeingCalled.getId(), null); } if (currentConversation == null) {