Skip to content

Commit

Permalink
Code Format Cleanup
Browse files Browse the repository at this point in the history 
Clean up and maintenance of code format, no real changes just arrangement of imports
and formatting style of code.
  • Loading branch information
@xLaMbChOpSx
xLaMbChOpSx committed Jun 21, 2014
1 parent a406a51 commit abb4ebf
Show file tree
Hide file tree
Showing 34 changed files with 669 additions and 606 deletions.
44 changes: 20 additions & 24 deletions app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@

package com.SecUpwN.AIMSICD;

import com.SecUpwN.AIMSICD.activities.MapViewer;
import com.SecUpwN.AIMSICD.activities.PrefActivity;
import com.SecUpwN.AIMSICD.fragments.AboutFragment;
import com.SecUpwN.AIMSICD.fragments.AtCommandFragment;
import com.SecUpwN.AIMSICD.fragments.CellInfoFragment;
import com.SecUpwN.AIMSICD.fragments.DbViewerFragment;
import com.SecUpwN.AIMSICD.fragments.DeviceFragment;
import com.SecUpwN.AIMSICD.service.AimsicdService;
import com.SecUpwN.AIMSICD.utils.Helpers;
import com.SecUpwN.AIMSICD.utils.RequestTask;

import android.app.Activity;
import android.app.AlertDialog;
import android.app.Fragment;
Expand All @@ -33,7 +44,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.IBinder;

import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.widget.DrawerLayout;
import android.telephony.TelephonyManager;
Expand All @@ -48,17 +58,6 @@
import android.widget.SimpleAdapter;
import android.widget.Toast;

import com.SecUpwN.AIMSICD.activities.MapViewer;
import com.SecUpwN.AIMSICD.activities.PrefActivity;
import com.SecUpwN.AIMSICD.fragments.AboutFragment;
import com.SecUpwN.AIMSICD.fragments.AtCommandFragment;
import com.SecUpwN.AIMSICD.fragments.CellInfoFragment;
import com.SecUpwN.AIMSICD.fragments.DbViewerFragment;
import com.SecUpwN.AIMSICD.fragments.DeviceFragment;
import com.SecUpwN.AIMSICD.service.AimsicdService;
import com.SecUpwN.AIMSICD.utils.Helpers;
import com.SecUpwN.AIMSICD.utils.RequestTask;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand All @@ -72,17 +71,14 @@ public class AIMSICD extends Activity {
private SharedPreferences prefs;
private Editor prefsEditor;
private String mDisclaimerAccepted;

private AimsicdService mAimsicdService;

private String[] mNavigationTitles;
private List<HashMap<String,String>> mNavigationItems;

private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
private ActionBarDrawerToggle mDrawerToggle;
private CharSequence mDrawerTitle;
private CharSequence mTitle;

public static ProgressBar mProgressBar;

//Back press to exit timer
Expand Down Expand Up @@ -115,24 +111,23 @@ public void onCreate(Bundle savedInstanceState) {
R.drawable.ic_action_about,
};


mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
mDrawerList = (ListView) findViewById(R.id.left_drawer);

mNavigationItems = new ArrayList<>();
for(int i=0;i<6;i++){
List<HashMap<String, String>> navigationItems = new ArrayList<>();
for (int i = 0; i < 6; i++) {
HashMap<String, String> hm = new HashMap<>();
hm.put("title", mNavigationTitles[i]);
hm.put("icon", Integer.toString(mIcons[i]) );
mNavigationItems.add(hm);
hm.put("icon", Integer.toString(mIcons[i]));
navigationItems.add(hm);
}

String[] from = {"title", "icon"};
int[] to = {R.id.navigation_item, R.id.icon};

// Set the adapter for the list view
mDrawerList.setAdapter(new SimpleAdapter(mContext,
mNavigationItems, R.layout.drawer_layout, from, to));
navigationItems, R.layout.drawer_layout, from, to));
mDrawerToggle = new ActionBarDrawerToggle(
this, /* host Activity */
mDrawerLayout, /* DrawerLayout object */
Expand Down Expand Up @@ -219,7 +214,6 @@ public void onConfigurationChanged(Configuration newConfig) {
}



@Override
protected void onDestroy() {
super.onDestroy();
Expand All @@ -238,6 +232,7 @@ protected void onDestroy() {
}

private class DrawerItemClickListener implements ListView.OnItemClickListener {

@Override
public void onItemClick(AdapterView parent, View view, int position, long id) {
selectItem(position);
Expand Down Expand Up @@ -425,7 +420,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
*/
@Override
public void onBackPressed() {
Toast onBackPressedToast = Toast.makeText(this, R.string.press_once_again_to_exit, Toast.LENGTH_SHORT);
Toast onBackPressedToast = Toast
.makeText(this, R.string.press_once_again_to_exit, Toast.LENGTH_SHORT);
long currentTime = System.currentTimeMillis();
if (currentTime - mLastPress > 5000) {
onBackPressedToast.show();
Expand Down
76 changes: 39 additions & 37 deletions app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@

package com.SecUpwN.AIMSICD.activities;

import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapFragment;
import com.google.android.gms.maps.UiSettings;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;

import com.SecUpwN.AIMSICD.R;
import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter;
import com.SecUpwN.AIMSICD.service.AimsicdService;
import com.SecUpwN.AIMSICD.utils.Helpers;
import com.SecUpwN.AIMSICD.utils.RequestTask;

import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
Expand All @@ -41,43 +59,23 @@
import android.widget.TableRow;
import android.widget.TextView;

import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapFragment;
import com.google.android.gms.maps.UiSettings;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.CircleOptions;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;

import com.SecUpwN.AIMSICD.R;
import com.SecUpwN.AIMSICD.adapters.AIMSICDDbAdapter;
import com.SecUpwN.AIMSICD.service.AimsicdService;
import com.SecUpwN.AIMSICD.utils.Helpers;
import com.SecUpwN.AIMSICD.utils.RequestTask;

import java.util.HashMap;
import java.util.Map;


public class MapViewer extends FragmentActivity implements OnSharedPreferenceChangeListener {
private final String TAG = "AIMSICD_MapViewer";

private final String TAG = "AIMSICD_MapViewer";
public static String updateOpenCellIDMarkers = "update_opencell_markers";

private GoogleMap mMap;

private AIMSICDDbAdapter mDbHelper;
private Context mContext;
private LatLng loc = null;
private SharedPreferences prefs;

private AimsicdService mAimsicdService;
private boolean mBound;

private LatLng loc = null;
private final Map<Marker, MarkerData> mMarkerMap = new HashMap<>();

/**
Expand All @@ -88,7 +86,8 @@ public void onCreate(Bundle savedInstanceState) {
Log.i(TAG, "Starting MapViewer");
super.onCreate(savedInstanceState);

if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) != ConnectionResult.SUCCESS) {
if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this)
!= ConnectionResult.SUCCESS) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(R.string.error_google_play_services_message)
.setTitle(R.string.error_google_play_services_title);
Expand All @@ -103,8 +102,6 @@ public void onCreate(Bundle savedInstanceState) {
// Bind to LocalService
Intent intent = new Intent(mContext, AimsicdService.class);
mContext.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);


}

@Override
Expand Down Expand Up @@ -198,7 +195,6 @@ private void loadPreferences() {

/**
* Initialises the Map and sets initial options
*
*/
private void setUpMapIfNeeded() {
// Do a null check to confirm that we have not already instantiated the
Expand Down Expand Up @@ -236,7 +232,7 @@ public View getInfoContents(Marker arg0) {
// Getting view from the layout file info_window_layout
View v = getLayoutInflater().inflate(R.layout.marker_info_window, null);

if (v != null) {
if (v != null) {
final MarkerData data = mMarkerMap.get(arg0);
if (data != null) {
if (data.openCellID) {
Expand Down Expand Up @@ -289,8 +285,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
Intent intent = new Intent(this, MapPrefActivity.class);
startActivity(intent);
return true;
case R.id.get_opencellid:
{
case R.id.get_opencellid: {
Location lastKnown = mAimsicdService.lastKnownLocation();
if (lastKnown != null) {
Helpers.sendMsg(this, "Contacting OpenCellID.org for data...");
Expand All @@ -314,7 +309,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
/**
* Loads Signal Strength Database details to plot on the map,
* only entries which have a location (lon, lat) are used.
*
*/
private void loadEntries() {
final int SIGNAL_SIZE_RATIO = 15;
Expand All @@ -331,8 +325,9 @@ private void loadEntries() {
final int net = c.getInt(2);
final double dlat = Double.parseDouble(c.getString(3));
final double dlng = Double.parseDouble(c.getString(4));
if (dlat == 0.0 && dlng == 0.0)
if (dlat == 0.0 && dlng == 0.0) {
continue;
}
signal = c.getInt(5);
if (signal <= 0) {
signal = 20;
Expand Down Expand Up @@ -395,7 +390,7 @@ private void loadEntries() {
.draggable(false)
.title("CellID - " + cellID));
mMarkerMap.put(marker, new MarkerData("" + cellID, "" + loc.latitude,
"" + loc.longitude, "" + lac, "", "", "",false));
"" + loc.longitude, "" + lac, "", "", "", false));
}

} while (c.moveToNext());
Expand All @@ -412,7 +407,8 @@ private void loadEntries() {
} else {
// Try and find last known location and zoom there
Location lastLoc = mAimsicdService.lastKnownLocation();
if (lastLoc != null && (lastLoc.getLatitude() != 0.0 && lastLoc.getLongitude() != 0.0)) {
if (lastLoc != null && (lastLoc.getLatitude() != 0.0
&& lastLoc.getLongitude() != 0.0)) {
loc = new LatLng(lastLoc.getLatitude(), lastLoc.getLongitude());
CameraPosition POSITION =
new CameraPosition.Builder().target(loc)
Expand Down Expand Up @@ -449,7 +445,7 @@ private void loadOpenCellIDMarkers() {
final double dlng = Double.parseDouble(c.getString(5));
final int cellID = c.getInt(0);
final int lac = c.getInt(1);
final LatLng location = new LatLng (dlat, dlng);
final LatLng location = new LatLng(dlat, dlng);
final int mcc = c.getInt(2);
final int mnc = c.getInt(3);
final int samples = c.getInt(7);
Expand All @@ -469,13 +465,21 @@ private void loadOpenCellIDMarkers() {
}

public class MarkerData {

public final String cellID;

public final String lat;

public final String lng;

public final String lac;

public final String mcc;

public final String mnc;

public final String samples;

public final boolean openCellID;

MarkerData(String cell_id, String latitude, String longitude,
Expand All @@ -493,9 +497,7 @@ public class MarkerData {
}



public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
{
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
final String KEY_MAP_TYPE = getBaseContext().getString(R.string.pref_map_type_key);

if (key.equals(KEY_MAP_TYPE)) {
Expand Down
Loading

0 comments on commit abb4ebf

Please sign in to comment.