Add option to run on wifi only

markwinter · Sep 23, 2014 · 2ee717f · 2ee717f
1 parent 4c876c8
commit 2ee717f
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 6 deletions.
diff --git a/app/src/main/java/im/tox/antox/fragments/SettingsFragment.java b/app/src/main/java/im/tox/antox/fragments/SettingsFragment.java
@@ -1,7 +1,10 @@
 package im.tox.antox.fragments;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
@@ -15,6 +18,7 @@
 
 import im.tox.antox.R;
 import im.tox.antox.activities.LoginActivity;
+import im.tox.antox.data.AntoxDB;
 import im.tox.antox.data.UserDB;
 import im.tox.antox.tox.ToxDoService;
 import im.tox.antox.tox.ToxSingleton;
@@ -258,5 +262,20 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             // Start service
             getActivity().startService(service);
         }
+
+        if(key.equals("wifi_only")) {
+            final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+            final ConnectivityManager connManager = (ConnectivityManager) getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+            final NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+            boolean wifiOnly = sharedPreferences.getBoolean("wifi_only", true);
+
+            // Set all offline as we wont receive callbacks for them by not doing doTox()
+            if(wifiOnly && !mWifi.isConnected()) {
+                AntoxDB antoxDB = new AntoxDB(getActivity());
+                antoxDB.setAllOffline();
+                antoxDB.close();
+            }
+        }
     }
 }
diff --git a/app/src/main/java/im/tox/antox/tox/ToxDoService.java b/app/src/main/java/im/tox/antox/tox/ToxDoService.java
@@ -1,8 +1,13 @@
 package im.tox.antox.tox;
 
 import android.app.Service;
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.IBinder;
+import android.preference.PreferenceManager;
 import android.util.Log;
 
 import im.tox.jtoxcore.ToxException;
@@ -31,10 +36,27 @@ public void onCreate() {
             @Override
             public void run() {
                 while(keepRunning) {
-                    try {
-                        Thread.sleep(toxSingleton.jTox.doToxInterval());
-                        toxSingleton.jTox.doTox();
-                    } catch (Exception e) {
+                    final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+                    final ConnectivityManager connManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+                    final boolean wifiOnly = preferences.getBoolean("wifi_only", true);
+                    final NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
+
+                    if(wifiOnly && !mWifi.isConnected()) {
+
+                        try {
+                            // Sleep for 10 seconds before checking again
+                            Thread.sleep(10000);
+                        } catch (Exception e) {
+                        }
+
+                    } else {
+
+                        try {
+                            Thread.sleep(toxSingleton.jTox.doToxInterval());
+                            toxSingleton.jTox.doTox();
+                        } catch (Exception e) {
+                        }
+
                     }
                 }
             }

diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
@@ -34,10 +34,11 @@
     <string name="pref_title_enable_notifications">Enable notifications</string>
     <string name="pref_title_new_message_notifications">Message notifications</string>
     <string name="pref_title_new_friend_notifications">Friend request notifications</string>
-    <string name="pref_title_action_messages">Action messages</string>
 
     <!-- Other -->
     <string name="pref_header_other">Other</string>
+    <string name="pref_title_connection_status_messages">Online/Offline Messages</string>
+    <string name="pref_title_wifi_only">Wi-Fi Only</string>
 
     <string name="pref_title_language">Language</string>
     <string-array name="pref_language_list_titles" translatable="false">

diff --git a/app/src/main/res/xml/pref_other.xml b/app/src/main/res/xml/pref_other.xml
@@ -12,9 +12,14 @@
         android:negativeButtonText="@null"
         android:positiveButtonText="@null" />
 
+    <CheckBoxPreference
+        android:key="wifi_only"
+        android:title="@string/pref_title_wifi_only"
+        android:defaultValue="true" />
+
     <CheckBoxPreference
         android:key="action_messages"
-        android:title="@string/pref_title_action_messages"
+        android:title="@string/pref_title_connection_status_messages"
         android:defaultValue="true" />
 
     <PreferenceScreen