impl setting

eknoes · Nov 6, 2023 · b0ff7ec · b0ff7ec
1 parent 6f208a4
commit b0ff7ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/app/src/main/java/de/eknoes/inofficialgolem/updater/GolemFetcher.java b/app/src/main/java/de/eknoes/inofficialgolem/updater/GolemFetcher.java
@@ -66,13 +66,19 @@ protected void onPreExecute() {
     @Override
     protected GolemFetcher.FETCH_STATE doInBackground(Void... voids) {
         Context ctx = context.get();
+        boolean onlyWifi = PreferenceManager.getDefaultSharedPreferences(ctx).getBoolean("only_wifi", false);
         if(ctx != null) {
             ConnectivityManager connMgr = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
             NetworkInfo networkInfo = null;
+            NetworkInfo wifiInfo = null;
             if (connMgr != null) {
                 networkInfo = connMgr.getActiveNetworkInfo();
+                wifiInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
             }
             if (networkInfo != null && networkInfo.isConnected()) {
+                if(onlyWifi && !wifiInfo.isConnected()){
+                    return FETCH_STATE.WIFI_NOT_CONNECTED;
+                }
                 FETCH_STATE result = FETCH_STATE.SUCCESS;
                 for (int i = 0; i < updater.length; i++) {
                     GolemUpdater u = updater[i];
@@ -121,6 +127,9 @@ protected void onPostExecute(GolemFetcher.FETCH_STATE finished) {
             case ABO_INVALID:
                 msgString = R.string.refresh_error_invalid_abo;
                 break;
+            case WIFI_NOT_CONNECTED:
+                msgString = R.string.wifi_is_not_connected;
+                break;
             case UNDEFINED_ERROR:
             default:
                 msgString = R.string.refresh_error_undefined;
@@ -222,5 +231,5 @@ private void writeArticles(List<GolemItem> articles, boolean insertNew) {
         }
     }
 
-    enum FETCH_STATE {SUCCESS, NO_CONNECTION, TIMEOUT, ABO_INVALID, UNDEFINED_ERROR}
+    enum FETCH_STATE {SUCCESS, NO_CONNECTION, TIMEOUT, ABO_INVALID, UNDEFINED_ERROR, WIFI_NOT_CONNECTED}
 }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -61,4 +61,5 @@
     <string name="action_imprint">Golem.de Kontakt</string>
     <string name="synchronize_only_if_wi_fi_is_available">Synchronisiere nur, wenn WLAN verfügbar ist.</string>
     <string name="if_enabled_articles_will_be_synchronized_only_when_wi_fi_is_available">Wenn aktiviert, werden Artikel nur synchronisiert, wenn WLAN verfügbar ist.</string>
+    <string name="wifi_is_not_connected">Wlan ist nicht verbunden!</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -76,4 +76,5 @@
     <string name="action_imprint">Golem.de Contact</string>
     <string name="synchronize_only_if_wi_fi_is_available">Synchronize only if Wi-Fi is available.</string>
     <string name="if_enabled_articles_will_be_synchronized_only_when_wi_fi_is_available">If enabled, articles will be synchronized only when Wi-Fi is available.</string>
+    <string name="wifi_is_not_connected">Wifi is not connected!</string>
 </resources>