diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/service/CellTracker.java b/app/src/main/java/com/SecUpwN/AIMSICD/service/CellTracker.java index 65b7a3ea1277572af3e63a46020c173b6288b2f3..0cad5da786a398f005da6c3c23db698c7daaad06 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/CellTracker.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/CellTracker.java @@ -67,6 +67,9 @@ import java.util.concurrent.TimeUnit; * * ChangeLog * + * 2015-03-02 Kai Renken remove OCID_UPLOAD_PREF: Upload is done manual, so this is not needed + * anymore. + * */ public class CellTracker implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -88,7 +91,6 @@ public class CellTracker implements SharedPreferences.OnSharedPreferenceChangeLi public static int PHONE_TYPE; // public static long REFRESH_RATE; // [s] The DeviceInfo refresh rate (arrays.xml) public static int LAST_DB_BACKUP_VERSION; // - public static boolean OCID_UPLOAD_PREF; // public static final String SILENT_SMS = "SILENT_SMS_INTERCEPTED"; private boolean CELL_TABLE_CLEANSED; @@ -281,7 +283,6 @@ public class CellTracker implements SharedPreferences.OnSharedPreferenceChangeLi final String FEMTO_DETECTION = context.getString(R.string.pref_femto_detection_key); final String REFRESH = context.getString(R.string.pref_refresh_key); // Manual Refresh final String DB_VERSION = context.getString(R.string.pref_last_database_backup_version); - final String OCID_UPLOAD = context.getString(R.string.pref_ocid_upload); // BOOLEAN to enable OCID data upload final String OCID_KEY = context.getString(R.string.pref_ocid_key); if (key.equals(KEY_UI_ICONS)) { @@ -314,8 +315,6 @@ public class CellTracker implements SharedPreferences.OnSharedPreferenceChangeLi REFRESH_RATE = TimeUnit.SECONDS.toMillis(t); } else if (key.equals(DB_VERSION)) { LAST_DB_BACKUP_VERSION = sharedPreferences.getInt(DB_VERSION, 1); - } else if (key.equals(OCID_UPLOAD)) { - OCID_UPLOAD_PREF = sharedPreferences.getBoolean(OCID_UPLOAD, false); } else if (key.equals(OCID_KEY)) { getOcidKey(); } @@ -555,7 +554,6 @@ public class CellTracker implements SharedPreferences.OnSharedPreferenceChangeLi boolean monitorCellPref = prefs.getBoolean( context.getString(R.string.pref_enable_cell_monitoring_key), true); LAST_DB_BACKUP_VERSION = prefs.getInt( context.getString(R.string.pref_last_database_backup_version), 1); - OCID_UPLOAD_PREF = prefs.getBoolean( context.getString(R.string.pref_ocid_upload), false); CELL_TABLE_CLEANSED = prefs.getBoolean( context.getString(R.string.pref_cell_table_cleansed), false); String refreshRate = prefs.getString( context.getString(R.string.pref_refresh_key), "1"); diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java index 3e6b2ec7a10726e95d6e3785121aa308b0c6cf3f..8cecf6197b14f0af679f4b443a83e9b8c25a5336 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java @@ -75,6 +75,7 @@ import java.net.URL; * * 2015-01-21 E:V:A Moved code blocks, added placeholder code, disabled upload * 2015-02-13 E:V:A Added onPreExecute() and super keywords & Logs (to be removed when working) + * 2015-03-02 Kai Renken remove OCID_UPLOAD_PREF: Upload is manual, so this is not needed anymore. * * To Fix: * @@ -113,8 +114,6 @@ public class RequestTask extends AsyncTask<String, Integer, String> { // UPLOADING !! case DBE_UPLOAD_REQUEST: // OCID upload request from "APPLICATION" drawer title try { - // TODO: Remove OCID_UPLOAD_PREF? - //if (CellTracker.OCID_UPLOAD_PREF) { boolean prepared = mDbAdapter.prepareOpenCellUploadData(); Log.i("AIMSICD", "OCID upload data prepared - " + String.valueOf(prepared)); if (prepared) { @@ -159,11 +158,12 @@ public class RequestTask extends AsyncTask<String, Integer, String> { } publishProgress(95,100); } - + return "Successful"; + } else { + Helpers.msgLong(mContext, "No data for publishing available"); + return null; } - return "Successful"; - //} - //return null; + } catch (Exception e) { Log.i("AIMSICD", "Upload OpenCellID data - " + e.getMessage()); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ecb32ba4920469a8ba608dcdff5f55a3329cef61..34d9df71ae12f979b25d26973833544d2e779c52 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -178,9 +178,6 @@ <string name="pref_refresh_summ">Control the frequency of device updates</string> <string name="pref_last_database_backup_version">pref_last_db_backup_version</string> <string name="pref_ocid_title">OpenCellID Settings</string> - <string name="pref_ocid_upload">pref_ocid_upload</string> - <string name="pref_ui_ocid_upload_title">Contribute Cell Data</string> - <string name="pref_ui_ocid_upload_summ">Contribute data to the OpenCellID Project (NO personal information will ever be submitted without notice)</string> <string name="pref_cell_table_cleansed">pref_cell_table_cleansed</string> <string name="pref_ocid_key">pref_ocid_key</string> <string name="pref_ocid_key_title">OpenCellID API Key</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 97161eebc2a7407b27de7a216cdd9b06cbd8b6b4..ad9c00a1161c10968543f70658e08e47b30a4f05 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -78,11 +78,6 @@ android:key="@string/pref_ocid_key" android:summary="@string/pref_ocid_key_summ" android:title="@string/pref_ocid_key_title"/> - <CheckBoxPreference - android:defaultValue="false" - android:key="@string/pref_ocid_upload" - android:summary="@string/pref_ui_ocid_upload_summ" - android:title="@string/pref_ui_ocid_upload_title"/> </PreferenceCategory> used</PreferenceScreen>