From 8f92274e0bc26c865c382ace16e7822f02797763 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 28 Sep 2019 16:29:40 +0200
Subject: [PATCH] remove callList from BaseActivity (#1503)

* remove callList from BaseActivity

* remove callList from BaseActivity
---
 .../java/com/keylesspalace/tusky/BaseActivity.java  | 13 -------------
 .../keylesspalace/tusky/BottomSheetActivityTest.kt  |  1 -
 2 files changed, 14 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
index 2c96c83d..389a745e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
@@ -50,12 +50,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import retrofit2.Call;
-
 public abstract class BaseActivity extends AppCompatActivity implements Injectable {
 
-    protected List<Call> callList;
-
     @Inject
     public ThemeUtils themeUtils;
     @Inject
@@ -95,7 +91,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
             redirectIfNotLoggedIn();
         }
 
-        callList = new ArrayList<>();
         requesters = new HashMap<>();
     }
 
@@ -164,14 +159,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        for (Call call : callList) {
-            call.cancel();
-        }
-        super.onDestroy();
-    }
-
     public void showAccountChooserDialog(CharSequence dialogTitle, boolean showActiveAccount, AccountSelectionListener listener) {
         List<AccountEntity> accounts = accountManager.getAllAccountsOrderedByActive();
         AccountEntity activeAccount = accountManager.getActiveAccount();
diff --git a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
index 79d81a23..2db1cd0d 100644
--- a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
@@ -268,7 +268,6 @@ class BottomSheetActivityTest {
             mastodonApi = api
             @Suppress("UNCHECKED_CAST")
             bottomSheet = mock(BottomSheetBehavior::class.java) as BottomSheetBehavior<LinearLayout>
-            callList = arrayListOf()
         }
 
         override fun openLink(url: String) {