Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove reference to MainActivity instance

Browse Source
This commit is contained in:
Domingos Lopes 2016-03-22 13:24:09 -04:00
parent 09bad517fc
commit fcb35a403f
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
View File

@ -1,6 +1,5 @@
package de.danoeh.antennapod.fragment; package de.danoeh.antennapod.fragment;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@ -24,7 +23,6 @@ import android.widget.Toast;
import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration; import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import de.danoeh.antennapod.R; import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.activity.MainActivity;
@ -81,8 +79,6 @@ public class AllEpisodesFragment extends Fragment {
private boolean itemsLoaded = false; private boolean itemsLoaded = false;
private boolean viewsCreated = false; private boolean viewsCreated = false;
private AtomicReference<MainActivity> activity = new AtomicReference<>();
private boolean isUpdatingFeeds; private boolean isUpdatingFeeds;
protected Subscription subscription; protected Subscription subscription;
@ -101,7 +97,6 @@ public class AllEpisodesFragment extends Fragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
EventDistributor.getInstance().register(contentUpdate); EventDistributor.getInstance().register(contentUpdate);
this.activity.set((MainActivity) getActivity());
if (viewsCreated && itemsLoaded) { if (viewsCreated && itemsLoaded) {
onFragmentLoaded(); onFragmentLoaded();
} }
@ -132,12 +127,6 @@ public class AllEpisodesFragment extends Fragment {
} }
} }
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
this.activity.set((MainActivity) getActivity());
}
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();
@ -176,18 +165,13 @@ public class AllEpisodesFragment extends Fragment {
} }
protected void resetViewState() { protected void resetViewState() {
listAdapter = null;
activity.set(null);
viewsCreated = false; viewsCreated = false;
listAdapter = null;
} }
private final MenuItemUtils.UpdateRefreshMenuItemChecker updateRefreshMenuItemChecker = new MenuItemUtils.UpdateRefreshMenuItemChecker() { private final MenuItemUtils.UpdateRefreshMenuItemChecker updateRefreshMenuItemChecker =
@Override () -> DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds();
public boolean isRefreshing() {
return DownloadService.isRunning && DownloadRequester.getInstance().isDownloadingFeeds();
}
};
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@ -325,7 +309,7 @@ public class AllEpisodesFragment extends Fragment {
viewsCreated = true; viewsCreated = true;
if (itemsLoaded && activity.get() != null) { if (itemsLoaded) {
onFragmentLoaded(); onFragmentLoaded();
} }
@ -334,7 +318,7 @@ public class AllEpisodesFragment extends Fragment {
private void onFragmentLoaded() { private void onFragmentLoaded() {
if (listAdapter == null) { if (listAdapter == null) {
MainActivity mainActivity = activity.get(); MainActivity mainActivity = (MainActivity) getActivity();
listAdapter = new AllEpisodesRecycleAdapter(mainActivity, itemAccess, listAdapter = new AllEpisodesRecycleAdapter(mainActivity, itemAccess,
new DefaultActionButtonCallback(mainActivity), showOnlyNewEpisodes()); new DefaultActionButtonCallback(mainActivity), showOnlyNewEpisodes());
listAdapter.setHasStableIds(true); listAdapter.setHasStableIds(true);
@ -477,7 +461,7 @@ public class AllEpisodesFragment extends Fragment {
if (data != null) { if (data != null) {
episodes = data; episodes = data;
itemsLoaded = true; itemsLoaded = true;
if (viewsCreated && activity.get() != null) { if (viewsCreated) {
onFragmentLoaded(); onFragmentLoaded();
} }
} }