Now auto generates a new nospam instead of asking for one

markwinter · Sep 23, 2014 · 55ad0bf · 55ad0bf
1 parent 027b70d
commit 55ad0bf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 33 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
@@ -73,7 +73,6 @@ public void onCreate(Bundle savedInstanceState) {
         bindPreferenceSummaryToValue(findPreference("status_message"));
         bindPreferenceSummaryToValue(findPreference("language"));
         bindPreferenceSummaryToValue(findPreference("tox_id"));
-        bindPreferenceSummaryToValue(findPreference("nospam"));
         bindPreferenceSummaryToValue(findPreference("active_account"));
 
         /* Override the Tox ID click functionality to display a dialog with the qr image
@@ -115,6 +114,28 @@ public boolean onPreferenceClick(Preference preference) {
                 return true;
             }
         });
+
+        Preference nospamPreference = (Preference) findPreference("nospam");
+        nospamPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                ToxSingleton toxSingleton = ToxSingleton.getInstance();
+                try {
+                    Random random = new Random();
+                    int nospam = random.nextInt(1234567890);
+                    toxSingleton.jTox.setNospam(nospam);
+                    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+                    SharedPreferences.Editor editor = preferences.edit();
+                    editor.putString("tox_id", toxSingleton.jTox.getAddress());
+                    editor.commit();
+                    bindPreferenceSummaryToValue(findPreference("tox_id"));
+                } catch (ToxException e) {
+                    e.printStackTrace();
+                }
+
+                return true;
+            }
+        });
     }
 
     /**
@@ -227,30 +248,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             db.updateUserDetail(sharedPreferences.getString("active_account", ""), "status_message", sharedPreferences.getString(key, ""));
         }
 
-        if (key.equals("nospam")) {
-            ToxSingleton toxSingleton = ToxSingleton.getInstance();
-            try {
-                String nospamString = sharedPreferences.getString("nospam", "");
-                int nospam;
-                // Check if they entered an empty nospam
-                if (!nospamString.equals("")) {
-                    nospam = Integer.parseInt(sharedPreferences.getString("nospam", ""));
-                }  else {
-                    Random random = new Random();
-                    nospam = random.nextInt(1000);
-                }
-
-                toxSingleton.jTox.setNospam(nospam);
-                SharedPreferences.Editor editor = sharedPreferences.edit();
-                editor.putString("tox_id", toxSingleton.jTox.getAddress());
-                editor.commit();
-                bindPreferenceSummaryToValue(findPreference("tox_id"));
-
-            } catch (ToxException e) {
-                e.printStackTrace();
-            }
-        }
-
         if (key.equals("enable_udp")) {
             ToxSingleton toxSingleton = ToxSingleton.getInstance();
 

diff --git a/app/src/main/res/values/strings_activity_settings.xml b/app/src/main/res/values/strings_activity_settings.xml
@@ -84,6 +84,6 @@
     <!-- Advanced strings -->
     <string name="pref_udp">Enable UDP</string>
     <string name="pref_advanced">Advanced</string>
-    <string name="pref_nospam">Nospam</string>
+    <string name="pref_nospam">Generate New Nospam</string>
 
 </resources>
diff --git a/app/src/main/res/xml/pref_other.xml b/app/src/main/res/xml/pref_other.xml
@@ -30,14 +30,9 @@
                 android:title="@string/pref_udp"
                 android:defaultValue="false" />
 
-            <EditTextPreference
+            <Preference
                 android:key="nospam"
-                android:title="@string/pref_nospam"
-                android:defaultValue=""
-                android:numeric="integer"
-                android:inputType="number"
-                android:singleLine="true"
-                android:maxLines="1" />
+                android:title="@string/pref_nospam" />
 
             <Preference
                 android:key="tox_id"