From 33e01d42a40defa7731216d7d6fc0e616c7d5294 Mon Sep 17 00:00:00 2001 From: Denis Date: Thu, 4 Dec 2014 17:50:27 +0200 Subject: [PATCH] Refactored internet connection error messages --- OsmAnd/res/values/strings.xml | 6 +- .../plus/download/BaseDownloadActivity.java | 93 +++++++------------ 2 files changed, 36 insertions(+), 63 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 9d6dbaf745..1eca00e7d5 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,11 +9,7 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> - Your sim card need you to enter PUK. - Your sim card need you to enter PIN. - Network is locked. Please connect to Wi-Fi to be able to download. - No sim card available. Please insert sim card or connect to Wi-Fi to be able to download. - Not possible to download. Please connect to Wi-Fi to proceed. + Not possible to download. Please connect to Wi-Fi to proceed. Dismiss Everything up to date Use OpenGL rendering diff --git a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java index 4f4946da75..9e9d791120 100644 --- a/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java +++ b/OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java @@ -48,7 +48,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); settings = ((OsmandApplication) getApplication()).getSettings(); - if(downloadListIndexThread == null) { + if (downloadListIndexThread == null) { downloadListIndexThread = new DownloadIndexesThread(this); } prepareDownloadDirectory(); @@ -70,7 +70,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { } - public void updateDownloadList(List list){ + public void updateDownloadList(List list) { } @@ -78,12 +78,12 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { } - public DownloadActivityType getDownloadType(){ + public DownloadActivityType getDownloadType() { return type; } public Map> getEntriesToDownload() { - if(downloadListIndexThread == null) { + if (downloadListIndexThread == null) { return new LinkedHashMap>(); } return downloadListIndexThread.getEntriesToDownload(); @@ -97,20 +97,20 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { } - public void downloadListUpdated(){ + public void downloadListUpdated() { } - public OsmandApplication getMyApplication(){ - return (OsmandApplication)getApplication(); + public OsmandApplication getMyApplication() { + return (OsmandApplication) getApplication(); } - public void categorizationFinished(List filtered, List cats){ + public void categorizationFinished(List filtered, List cats) { } - public void startDownload(IndexItem item){ - if (downloadListIndexThread.getCurrentRunningTask() != null){ + public void startDownload(IndexItem item) { + if (downloadListIndexThread.getCurrentRunningTask() != null) { Toast.makeText(this, "Please wait before previous download is finished", Toast.LENGTH_SHORT).show(); return; } @@ -122,7 +122,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { public void downloadFilesPreCheckSpace() { double sz = 0; List list = downloadListIndexThread.flattenDownloadEntries(); - for (DownloadEntry es : list) { + for (DownloadEntry es : list) { sz += es.sizeMB; } // get availabile space @@ -144,7 +144,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { } protected void downloadFilesCheckFreeVersion() { - if (Version.isFreeVersion(getMyApplication()) ) { + if (Version.isFreeVersion(getMyApplication())) { int total = settings.NUMBER_OF_FREE_DOWNLOADS.get(); boolean wiki = false; for (IndexItem es : DownloadActivity.downloadListIndexThread.getEntriesToDownload().keySet()) { @@ -171,51 +171,26 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { } protected void downloadFilesCheckInternet() { - if(!getMyApplication().getSettings().isWifiConnected()) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(getString(R.string.download_using_mobile_internet)); - builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - downloadFilesCheckSim(); - } - }); - builder.setNegativeButton(R.string.default_buttons_no, null); - builder.show(); + if (!getMyApplication().getSettings().isWifiConnected()) { + if (getMyApplication().getSettings().isInternetConnectionAvailable()) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(getString(R.string.download_using_mobile_internet)); + builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + downloadFilesPreCheckSpace(); + } + }); + builder.setNegativeButton(R.string.default_buttons_no, null); + builder.show(); + } else { + AccessibleToast.makeText(this, R.string.no_internet_connection, Toast.LENGTH_LONG).show(); + } } else { downloadFilesPreCheckSpace(); } } - protected void downloadFilesCheckSim(){ - TelephonyManager telMgr = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE); - int phoneType = telMgr.getPhoneType(); - - if (phoneType == TelephonyManager.PHONE_TYPE_NONE){ - AccessibleToast.makeText(this, R.string.sim_card_not_supported, Toast.LENGTH_LONG).show(); - return; - } - int simState = telMgr.getSimState(); - switch (simState) { - case TelephonyManager.SIM_STATE_NETWORK_LOCKED: - AccessibleToast.makeText(this, R.string.network_locked, Toast.LENGTH_LONG).show(); - break; - case TelephonyManager.SIM_STATE_PIN_REQUIRED: - AccessibleToast.makeText(this, R.string.sim_pin_required, Toast.LENGTH_LONG).show(); - break; - case TelephonyManager.SIM_STATE_PUK_REQUIRED: - AccessibleToast.makeText(this, R.string.sim_puk_required, Toast.LENGTH_LONG).show(); - break; - case TelephonyManager.SIM_STATE_READY: - downloadFilesPreCheckSpace(); - break; - case TelephonyManager.SIM_STATE_ABSENT: - case TelephonyManager.SIM_STATE_UNKNOWN: - AccessibleToast.makeText(this, R.string.no_sim_card, Toast.LENGTH_LONG).show(); - break; - } - } - @Override public void onAttachFragment(Fragment fragment) { fragList.add(new WeakReference(fragment)); @@ -244,12 +219,12 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { } private void prepareDownloadDirectory() { - if(getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) { + if (getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) { boolean showedDialog = false; - if(Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) { + if (Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) { SuggestExternalDirectoryDialog.showDialog(this, null, null); } - if(!showedDialog) { + if (!showedDialog) { showDialogOfFreeDownloadsIfNeeded(); } } else { @@ -323,13 +298,15 @@ public class BaseDownloadActivity extends SherlockFragmentActivity { new File(newLoc, IndexConstants.APP_DIR)) { protected Boolean doInBackground(Void[] params) { Boolean result = super.doInBackground(params); - if(result) { + if (result) { settings.setExternalStorageDirectory(newLoc); getMyApplication().getResourceManager().resetStoreDirectory(); - getMyApplication().getResourceManager().reloadIndexes(progress) ; + getMyApplication().getResourceManager().reloadIndexes(progress); } return result; - }; + } + + ; }; task.execute(); }