aboutsummaryrefslogtreecommitdiffstats
path: root/src/cgeo/geocaching/cgeovisit.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgeo/geocaching/cgeovisit.java')
-rw-r--r--src/cgeo/geocaching/cgeovisit.java57
1 files changed, 22 insertions, 35 deletions
diff --git a/src/cgeo/geocaching/cgeovisit.java b/src/cgeo/geocaching/cgeovisit.java
index 59e26b0..d135c0a 100644
--- a/src/cgeo/geocaching/cgeovisit.java
+++ b/src/cgeo/geocaching/cgeovisit.java
@@ -10,7 +10,6 @@ import android.app.Dialog;
import android.app.ProgressDialog;
import android.content.Intent;
import android.content.res.Configuration;
-import android.content.res.Resources;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -28,12 +27,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
public class cgeovisit extends cgLogForm {
- private cgeoapplication app = null;
- private Resources res = null;
private LayoutInflater inflater = null;
- private cgBase base = null;
- private cgSettings settings = null;
- private cgWarning warning = null;
private cgCache cache = null;
private ArrayList<Integer> types = new ArrayList<Integer>();
private ProgressDialog waitDialog = null;
@@ -79,11 +73,11 @@ public class cgeovisit extends cgLogForm {
typeSelected = types.get(0);
setType(typeSelected);
- warning.showToast(res.getString(R.string.info_log_type_changed));
+ showToast(res.getString(R.string.info_log_type_changed));
}
if ((viewstate == null || viewstate.length() == 0) && attempts < 2) {
- warning.showToast(res.getString(R.string.err_log_load_data_again));
+ showToast(res.getString(R.string.err_log_load_data_again));
loadData thread;
thread = new loadData(cacheid);
@@ -91,7 +85,7 @@ public class cgeovisit extends cgLogForm {
return;
} else if ((viewstate == null || viewstate.length() == 0) && attempts >= 2) {
- warning.showToast(res.getString(R.string.err_log_load_data));
+ showToast(res.getString(R.string.err_log_load_data));
showProgress(false);
return;
@@ -177,7 +171,7 @@ public class cgeovisit extends cgLogForm {
@Override
public void handleMessage(Message msg) {
if (msg.what == 1) {
- warning.showToast(res.getString(R.string.info_log_posted));
+ showToast(res.getString(R.string.info_log_posted));
if (waitDialog != null) {
waitDialog.dismiss();
@@ -186,7 +180,7 @@ public class cgeovisit extends cgLogForm {
finish();
return;
} else if (msg.what == 2) {
- warning.showToast(res.getString(R.string.info_log_saved));
+ showToast(res.getString(R.string.info_log_saved));
if (waitDialog != null) {
waitDialog.dismiss();
@@ -196,17 +190,17 @@ public class cgeovisit extends cgLogForm {
return;
} else if (msg.what >= 1000) {
if (msg.what == 1001) {
- warning.showToast(res.getString(R.string.warn_log_text_fill));
+ showToast(res.getString(R.string.warn_log_text_fill));
} else if (msg.what == 1002) {
- warning.showToast(res.getString(R.string.err_log_failed_server));
+ showToast(res.getString(R.string.err_log_failed_server));
} else {
- warning.showToast(res.getString(R.string.err_log_post_failed));
+ showToast(res.getString(R.string.err_log_post_failed));
}
} else {
if (cgBase.errorRetrieve.get(msg.what) != null) {
- warning.showToast(res.getString(R.string.err_log_post_failed_because) + " " + cgBase.errorRetrieve.get(msg.what) + ".");
+ showToast(res.getString(R.string.err_log_post_failed_because) + " " + cgBase.errorRetrieve.get(msg.what) + ".");
} else {
- warning.showToast(res.getString(R.string.err_log_post_failed));
+ showToast(res.getString(R.string.err_log_post_failed));
}
}
@@ -224,13 +218,6 @@ public class cgeovisit extends cgLogForm {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // init
- res = this.getResources();
- app = (cgeoapplication) this.getApplication();
- settings = new cgSettings(this, getSharedPreferences(cgSettings.preferences, 0));
- base = new cgBase(app, settings, getSharedPreferences(cgSettings.preferences, 0));
- warning = new cgWarning(this);
-
setTheme();
setContentView(R.layout.visit);
setTitle(res.getString(R.string.log_new_log));
@@ -262,7 +249,7 @@ public class cgeovisit extends cgLogForm {
app.setAction(geocode);
if (cache == null) {
- warning.showToast(res.getString(R.string.err_detail_cache_forgot_visit));
+ showToast(res.getString(R.string.err_detail_cache_forgot_visit));
finish();
return;
@@ -408,7 +395,7 @@ public class cgeovisit extends cgLogForm {
if (settings.getSignature().contains("[NUMBER]") == true) {
final HashMap<String, String> params = new HashMap<String, String>();
final String page = base.request(false, "www.geocaching.com", "/my/", "GET", params, false, false, false).getData();
- int current = base.parseFindCount(page);
+ int current = cgBase.parseFindCount(page);
if (current >= 0) {
findCount = "" + (current + 1);
@@ -729,7 +716,7 @@ public class cgeovisit extends cgLogForm {
Thread thread = new postLog(postLogHandler, log);
thread.start();
} else {
- warning.showToast(res.getString(R.string.err_log_load_data_still));
+ showToast(res.getString(R.string.err_log_load_data_still));
}
}
}
@@ -745,10 +732,10 @@ public class cgeovisit extends cgLogForm {
save.setOnClickListener(new saveListener());
if (status == true) {
- warning.showToast(res.getString(R.string.info_log_saved));
+ showToast(res.getString(R.string.info_log_saved));
app.saveVisitDate(geocode);
} else {
- warning.showToast(res.getString(R.string.err_log_post_failed));
+ showToast(res.getString(R.string.err_log_post_failed));
}
}
}
@@ -784,7 +771,7 @@ public class cgeovisit extends cgLogForm {
}
clear.setOnClickListener(new clearListener());
- warning.showToast(res.getString(R.string.info_log_cleared));
+ showToast(res.getString(R.string.info_log_cleared));
}
}
@@ -796,7 +783,7 @@ public class cgeovisit extends cgLogForm {
cacheid = cacheidIn;
if (cacheid == null) {
- warning.showToast(res.getString(R.string.err_detail_cache_forgot_visit));
+ showToast(res.getString(R.string.err_detail_cache_forgot_visit));
finish();
return;
@@ -821,11 +808,11 @@ public class cgeovisit extends cgLogForm {
final String page = base.request(false, "www.geocaching.com", "/seek/log.aspx", "GET", params, false, false, false).getData();
- viewstate = base.findViewstate(page, 0);
- viewstate1 = base.findViewstate(page, 1);
- trackables = base.parseTrackableLog(page);
+ viewstate = cgBase.findViewstate(page, 0);
+ viewstate1 = cgBase.findViewstate(page, 1);
+ trackables = cgBase.parseTrackableLog(page);
- final ArrayList<Integer> typesPre = base.parseTypes(page);
+ final ArrayList<Integer> typesPre = cgBase.parseTypes(page);
if (typesPre.size() > 0) {
types.clear();
types.addAll(typesPre);
@@ -906,7 +893,7 @@ public class cgeovisit extends cgLogForm {
&& settings.tokenPublic != null && settings.tokenPublic.length() > 0 && settings.tokenSecret != null
&& settings.tokenSecret.length() > 0 && tweetCheck.isChecked() == true && tweetBox.getVisibility() == View.VISIBLE
) {
- base.postTweetCache(app, settings, geocode);
+ cgBase.postTweetCache(app, settings, geocode);
}
if (status == 1 && typeSelected == cgBase.LOG_FOUND_IT && settings.isGCvoteLogin() == true) {
generated by cgit v1.1 at 2025-11-16 15:18:46 +0000