diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 89b09d9..b7c088e 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -38,6 +38,7 @@ import de.sebse.fuplanner.fragments.canteen.DaySwitcherFragment; import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment; import de.sebse.fuplanner.services.Canteen.CanteenBrowser; import de.sebse.fuplanner.services.Canteen.types.Canteen; +import de.sebse.fuplanner.services.Canteen.types.CanteenListener; import de.sebse.fuplanner.services.GoogleAuth.Credentials; import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth; import de.sebse.fuplanner.services.KVV.KVV; @@ -57,7 +58,7 @@ import de.sebse.fuplanner.tools.network.NetworkErrorCallback; import de.sebse.fuplanner.tools.types.News; public class MainActivity extends AppCompatActivity - implements MainActivityListener, KVVListener, + implements MainActivityListener, KVVListener, CanteenListener, NavigationView.OnNavigationItemSelectedListener, ModulesFragment.OnModulesFragmentInteractionListener, CanteensFragment.OnCanteensFragmentInteractionListener { @@ -582,7 +583,7 @@ public class MainActivity extends AppCompatActivity } @Override - public void onRefreshCompleted(boolean isFailed) { + public void onCanteenRefreshCompleted(boolean isFailed) { setRefreshFailedBanner(isFailed); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java index 5dd5e54..9ae6fdb 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java +++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/CanteenBrowser.java @@ -8,12 +8,11 @@ import org.json.JSONObject; import java.io.IOException; -import de.sebse.fuplanner.MainActivity; import de.sebse.fuplanner.services.Canteen.types.Canteen; +import de.sebse.fuplanner.services.Canteen.types.CanteenListener; import de.sebse.fuplanner.services.Canteen.types.Canteens; import de.sebse.fuplanner.services.Canteen.types.Day; import de.sebse.fuplanner.tools.AsyncQueue; -import de.sebse.fuplanner.tools.MainActivityListener; import de.sebse.fuplanner.tools.network.HTTPService; import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkError; @@ -23,15 +22,15 @@ public class CanteenBrowser extends HTTPService { private Canteens canteens; private final AsyncQueue queue = new AsyncQueue(); private final Context context; - private MainActivityListener mListener; + private CanteenListener mListener; public CanteenBrowser(Context context) { super(context); this.context = context; - if (context instanceof MainActivityListener) - mListener = (MainActivity) context; + if (context instanceof CanteenListener) + mListener = (CanteenListener) context; else - throw new RuntimeException(context.toString() + " must implement MainActivityListener"); + throw new RuntimeException(context.toString() + " must implement CanteenListener"); try { this.canteens = Canteens.load(context); } catch (IOException e) { @@ -224,14 +223,14 @@ public class CanteenBrowser extends HTTPService { private NetworkCallback saveOnCallback(NetworkCallback callback, boolean forceRefresh){ return (success -> { if (forceRefresh) - mListener.onRefreshCompleted(false); + mListener.onCanteenRefreshCompleted(false); callback.onResponse(success); }); } private NetworkErrorCallback errorOnCallback(NetworkErrorCallback errorCallback){ return (error -> { - mListener.onRefreshCompleted(true); + mListener.onCanteenRefreshCompleted(true); errorCallback.onError(error); }); } diff --git a/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java new file mode 100644 index 0000000..f6d36c1 --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/services/Canteen/types/CanteenListener.java @@ -0,0 +1,5 @@ +package de.sebse.fuplanner.services.Canteen.types; + +public interface CanteenListener { + void onCanteenRefreshCompleted(boolean b); +} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java b/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java index d902e1a..c37daa2 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/MainActivityListener.java @@ -24,9 +24,6 @@ public interface MainActivityListener { NewsManager getNewsManager(); - @Deprecated - void onRefreshCompleted(boolean isFailed); - void addRequestPermissionsResultListener(RequestPermissionsResultListener listener, String id); void removeRequestPermissionsResultListener(String id);