Merge pull request #1 from SecUpwN/master

merge upstream
CellularPrivacy · Jan 27, 2015 · bbc9f3e · bbc9f3e
2 parents 0d2c636 + c92ef9f
commit bbc9f3e
Show file tree

Hide file tree

Showing 22 changed files with 1,039 additions and 371 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,27 @@
 # CHANGELOG of 'AIMSICD'
 ----------------------
 
+#### 22.01.2015 - WIP-Internal v0.1.25-alpha-build-22
+
+* Changed: `setLocationUpdateMinTime` in OpenStreetMap from 60 to 10 s
+* Changed: `setLocationUpdateMinDistance` in OSM from 1000 to 100 meters
+* Added: Even more code comments, TODO's and code formatting to digg into
+
+---
+
+#### 22.01.2015 - WIP-Internal v0.1.25-alpha-build-21
+
+* Improved: Teweaked some log messages for a better output and clearer evaluation
+* Removed: Commented out "Upload" code in the OCID download request handler
+* Changed: Task request strings from `OPEN_CELL_ID_REQUEST` to `DBE_DOWNLOAD_REQUEST`
+* Added: Lots of code placeholders to import CSV columns from OCID data and display them
+* Added: Created `aimsicd.sql` as new SQL to create all new tables in the new structure
+* Added: Created `CreateDBe_import.sql` which will be used to import the new Databases
+* Added: More comments and basic code reformat for Database Viewer to support new tables
+* Fixed: Clarified "range" vs "samples" confusion in Database Viewer
+
+---
+
 #### 20.01.2015 - WIP-Internal v0.1.25-alpha-build-20
 
 * Improved: Silenced spammy Samsung Galaxy class debug logcat entries from DebugLog

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.SecUpwN.AIMSICD"
           android:versionCode="25"
-          android:versionName="0.1.25-alpha-b22">
+          android:versionName="0.1.25-alpha-b23">
 
     <!-- PERMISSIONS ARE SORTED BY TYPE - PLEASE KEEP THIS STRUCTURE. THANK YOU. /> -->
 

diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java
@@ -70,6 +70,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ *
+ * Description:     TODO: Please add some comments about this class
+ *
+ * Dependencies:    TODO: Write a few words about where the content of this is used.
+ *
+ * Issues:
+ *
+ * ChangeLog:
+ *
+ */
 public class AIMSICD extends BaseActivity implements AsyncResponse {
 
     private final String TAG = "AIMSICD";
@@ -293,6 +304,8 @@ void selectItem(int position) {
                     Helpers.getOpenCellData(mContext, cell, RequestTask.DBE_DOWNLOAD_REQUEST);
                 } else {
                     Helpers.msgShort(mContext, "Waiting for location...");
+
+                    // TODO: Is this implemented?? --E:V:A (2015-01-22)
                     //Attempt to find location through CID
                     //CID Location Async Output Delegate Interface Implementation
                     LocationServices.LocationAsync locationAsync

diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewerOsmDroid.java b/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewerOsmDroid.java
@@ -86,9 +86,8 @@
  *
  *  ChangeLog:
  *
- *      <date>  <name>  <description>
- *      2015-01-22  E:V:A   Changed:    setLocationUpdateMinTime:    60000 to 10000 ms
- *                                      setLocationUpdateMinDistance: 1000 to 100 meters
+ *      2015-01-22  E:V:A   Changed: setLocationUpdateMinTime:    60000 to 10000 ms
+ *                                   setLocationUpdateMinDistance: 1000 to 100 meters
  *
  *
  */
@@ -498,7 +497,7 @@ protected GeoPoint doInBackground(Void... voids) {
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
-                            Helpers.msgShort(MapViewerOsmDroid.this, "No tracked locations found to show on map.");
+                            Helpers.msgLong(MapViewerOsmDroid.this, "No tracked locations found to show on map.");
                         }
                     });
                 }

diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/activities/OpenCellIdActivity.java b/app/src/main/java/com/SecUpwN/AIMSICD/activities/OpenCellIdActivity.java
@@ -58,9 +58,8 @@ protected String doInBackground(Void... voids) {
                                 public void run() {
                                 pd.dismiss();
                                 Helpers.msgLong(OpenCellIdActivity.this,
-                                                getString(R.string.ocid_api_error)
-                                                + e.getClass().getName()
-                                                + " - " + e.getMessage());
+                                                getString(R.string.ocid_api_error) + e.getClass().getName() +
+                                                " - " + e.getMessage());
                                 }
                             });
                             return null;