aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2014-05-17 06:45:41 +0200
committerBananeweizen <bananeweizen@gmx.de>2014-05-17 06:45:41 +0200
commit2b2753afb1a0bf528315ea2b3efa9dc61a5e6bdf (patch)
tree4fa91b7f8c9949b1c670c603e72c2d3ed581d2fb /main/src
parent7bf8d33c30e731fe7728bc9275a84919718b334d (diff)
downloadcgeo-2b2753afb1a0bf528315ea2b3efa9dc61a5e6bdf.zip
cgeo-2b2753afb1a0bf528315ea2b3efa9dc61a5e6bdf.tar.gz
cgeo-2b2753afb1a0bf528315ea2b3efa9dc61a5e6bdf.tar.bz2
fix #3342: show send2cgeo menu also with no registration
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/CacheListActivity.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/CacheListActivity.java b/main/src/cgeo/geocaching/CacheListActivity.java
index 5a385a2..87f03da 100644
--- a/main/src/cgeo/geocaching/CacheListActivity.java
+++ b/main/src/cgeo/geocaching/CacheListActivity.java
@@ -40,6 +40,7 @@ import cgeo.geocaching.sensors.DirectionProvider;
import cgeo.geocaching.sensors.GeoDirHandler;
import cgeo.geocaching.sensors.IGeoData;
import cgeo.geocaching.settings.Settings;
+import cgeo.geocaching.settings.SettingsActivity;
import cgeo.geocaching.sorting.CacheComparator;
import cgeo.geocaching.sorting.ComparatorUserInterface;
import cgeo.geocaching.ui.CacheListAdapter;
@@ -67,6 +68,7 @@ import android.app.AlertDialog;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.res.Configuration;
import android.database.Cursor;
@@ -543,7 +545,7 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
setVisible(menu, R.id.menu_export, !isEmpty && (isHistory || isOffline));
setVisible(menu, R.id.menu_remove_from_history, !isEmpty && isHistory);
setVisible(menu, R.id.menu_clear_offline_logs, !isEmpty && containsOfflineLogs() && (isHistory || isOffline));
- setVisible(menu, R.id.menu_import_web, isOffline && Settings.getWebDeviceCode() != null);
+ setVisible(menu, R.id.menu_import_web, isOffline);
setVisible(menu, R.id.menu_import_gpx, isOffline);
setVisible(menu, R.id.menu_refresh_stored_top, !isOffline && !isEmpty);
@@ -1077,8 +1079,19 @@ public class CacheListActivity extends AbstractListActivity implements FilteredA
}
public void importWeb() {
- detailProgress = 0;
+ // menu is also shown with no device connected
+ if (Settings.getWebDeviceCode() == null) {
+ Dialogs.confirm(this, R.string.web_import_title, R.string.init_sendToCgeo_description, new OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ SettingsActivity.openForScreen(R.string.preference_screen_sendtocgeo, CacheListActivity.this);
+ }
+ });
+ return;
+ }
+ detailProgress = 0;
showProgress(false);
final DownloadFromWebHandler downloadFromWebHandler = new DownloadFromWebHandler();
progress.show(this, null, res.getString(R.string.web_import_waiting), true, downloadFromWebHandler.cancelMessage());