Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the unnecessary StatisticsEvent

This commit is contained in:
Xavier Gouchet 2019-10-08 19:48:26 +02:00
parent 91463ba877
commit 5989d6daf6
3 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/de/danoeh/antennapod/fragment/preferences/StatisticsFragment.java
View File

@ -20,15 +20,12 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.PreferenceActivity;
import de.danoeh.antennapod.adapter.StatisticsListAdapter;
import de.danoeh.antennapod.core.event.StatisticsEvent;
import de.danoeh.antennapod.core.storage.DBReader;
import de.danoeh.antennapod.core.storage.DBWriter;
import io.reactivex.Completable;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@ -72,11 +69,6 @@ public class StatisticsFragment extends Fragment {
return root;
}
@Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
EventBus.getDefault().register(this);
}
@Override
public void onStart() {
super.onStart();
@ -86,7 +78,6 @@ public class StatisticsFragment extends Fragment {
@Override public void onDestroyView() {
super.onDestroyView();
EventBus.getDefault().unregister(this);
if (disposable != null) {
disposable.dispose();
}
@ -110,12 +101,6 @@ public class StatisticsFragment extends Fragment {
return super.onOptionsItemSelected(item);
}
@Subscribe
public void onEvent(StatisticsEvent event) {
Log.d(TAG, "onEvent() called with: " + "event = [" + event + "]");
refreshStatistics();
}
private void selectStatisticsMode() {
View contentView = View.inflate(getContext(), R.layout.statistics_mode_select_dialog, null);
AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
@ -133,15 +118,25 @@ public class StatisticsFragment extends Fragment {
listAdapter.setCountAll(countAll);
prefs.edit().putBoolean(PREF_COUNT_ALL, countAll).apply();
refreshStatistics();
getActivity().invalidateOptionsMenu();
});
builder.show();
}
private void resetStatistics() {
progressBar.setVisibility(View.VISIBLE);
feedStatisticsList.setVisibility(View.GONE);
DBWriter.resetStatistics();
if (!countAll) {
progressBar.setVisibility(View.VISIBLE);
feedStatisticsList.setVisibility(View.GONE);
if (disposable != null) {
disposable.dispose();
}
disposable = Completable.fromFuture(DBWriter.resetStatistics())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(this::refreshStatistics, error -> Log.e(TAG, Log.getStackTraceString(error)));
}
}
private void refreshStatistics() {

14
core/src/main/java/de/danoeh/antennapod/core/event/StatisticsEvent.java
View File

@ -1,14 +0,0 @@
package de.danoeh.antennapod.core.event;
public class StatisticsEvent {
public enum Action {
STATISTICS_UPDATED
}
public final Action action;
public StatisticsEvent(Action action) {
this.action = action;
}
}

2
core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
View File

@ -24,7 +24,6 @@ import de.danoeh.antennapod.core.event.FavoritesEvent;
import de.danoeh.antennapod.core.event.FeedItemEvent;
import de.danoeh.antennapod.core.event.MessageEvent;
import de.danoeh.antennapod.core.event.QueueEvent;
import de.danoeh.antennapod.core.event.StatisticsEvent;
import de.danoeh.antennapod.core.feed.EventDistributor;
import de.danoeh.antennapod.core.feed.Feed;
import de.danoeh.antennapod.core.feed.FeedEvent;
@ -969,7 +968,6 @@ public class DBWriter {
}
}
adapter.close();
EventBus.getDefault().post(new StatisticsEvent(StatisticsEvent.Action.STATISTICS_UPDATED));
});
}
}