aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/layout/init.xml2
-rw-r--r--res/values/strings.xml9
-rw-r--r--src/cgeo/geocaching/cgBase.java2
-rw-r--r--src/cgeo/geocaching/cgData.java4
-rw-r--r--src/cgeo/geocaching/cgHtmlImg.java15
-rw-r--r--src/cgeo/geocaching/cgSettings.java4
-rw-r--r--src/cgeo/geocaching/cgeodetail.java2
-rw-r--r--src/cgeo/geocaching/cgeoimages.java6
-rw-r--r--src/cgeo/geocaching/cgeoinit.java14
9 files changed, 24 insertions, 34 deletions
diff --git a/res/layout/init.xml b/res/layout/init.xml
index 4964629..8ea63f3 100644
--- a/res/layout/init.xml
+++ b/res/layout/init.xml
@@ -402,7 +402,7 @@
android:paddingRight="3dip"
android:textSize="14dip"
android:textColor="?text_color"
- android:text="@string/save_log_img" />
+ android:text="@string/init_save_log_img" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebcb6ec..62e46c5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -204,6 +204,8 @@
<string name="warn_search_help_user">Fill name of user at Geocaching.com.</string>
<string name="warn_search_help_tb">Fill code of trackable. For example \"TB29QMZ\".</string>
<string name="warn_log_text_fill">Please, fill some log text.</string>
+ <string name="warn_load_log_image">Sorry, c:geo failed to load log image.</string>
+ <string name="warn_load_spoiler_image">Sorry, c:geo failed to load spoiler image.</string>
<string name="info_altitude">Current altitude</string>
<string name="info_distance">Distance traveled</string>
@@ -388,6 +390,7 @@
<string name="init_exclude">Exclude own and found caches</string>
<string name="init_disabled">Exclude disabled caches</string>
<string name="init_offline">Store static maps for offline use</string>
+ <string name="init_save_log_img">Save Images from Logs</string>
<string name="init_units">Use miles/feet\n(imperial units)</string>
<string name="init_nav">Use Google Navigation</string>
<string name="init_autoload">Auto-loading long description</string>
@@ -463,6 +466,9 @@
<string name="cache_attributes">Attributes</string>
<string name="cache_inventory">Inventory</string>
<string name="cache_log_offline">Offline log</string>
+ <string name="cache_log_images_loading">Loading log Image ...</string>
+ <string name="cache_log_images_title">Logimage</string>
+ <string name="cache_log_image_default_title">Photo</string>
<string name="cache_description">Description</string>
<string name="cache_description_long">Long description</string>
<string name="cache_watchlist">Watchlist</string>
@@ -994,7 +1000,4 @@
· new: Any destination saves last used location\n
· fix: End of line in logs\n
\n</string>
- <string name="cache_log_images_loading">Loading log Image ...</string>
- <string name="cache_log_images_title">Logimage</string>
- <string name="save_log_img">Save Images from Logs</string>
</resources>
diff --git a/src/cgeo/geocaching/cgBase.java b/src/cgeo/geocaching/cgBase.java
index 2a6cc7f..43e93ce 100644
--- a/src/cgeo/geocaching/cgBase.java
+++ b/src/cgeo/geocaching/cgBase.java
@@ -5157,7 +5157,7 @@ public class cgBase {
}
// store images from logs
- if (settings.storeLogImg == 1) {
+ if (settings.storelogimages == true) {
for (cgLog log : cache.logs) {
if (log.logImages != null && log.logImages.isEmpty() == false) {
for (cgImage oneLogImg : log.logImages) {
diff --git a/src/cgeo/geocaching/cgData.java b/src/cgeo/geocaching/cgData.java
index 38c6dfc..c8c98a0 100644
--- a/src/cgeo/geocaching/cgData.java
+++ b/src/cgeo/geocaching/cgData.java
@@ -2277,9 +2277,7 @@ public class cgData {
final cgImage log_img = new cgImage();
log_img.title = (String)cursor.getString(cursor.getColumnIndex("title"));
log_img.url = (String)cursor.getString(cursor.getColumnIndex("url"));
- if (logImgList != null) {
- logImgList.add(log_img);
- }
+ logImgList.add(log_img);
} while (cursor.moveToNext());
}
diff --git a/src/cgeo/geocaching/cgHtmlImg.java b/src/cgeo/geocaching/cgHtmlImg.java
index 4728857..645e9d2 100644
--- a/src/cgeo/geocaching/cgHtmlImg.java
+++ b/src/cgeo/geocaching/cgHtmlImg.java
@@ -39,20 +39,9 @@ public class cgHtmlImg implements Html.ImageGetter {
private double ratio = 1.0d;
private int width = 0;
private int height = 0;
-
- public cgHtmlImg(Activity activityIn, cgSettings settingsIn, String geocodeIn, boolean placementIn, int reasonIn, boolean onlySaveIn) {
- activity = activityIn;
- settings = settingsIn;
- geocode = geocodeIn;
- placement = placementIn;
- reason = reasonIn;
- onlySave = onlySaveIn;
-
- bfOptions.inTempStorage = new byte[16 * 1024];
- display = ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
- maxWidth = display.getWidth() - 25;
- maxHeight = display.getHeight() - 25;
+ public cgHtmlImg(Activity activityIn, cgSettings settingsIn, String geocodeIn, boolean placementIn, int reasonIn, boolean onlySaveIn) {
+ this(activityIn, settingsIn, geocodeIn, placementIn, reasonIn, onlySaveIn, true);
}
public cgHtmlImg(Activity activityIn, cgSettings settingsIn, String geocodeIn, boolean placementIn, int reasonIn, boolean onlySaveIn, boolean saveIn) {
diff --git a/src/cgeo/geocaching/cgSettings.java b/src/cgeo/geocaching/cgSettings.java
index f832468..f4c46b7 100644
--- a/src/cgeo/geocaching/cgSettings.java
+++ b/src/cgeo/geocaching/cgSettings.java
@@ -73,7 +73,7 @@ public class cgSettings {
public int excludeMine = 0;
public int excludeDisabled = 0;
public int storeOfflineMaps = 0;
- public int storeLogImg = 0;
+ public boolean storelogimages = false;
public int asBrowser = 1;
public int useCompass = 1;
public int useGNavigation = 1;
@@ -141,7 +141,7 @@ public class cgSettings {
excludeMine = prefs.getInt("excludemine", 0);
excludeDisabled = prefs.getInt("excludedisabled", 0);
storeOfflineMaps = prefs.getInt("offlinemaps", 1);
- storeLogImg = prefs.getInt("logimages", 0);
+ storelogimages = prefs.getBoolean("logimages", false);
asBrowser = prefs.getInt("asbrowser", 1);
useCompass = prefs.getInt("usecompass", 1);
useGNavigation = prefs.getInt("usegnav", 1);
diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java
index 16726a8..fa41293 100644
--- a/src/cgeo/geocaching/cgeodetail.java
+++ b/src/cgeo/geocaching/cgeodetail.java
@@ -1204,7 +1204,7 @@ public class cgeodetail extends Activity {
for (int i_img_cnt = 0; i_img_cnt < log.logImages.size(); i_img_cnt++) {
String img_title = log.logImages.get(i_img_cnt).title;
if (img_title.equals("")) {
- img_title = "Photo";
+ img_title = res.getString(R.string.cache_log_image_default_title);
}
final String title = img_title;
final String url = log.logImages.get(i_img_cnt).url;
diff --git a/src/cgeo/geocaching/cgeoimages.java b/src/cgeo/geocaching/cgeoimages.java
index 3b46ad5..4e6b493 100644
--- a/src/cgeo/geocaching/cgeoimages.java
+++ b/src/cgeo/geocaching/cgeoimages.java
@@ -57,10 +57,10 @@ public class cgeoimages extends Activity {
}
switch (img_type) {
case LOG_IMAGE:
- warning.showToast("Sorry, c:geo failed to load log image.");
+ warning.showToast(res.getString(R.string.warn_load_log_image));
break;
case SPOILER_IMAGE:
- warning.showToast("Sorry, c:geo failed to load spoiler images.");
+ warning.showToast(res.getString(R.string.warn_load_spoiler_image));
break;
}
@@ -197,7 +197,7 @@ public class cgeoimages extends Activity {
break;
case LOG_IMAGE:
load_process_string = res.getString(R.string.cache_log_images_loading);
- if (settings.storeLogImg == 1) {
+ if (settings.storelogimages == true) {
save = true;
} else {
save = false;
diff --git a/src/cgeo/geocaching/cgeoinit.java b/src/cgeo/geocaching/cgeoinit.java
index f1cc7c1..1b7a3d0 100644
--- a/src/cgeo/geocaching/cgeoinit.java
+++ b/src/cgeo/geocaching/cgeoinit.java
@@ -345,7 +345,7 @@ public class cgeoinit extends Activity {
offlineButton.setOnClickListener(new cgeoChangeOffline());
CheckBox saveLogImgButton = (CheckBox) findViewById(R.id.save_log_img);
- if (prefs.getInt("logimages", 1) == 0) {
+ if (prefs.getBoolean("logimages", false) == false) {
saveLogImgButton.setChecked(false);
} else {
saveLogImgButton.setChecked(true);
@@ -829,17 +829,17 @@ public class cgeoinit extends Activity {
public void onClick(View arg0) {
SharedPreferences.Editor edit = prefs.edit();
- if (prefs.getInt("logimages", 1) == 0) {
- edit.putInt("logimages", 1);
- settings.storeLogImg = 1;
+ if (prefs.getBoolean("logimages", true) == false) {
+ edit.putBoolean("logimages", true);
+ settings.storelogimages = true;
} else {
- edit.putInt("logimages", 0);
- settings.storeLogImg = 0;
+ edit.putBoolean("logimages", false);
+ settings.storelogimages = false;
}
edit.commit();
CheckBox saveLogImgButton = (CheckBox) findViewById(R.id.save_log_img);
- if (prefs.getInt("logimages", 1) == 0) {
+ if (prefs.getBoolean("logimages", true) == false) {
saveLogImgButton.setChecked(false);
} else {
saveLogImgButton.setChecked(true);
generated by cgit v1.1 at 2025-11-15 23:38:14 +0000