From 045413093d5069574ad9e619cb3ba3c41bc0fac5 Mon Sep 17 00:00:00 2001 From: ziem Date: Fri, 29 May 2015 22:41:40 +0200 Subject: [PATCH 01/65] Rectoring: - removed unused imports - removed unnecessary toString calls - added default locale to SimpleDateFormat constructor - removed public modifier from interface methods - some code refactoring - added parent view instead of null when inflating layouts - closed some database cursors - TextViews - replaced dp with sp --- .../com/SecUpwN/AIMSICD/test/GetProp.java | 5 ---- .../java/com/SecUpwN/AIMSICD/AIMSICD.java | 14 +-------- .../activities/CreditsRollActivity.java | 1 - .../AIMSICD/activities/MapPrefActivity.java | 4 +-- .../AIMSICD/activities/PrefActivity.java | 4 +-- .../AIMSICD/adapters/AIMSICDDbAdapter.java | 13 ++++----- .../AIMSICD/adapters/CellCardInflater.java | 4 +-- .../adapters/DefaultLocationCardInflater.java | 4 +-- .../adapters/IAdapterViewInflater.java | 4 +-- .../MeasuredCellStrengthCardData.java | 4 ++- .../adapters/OpenCellIdCardInflater.java | 4 +-- .../AIMSICD/adapters/SilentSmsCardData.java | 3 +- .../adapters/SilentSmsCardInflater.java | 4 +-- .../SecUpwN/AIMSICD/drawer/NavDrawerItem.java | 14 ++++----- .../SecUpwN/AIMSICD/enums/StatesDbViewer.java | 1 - .../AIMSICD/fragments/AboutFragment.java | 8 ++--- .../AIMSICD/fragments/DbViewerFragment.java | 6 ++-- .../AIMSICD/fragments/DeviceFragment.java | 10 +++---- .../AIMSICD/fragments/MapPrefFragment.java | 4 +-- .../AIMSICD/fragments/PrefFragment.java | 4 +-- .../SecUpwN/AIMSICD/map/CellTowerMarker.java | 1 - .../receiver/BootCompletedReceiver.java | 6 ++-- .../SecUpwN/AIMSICD/receiver/SmsReceiver.java | 5 ++-- .../AIMSICD/rilexecutor/OemRilExecutor.java | 10 +++---- .../AIMSICD/rilexecutor/RilExecutor.java | 4 --- .../SamsungMulticlientRilExecutor.java | 2 -- .../AIMSICD/service/AccelerometerMonitor.java | 1 - .../AIMSICD/service/AimsicdService.java | 16 ++++------ .../SecUpwN/AIMSICD/service/CellTracker.java | 2 +- .../AIMSICD/service/LocationTracker.java | 4 +-- .../service/SignalStrengthTracker.java | 1 - .../smsdetection/AdvanceUserBaseAdapter.java | 2 +- .../AdvanceUserBaseSmsAdapter.java | 2 +- .../smsdetection/AdvancedUserActivity.java | 2 +- .../smsdetection/SmsDetectionDbAccess.java | 29 ++++++++++--------- .../AIMSICD/smsdetection/SmsDetector.java | 22 +++++--------- .../SecUpwN/AIMSICD/utils/CommandResult.java | 4 +-- .../com/SecUpwN/AIMSICD/utils/Helpers.java | 1 - .../AIMSICD/utils/LocationServices.java | 4 --- .../com/SecUpwN/AIMSICD/utils/MiscUtils.java | 3 +- .../SecUpwN/AIMSICD/utils/RequestTask.java | 24 +++++++-------- .../AIMSICD/utils/StackOverflowXmlParser.java | 4 +-- .../com/SecUpwN/AIMSICD/utils/TinyDB.java | 17 +++++------ app/src/main/res/layout/about_fragment.xml | 18 ++++++------ app/src/main/res/layout/about_pop_up.xml | 8 ++--- .../res/layout/activity_advanced_user.xml | 2 +- .../main/res/layout/activity_open_cell_id.xml | 2 +- app/src/main/res/layout/bonuspack_bubble.xml | 2 +- app/src/main/res/layout/creditroll.xml | 2 +- app/src/main/res/layout/db_view.xml | 2 +- 50 files changed, 133 insertions(+), 184 deletions(-) diff --git a/app/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java b/app/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java index 0b6f59fe1..9a6129b2b 100644 --- a/app/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java +++ b/app/src/androidTest/java/com/SecUpwN/AIMSICD/test/GetProp.java @@ -1,14 +1,9 @@ package com.SecUpwN.AIMSICD.test; import android.test.ActivityInstrumentationTestCase2; -import android.test.AndroidTestCase; import android.util.Log; -import android.widget.Toast; -import com.SecUpwN.AIMSICD.AIMSICD; import com.SecUpwN.AIMSICD.activities.DebugLogs; -import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; -import com.SecUpwN.AIMSICD.utils.Cell; import java.io.IOException; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java index a439878c7..b2b201104 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java @@ -19,11 +19,8 @@ import android.os.Bundle; import android.os.Environment; import android.os.IBinder; -import android.provider.MediaStore; import android.support.v4.app.ActionBarDrawerToggle; -import android.support.v4.content.ContextCompat; import android.support.v4.widget.DrawerLayout; -import android.telephony.TelephonyManager; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -39,11 +36,8 @@ import com.SecUpwN.AIMSICD.activities.MapViewerOsmDroid; import com.SecUpwN.AIMSICD.activities.PrefActivity; import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; -import com.SecUpwN.AIMSICD.adapters.DrawerMenuAdapter; import com.SecUpwN.AIMSICD.constants.DrawerMenu; import com.SecUpwN.AIMSICD.drawer.DrawerMenuActivityConfiguration; -import com.SecUpwN.AIMSICD.drawer.DrawerMenuItem; -import com.SecUpwN.AIMSICD.drawer.DrawerMenuSection; import com.SecUpwN.AIMSICD.drawer.NavDrawerItem; import com.SecUpwN.AIMSICD.fragments.AboutFragment; import com.SecUpwN.AIMSICD.fragments.AtCommandFragment; @@ -60,12 +54,6 @@ import com.SecUpwN.AIMSICD.utils.RequestTask; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; import java.util.List; /** @@ -706,7 +694,7 @@ private void moveData() { for(int i = 0; i < content.length; i++) { File from = new File(content[i].toString()); //move file to new directory - from.renameTo(new File(destinedPath.toString() + content[i].getName().toString())); + from.renameTo(new File(destinedPath.toString() + content[i].getName())); } } //remove current directory so it won't try to move it again diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/activities/CreditsRollActivity.java b/app/src/main/java/com/SecUpwN/AIMSICD/activities/CreditsRollActivity.java index a7baef0e4..6e1fb9ea1 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/activities/CreditsRollActivity.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/activities/CreditsRollActivity.java @@ -26,7 +26,6 @@ import android.view.View; import android.view.animation.LinearInterpolator; import android.widget.SeekBar; -import android.widget.Toast; import com.SecUpwN.AIMSICD.R; import com.SecUpwN.AIMSICD.fragments.CreditsRollView; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapPrefActivity.java b/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapPrefActivity.java index 67afdaf79..4e4c35342 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapPrefActivity.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapPrefActivity.java @@ -1,11 +1,11 @@ package com.SecUpwN.AIMSICD.activities; -import com.SecUpwN.AIMSICD.fragments.MapPrefFragment; - import android.app.FragmentManager; import android.app.FragmentTransaction; import android.os.Bundle; +import com.SecUpwN.AIMSICD.fragments.MapPrefFragment; + public class MapPrefActivity extends BaseActivity { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/activities/PrefActivity.java b/app/src/main/java/com/SecUpwN/AIMSICD/activities/PrefActivity.java index f48835e22..318e7d582 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/activities/PrefActivity.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/activities/PrefActivity.java @@ -1,11 +1,11 @@ package com.SecUpwN.AIMSICD.activities; -import com.SecUpwN.AIMSICD.fragments.PrefFragment; - import android.app.FragmentManager; import android.app.FragmentTransaction; import android.os.Bundle; +import com.SecUpwN.AIMSICD.fragments.PrefFragment; + public class PrefActivity extends BaseActivity { diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/AIMSICDDbAdapter.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/AIMSICDDbAdapter.java index 726bf5f48..244d6de36 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/AIMSICDDbAdapter.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/AIMSICDDbAdapter.java @@ -1,14 +1,7 @@ package com.SecUpwN.AIMSICD.adapters; -import com.SecUpwN.AIMSICD.AIMSICD; -import com.SecUpwN.AIMSICD.constants.Examples; -import com.SecUpwN.AIMSICD.utils.Cell; -import com.SecUpwN.AIMSICD.utils.CMDProcessor; -import com.SecUpwN.AIMSICD.constants.Examples.EVENT_LOG_DATA; - import android.content.ContentValues; import android.content.Context; -import android.content.SharedPreferences; import android.content.res.AssetManager; import android.database.Cursor; import android.database.SQLException; @@ -19,6 +12,12 @@ import android.util.Log; import android.util.SparseArray; +import com.SecUpwN.AIMSICD.AIMSICD; +import com.SecUpwN.AIMSICD.constants.Examples; +import com.SecUpwN.AIMSICD.constants.Examples.EVENT_LOG_DATA; +import com.SecUpwN.AIMSICD.utils.CMDProcessor; +import com.SecUpwN.AIMSICD.utils.Cell; + import java.io.File; import java.io.FileOutputStream; import java.io.FileReader; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/CellCardInflater.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/CellCardInflater.java index d9a6cc855..51c6dec1f 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/CellCardInflater.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/CellCardInflater.java @@ -1,12 +1,12 @@ package com.SecUpwN.AIMSICD.adapters; -import com.SecUpwN.AIMSICD.R; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.SecUpwN.AIMSICD.R; + /** * Brief: TODO: Please explain its use. diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/DefaultLocationCardInflater.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/DefaultLocationCardInflater.java index f4e74853f..033978c35 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/DefaultLocationCardInflater.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/DefaultLocationCardInflater.java @@ -1,12 +1,12 @@ package com.SecUpwN.AIMSICD.adapters; -import com.SecUpwN.AIMSICD.R; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.SecUpwN.AIMSICD.R; + public class DefaultLocationCardInflater implements IAdapterViewInflater { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/IAdapterViewInflater.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/IAdapterViewInflater.java index 687df994a..669fd1de6 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/IAdapterViewInflater.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/IAdapterViewInflater.java @@ -4,7 +4,5 @@ import android.view.ViewGroup; public interface IAdapterViewInflater { - - public View inflate(BaseInflaterAdapter adapter, int pos, View convertView, - ViewGroup parent); + View inflate(BaseInflaterAdapter adapter, int pos, View convertView, ViewGroup parent); } \ No newline at end of file diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/MeasuredCellStrengthCardData.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/MeasuredCellStrengthCardData.java index 4426dc4ff..587370c0c 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/MeasuredCellStrengthCardData.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/MeasuredCellStrengthCardData.java @@ -1,6 +1,8 @@ package com.SecUpwN.AIMSICD.adapters; import java.text.SimpleDateFormat; +import java.util.Locale; + /** * * Data card class used in DB viewer (for Measured cell strength measurements) @@ -12,7 +14,7 @@ public class MeasuredCellStrengthCardData { private final long timestamp; private final int signal; private final int cellID; - private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); public MeasuredCellStrengthCardData(int cellID, int signal, long timestamp) { this.cellID = cellID; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/OpenCellIdCardInflater.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/OpenCellIdCardInflater.java index 2726d1c65..a033157fd 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/OpenCellIdCardInflater.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/OpenCellIdCardInflater.java @@ -1,12 +1,12 @@ package com.SecUpwN.AIMSICD.adapters; -import com.SecUpwN.AIMSICD.R; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.SecUpwN.AIMSICD.R; + public class OpenCellIdCardInflater implements IAdapterViewInflater { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardData.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardData.java index 84dfd1ba5..c797b977b 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardData.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardData.java @@ -1,6 +1,7 @@ package com.SecUpwN.AIMSICD.adapters; import java.text.SimpleDateFormat; +import java.util.Locale; public class SilentSmsCardData { @@ -68,7 +69,7 @@ public String getMessage() { } public String getTimestamp() { - SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss"); + SimpleDateFormat formatter = new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss", Locale.getDefault()); String dateString = formatter.format(mTimestamp); return "Timestamp: " + dateString; } diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardInflater.java b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardInflater.java index dfc1592aa..917068185 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardInflater.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/adapters/SilentSmsCardInflater.java @@ -1,12 +1,12 @@ package com.SecUpwN.AIMSICD.adapters; -import com.SecUpwN.AIMSICD.R; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.SecUpwN.AIMSICD.R; + public class SilentSmsCardInflater implements IAdapterViewInflater { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/drawer/NavDrawerItem.java b/app/src/main/java/com/SecUpwN/AIMSICD/drawer/NavDrawerItem.java index 9e8ed2133..79a33e53e 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/drawer/NavDrawerItem.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/drawer/NavDrawerItem.java @@ -1,11 +1,11 @@ package com.SecUpwN.AIMSICD.drawer; public interface NavDrawerItem { - public int getId(); - public String getLabel(); - public void setLabel(String label); - public void setmIconId(int icon); - public int getType(); - public boolean isEnabled(); - public boolean updateActionBarTitle(); + int getId(); + String getLabel(); + void setLabel(String label); + void setmIconId(int icon); + int getType(); + boolean isEnabled(); + boolean updateActionBarTitle(); } \ No newline at end of file diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/enums/StatesDbViewer.java b/app/src/main/java/com/SecUpwN/AIMSICD/enums/StatesDbViewer.java index 778daa50b..268b7e923 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/enums/StatesDbViewer.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/enums/StatesDbViewer.java @@ -8,7 +8,6 @@ import android.content.Context; - import com.SecUpwN.AIMSICD.R; import java.util.ArrayList; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java index 00d1d6865..1a4fa6d2d 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/AboutFragment.java @@ -1,9 +1,5 @@ package com.SecUpwN.AIMSICD.fragments; -import com.SecUpwN.AIMSICD.R; -import com.SecUpwN.AIMSICD.activities.CreditsRollActivity; -import com.SecUpwN.AIMSICD.utils.MiscUtils; - import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -18,6 +14,10 @@ import android.widget.Button; import android.widget.TextView; +import com.SecUpwN.AIMSICD.R; +import com.SecUpwN.AIMSICD.activities.CreditsRollActivity; +import com.SecUpwN.AIMSICD.utils.MiscUtils; + public class AboutFragment extends Fragment { private Context mContext; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DbViewerFragment.java b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DbViewerFragment.java index 718d18c68..57db112e3 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DbViewerFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DbViewerFragment.java @@ -26,7 +26,6 @@ import com.SecUpwN.AIMSICD.adapters.MeasuredCellStrengthCardInflater; import com.SecUpwN.AIMSICD.adapters.OpenCellIdCardInflater; import com.SecUpwN.AIMSICD.adapters.SilentSmsCardData; -import com.SecUpwN.AIMSICD.adapters.SilentSmsCardInflater; import com.SecUpwN.AIMSICD.constants.Examples; import com.SecUpwN.AIMSICD.enums.StatesDbViewer; import com.SecUpwN.AIMSICD.smsdetection.CapturedSmsCardInflater; @@ -70,8 +69,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa DbViewerSpinnerAdapter mSpinnerAdapter = new DbViewerSpinnerAdapter(getActivity(), R.layout.item_spinner_db_viewer); tblSpinner.setAdapter(mSpinnerAdapter); - Spinner spnLocale = (Spinner) view.findViewById(R.id.table_spinner); - spnLocale.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + tblSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parentView, View selectedItemView, final int position, long id) { @@ -161,7 +159,7 @@ protected void onPostExecute(BaseInflaterAdapter adapter) { @Override public void onNothingSelected(AdapterView parentView) { - return; + } }); diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DeviceFragment.java b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DeviceFragment.java index 1116ee69b..30a770dd0 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DeviceFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DeviceFragment.java @@ -1,10 +1,5 @@ package com.SecUpwN.AIMSICD.fragments; -import com.SecUpwN.AIMSICD.R; -import com.SecUpwN.AIMSICD.service.AimsicdService; -import com.SecUpwN.AIMSICD.utils.Device; -import com.SecUpwN.AIMSICD.utils.Helpers; - import android.app.Activity; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -23,6 +18,11 @@ import android.widget.TableRow; import android.widget.TextView; +import com.SecUpwN.AIMSICD.R; +import com.SecUpwN.AIMSICD.service.AimsicdService; +import com.SecUpwN.AIMSICD.utils.Device; +import com.SecUpwN.AIMSICD.utils.Helpers; + public class DeviceFragment extends Fragment { private final String TAG = "AIMSICD"; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/MapPrefFragment.java b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/MapPrefFragment.java index 92d6fafb2..84da52630 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/MapPrefFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/MapPrefFragment.java @@ -1,10 +1,10 @@ package com.SecUpwN.AIMSICD.fragments; -import com.SecUpwN.AIMSICD.R; - import android.os.Bundle; import android.preference.PreferenceFragment; +import com.SecUpwN.AIMSICD.R; + public class MapPrefFragment extends PreferenceFragment { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/PrefFragment.java b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/PrefFragment.java index 8396890f3..714db39ff 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/PrefFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/PrefFragment.java @@ -1,10 +1,10 @@ package com.SecUpwN.AIMSICD.fragments; -import com.SecUpwN.AIMSICD.R; - import android.os.Bundle; import android.preference.PreferenceFragment; +import com.SecUpwN.AIMSICD.R; + public class PrefFragment extends PreferenceFragment { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/map/CellTowerMarker.java b/app/src/main/java/com/SecUpwN/AIMSICD/map/CellTowerMarker.java index af4875109..20de070a0 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/map/CellTowerMarker.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/map/CellTowerMarker.java @@ -13,7 +13,6 @@ import org.osmdroid.bonuspack.overlays.Marker; import org.osmdroid.util.GeoPoint; import org.osmdroid.views.MapView; -import org.osmdroid.views.overlay.OverlayItem; /** * BTS pin item diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/receiver/BootCompletedReceiver.java b/app/src/main/java/com/SecUpwN/AIMSICD/receiver/BootCompletedReceiver.java index 0abce35f6..37d1d7690 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/receiver/BootCompletedReceiver.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/receiver/BootCompletedReceiver.java @@ -1,14 +1,14 @@ package com.SecUpwN.AIMSICD.receiver; -import com.SecUpwN.AIMSICD.R; -import com.SecUpwN.AIMSICD.service.AimsicdService; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.util.Log; +import com.SecUpwN.AIMSICD.R; +import com.SecUpwN.AIMSICD.service.AimsicdService; + public class BootCompletedReceiver extends BroadcastReceiver { @Override diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/receiver/SmsReceiver.java b/app/src/main/java/com/SecUpwN/AIMSICD/receiver/SmsReceiver.java index 83fc38076..dc8564aa8 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/receiver/SmsReceiver.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/receiver/SmsReceiver.java @@ -1,8 +1,5 @@ package com.SecUpwN.AIMSICD.receiver; -import com.SecUpwN.AIMSICD.service.AimsicdService; -import com.SecUpwN.AIMSICD.service.CellTracker; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -10,6 +7,8 @@ import android.telephony.SmsMessage; import android.util.Log; +import com.SecUpwN.AIMSICD.service.CellTracker; + import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/OemRilExecutor.java b/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/OemRilExecutor.java index 0a1d71bd4..1cd0de1d9 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/OemRilExecutor.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/OemRilExecutor.java @@ -4,11 +4,11 @@ public interface OemRilExecutor { - public DetectResult detect(); + DetectResult detect(); - public void start(); + void start(); - public void stop(); + void stop(); /** * Invokes RIL_REQUEST_OEM_HOOK_RAW. @@ -22,7 +22,7 @@ public interface OemRilExecutor { * com.android.internal.telephony.gsm.CommandException * @see #invokeOemRilRequestRaw(byte[], android.os.Message) */ - public void invokeOemRilRequestRaw(byte data[], Message response); + void invokeOemRilRequestRaw(byte data[], Message response); /** * Invokes RIL_REQUEST_OEM_HOOK_STRING @@ -36,6 +36,6 @@ public interface OemRilExecutor { * com.android.internal.telephony.gsm.CommandException * @see #invokeOemRilRequestStrings(String[], android.os.Message) */ - public void invokeOemRilRequestStrings(String[] strings, Message response); + void invokeOemRilRequestStrings(String[] strings, Message response); } diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/RilExecutor.java b/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/RilExecutor.java index b1a0f66e0..37f3320ac 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/RilExecutor.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/RilExecutor.java @@ -8,10 +8,6 @@ import android.os.Message; import android.util.Log; -import com.SecUpwN.AIMSICD.rilexecutor.DetectResult; -import com.SecUpwN.AIMSICD.rilexecutor.OemRilExecutor; -import com.SecUpwN.AIMSICD.rilexecutor.RawResult; -import com.SecUpwN.AIMSICD.rilexecutor.SamsungMulticlientRilExecutor; import com.SecUpwN.AIMSICD.utils.Helpers; import com.SecUpwN.AIMSICD.utils.OemCommands; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/SamsungMulticlientRilExecutor.java b/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/SamsungMulticlientRilExecutor.java index ba8337b5d..2987d9bf8 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/SamsungMulticlientRilExecutor.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/rilexecutor/SamsungMulticlientRilExecutor.java @@ -15,8 +15,6 @@ */ package com.SecUpwN.AIMSICD.rilexecutor; -import com.SecUpwN.AIMSICD.BuildConfig; - import android.annotation.SuppressLint; import android.net.LocalSocket; import android.net.LocalSocketAddress; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/service/AccelerometerMonitor.java b/app/src/main/java/com/SecUpwN/AIMSICD/service/AccelerometerMonitor.java index ef32bed59..e7fab1ea9 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/AccelerometerMonitor.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/AccelerometerMonitor.java @@ -5,7 +5,6 @@ import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; -import android.util.Log; /** * Class to handle monitoring the Accelerometer to enable/disable GPS for battery saving diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java b/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java index f8059c743..24379afbf 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java @@ -26,13 +26,8 @@ import android.app.AlertDialog; import android.app.Service; -import android.content.BroadcastReceiver; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.IntentFilter; -import android.content.SharedPreferences; -import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; @@ -44,7 +39,6 @@ import android.view.WindowManager; import com.SecUpwN.AIMSICD.R; -import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; import com.SecUpwN.AIMSICD.rilexecutor.RilExecutor; import com.SecUpwN.AIMSICD.smsdetection.SmsDetector; import com.SecUpwN.AIMSICD.utils.Cell; @@ -124,10 +118,10 @@ public void onDestroy() { mLocationTracker.stop(); mAccelerometerMonitor.stop(); mRilExecutor.stop(); - if (smsdetector.getSmsDetectionState()) - { - smsdetector.stopSmsDetection(); - } + + if (SmsDetector.getSmsDetectionState()) { + smsdetector.stopSmsDetection(); + } Log.i(TAG, "Service destroyed."); } @@ -175,7 +169,7 @@ public void setTrackingFemtocell(boolean track) { //SMS DETECTION public boolean isSmsTracking() { - return smsdetector.getSmsDetectionState(); + return SmsDetector.getSmsDetectionState(); } public void startSmsTracking() { 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 3ff5334c7..d15894d6e 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/CellTracker.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/CellTracker.java @@ -326,7 +326,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin t = 15L; // Automatic refresh rate is 15 seconds break; default: - t = (rate * 1L); + t = (long) rate; break; } REFRESH_RATE = TimeUnit.SECONDS.toMillis(t); diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/service/LocationTracker.java b/app/src/main/java/com/SecUpwN/AIMSICD/service/LocationTracker.java index cdeebc150..a48b6ca62 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/LocationTracker.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/LocationTracker.java @@ -88,9 +88,7 @@ public boolean notMovedInAWhile() { if (lastLocationTime <= 0) return true; // haven't received a GPS update in a while, assume no movement - if (System.currentTimeMillis() - lastLocationTime > MOVEMENT_THRESHOLD_MS) return true; - - return false; + return System.currentTimeMillis() - lastLocationTime > MOVEMENT_THRESHOLD_MS; } public GeoLocation lastKnownLocation() { diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/service/SignalStrengthTracker.java b/app/src/main/java/com/SecUpwN/AIMSICD/service/SignalStrengthTracker.java index d4a5e6b4b..6b1cc0e3d 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/SignalStrengthTracker.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/SignalStrengthTracker.java @@ -5,7 +5,6 @@ import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; -import java.util.ArrayList; import java.util.HashMap; /** diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseAdapter.java b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseAdapter.java index 9ce2a9374..6efe3641d 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseAdapter.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseAdapter.java @@ -41,7 +41,7 @@ public long getItemId(int position) { public View getView(int position, View convertView, ViewGroup parent) { ViewHolder holder; if (convertView == null) { - convertView = l_Inflater.inflate(R.layout.adv_user_strings_list, null); + convertView = l_Inflater.inflate(R.layout.adv_user_strings_list, parent); holder = new ViewHolder(); holder.tv_detection_string = (TextView)convertView.findViewById(R.id.tv_adv_list_det_str); holder.tv_detection_type = (TextView)convertView.findViewById(R.id.tv_adv_list_det_type); diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseSmsAdapter.java b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseSmsAdapter.java index edfd02d8d..d890575a5 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseSmsAdapter.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvanceUserBaseSmsAdapter.java @@ -41,7 +41,7 @@ public long getItemId(int position) { public View getView(int position, View convertView, ViewGroup parent) { ViewHolder holder; if (convertView == null) { - convertView = l_Inflater.inflate(R.layout.adv_user_sms_listview, null); + convertView = l_Inflater.inflate(R.layout.adv_user_sms_listview, parent); holder = new ViewHolder(); holder.smsd_timestamp = (TextView)convertView.findViewById(R.id.tv_adv_smsdata_timestamp); holder.smsd_smstype = (TextView) convertView.findViewById(R.id.tv_adv_smsdata_smstype); diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvancedUserActivity.java b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvancedUserActivity.java index 83ea1343f..086c3752c 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvancedUserActivity.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/AdvancedUserActivity.java @@ -46,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) { }catch (Exception ee){ System.out.println("DB ERROR>>>>"+ee.toString()); - msgitems = new ArrayList(); + msgitems = new ArrayList<>(); AdvanceUserItems itemss = new AdvanceUserItems(); itemss.setDetection_string("NO DATA"); itemss.setDetection_type("No TYPE"); diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetectionDbAccess.java b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetectionDbAccess.java index d67fb7f0c..ef3b6bc67 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetectionDbAccess.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetectionDbAccess.java @@ -77,9 +77,13 @@ public boolean insertNewDetectionString(ContentValues newstring) { String check4String = String.format("SELECT * FROM %s WHERE %s = \"%s\"", SmsDetectionDbHelper.SILENT_SMS_STRINGS_TABLE, SmsDetectionDbHelper.SILENT_SMS_STRING_COLUMN, newstring.get(SmsDetectionDbHelper.SILENT_SMS_STRING_COLUMN)); - Cursor stringcount = dectection_db.rawQuery(check4String, null); + Cursor stringCountCursor = dectection_db.rawQuery(check4String, null); - if (stringcount.getCount() > 0) { + int stringCount = stringCountCursor.getCount(); + + stringCountCursor.close(); + + if (stringCount > 0) { Log.i(LOGTAG, "Detection String already in Database"); } else { @@ -121,29 +125,28 @@ public boolean deleteDetectedSms(long deleteme) { // ==================================================================== // Get all detection strings // ==================================================================== - public ArrayList getDetectionStrings(){ - - - Cursor stringcount = dectection_db.rawQuery("SELECT * FROM "+ SmsDetectionDbHelper.SILENT_SMS_STRINGS_TABLE,null); + public ArrayList getDetectionStrings() { + Cursor stringCountCursor = dectection_db.rawQuery("SELECT * FROM "+ SmsDetectionDbHelper.SILENT_SMS_STRINGS_TABLE, null); ArrayList detection_strs = new ArrayList<>(); - System.out.println("DB LEN = "+stringcount.getCount()); - if(stringcount.getCount() > 0) { - while (stringcount.moveToNext()) { + System.out.println("DB LEN = " + stringCountCursor.getCount()); + if (stringCountCursor.getCount() > 0) { + while (stringCountCursor.moveToNext()) { AdvanceUserItems setitems = new AdvanceUserItems(); - setitems.setDetection_string(stringcount.getString(stringcount.getColumnIndex(SmsDetectionDbHelper.SILENT_SMS_STRING_COLUMN))); - setitems.setDetection_type(stringcount.getString(stringcount.getColumnIndex(SmsDetectionDbHelper.SILENT_SMS_TYPE_COLUMN))); + setitems.setDetection_string(stringCountCursor.getString(stringCountCursor.getColumnIndex(SmsDetectionDbHelper.SILENT_SMS_STRING_COLUMN))); + setitems.setDetection_type(stringCountCursor.getString(stringCountCursor.getColumnIndex(SmsDetectionDbHelper.SILENT_SMS_TYPE_COLUMN))); detection_strs.add(setitems); } - }else - { + } else { AdvanceUserItems setitems = new AdvanceUserItems(); setitems.setDetection_string("No data"); setitems.setDetection_type("No data"); detection_strs.add(setitems); } + stringCountCursor.close(); + return detection_strs; } public Cursor getDetectionStringCursor() { diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetector.java b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetector.java index a185ae16a..32dee16ad 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetector.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/smsdetection/SmsDetector.java @@ -25,20 +25,14 @@ package com.SecUpwN.AIMSICD.smsdetection; -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.os.IBinder; -import android.support.v4.app.NotificationCompat; import android.util.Log; -import com.SecUpwN.AIMSICD.AIMSICD; -import com.SecUpwN.AIMSICD.R; import com.SecUpwN.AIMSICD.service.AimsicdService; import com.SecUpwN.AIMSICD.utils.Device; import com.SecUpwN.AIMSICD.utils.MiscUtils; @@ -141,7 +135,7 @@ public void run() { try { try { - new Thread().sleep(500); + Thread.sleep(500); } catch (InterruptedException e) { e.printStackTrace(); } @@ -262,14 +256,14 @@ public void checkForSilentSms(String[] progress){ //System.out.println("NewCount >>> "+newcount+" Xcount>>>>> "+x); if(newcount > 0) {//only check if array length is not -minus (if minus we cant count back so skip) while (newcount < x) { - if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[2].toString())) { + if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[2])) { try { //Looking for OrigAddr this is where type0 sender number is - String number = progress[newcount].substring(progress[newcount].indexOf("OrigAddr")).replace(DETECTION_PHONENUM_SMS_DATA[2].toString(), "").trim(); + String number = progress[newcount].substring(progress[newcount].indexOf("OrigAddr")).replace(DETECTION_PHONENUM_SMS_DATA[2], "").trim(); setmsg.setSenderNumber(number);//default }catch (Exception ee){Log.e(TAG,"Error parsing number");} //System.out.println("Number>>>"+number); - } else if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[1].toString())) { + } else if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[1])) { try { String smsdata = progress[newcount].substring( progress[newcount].indexOf("'") + 1, @@ -305,7 +299,7 @@ public void checkForSilentSms(String[] progress){ //System.out.println("NewCount >>> "+newcount+" Xcount>>>>> "+x); if(newcount > 0) {//only check if array length is not -minus while (newcount < x) { - if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[0].toString())) { + if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[0])) { /* This first try usually has the number of the sender * and second try is just there incase OrigAddr string shows. * */ @@ -314,14 +308,14 @@ public void checkForSilentSms(String[] progress){ setmsg.setSenderNumber(number);//default }catch (Exception ee){} //System.out.println("Number>>>"+number); - }else if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[2].toString())) { + }else if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[2])) { try { //Looking for OrigAddr this is where type0 sender number is - String number = progress[newcount].substring(progress[newcount].indexOf("OrigAddr")).replace(DETECTION_PHONENUM_SMS_DATA[2].toString(), "").trim(); + String number = progress[newcount].substring(progress[newcount].indexOf("OrigAddr")).replace(DETECTION_PHONENUM_SMS_DATA[2], "").trim(); setmsg.setSenderNumber(number);//default }catch (Exception ee){Log.e(TAG,"Error parsing number");} //System.out.println("Number>>>"+number); - } else if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[1].toString())) { + } else if (progress[newcount].contains(DETECTION_PHONENUM_SMS_DATA[1])) { try { String smsdata = progress[newcount].substring( progress[newcount].indexOf("'") + 1, diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/CommandResult.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/CommandResult.java index 05c1d9d90..817e094fc 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/CommandResult.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/CommandResult.java @@ -21,12 +21,12 @@ package com.SecUpwN.AIMSICD.utils; -import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; - import android.os.Parcel; import android.os.Parcelable; import android.util.Log; +import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; + import java.io.File; import java.io.FileWriter; import java.io.IOException; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/Helpers.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/Helpers.java index 5e0767f63..1c0f2fbe3 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/Helpers.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/Helpers.java @@ -24,7 +24,6 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.CountDownTimer; -import android.os.Environment; import android.os.Handler; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/LocationServices.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/LocationServices.java index f4e83bd1d..a130fe609 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/LocationServices.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/LocationServices.java @@ -2,13 +2,9 @@ import android.os.AsyncTask; -import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; public class LocationServices { diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/MiscUtils.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/MiscUtils.java index 74d934a30..777d55b16 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/MiscUtils.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/MiscUtils.java @@ -15,6 +15,7 @@ import java.io.InputStreamReader; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; /** * Created by Paul Kinsella on 04/03/15. @@ -59,7 +60,7 @@ public static void startPopUpInfo(Context context,int mode){ public static String getCurrentTimeStamp(){ Date now = new Date(); - String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(now); + String timestamp = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(now); return timestamp; } 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 d74c7473a..0ada0a8e3 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java @@ -4,9 +4,6 @@ import android.app.AlertDialog; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; -import android.os.AsyncTask; -import android.os.Environment; import android.support.v4.content.LocalBroadcastManager; import android.util.Log; @@ -16,10 +13,16 @@ import com.SecUpwN.AIMSICD.activities.MapViewerOsmDroid; import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter; import com.SecUpwN.AIMSICD.constants.TinyDbKeys; -import com.SecUpwN.AIMSICD.service.AimsicdService; import com.SecUpwN.AIMSICD.service.CellTracker; -//import com.SecUpwN.AIMSICD.utils.Helpers; -import com.SecUpwN.AIMSICD.utils.TinyDB; + +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.mime.MultipartEntity; +import org.apache.http.entity.mime.content.InputStreamBody; +import org.apache.http.entity.mime.content.StringBody; +import org.apache.http.impl.client.DefaultHttpClient; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -33,14 +36,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.entity.mime.MultipartEntity; -import org.apache.http.entity.mime.content.InputStreamBody; -import org.apache.http.entity.mime.content.StringBody; -import org.apache.http.impl.client.DefaultHttpClient; +//import com.SecUpwN.AIMSICD.utils.Helpers; /** * diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/StackOverflowXmlParser.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/StackOverflowXmlParser.java index a6f8c34aa..94f27c998 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/StackOverflowXmlParser.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/StackOverflowXmlParser.java @@ -1,10 +1,10 @@ package com.SecUpwN.AIMSICD.utils; +import android.util.Xml; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import android.util.Xml; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/utils/TinyDB.java b/app/src/main/java/com/SecUpwN/AIMSICD/utils/TinyDB.java index 17f11c4c3..9bb8da286 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/TinyDB.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/TinyDB.java @@ -15,24 +15,23 @@ */ package com.SecUpwN.AIMSICD.utils; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Map; - import android.content.Context; import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.graphics.BitmapFactory; -import android.os.Environment; import android.preference.PreferenceManager; import android.text.TextUtils; import android.util.Log; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Map; + /** * Description: This class simplifies calls to SharedPreferences in a line of code. diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml index d18d40266..d52e95099 100644 --- a/app/src/main/res/layout/about_fragment.xml +++ b/app/src/main/res/layout/about_fragment.xml @@ -48,7 +48,7 @@ android:textColor="@color/green_text" android:id="@+id/textView2" android:gravity="center_vertical|center_horizontal" - android:textSize="14dp" /> + android:textSize="14sp" /> + android:textSize="14sp" />