From a0135bda5ba1f756318cc5874599209c15be4b7c Mon Sep 17 00:00:00 2001 From: xLaMbChOpSx Date: Sat, 28 Jun 2014 22:37:09 +1000 Subject: [PATCH] Reduce Toast Length Changed the toast to the msgShort method which uses a shorter timer for the toast events, meaning toasts displayed by the application will be visible for a shorter period. --- app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java | 4 ++-- .../com/SecUpwN/AIMSICD/activities/MapViewer.java | 13 ++++++------- .../AIMSICD/fragments/CellInfoFragment.java | 4 ++-- .../AIMSICD/fragments/DbViewerFragment.java | 2 +- .../SecUpwN/AIMSICD/service/AimsicdService.java | 4 ++-- .../com/SecUpwN/AIMSICD/utils/RequestTask.java | 14 +++++++------- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java index b10df6b60..ecbaeb792 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/AIMSICD.java @@ -400,11 +400,11 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.update_opencelldata: Location loc = mAimsicdService.lastKnownLocation(); if (loc != null && loc.hasAccuracy()) { - Helpers.sendMsg(mContext, "Contacting OpenCellID.org for data..."); + Helpers.msgShort(mContext, "Contacting OpenCellID.org for data..."); Helpers.getOpenCellData(mContext, loc.getLatitude(), loc.getLongitude(), RequestTask.OPEN_CELL_ID_REQUEST); } else { - Helpers.sendMsg(mContext, + Helpers.msgShort(mContext, "Unable to determine your last location. \nEnable Location Services and try again."); } return true; diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewer.java b/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewer.java index b1eefa2c2..9d38c7e50 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewer.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/activities/MapViewer.java @@ -260,7 +260,7 @@ public View getInfoContents(Marker arg0) { } }); } else { - Helpers.sendMsg(this, "Unable to create map!"); + Helpers.msgShort(this, "Unable to create map!"); } } } @@ -288,15 +288,15 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.get_opencellid: { Location lastKnown = mAimsicdService.mDevice.getLastLocation(); if (lastKnown != null) { - Helpers.sendMsg(this, "Contacting OpenCellID.org for data..."); + Helpers.msgShort(this, "Contacting OpenCellID.org for data..."); Helpers.getOpenCellData(mContext, lastKnown.getLatitude(), lastKnown.getLongitude(), RequestTask.OPEN_CELL_ID_REQUEST_FROM_MAP); } else if (loc != null) { - Helpers.sendMsg(this, "Contacting OpenCellID.org for data..."); + Helpers.msgShort(this, "Contacting OpenCellID.org for data..."); Helpers.getOpenCellData(mContext, loc.latitude, loc.longitude, RequestTask.OPEN_CELL_ID_REQUEST_FROM_MAP); } else { - Helpers.sendMsg(mContext, + Helpers.msgShort(mContext, "Unable to determine your last location. \nEnable Location Services and try again."); } return true; @@ -406,9 +406,8 @@ private void loadEntries() { mMap.animateCamera(CameraUpdateFactory.newCameraPosition(POSITION)); } else { // Try and find last known location and zoom there - Location lastLoc = mAimsicdService.mDevice.getLastLocation(); - if (lastLoc != null && (lastLoc.getLatitude() != 0.0 - && lastLoc.getLongitude() != 0.0)) { + Location lastLoc = mAimsicdService.lastKnownLocation(); + if (lastLoc != null && lastLoc.hasAccuracy()) { loc = new LatLng(lastLoc.getLatitude(), lastLoc.getLongitude()); CameraPosition POSITION = new CameraPosition.Builder().target(loc) diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/CellInfoFragment.java b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/CellInfoFragment.java index 464b44908..5b450b635 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/CellInfoFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/CellInfoFragment.java @@ -87,7 +87,7 @@ public void onResume() { //Refresh display if preference is not set to manual if (AimsicdService.REFRESH_RATE != 0) { timerHandler.postDelayed(timerRunnable, 0); - Helpers.sendMsg(mContext, "Refreshing every " + Helpers.msgShort(mContext, "Refreshing every " + TimeUnit.MILLISECONDS.toSeconds(AimsicdService.REFRESH_RATE) + " seconds"); } } @@ -150,7 +150,7 @@ private class btnClick implements View.OnClickListener { @Override public void onClick(View v) { - Helpers.sendMsg(mContext, "Refreshing now..."); + Helpers.msgShort(mContext, "Refreshing now..."); updateUI(); } } 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 5942f6bd9..7cd8650b9 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DbViewerFragment.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/fragments/DbViewerFragment.java @@ -173,7 +173,7 @@ private void BuildTable(Cursor tableData) { lv.setVisibility(View.VISIBLE); } else { lv.setVisibility(View.GONE); - Helpers.sendMsg(mContext, "Table contains no data to display"); + Helpers.msgShort(mContext, "Table contains no data to display"); } } 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 374962f46..9d1ce9b61 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java @@ -1021,7 +1021,7 @@ public void startTrackingFemto() { /* Check if it is a CDMA phone */ if (mDevice.getPhoneID() != TelephonyManager.PHONE_TYPE_CDMA) { - Helpers.sendMsg(this, "AIMSICD can only detect Femtocell connections on CDMA devices."); + Helpers.msgShort(this, "AIMSICD can only detect Femtocell connections on CDMA devices."); return; } @@ -1053,7 +1053,7 @@ public void stopTrackingFemto() { private void getServiceStateInfo(ServiceState s) { if (s != null) { if (IsConnectedToCdmaFemto(s)) { - Helpers.sendMsg(this, "ALERT!! Femtocell Connection Detected!!"); + Helpers.msgShort(this, "ALERT!! Femtocell Connection Detected!!"); mFemtoDetected = true; setNotification(); //toggleRadio(); 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 ba04b21e8..f2f0091d6 100644 --- a/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java +++ b/app/src/main/java/com/SecUpwN/AIMSICD/utils/RequestTask.java @@ -133,11 +133,11 @@ protected void onPostExecute(String result) { if (result != null && result.equals("Successful")) { mDbAdapter.open(); if (mDbAdapter.updateOpenCellID()) { - Helpers.sendMsg(mContext, "OpenCellID data successfully received"); + Helpers.msgShort(mContext, "OpenCellID data successfully received"); } mDbAdapter.close(); } else { - Helpers.sendMsg(mContext, "Error retrieving OpenCellID data"); + Helpers.msgShort(mContext, "Error retrieving OpenCellID data"); } break; case OPEN_CELL_ID_REQUEST_FROM_MAP: @@ -146,19 +146,19 @@ protected void onPostExecute(String result) { if (mDbAdapter.updateOpenCellID()) { Intent intent = new Intent(MapViewer.updateOpenCellIDMarkers); LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent); - Helpers.sendMsg(mContext, "OpenCellID data successfully received and " + Helpers.msgShort(mContext, "OpenCellID data successfully received and " + "Map Markers updated"); mDbAdapter.close(); } } else { - Helpers.sendMsg(mContext, "Error retrieving OpenCellID data"); + Helpers.msgShort(mContext, "Error retrieving OpenCellID data"); } break; case RESTORE_DATABASE: if (result != null && result.equals("Successful")) { - Helpers.sendMsg(mContext, "Restore database completed successfully"); + Helpers.msgShort(mContext, "Restore database completed successfully"); } else { - Helpers.sendMsg(mContext, "Error restoring database"); + Helpers.msgShort(mContext, "Error restoring database"); } break; case BACKUP_DATABASE: @@ -169,7 +169,7 @@ protected void onPostExecute(String result) { + AIMSICDDbAdapter.FOLDER); builder.create().show(); } else { - Helpers.sendMsg(mContext, "Error backing up database"); + Helpers.msgShort(mContext, "Error backing up database"); } } }