diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java index 5bfdb640..f5913960 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java @@ -77,9 +77,6 @@ public class UserLists extends AsyncTask { usrAdp.setData(user); usrAdp.notifyDataSetChanged(); } else { - SwipeRefreshLayout refresh = ui.get().findViewById(R.id.user_refresh); - refresh.setRefreshing(false); - switch (returnCode) { case 420: Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show(); @@ -88,5 +85,7 @@ public class UserLists extends AsyncTask { Toast.makeText(ui.get(), errorMessage, Toast.LENGTH_SHORT).show(); } } + SwipeRefreshLayout refresh = ui.get().findViewById(R.id.user_refresh); + refresh.setRefreshing(false); } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java index a9aeb73d..acc8e702 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java @@ -50,10 +50,10 @@ public class UserDetail extends AppCompatActivity implements OnItemClicked, OnRe } View root = findViewById(R.id.user_view); + Toolbar toolbar = findViewById(R.id.user_toolbar); refresh = findViewById(R.id.user_refresh); userList = findViewById(R.id.userlist); userList.setLayoutManager(new LinearLayoutManager(this)); - Toolbar toolbar = findViewById(R.id.user_toolbar); setSupportActionBar(toolbar); settings = GlobalSettings.getInstance(this); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java index 2a11413b..39bff2b6 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java @@ -23,7 +23,7 @@ import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.adapter.TimelineAdapter; import org.nuclearfog.twidda.adapter.TimelineAdapter.OnItemClicked; import org.nuclearfog.twidda.backend.ProfileLoader; -import org.nuclearfog.twidda.backend.clickable.Tagger; +import org.nuclearfog.twidda.backend.clickable.Tagger.OnTagClickListener; import org.nuclearfog.twidda.backend.listitems.Tweet; import org.nuclearfog.twidda.database.GlobalSettings; @@ -35,7 +35,7 @@ import static android.os.AsyncTask.Status.RUNNING; * @see ProfileLoader */ public class UserProfile extends AppCompatActivity implements OnRefreshListener, - OnTabChangeListener, OnItemClicked, Tagger.OnTagClickListener { + OnTabChangeListener, OnItemClicked, OnTagClickListener { private static final int TWEET = 1; @@ -45,8 +45,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener, private RecyclerView homeList, favoriteList; private TabHost mTab; private View lastTab; - private boolean isFollowing, isBlocked, isMuted, canDm; - private boolean home; + private boolean home, isFollowing, isBlocked, isMuted, canDm; private long userId = 0; private int tabIndex = 0; private String username = "";