Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Refactored internet connection error messages

Browse source
This commit is contained in:
Denis 2014-12-04 17:50:27 +02:00
parent bfc480fd71
commit 33e01d42a4
2 changed files with 36 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/values/strings.xml
View file

@ -9,11 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 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 PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
--> -->
<string name="sim_puk_required">Your sim card need you to enter PUK.</string> <string name="no_internet_connection">Not possible to download. Please connect to Wi-Fi to proceed.</string>
<string name="sim_pin_required">Your sim card need you to enter PIN.</string>
<string name="network_locked">Network is locked. Please connect to Wi-Fi to be able to download.</string>
<string name="no_sim_card">No sim card available. Please insert sim card or connect to Wi-Fi to be able to download.</string>
<string name="sim_card_not_supported">Not possible to download. Please connect to Wi-Fi to proceed.</string>
<string name="dismiss">Dismiss</string> <string name="dismiss">Dismiss</string>
<string name="everything_up_to_date">Everything up to date</string> <string name="everything_up_to_date">Everything up to date</string>
<string name="use_opengl_render">Use OpenGL rendering</string> <string name="use_opengl_render">Use OpenGL rendering</string>

73
OsmAnd/src/net/osmand/plus/download/BaseDownloadActivity.java
View file

@ -48,7 +48,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
settings = ((OsmandApplication) getApplication()).getSettings(); settings = ((OsmandApplication) getApplication()).getSettings();
if(downloadListIndexThread == null) { if (downloadListIndexThread == null) {
downloadListIndexThread = new DownloadIndexesThread(this); downloadListIndexThread = new DownloadIndexesThread(this);
} }
prepareDownloadDirectory(); prepareDownloadDirectory();
@ -70,7 +70,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
} }
public void updateDownloadList(List<IndexItem> list){ public void updateDownloadList(List<IndexItem> list) {
} }
@ -78,12 +78,12 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
} }
public DownloadActivityType getDownloadType(){ public DownloadActivityType getDownloadType() {
return type; return type;
} }
public Map<IndexItem, List<DownloadEntry>> getEntriesToDownload() { public Map<IndexItem, List<DownloadEntry>> getEntriesToDownload() {
if(downloadListIndexThread == null) { if (downloadListIndexThread == null) {
return new LinkedHashMap<IndexItem, List<DownloadEntry>>(); return new LinkedHashMap<IndexItem, List<DownloadEntry>>();
} }
return downloadListIndexThread.getEntriesToDownload(); return downloadListIndexThread.getEntriesToDownload();
@ -97,20 +97,20 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
} }
public void downloadListUpdated(){ public void downloadListUpdated() {
} }
public OsmandApplication getMyApplication(){ public OsmandApplication getMyApplication() {
return (OsmandApplication)getApplication(); return (OsmandApplication) getApplication();
} }
public void categorizationFinished(List<IndexItem> filtered, List<IndexItemCategory> cats){ public void categorizationFinished(List<IndexItem> filtered, List<IndexItemCategory> cats) {
} }
public void startDownload(IndexItem item){ public void startDownload(IndexItem item) {
if (downloadListIndexThread.getCurrentRunningTask() != null){ if (downloadListIndexThread.getCurrentRunningTask() != null) {
Toast.makeText(this, "Please wait before previous download is finished", Toast.LENGTH_SHORT).show(); Toast.makeText(this, "Please wait before previous download is finished", Toast.LENGTH_SHORT).show();
return; return;
} }
@ -144,7 +144,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
} }
protected void downloadFilesCheckFreeVersion() { protected void downloadFilesCheckFreeVersion() {
if (Version.isFreeVersion(getMyApplication()) ) { if (Version.isFreeVersion(getMyApplication())) {
int total = settings.NUMBER_OF_FREE_DOWNLOADS.get(); int total = settings.NUMBER_OF_FREE_DOWNLOADS.get();
boolean wiki = false; boolean wiki = false;
for (IndexItem es : DownloadActivity.downloadListIndexThread.getEntriesToDownload().keySet()) { for (IndexItem es : DownloadActivity.downloadListIndexThread.getEntriesToDownload().keySet()) {
@ -171,51 +171,26 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
} }
protected void downloadFilesCheckInternet() { protected void downloadFilesCheckInternet() {
if(!getMyApplication().getSettings().isWifiConnected()) { if (!getMyApplication().getSettings().isWifiConnected()) {
if (getMyApplication().getSettings().isInternetConnectionAvailable()) {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.download_using_mobile_internet)); builder.setMessage(getString(R.string.download_using_mobile_internet));
builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
downloadFilesCheckSim(); downloadFilesPreCheckSpace();
} }
}); });
builder.setNegativeButton(R.string.default_buttons_no, null); builder.setNegativeButton(R.string.default_buttons_no, null);
builder.show(); builder.show();
} else {
AccessibleToast.makeText(this, R.string.no_internet_connection, Toast.LENGTH_LONG).show();
}
} else { } else {
downloadFilesPreCheckSpace(); 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 @Override
public void onAttachFragment(Fragment fragment) { public void onAttachFragment(Fragment fragment) {
fragList.add(new WeakReference<Fragment>(fragment)); fragList.add(new WeakReference<Fragment>(fragment));
@ -244,12 +219,12 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
} }
private void prepareDownloadDirectory() { private void prepareDownloadDirectory() {
if(getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) { if (getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) {
boolean showedDialog = false; 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); SuggestExternalDirectoryDialog.showDialog(this, null, null);
} }
if(!showedDialog) { if (!showedDialog) {
showDialogOfFreeDownloadsIfNeeded(); showDialogOfFreeDownloadsIfNeeded();
} }
} else { } else {
@ -323,13 +298,15 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
new File(newLoc, IndexConstants.APP_DIR)) { new File(newLoc, IndexConstants.APP_DIR)) {
protected Boolean doInBackground(Void[] params) { protected Boolean doInBackground(Void[] params) {
Boolean result = super.doInBackground(params); Boolean result = super.doInBackground(params);
if(result) { if (result) {
settings.setExternalStorageDirectory(newLoc); settings.setExternalStorageDirectory(newLoc);
getMyApplication().getResourceManager().resetStoreDirectory(); getMyApplication().getResourceManager().resetStoreDirectory();
getMyApplication().getResourceManager().reloadIndexes(progress) ; getMyApplication().getResourceManager().reloadIndexes(progress);
} }
return result; return result;
}; }
;
}; };
task.execute(); task.execute();
} }