diff options
50 files changed, 3 insertions, 1397 deletions
diff --git a/main/res/layout/init.xml b/main/res/layout/init.xml index e660b27..572b5a9 100644 --- a/main/res/layout/init.xml +++ b/main/res/layout/init.xml @@ -70,47 +70,6 @@ <RelativeLayout style="@style/separator_horizontal_layout" > <View style="@style/separator_horizontal" /> <TextView style="@style/separator_horizontal_headline" - android:text="@string/init_go4cache" /> - </RelativeLayout> - <TextView android:id="@+id/about_go4cache" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:layout_marginRight="10dip" - android:layout_marginBottom="5dip" - android:layout_gravity="left" - android:padding="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:textColorLink="?text_color_link" - android:linksClickable="true" - android:text="@string/about_go4cache" /> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="3dip" - android:orientation="horizontal" - android:padding="3dip" > - <CheckBox android:id="@+id/publicloc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:padding="1px" - android:gravity="center" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:gravity="left" - android:paddingRight="3dip" - android:textSize="14dip" - android:textColor="?text_color" - android:text="@string/init_go4cache_connect" /> - </LinearLayout> -<!-- ** --> - <RelativeLayout style="@style/separator_horizontal_layout" > - <View style="@style/separator_horizontal" /> - <TextView style="@style/separator_horizontal_headline" android:text="@string/init_twitter" /> </RelativeLayout> <TextView android:id="@+id/about_twitter" diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index d798658..463b190 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -304,7 +304,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">gcvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Uživatelské jméno</string> <string name="init_password">Heslo</string> @@ -315,7 +314,6 @@ <string name="init_login_popup_ok">Přihlášení proběhlo</string> <string name="init_login_popup_failed">Přihlášení neproběhlo</string> <string name="init_login_popup_failed_reason">Přihlášení neproběhlo, protože</string> - <string name="init_go4cache_connect">Připojit ke Go 4 Cache</string> <string name="init_twitter_authorize">Autorizovat c:geo</string> <string name="init_twitter_publish">Nový status při nálezu keše</string> <string name="init_signature">Podpis</string> @@ -621,7 +619,6 @@ <string name="website">web: <a href="http://cgeo.org/">cgeo.org</a></string> <string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a> </string> <string name="twitter">twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> - <string name="about_go4cache">Služba <b>Go 4 cache</b> umožňuje sledovat v reálném čase ostatní kačery na mapě (v <b>c:geo</b> nebo v prohlížeči). Můžete se tak podívat třeba na to, jakou kešku právě hledají. Připojením ke službě <b>Go 4 cache</b> umožníte aplikaci <b>c:geo</b> zveřejňovat Vaši aktuální polohu (pouze pokud <b>c:geo</b> běží).</string> <string name="about_twitter">Chcete, aby <b>c:geo</b> napsalo na Váš Twitter pokaždé, když zapíšete nález kešky?</string> <string name="about_auth_1">Pomocí následujícího procesu můžete umožnit <b>c:geo</b> aplikaci odesílání příspěvků na Váš Twitter.</string> <string name="about_auth_2">Tapnutím na tlačítko "zahájit autorizaci" celý proces začne. Tento proces otevře webovou stránku Twitteru, kde se budete muset přihlásit a tlačítkem Accept pak umožnit aplikaci <b>c:geo</b>přístup k Vašemu Twitteru. Twitter Vám přidělí PIN kód pokud tapnete na Accept. Tento kód zkopírujte a vložte do aplikace <b>c:geo</b>. A potvrďte. To je vše.</string> diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml index ec6864f..9f088ab 100644 --- a/main/res/values-da/strings.xml +++ b/main/res/values-da/strings.xml @@ -133,13 +133,11 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Brugernavn</string> <string name="init_password">Password</string> <string name="init_passvote">Password</string> <string name="init_login">Check login</string> - <string name="init_go4cache_connect">Forbind til Go 4 Cache</string> <string name="init_twitter_authorize">Godkend c:geo</string> <string name="init_twitter_publish">Offentliggør status når cache er fundet</string> <string name="init_signature">Signatur</string> @@ -288,7 +286,6 @@ <string name="website">Hjemmeside: <a href="http://cgeo.org/">cgeo.org</a></string> <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> - <string name="about_go4cache">Servicen <b>Go 4 Cache</b> viser andre geocachere på kortet (i <b>c:geo</b> eller i browser) i realtime. Servicen kan f.eks. vise hvilken cache de er på vej hen til. Ved forbindelse til <b>Go 4 Cache</b> tillader du at <b>c:geo</b> offentliggør din position når du geocacher (kun når <b>c:geo</b> er startet).</string> <string name="about_twitter">Skal <b>c:geo</b> sende status til Twitter hvergang du logger en cache?</string> <string name="about_auth_1">Med denne proces tillader du at <b>c:geo</b> får adgang til din Twitter.</string> <string name="about_auth_2">Klik på \"godkend c:geo\" knappen for at starte godkendelsesprocessen. Det vil åbne Twitter i en webbrowser. Log ind på siden og tillad <b>c:geo</b> at tilgå din Twitter. Når godkendt, vil Twitter vise en PIN-kode. Denne PIN skal tastes ind i <b>c:geo</b> og bekræftes.</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 9d0a5ed..bf6ea7b 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -357,7 +357,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Benutzername</string> <string name="init_password">Passwort</string> @@ -368,7 +367,6 @@ <string name="init_login_popup_ok">Login OK</string> <string name="init_login_popup_failed">Login fehlgeschlagen</string> <string name="init_login_popup_failed_reason">Login fehlgeschlagen:</string> - <string name="init_go4cache_connect">Mit Go 4 Cache verbinden</string> <string name="init_twitter_authorize">c:geo autorisieren</string> <string name="init_twitter_publish">Status veröffentlichen wenn ein Cache gefunden wurde</string> <string name="init_signature">Signatur</string> @@ -968,7 +966,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Benutzung: <a href="http://manual.cgeo.org/">c:geo Kurzanleitung</a></string> - <string name="about_go4cache">Der Service <b>Go 4 cache</b> ermöglicht es, andere Geocacher in Echtzeit auf der Karte zu sehen (in <b>c:geo</b> oder im Browser). Es kann auch angezeigt werden, welcher Cache gerade gesucht wird. Wenn <b>c:geo</b> mit <b>Go 4 cache</b> verbunden wird, kann <b>c:geo</b> die aktuelle Position veröffentlichen (nur während <b>c:geo</b> ausgeführt wird).</string> <string name="about_twitter">Soll jeder neue Fund auf Twitter veröffentlicht werden, wenn er über <b>c:geo</b> geloggt wird?</string> <string name="about_auth_1">Der folgende Prozess erlaubt es <b>c:geo</b> auf den persönlichen Twitter-Account zuzugreifen, wenn zugestimmt wird.</string> <string name="about_auth_2">Ein Klick auf \"Starte Autorisierung\" öffnet eine Twitter-Seite in einem Browserfenster. Durch die Anmeldung und die Bestätigung wird <b>c:geo</b> ermöglicht, auf den persönlichen Twitter-Account zuzugreifen. Wird dies bestätigt, nennt Twitter eine numerische PIN, diese muss kopiert und in <b>c:geo</b> eingefügt werden. Das ist alles.</string> @@ -980,15 +977,6 @@ <string name="status_geocaching_change">Änderungen auf geocaching.com führen zu Problemen mit c:geo.\nWir arbeiten daran.</string> <string name="status_geocaching_livemap">Änderungen auf geocaching.com führen zu Problemen mit der Live Map.\nWir arbeiten daran.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Schaut sich um</string> - <string name="go4cache_tweeting">Twittert</string> - <string name="go4cache_heading_to">Auf dem Weg zu</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">vor einer Minute</item> - <item quantity="other">vor %d Minuten</item> - </plurals> - <string name="clipboard_copy_ok">In Zwischenablage kopiert</string> <plurals name="days_ago"> <item quantity="one">gestern</item> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index 266cb51..45ce45d 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -318,7 +318,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Usuario</string> <string name="init_password">Contraseña</string> @@ -329,7 +328,6 @@ <string name="init_login_popup_ok">Acceso conseguido.</string> <string name="init_login_popup_failed">Error en el acceso.</string> <string name="init_login_popup_failed_reason">El acceso ha fallado debido a </string> - <string name="init_go4cache_connect">Conectar a Go 4 Cache</string> <string name="init_twitter_authorize">Autorizar a c:geo</string> <string name="init_twitter_publish">Publicar estado cuando se encuente un escondite</string> <string name="init_signature">Firma</string> @@ -788,7 +786,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manual: <a href="http://itw.bidix.info/cgeo/">c:geo en breve</a></string> - <string name="about_go4cache">Servicio <b>Go 4 Cache</b> muestra a otros buscadores en el mapa (en <b>c:geo</b> o en el navegador) en tiempo real. Puede mostrar, por ejemplo, qué escondite estan buscando. Al conectarte a <b>Go 4 Cache</b> <b>c:geo</b> está autorizado a publicar tu ubicación (sólo cuando <b>c:geo</b> está activo).</string> <string name="about_twitter">¿Debe <b>c:geo</b> publicar el nuevo estado en Twitter cuando registras un escondite?</string> <string name="about_auth_1">El siguiente proceso permite a <b>c:geo</b> acceder a Twitter - si estás de acuerdo.</string> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index f18996a..f680665 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -356,7 +356,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Identifiant</string> <string name="init_password">Mot de passe</string> @@ -367,7 +366,6 @@ <string name="init_login_popup_ok">Identifiants OK</string> <string name="init_login_popup_failed">Erreur de connexion</string> <string name="init_login_popup_failed_reason">Erreur de connexion: </string> - <string name="init_go4cache_connect">Connexion à Go 4 Cache</string> <string name="init_twitter_authorize">Autorisation de c:geo</string> <string name="init_twitter_publish">Publication d\'une cache trouvée</string> <string name="init_signature">Signature</string> @@ -954,7 +952,6 @@ <string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">page c:geo</a></string> <string name="twitter">twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manuel: <a href="http://manual.cgeo.org/">c:geo en bref</a></string> - <string name="about_go4cache">Le service <b>Go 4 cache</b> vous permet de voir en temps réel d\'autres géocacheurs sur une carte (dans <b>c:geo</b> ou dans le navigateur). Il peut afficher les caches en cours de recherche. En vous connectant sur <b>Go 4 cache</b> vous permettez à <b>c:geo</b> de publier votre publication (seulement si <b>c:geo</b> fonctionne).</string> <string name="about_twitter">Voulez-vous publier un nouveau statut sur Twitter à chaque nouvelle cache découverte sous <b>c:geo</b>?</string> <string name="about_auth_1">Le processus suivant permet à <b>c:geo</b> d\'accéder à votre compte Twitter - si vous acceptez.</string> <string name="about_auth_2">Cliquer sur le bouton \"début d\'autorisation\" pour démarrer. Une fenêtre de navigateur va s\'ouvrir pour vous connecter sur Twitter. Accepter pour que <b>c:geo</b> accéde à votre compte. Twitter vous affichera alors une code PIN composé de chiffres. Merci de coller ce code dans <b>c:geo</b> puis confirmer. C\'est tout!</string> @@ -966,15 +963,6 @@ <string name="status_geocaching_change">Des changements récents sur geocaching.com ont cassé c:geo.\nNous sommes en train de nous en occuper.</string> <string name="status_geocaching_livemap">Des changements récents sur geocaching.com ont cassé la carte active.\nNous sommes en train de nous en occuper.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">En balade</string> - <string name="go4cache_tweeting">En train de tweeter</string> - <string name="go4cache_heading_to">En direction de</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">il y a une minute</item> - <item quantity="other">il y a %d minutes</item> - </plurals> - <string name="clipboard_copy_ok">Copié dans le presse-papiers</string> <plurals name="days_ago"> <item quantity="one">hier</item> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index c86c333..b465e7d 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -322,7 +322,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Felhasználónév</string> <string name="init_password">Jelszó</string> @@ -333,7 +332,6 @@ <string name="init_login_popup_ok">Belépés ok.</string> <string name="init_login_popup_failed">Belépés sikertelen.</string> <string name="init_login_popup_failed_reason">Belépés sikertelen, mert </string> - <string name="init_go4cache_connect">Csatlakozás a Go 4 Cache-hez</string> <string name="init_twitter_authorize">Engedélyezés</string> <string name="init_twitter_publish">Állapot bejelentése láda megtalálásakor</string> <string name="init_signature">Aláírás</string> @@ -808,7 +806,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Kézikönyv: <a href="http://manual.cgeo.org/">A c:geo dióhéjban</a></string> - <string name="about_go4cache">A <b>Go 4 Cache</b> szolgáltatás más cachereket mutat a térképen (a <b>c:geo</b>-ban vagy a böngészőben) valós időben. Megmutathatja például melyik ládát keresik. Ha csatlakozol a <b>Go 4 Cache</b> szolgáltatáshoz, azzal engedélyezed a <b>c:geo</b>-nak, hogy megjelenítse a jelenlegi helyzeted miközben ládát keresel.(csak ha a <b>c:geo</b> fut).</string> <string name="about_twitter">Akarod, hogy <b>c:geo</b> új bejegyzést írjon Twitterre mindig mikor egy ládát megtalálsz?</string> <string name="about_auth_1">A következő folyamat engedélyezi a <b>c:geo</b>-nak, hogy hozzáférjen a Twitterhez – ha jóváhagyod.</string> <string name="about_auth_2">Kattints a \"c:geo engedélyezése\" gombra, hogy elindítsd a folyamatot. Ez a folyamat meg fog nyitni egy böngészőt a Twitter weboldallal. Lépj be ezen az oldalon és hagyd jóvá, hogy a <b>c:geo</b> hozzáférjen a felhasználói fiókodhoz. Ha elfogadod, a Twitter mutatni fog egy számokból álló PIN kódot. Ezt a PIN kódot kell a <b>c:geo</b>-ban beillesztened és jóváhagynod. Ilyen egyszerű.</string> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index a9af5b5..e397376 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -354,7 +354,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Utente</string> <string name="init_password">Password</string> @@ -365,7 +364,6 @@ <string name="init_login_popup_ok">Login OK.</string> <string name="init_login_popup_failed">Login fallito.</string> <string name="init_login_popup_failed_reason">Login fallito perché </string> - <string name="init_go4cache_connect">Connetti a Go 4 Cache</string> <string name="init_twitter_authorize">Autorizza c:geo</string> <string name="init_twitter_publish">Manda un tweet quando trovi un cache</string> <string name="init_signature">Firma</string> @@ -951,7 +949,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">pagina c:geo </a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manuale: <a href="http://manual.cgeo.org/">c:geo in a Nutshell</a></string> - <string name="about_go4cache">Il servizio <b>Go 4 Cache</b> mostra altri utenti geocacher sulla mappa (in <b>c:geo</b> o nel browser) in tempo reale. È visibile, ad esempio, quali cache stanno cercando. Collegandosi tramite <b>Go 4 Cache</b> <b>c:geo</b> è autorizzato a pubblicare la tua posizione attuale quando fai geocaching (solo quando <b>c:geo</b> è in esecuzione).</string> <string name="about_twitter">Può <b>c:geo</b> pubblicare su Twitter ogni volta che logghi una cache?</string> <string name="about_auth_1">La procesura seguente autorizza <b>c:geo</b> ad accedere a Twitter - se confermato.</string> <string name="about_auth_2">Clicca sul pulsante \"Autorizza c:geo\" per iniziare. Questa procedura aprirà il browser sulla pagina Twitter. Fai Login su questa pagina e autorizza <b>c:geo</b> ad accedere al tuo account. Se accettato, Twitter mostrerà un PIN code numerico. Questo PIN deve essere riportato in <b>c:geo</b> e confermato.</string> @@ -963,15 +960,6 @@ <string name="status_geocaching_change">Modifiche recenti al sito geocaching hanno disattivato c:geo.\nCi stiamo lavorando, riprova più tardi.</string> <string name="status_geocaching_livemap">Modifiche recenti al sito geocaching hanno disattivato la mappa live.\nCi stiamo lavorando, riprova più tardi.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Guardando attorno</string> - <string name="go4cache_tweeting">Tweeting</string> - <string name="go4cache_heading_to">Puntando a</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">un minuto fa</item> - <item quantity="other">%d minuti fa</item> - </plurals> - <string name="clipboard_copy_ok">Copiato nella clipboard</string> <plurals name="days_ago"> <item quantity="one">ieri</item> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index acfbe4c..daa1b43 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -358,7 +358,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">ユーザ名</string> <string name="init_password">パスワード</string> @@ -369,7 +368,6 @@ <string name="init_login_popup_ok">ログイン完了</string> <string name="init_login_popup_failed">ログイン失敗</string> <string name="init_login_popup_failed_reason">ログインに失敗しました。原因: </string> - <string name="init_go4cache_connect">Go 4 Cacheに接続する</string> <string name="init_twitter_authorize">c:geoを認証する</string> <string name="init_twitter_publish">キャッシュが見つかったら状況をツイートする</string> <string name="init_signature">署名</string> @@ -983,7 +981,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">マニュアル: <a href="http://manual.cgeo.org/">c:geo マニュアル</a>(英語)</string> - <string name="about_go4cache"><b>Go 4 cache</b>サービスにより他のジオキャッシャーを(<b>c:geo</b>またはブラウザで)地図上にリアルタイムで表示できます。例えば、彼らがどのキャッシュを探しているのか表示できます。<b>Go 4 cache</b>に接続すれば<b>c:geo</b>でジオキャッシング中に現在地を(<b>c:geo</b>が起動している間だけ)公開することができます。</string> <string name="about_twitter">キャッシュのログを書いたら<b>c:geo</b>にTwitterでつぶやいてほしい?</string> <string name="about_auth_1"><b>c:geo</b>がTwitterにアクセスする許可を得るには次のようにしてください。</string> <string name="about_auth_2">「認証を開始する」ボタンを押すとブラウザでTwitterのページが開きます。そのページにログインすれば<b>c:geo</b>があなたのアカウントにアクセルする許可が得られます。ログインに成功したら数字のPINコードが表示されるので、この下の入力欄にコピー&ペーストして「完了」ボタンを押してください。</string> @@ -995,15 +992,6 @@ <string name="status_geocaching_change">geocaching.comが更新されましたがc:geoはまだ未対応です。\n現在、作業中です。しばらくお待ちください。</string> <string name="status_geocaching_livemap">geocaching.comが更新されましたがオンライン地図機能はまだ未対応です。\n現在、作業中です。しばらくお待ちください。</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Looking around</string> - <string name="go4cache_tweeting">Tweeting</string> - <string name="go4cache_heading_to">Heading to</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">1分前</item> - <item quantity="other">%d分前</item> - </plurals> - <string name="clipboard_copy_ok">クリップボードにコピーしました</string> <plurals name="days_ago"> <item quantity="one">昨日</item> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index f158810..e948aae 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -208,7 +208,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCVote.com</string> - <string name="init_go4cache">go 4 cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Brukernavn</string> <string name="init_password">Passord</string> @@ -219,7 +218,6 @@ <string name="init_login_popup_ok">Innlogging fullført.</string> <string name="init_login_popup_failed">Innlogging mislyktes.</string> <string name="init_login_popup_failed_reason">Innlogging mislyktes p.g.a.</string> - <string name="init_go4cache_connect">Koble til go 4 cache</string> <string name="init_twitter_authorize">Autoriser c:geo</string> <string name="init_twitter_publish">Del på Twitter når du finner cacher</string> <string name="init_signature">Signatur</string> @@ -407,7 +405,6 @@ <string name="support">e-post adresse: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string> <string name="website">web-side: <a href="http://cgeo.org/">cgeo.org</a></string> <string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> - <string name="about_go4cache">Tjenesten <b>Go 4 cache</b> gjør det mulig for deg å se andre geocachere på kartet (i <b>c:geo</b> eller i web-leseren). Det kan for eksempel vise hvilken cache de er ute etter. Ved å koble til <b>Go 4 cache</b> får <b>c:geo</b> din tillatelse til oppgi dine koordinater til andre brukere av <b>Go 4 cache</b>, men bare mens <b>c:geo</b> kjører.</string> <string name="about_twitter">Ønsker du at <b>c:geo</b> skal poste en status på Twitter hver gang du logger ett funn via <b>c:geo</b>?</string> <string name="about_auth_1">Den følgende prosessen tillater <b>c:geo</b> tilgang til Twitter - hvis bruker samtykker.</string> <string name="about_auth_2">Trykk på \"Start autorisasjon\" knappen for å starte prosessen. Denne prosessen vil åpne Twitter i web-leseren. Logg inn, og tillat <b>c:geo</b> tilgang til kontoen din. Hvis du aksepterer, vil Twitter oppgi en numerisk PIN-kode. Denne PIN-koden må så limes inn i <b>c:geo</b>. Verre er det ikke.</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index d17c3d4..4c608df 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -345,7 +345,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Gebruikersnaam</string> <string name="init_password">Wachtwoord</string> @@ -356,7 +355,6 @@ <string name="init_login_popup_ok">Ingelogd.</string> <string name="init_login_popup_failed">Inloggen mislukt.</string> <string name="init_login_popup_failed_reason">Inloggen mislukt omdat </string> - <string name="init_go4cache_connect">Verbinden met Go 4 Cache</string> <string name="init_twitter_authorize">c:geo Autoriseren</string> <string name="init_twitter_publish">Status publiceren bij gevonden cache</string> <string name="init_signature">Handtekening</string> @@ -898,7 +896,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Handleiding: <a href="http://manual.cgeo.org/">c:geo in een notendop</a></string> - <string name="about_go4cache">Service <b>Go 4 cache</b> toont andere geocachers op de kaart (in <b>c:geo</b> of in browser) in real time. Het toont bijvoorbeeld welke cache ze zoeken. Door te verbinden met <b>Go 4 cache</b> is <b>c:geo</b> toegestaan om je huidige locatie te publiceren (alleen tijdens het gebruik van <b>c:geo</b>).</string> <string name="about_twitter">Moet <b>c:geo</b> elke cache vondst publiceren naar Twitter?</string> <string name="about_auth_1">Het volgende proces staat <b>c:geo</b> toe om Twitter toegang te verkrijgen bij goedkeuring.</string> <string name="about_auth_2">Klik op de \"autoriseer c:geo\" knop om het proces te starten. Dit proces zal een browser openen met een Twitter pagina. Login op deze pagina en sta <b>c:geo</b> toegang tot je account toe. Bij goedkeuring laat Twitter een numerieke PIN code zien. Deze PIN dien je te plakken en te bevestigen in <b>c:geo</b>.</string> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index 45b6c3d..b04f488 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -314,7 +314,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Nazwa użytkownika</string> <string name="init_password">Hasło</string> @@ -325,7 +324,6 @@ <string name="init_login_popup_ok">Login ok.</string> <string name="init_login_popup_failed">Logowanie nie powiodło się.</string> <string name="init_login_popup_failed_reason">Logowanie nie powiodło się, ponieważ </string> - <string name="init_go4cache_connect">Połącz się z Go 4 Cache</string> <string name="init_twitter_authorize">Autoryzacja c:geo</string> <string name="init_twitter_publish">Publikowanie stanu, gdy znaleziono skrzynkę</string> <string name="init_signature">Sygnatura</string> @@ -785,7 +783,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo strona</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manuał: <a href="http://itw.bidix.info/cgeo/">c:geo skrócona instrukcja obsługi</a></string> - <string name="about_go4cache">Serwis <b>Go 4 Cache</b> pokazuje innych geocachers na mapie (w <b>c:geo</b> lub w przeglądarce) w czasie rzeczywistym. Pokazuje na przykład co inni w tym czasie szukają. Razem z połączeniem do <b>Go 4 Cache</b> pozwalasz <b>c:geo</b> aby twoje współrzędne zostały na stronie internetowej opublikowane (tylko i wyłącznie wtedy, gdy <b>c:geo</b> jest aktywny).</string> <string name="about_twitter">Czy chczesz aby <b>c:geo</b> publikował wiadomości textowe na stronie Twitter za każdym razem jak znajdziesz skrzynkę?</string> <string name="about_auth_1">Poniższy proces pozwala <b>c:geo</b>, aby uzyskać dostęp do Twitter - po uzgodnieniu.</string> <string name="about_auth_2">Kliknięcie na \"Autoryzacja c:geo\" spowoduje rozpoczęcie procesu. Ten proces spowoduje otwarcie przeglądarki internetowej na stronie Twitter. Zaloguj się na tej stronie i pozwól <b>c:geo</b> aby uzyskać dostęp do konta. Jeśli zostanie zaakceptowany, Twitter pojawi kod numeryczny PIN. Kod PIN musi zostać wklejony do <b>c:geo</b> i zostać potwierdzony. To jest wszystko.</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index 930726e..b2d32f7 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -339,7 +339,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Nome de utilizador</string> <string name="init_password">Password</string> @@ -350,7 +349,6 @@ <string name="init_login_popup_ok">Login ok.</string> <string name="init_login_popup_failed">Login falhado.</string> <string name="init_login_popup_failed_reason">Login falhado porque </string> - <string name="init_go4cache_connect">Ligar a Go 4 Cache</string> <string name="init_twitter_authorize">Autorize o c:geo</string> <string name="init_twitter_publish">Publicar estado quando encontrar cache</string> <string name="init_signature">Assinatura</string> @@ -882,18 +880,8 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">página do c:geo</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manual: <a href="http://manual.cgeo.org/">o essencial do c:geo</a></string> - <string name="about_go4cache">O serviço <b>Go 4 Cache</b> mostra outros geocachers no mapa (no <b>c:geo</b> ou no browser) em tempo real. Pode mostrar, por exemplo, que cache eles estão a procurar. Ao ligar-se ao <b>Go 4 Cache</b>, o <b>c:geo</b> está autorizado a publicar a sua localização actual quando fizer geocaching (apenas enquanto estiver a usar o <b>c:geo</b>).</string> <string name="about_twitter">O <b>c:geo</b> deve publicar no Twitter de cada vez que uma cache for registada?</string> <string name="about_auth_1">O processo seguinte permite ao <b>c:geo</b> aceder ao Twitter - se concordar.</string> <string name="about_auth_2">Premir o botão \"Autorizar c:geo\" dará início ao processo. Este processo irá abrir a página do Twitter no seu browser. Faça login nesta página e autorize o <b>c:geo</b> a aceder à sua conta. Se autorizar, o Twitter irá mostrar um código PIN numérico. Este PIN deverá ser copiado para o <b>c:geo</b> e sujeito a confirmação. E é tudo.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Olhando à volta</string> - <string name="go4cache_tweeting">Tweeting</string> - <string name="go4cache_heading_to">Em direcção a</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">um Minuto atrás</item> - <item quantity="other">%d Minutos atrás</item> - </plurals> - </resources> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 5ca32ab..4475a26 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -358,7 +358,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">používateľské meno</string> <string name="init_password">heslo</string> @@ -369,7 +368,6 @@ <string name="init_login_popup_ok">Prihlásenie úspešné</string> <string name="init_login_popup_failed">Prihlásenie neúspešné</string> <string name="init_login_popup_failed_reason">Prihlásenie neúspešné: </string> - <string name="init_go4cache_connect">Pripojiť ku Go 4 Cache</string> <string name="init_twitter_authorize">Autorizovať c:geo</string> <string name="init_twitter_publish">Nový status pri nájdení skrýše</string> <string name="init_signature">Podpis</string> @@ -972,7 +970,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manuál: <a href="http://manual.cgeo.org/">c:geo v kocke</a></string> - <string name="about_go4cache">Služba <b>Go 4 cache</b> umožňuje sledovať v reálnom čase ostatných cacherov na mape (v <b>c:geo</b> alebo v prehliadači). Môžete sa tak pozrieť napríklad na to, akú skrýšu práve hľadajú. Pripojením ku službe <b>Go 4 cache</b> umožníte aplikácii <b>c:geo</b> zverejňovať vašu aktuálnu polohu (iba pokiaľ <b>c:geo</b> beží).</string> <string name="about_twitter">Chcete, aby <b>c:geo</b> napísalo na váš Twitter vždy keď zapíšete nájdenie skrýše?</string> <string name="about_auth_1">Pomocou nasledujúceho procesu môžete aplikácii <b>c:geo</b> umožniť odosielanie príspevkov na váš Twitter. </string> <string name="about_auth_2">Ťuknutím na tlačidlo „Zahájiť autorizáciu“ celý proces začne. Tento proces otvorí webovú stránku Twitteru, kde sa sa prihlásite a tlačidlom „Authorize app“ umožníte aplikácii <b>c:geo</b> prístup k vášmu Twitter účtu. Potom čo ťuknete na „Authorize app“, Twitter vám pridelí PIN kód. Tento kód skopírujte a vložte do aplikácie <b>c:geo</b>. A potvrďte. To je všetko.</string> @@ -984,16 +981,6 @@ <string name="status_geocaching_change">Nedávne zmeny na geocaching.com znefunkčnili c:geo.\nPracujeme na tom, skúste skontrolovať aktualizácie onedlho.</string> <string name="status_geocaching_livemap">Nedávne zmeny na geocaching.com znefunkčnili aktívnu mapu.\nPracujeme na tom, skúste skontrolovať aktualizácie onedlho.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Prehľadávanie okolia</string> - <string name="go4cache_tweeting">Posielanie tweetov</string> - <string name="go4cache_heading_to">Smerovanie k</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">pred minútou</item> - <item quantity="few">pred %d minútami</item> - <item quantity="other">pred %d minútami</item> - </plurals> - <string name="clipboard_copy_ok">Skopírované do schránky</string> <plurals name="days_ago"> <item quantity="one">včera</item> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 21f72a6..1aa106a 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -357,7 +357,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Användare</string> <string name="init_password">Lösenord</string> @@ -368,7 +367,6 @@ <string name="init_login_popup_ok">Inloggning OK</string> <string name="init_login_popup_failed">Inloggning misslyckades</string> <string name="init_login_popup_failed_reason">Inloggning misslyckades pga </string> - <string name="init_go4cache_connect">Anslut till Go 4 Cache</string> <string name="init_twitter_authorize">Inställningar för Twitter</string> <string name="init_twitter_publish">Publicera status när en cache hittats</string> <string name="init_signature">Signatur</string> @@ -807,7 +805,6 @@ <string name="website">Hemsida: <a href="http://cgeo.org/">cgeo.org</a></string> <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> - <string name="about_go4cache">Tjänsten <b>Go 4 Cache</b> visar andra geocachare på kartan i realtid (i <b>c:geo</b> eller webbläsaren). Du kan till exempel se vilken cache de letar efter. Genom att ansluta till <b>Go 4 Cache</b> tillåter du <b>c:geo</b> att publicera din nuvarande plats när du geocachar (bara när <b>c:geo</b> är igång).</string> <string name="about_twitter">Ska <b>c:geo</b> publicera ny status på Twitter varje gång en cache loggas?</string> <string name="about_auth_1">Nedan tillåter du <b>c:geo</b> att ansluta till Twitter.</string> <string name="about_auth_2">Klicka på \"Påbörja koppling mot Twitter\" om du vill koppla ihop <b>c:geo</b> med Twitter. Twitters hemsida kommer att öppnas i en webbläsare. Logga in på den sidan och tillåt <b>c:geo</b> att ansluta till ditt konto. När du godkänt så kommer Twitter att visa en PIN kod. Kom ihåg denna PIN kod, stäng webbläsaren och skriv in PIN koden i <b>c:geo</b> och bekräfta.</string> @@ -819,15 +816,6 @@ <string name="status_geocaching_change">Ändringar som gjorts på geocaching.com har gjort så att c:geo inte fungerar.\nVi jobbar för att lösa problemen, försök igen om en stund.</string> <string name="status_geocaching_livemap">Ändringar som gjorts på geocaching.com har gjort så att Live kartan inte fungerar.\nVi jobbar för att lösa problemen, försök igen om en stund.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Tittar omkring</string> - <string name="go4cache_tweeting">Tweeting</string> - <string name="go4cache_heading_to">På väg mot</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">en minut sedan</item> - <item quantity="other">%d minuter sedan</item> - </plurals> - <string name="clipboard_copy_ok">Kopierat till urklipp.</string> <plurals name="days_ago"> <item quantity="one">igår</item> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 5ecc75b..4802dd4 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -358,7 +358,6 @@ <!-- init --> <string name="init_geocaching">Geocaching.com</string> <string name="init_gcvote">GCvote.com</string> - <string name="init_go4cache">Go 4 Cache</string> <string name="init_twitter">Twitter</string> <string name="init_username">Username</string> <string name="init_password">Password</string> @@ -369,7 +368,6 @@ <string name="init_login_popup_ok">Login OK</string> <string name="init_login_popup_failed">Login failed</string> <string name="init_login_popup_failed_reason">Login failed because of </string> - <string name="init_go4cache_connect">Connect to Go 4 Cache</string> <string name="init_twitter_authorize">Authorize c:geo</string> <string name="init_twitter_publish">Publish status when a cache has been found</string> <string name="init_signature">Signature</string> @@ -992,7 +990,6 @@ <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string> <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string> <string name="nutshellmanual">Manual: <a href="http://manual.cgeo.org/">c:geo in a Nutshell</a></string> - <string name="about_go4cache">The service <b>Go 4 Cache</b> shows other geocachers on the map (in <b>c:geo</b> or in their browser) in real time. It can show - for example - what cache they are searching for. By connecting to <b>Go 4 Cache</b> <b>c:geo</b> is allowed to publish your current location when geocaching (only while <b>c:geo</b> is running).</string> <string name="about_twitter">Should <b>c:geo</b> publish a new status on Twitter every time you log a cache?</string> <string name="about_auth_1">The following process allows <b>c:geo</b> to access Twitter - if agreed.</string> <string name="about_auth_2">A click on the \"authorize c:geo\" button will start the process. This process will open up a web browser with a Twitter page. Login on this page and allow <b>c:geo</b> to access your account. If this is accepted, Twitter will show up a numeric PIN code. This PIN must be pasted into <b>c:geo</b> and confirmed. That\'s all.</string> @@ -1004,15 +1001,6 @@ <string name="status_geocaching_change">Recent changes on geocaching.com broke c:geo.\nWe are working on it, check again soon.</string> <string name="status_geocaching_livemap">Recent changes on geocaching.com broke the live map feature.\nWe are working on it, check again soon.</string> - <!-- go4cache --> - <string name="go4cache_looking_around">Looking around</string> - <string name="go4cache_tweeting">Tweeting</string> - <string name="go4cache_heading_to">Heading to</string> - <plurals name="go4cache_time_minutes"> - <item quantity="one">one minute ago</item> - <item quantity="other">%d minutes ago</item> - </plurals> - <string name="clipboard_copy_ok">Copied to clipboard</string> <plurals name="days_ago"> <item quantity="one">yesterday</item> diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java index a119949..d765bdc 100644 --- a/main/src/cgeo/geocaching/AbstractPopupActivity.java +++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java @@ -109,8 +109,6 @@ public abstract class AbstractPopupActivity extends AbstractActivity { } protected void init() { - app.setAction(geocode); - cache = app.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB); if (cache == null) { diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index ed75d7a..5a11677 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -283,11 +283,6 @@ public class CacheDetailActivity extends AbstractActivity { return; } - // Go4Cache - if (StringUtils.isNotBlank(geocode)) { - app.setAction(geocode); - } - final LoadCacheHandler loadCacheHandler = new LoadCacheHandler(); try { diff --git a/main/src/cgeo/geocaching/EditWaypointActivity.java b/main/src/cgeo/geocaching/EditWaypointActivity.java index d32be66..ef2a2cc 100644 --- a/main/src/cgeo/geocaching/EditWaypointActivity.java +++ b/main/src/cgeo/geocaching/EditWaypointActivity.java @@ -66,8 +66,6 @@ public class EditWaypointActivity extends AbstractActivity { lookup = waypoint.getLookup(); own = waypoint.isUserDefined(); - app.setAction(geocode); - if (waypoint.getCoords() != null) { ((Button) findViewById(R.id.buttonLatitude)).setText(waypoint.getCoords().format(GeopointFormatter.Format.LAT_DECMINUTE)); ((Button) findViewById(R.id.buttonLongitude)).setText(waypoint.getCoords().format(GeopointFormatter.Format.LON_DECMINUTE)); @@ -126,10 +124,6 @@ public class EditWaypointActivity extends AbstractActivity { setTitle(res.getString(R.string.waypoint_edit_title)); } - if (geocode != null) { - app.setAction(geocode); - } - Button buttonLat = (Button) findViewById(R.id.buttonLatitude); buttonLat.setOnClickListener(new coordDialogListener()); Button buttonLon = (Button) findViewById(R.id.buttonLongitude); diff --git a/main/src/cgeo/geocaching/GeoDataProvider.java b/main/src/cgeo/geocaching/GeoDataProvider.java index 1b9a0f5..f615630 100644 --- a/main/src/cgeo/geocaching/GeoDataProvider.java +++ b/main/src/cgeo/geocaching/GeoDataProvider.java @@ -2,7 +2,6 @@ package cgeo.geocaching; import cgeo.geocaching.enumerations.LocationProviderType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4Cache; import cgeo.geocaching.utils.Log; import cgeo.geocaching.utils.MemorySubject; @@ -335,8 +334,6 @@ class GeoDataProvider extends MemorySubject<IGeoData> { final int visible = gpsLocation.isRecent() ? satellitesVisible : 0; final IGeoData current = new GeoData(locationData.location, gpsEnabled, visible, satellitesFixed); notifyObservers(current); - - Go4Cache.signalCoordinates(current.getCoords()); } } diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java index 578bd62..bcbc4d4 100644 --- a/main/src/cgeo/geocaching/LogTrackableActivity.java +++ b/main/src/cgeo/geocaching/LogTrackableActivity.java @@ -140,8 +140,6 @@ public class LogTrackableActivity extends AbstractActivity implements DateDialog setTitle(res.getString(R.string.trackable_touch) + ": " + trackable.getGeocode().toUpperCase()); } - app.setAction("logging trackable"); - if (guid == null) { showToast(res.getString(R.string.err_tb_forgot_saw)); @@ -232,10 +230,6 @@ public class LogTrackableActivity extends AbstractActivity implements DateDialog } public void init() { - if (geocode != null) { - app.setAction("logging trackable"); - } - final Button typeButton = (Button) findViewById(R.id.type); registerForContextMenu(typeButton); typeButton.setText(typeSelected.getL10n()); diff --git a/main/src/cgeo/geocaching/SearchActivity.java b/main/src/cgeo/geocaching/SearchActivity.java index 638e509..3221479 100644 --- a/main/src/cgeo/geocaching/SearchActivity.java +++ b/main/src/cgeo/geocaching/SearchActivity.java @@ -44,9 +44,6 @@ public class SearchActivity extends AbstractActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // init - app.setAction(null); - // search query Intent intent = getIntent(); if (Intent.ACTION_SEARCH.equals(intent.getAction())) { diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java index ee201e2..9e5a8a4 100644 --- a/main/src/cgeo/geocaching/Settings.java +++ b/main/src/cgeo/geocaching/Settings.java @@ -36,7 +36,6 @@ public final class Settings { private static final String KEY_HELP_SHOWN = "helper"; private static final String KEY_ANYLONGITUDE = "anylongitude"; private static final String KEY_ANYLATITUDE = "anylatitude"; - private static final String KEY_PUBLICLOC = "publicloc"; private static final String KEY_USE_OFFLINEMAPS = "offlinemaps"; private static final String KEY_USE_OFFLINEWPMAPS = "offlinewpmaps"; private static final String KEY_WEB_DEVICE_CODE = "webDeviceCode"; @@ -150,7 +149,6 @@ public final class Settings { e.putBoolean(KEY_HELP_SHOWN, old.getInt(KEY_HELP_SHOWN, 0) != 0); e.putFloat(KEY_ANYLONGITUDE, old.getFloat(KEY_ANYLONGITUDE, 0)); e.putFloat(KEY_ANYLATITUDE, old.getFloat(KEY_ANYLATITUDE, 0)); - e.putBoolean(KEY_PUBLICLOC, 0 != old.getInt(KEY_PUBLICLOC, 0)); e.putBoolean(KEY_USE_OFFLINEMAPS, 0 != old.getInt(KEY_USE_OFFLINEMAPS, 1)); e.putBoolean(KEY_USE_OFFLINEWPMAPS, 0 != old.getInt(KEY_USE_OFFLINEWPMAPS, 0)); e.putString(KEY_WEB_DEVICE_CODE, old.getString(KEY_WEB_DEVICE_CODE, null)); @@ -721,20 +719,6 @@ public final class Settings { }); } - public static boolean isPublicLoc() { - return sharedPrefs.getBoolean(KEY_PUBLICLOC, false); - } - - public static void setPublicLoc(final boolean publicLocation) { - editSharedSettings(new PrefRunnable() { - - @Override - public void edit(Editor edit) { - edit.putBoolean(KEY_PUBLICLOC, publicLocation); - } - }); - } - public static boolean isTrackableAutoVisit() { return sharedPrefs.getBoolean(KEY_AUTO_VISIT_TRACKABLES, false); } diff --git a/main/src/cgeo/geocaching/SettingsActivity.java b/main/src/cgeo/geocaching/SettingsActivity.java index 8d802bf..1f747b2 100644 --- a/main/src/cgeo/geocaching/SettingsActivity.java +++ b/main/src/cgeo/geocaching/SettingsActivity.java @@ -249,27 +249,6 @@ public class SettingsActivity extends AbstractActivity { ((EditText) findViewById(R.id.passvote)).setText(gcvoteLogin.right); } - // go4cache settings - TextView go4cache = (TextView) findViewById(R.id.about_go4cache); - go4cache.setClickable(true); - go4cache.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View arg0) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://go4cache.com/"))); - } - }); - - final CheckBox publicButton = (CheckBox) findViewById(R.id.publicloc); - publicButton.setChecked(Settings.isPublicLoc()); - publicButton.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - Settings.setPublicLoc(publicButton.isChecked()); - } - }); - // Twitter settings Button authorizeTwitter = (Button) findViewById(R.id.authorize_twitter); authorizeTwitter.setOnClickListener(new View.OnClickListener() { diff --git a/main/src/cgeo/geocaching/VisitCacheActivity.java b/main/src/cgeo/geocaching/VisitCacheActivity.java index e5410e7..fd552f5 100644 --- a/main/src/cgeo/geocaching/VisitCacheActivity.java +++ b/main/src/cgeo/geocaching/VisitCacheActivity.java @@ -267,8 +267,6 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D setTitle(res.getString(R.string.log_new_log) + ": " + cache.getGeocode().toUpperCase()); } - app.setAction(geocode); - init(); } @@ -466,9 +464,6 @@ public class VisitCacheActivity extends AbstractActivity implements DateDialog.D } public void init() { - if (geocode != null) { - app.setAction(geocode); - } postButton = (Button) findViewById(R.id.post); tweetBox = (LinearLayout) findViewById(R.id.tweet_box); tweetCheck = (CheckBox) findViewById(R.id.tweet); diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java index 5bf728f..c80ec6f 100644 --- a/main/src/cgeo/geocaching/cgeo.java +++ b/main/src/cgeo/geocaching/cgeo.java @@ -248,8 +248,6 @@ public class cgeo extends AbstractActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - app.setAction(null); - setContentView(R.layout.main); setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL); // type to search diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java index 137fe30..9c63555 100644 --- a/main/src/cgeo/geocaching/cgeoapplication.java +++ b/main/src/cgeo/geocaching/cgeoapplication.java @@ -36,7 +36,6 @@ import java.util.concurrent.atomic.AtomicBoolean; public class cgeoapplication extends Application { final private cgData storage = new cgData(); - private String action = null; private volatile GeoDataProvider geo; private volatile DirectionProvider dir; public boolean firstRun = true; // c:geo is just launched @@ -368,25 +367,6 @@ public class cgeoapplication extends Application { return storage.loadWaypoint(id); } - /** - * set the current action to be reported to Go4Cache (if enabled in settings)<br> - * this might be either - * <ul> - * <li>geocode</li> - * <li>name of a cache</li> - * <li>action like twittering</li> - * </ul> - * - * @param action - */ - public void setAction(String action) { - this.action = action; - } - - public String getAction() { - return StringUtils.defaultString(action); - } - /** {@link cgData#saveLogOffline(String, Date, LogType, String)} */ public boolean saveLogOffline(String geocode, Date date, LogType logtype, String log) { return storage.saveLogOffline(geocode, date, logtype, log); diff --git a/main/src/cgeo/geocaching/cgeocaches.java b/main/src/cgeo/geocaching/cgeocaches.java index 50a0d72..654927a 100644 --- a/main/src/cgeo/geocaching/cgeocaches.java +++ b/main/src/cgeo/geocaching/cgeocaches.java @@ -431,8 +431,6 @@ public class cgeocaches extends AbstractListActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - app.setAction(action); - setTheme(); setContentView(R.layout.caches); diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java index 53470b3..c308356 100644 --- a/main/src/cgeo/geocaching/cgeonavigate.java +++ b/main/src/cgeo/geocaching/cgeonavigate.java @@ -84,8 +84,6 @@ public class cgeonavigate extends AbstractActivity { return; } - setGo4CacheAction(); - // set header setTitle(); setDestCoords(); @@ -99,8 +97,6 @@ public class cgeonavigate extends AbstractActivity { public void onResume() { super.onResume(); - setGo4CacheAction(); - // sensor & geolocation manager geoDirHandler.startGeoAndDir(); @@ -110,14 +106,6 @@ public class cgeonavigate extends AbstractActivity { } } - private void setGo4CacheAction() { - if (StringUtils.isNotBlank(geocode)) { - app.setAction(geocode); - } else if (StringUtils.isNotBlank(name)) { - app.setAction(name); - } - } - @Override public void onPause() { geoDirHandler.stopGeoAndDir(); diff --git a/main/src/cgeo/geocaching/go4cache/Go4Cache.java b/main/src/cgeo/geocaching/go4cache/Go4Cache.java deleted file mode 100644 index 131faa4..0000000 --- a/main/src/cgeo/geocaching/go4cache/Go4Cache.java +++ /dev/null @@ -1,173 +0,0 @@ -package cgeo.geocaching.go4cache; - -import cgeo.geocaching.Settings; -import cgeo.geocaching.cgeoapplication; -import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.geopoint.GeopointFormatter.Format; -import cgeo.geocaching.geopoint.Viewport; -import cgeo.geocaching.network.Network; -import cgeo.geocaching.network.Parameters; -import cgeo.geocaching.utils.CryptUtils; -import cgeo.geocaching.utils.Log; -import cgeo.geocaching.utils.Version; - -import org.apache.commons.lang3.StringUtils; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; - -/** - * - * Thread to send location information to go4cache.com. The singleton will be created - * only if, at any time, the user opts in to send this information. Then the same thread - * will take care of sending updated positions when available. - * - */ - -public final class Go4Cache extends Thread { - - private static class InstanceHolder { // initialization on demand holder - private static final Go4Cache INSTANCE = new Go4Cache(); - } - - private final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 2010-07-25 14:44:01 - final private ArrayBlockingQueue<Geopoint> queue = new ArrayBlockingQueue<Geopoint>(1); - - public static Go4Cache getInstance() { // no need to be synchronized - return InstanceHolder.INSTANCE; - } - - private Go4Cache() { // private singleton constructor - super("Go4Cache"); - setPriority(Thread.MIN_PRIORITY); - start(); - } - - /** - * Send the coordinates to go4cache.com if the user opted in to do so. - * - * @param coords - * the current coordinates - */ - public static void signalCoordinates(final Geopoint coords) { - if (Settings.isPublicLoc()) { - getInstance().queue.offer(coords); - } - } - - @Override - public void run() { - Log.d("Go4Cache task started"); - Geopoint latestCoords = null; - String latestAction = null; - - try { - for (;;) { - final Geopoint currentCoords = queue.take(); - final String currentAction = cgeoapplication.getInstance().getAction(); - - // If we are too close and we haven't changed our current action, no need - // to update our situation. - if (null != latestCoords && latestCoords.distanceTo(currentCoords) < 0.75 && StringUtils.equals(latestAction, currentAction)) { - continue; - } - - final String username = Settings.getUsername(); - if (StringUtils.isBlank(username)) { - continue; - } - - final String latStr = currentCoords.format(Format.LAT_DECDEGREE_RAW); - final String lonStr = currentCoords.format(Format.LON_DECDEGREE_RAW); - final Parameters params = new Parameters( - "u", username, - "lt", latStr, - "ln", lonStr, - "a", currentAction, - "s", (CryptUtils.sha1(username + "|" + latStr + "|" + lonStr + "|" + currentAction + "|" + CryptUtils.md5("carnero: developing your dreams"))).toLowerCase(), - "v", Version.getVersionName(cgeoapplication.getInstance())); - - Network.postRequest("http://api.go4cache.com/", params); - - // Update our coordinates even if the request was not successful, as not to hammer the server - // with invalid requests for every new GPS position. - latestCoords = currentCoords; - latestAction = currentAction; - } - } catch (InterruptedException e) { - Log.e("Go4Cache.run: interrupted", e); - } - } - - /** - * Return an immutable list of users present in the given viewport. - * - * @param username - * the current username - * @param viewport - * the current viewport - * @return the list of users present in the viewport - */ - public static List<Go4CacheUser> getGeocachersInViewport(final String username, final Viewport viewport) { - final List<Go4CacheUser> users = new ArrayList<Go4CacheUser>(); - - if (null == username) { - return users; - } - - final Parameters params = new Parameters( - "u", username, - "ltm", viewport.bottomLeft.format(Format.LAT_DECDEGREE_RAW), - "ltx", viewport.topRight.format(Format.LAT_DECDEGREE_RAW), - "lnm", viewport.bottomLeft.format(Format.LON_DECDEGREE_RAW), - "lnx", viewport.topRight.format(Format.LON_DECDEGREE_RAW)); - - final String data = Network.getResponseData(Network.postRequest("http://api.go4cache.com/get.php", params)); - - if (StringUtils.isBlank(data)) { - Log.e("Go4Cache.getGeocachersInViewport: No data from server"); - return null; - } - - try { - final JSONArray usersData = new JSONObject(data).getJSONArray("users"); - final int count = usersData.length(); - for (int i = 0; i < count; i++) { - final JSONObject oneUser = usersData.getJSONObject(i); - users.add(parseUser(oneUser)); - } - } catch (Exception e) { - Log.e("cgBase.getGeocachersInViewport: " + e.toString()); - } - - return Collections.unmodifiableList(users); - } - - /** - * Parse user information from go4cache.com. - * - * @param user - * a JSON object - * @return a cgCache user filled with information - * @throws JSONException - * if JSON could not be parsed correctly - * @throws ParseException - * if the date could not be parsed as expected - */ - private static Go4CacheUser parseUser(final JSONObject user) throws JSONException, ParseException { - final Date date = dateFormat.parse(user.getString("located")); - final String username = user.getString("user"); - final Geopoint coords = new Geopoint(user.getDouble("latitude"), user.getDouble("longitude")); - final String action = user.getString("action"); - final String client = user.getString("client"); - return new Go4CacheUser(username, coords, date, action, client); - } -} diff --git a/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java b/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java deleted file mode 100644 index 08fd02e..0000000 --- a/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java +++ /dev/null @@ -1,106 +0,0 @@ -package cgeo.geocaching.go4cache; - -import cgeo.geocaching.R; -import cgeo.geocaching.cgeoapplication; -import cgeo.geocaching.geopoint.Geopoint; - -import android.content.res.Resources; - -import java.util.Date; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class Go4CacheUser { - private static final Pattern patternGeocode = Pattern.compile("^(GC[A-Z0-9]+)(\\: ?(.+))?$", Pattern.CASE_INSENSITIVE); - - private final Date date; - private final String username; - private final Geopoint coords; - private final String action; - private final String client; - - private String actionForDisplay; - private String geocode; - private Resources res; - - public Go4CacheUser(final String username, final Geopoint coords, final Date date, final String action, final String client) { - this.username = username; - this.coords = coords; - this.date = new Date(date.getTime()); - this.action = action; - this.client = client; - } - - public Date getDate() { - return date; - } - - public String getUsername() { - return username; - } - - public Geopoint getCoords() { - return coords; - } - - public int getIconId() { - if (client == null) { - return -1; - } - if (client.equalsIgnoreCase("c:geo")) { - return R.drawable.client_cgeo; - } - if (client.equalsIgnoreCase("preCaching")) { - return R.drawable.client_precaching; - } - if (client.equalsIgnoreCase("Handy Geocaching")) { - return R.drawable.client_handygeocaching; - } - return -1; - } - - private void getGeocodeAndAction() { - final Matcher matcherGeocode = patternGeocode.matcher(action.trim()); - res = cgeoapplication.getInstance().getResources(); - - geocode = ""; - if (0 == action.length() || action.equalsIgnoreCase("pending")) { - actionForDisplay = res.getString(R.string.go4cache_looking_around); - } else if (action.equalsIgnoreCase("tweeting")) { - actionForDisplay = res.getString(R.string.go4cache_tweeting); - } else if (matcherGeocode.find()) { - if (null != matcherGeocode.group(1)) { - geocode = matcherGeocode.group(1).trim().toUpperCase(); - } - if (null != matcherGeocode.group(3)) { - actionForDisplay = res.getString(R.string.go4cache_heading_to) + " " + geocode + " (" + matcherGeocode.group(3).trim() + ")"; - } else { - actionForDisplay = res.getString(R.string.go4cache_heading_to) + " " + geocode; - } - } else { - actionForDisplay = action; - } - } - - public String getAction() { - if (null == actionForDisplay) { - getGeocodeAndAction(); - } - return actionForDisplay + getTime() + "."; - } - - private String getTime() { - int minutes = (int) ((System.currentTimeMillis() - date.getTime()) / 60000); - if (minutes < 0) { - minutes = 0; - } - return " (" + res.getQuantityString(R.plurals.go4cache_time_minutes, minutes, minutes) + ")"; - } - - public String getGeocode() { - if (null == geocode) { - getGeocodeAndAction(); - } - return geocode; - } -}
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index d2910c4..aa9ed1b 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -22,8 +22,6 @@ import cgeo.geocaching.enumerations.StatusCode; import cgeo.geocaching.enumerations.WaypointType; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.Viewport; -import cgeo.geocaching.go4cache.Go4Cache; -import cgeo.geocaching.go4cache.Go4CacheUser; import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl; import cgeo.geocaching.maps.interfaces.GeoPointImpl; import cgeo.geocaching.maps.interfaces.MapActivityImpl; @@ -33,7 +31,6 @@ import cgeo.geocaching.maps.interfaces.MapProvider; import cgeo.geocaching.maps.interfaces.MapSource; import cgeo.geocaching.maps.interfaces.MapViewImpl; import cgeo.geocaching.maps.interfaces.OnMapDragListener; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; import cgeo.geocaching.utils.AngleUtils; import cgeo.geocaching.utils.CancellableHandler; import cgeo.geocaching.utils.GeoDirHandler; @@ -151,21 +148,16 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto // map status data private boolean followMyLocation = false; private Viewport viewport = null; - private Viewport viewportUsers = null; private int zoom = -100; // threads private LoadTimer loadTimer = null; - private Go4CacheTimer go4CacheTimer = null; private LoadDetails loadDetailsThread = null; /** Time of last {@link LoadRunnable} run */ private volatile long loadThreadRun = 0L; - /** Time of last {@link Go4CacheRunnable} run */ - private volatile long go4CacheThreadRun = 0L; //Interthread communication flag private volatile boolean downloaded = false; // overlays private CachesOverlay overlayCaches = null; - private OtherCachersOverlay overlayGo4Cache = null; private ScaleOverlay overlayScale = null; private PositionOverlay overlayPosition = null; // data for overlays @@ -206,10 +198,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto private static ThreadPoolExecutor downloadExecutor = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, downloadQueue, new ThreadPoolExecutor.DiscardOldestPolicy()); private static BlockingQueue<Runnable> loadQueue = new ArrayBlockingQueue<Runnable>(1); private static ThreadPoolExecutor loadExecutor = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, loadQueue, new ThreadPoolExecutor.DiscardOldestPolicy()); - private static BlockingQueue<Runnable> Go4CacheQueue = new ArrayBlockingQueue<Runnable>(1); - private static ThreadPoolExecutor Go4CacheExecutor = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, Go4CacheQueue, new ThreadPoolExecutor.DiscardOldestPolicy()); - private static BlockingQueue<Runnable> go4CacheDisplayQueue = new ArrayBlockingQueue<Runnable>(1); - private static ThreadPoolExecutor go4CacheDisplayExecutor = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, go4CacheDisplayQueue, new ThreadPoolExecutor.DiscardOldestPolicy()); // handlers /** Updates the titles */ @@ -433,10 +421,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto // initialize overlays mapView.clearOverlays(); - if (Settings.isPublicLoc() && overlayGo4Cache == null) { - overlayGo4Cache = mapView.createAddUsersOverlay(activity, getResources().getDrawable(R.drawable.user_location)); - } - if (overlayCaches == null) { overlayCaches = mapView.createAddMapOverlay(mapView.getContext(), getResources().getDrawable(R.drawable.marker)); } @@ -498,8 +482,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto public void onResume() { super.onResume(); - app.setAction(StringUtils.defaultIfBlank(geocodeIntent, null)); - addGeoDirObservers(); if (!CollectionUtils.isEmpty(dirtyCaches)) { @@ -532,11 +514,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto loadTimer = null; } - if (go4CacheTimer != null) { - go4CacheTimer.stopIt(); - go4CacheTimer = null; - } - deleteGeoDirObservers(); savePrefs(); @@ -975,7 +952,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto } /** - * Starts the {@link LoadTimer} and {@link Go4CacheTimer}. + * Starts the {@link LoadTimer}. */ public synchronized void startTimer() { @@ -991,15 +968,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto loadTimer = new LoadTimer(); loadTimer.start(); } - - if (Settings.isPublicLoc()) { - if (go4CacheTimer != null) { - go4CacheTimer.stopIt(); - go4CacheTimer = null; - } - go4CacheTimer = new Go4CacheTimer(); - go4CacheTimer.start(); - } } /** @@ -1082,60 +1050,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto } /** - * Timer triggering every 250 ms to start the {@link Go4CacheRunnable} for displaying user. - */ - - private class Go4CacheTimer extends Thread { - - public Go4CacheTimer() { - super("Users Timer"); - } - - private volatile boolean stop = false; - - public void stopIt() { - stop = true; - } - - @Override - public void run() { - while (!stop) { - try { - sleep(250); - - if (mapView != null) { - // get current viewport - final Viewport viewportNow = mapView.getViewport(); - - // check if map moved or zoomed - boolean moved = false; - - long currentTime = System.currentTimeMillis(); - - if (60000 < (currentTime - go4CacheThreadRun)) { - moved = true; - } else if (viewportUsers == null) { - moved = true; - } else if (mapMoved(viewportUsers, viewportNow) && !viewportUsers.includes(viewportNow)) { - moved = true; - } - - // save new values - if (moved && (1000 < (currentTime - go4CacheThreadRun))) { - viewportUsers = viewportNow; - Go4CacheExecutor.execute(new Go4CacheRunnable(viewportUsers)); - } - } - - yield(); - } catch (Exception e) { - Log.w("cgeomap.LoadUsersTimer.run: " + e.toString()); - } - } - } - } - - /** * Worker thread that loads caches and waypoints from the database and then spawns the {@link DownloadRunnable}. * started by {@link LoadTimer} */ @@ -1217,7 +1131,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto /** * Worker thread downloading caches from the internet. - * Started by {@link LoadRunnable}. Duplicate Code with {@link Go4CacheRunnable} + * Started by {@link LoadRunnable}. */ private class DownloadRunnable extends DoRunnable { @@ -1337,66 +1251,6 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto } } - /** - * Thread to load users from Go 4 Cache - */ - - private class Go4CacheRunnable extends DoRunnable { - - public Go4CacheRunnable(final Viewport viewport) { - super(viewport); - } - - @Override - public void run() { - go4CacheThreadRun = System.currentTimeMillis(); - List<Go4CacheUser> go4CacheUsers = Go4Cache.getGeocachersInViewport(Settings.getUsername(), viewport.resize(1.5)); - go4CacheDisplayExecutor.execute(new Go4CacheDisplayRunnable(go4CacheUsers, viewport)); - } - } - - /** - * Thread to display users of Go 4 Cache started from {@link Go4CacheRunnable} - */ - private class Go4CacheDisplayRunnable extends DoRunnable { - - private List<Go4CacheUser> users = null; - - public Go4CacheDisplayRunnable(List<Go4CacheUser> usersIn, final Viewport viewport) { - super(viewport); - users = usersIn; - } - - @Override - public void run() { - if (mapView == null || CollectionUtils.isEmpty(users)) { - return; - } - - // display users - List<OtherCachersOverlayItemImpl> items = new ArrayList<OtherCachersOverlayItemImpl>(); - - int counter = 0; - OtherCachersOverlayItemImpl item; - - for (Go4CacheUser userOne : users) { - if (userOne.getCoords() == null) { - continue; - } - - item = mapItemFactory.getOtherCachersOverlayItemBase(activity, userOne); - items.add(item); - - counter++; - if ((counter % 10) == 0) { - overlayGo4Cache.updateItems(items); - displayHandler.sendEmptyMessage(INVALIDATE_MAP); - } - } - - overlayGo4Cache.updateItems(items); - } - } /** * Thread to display one point. Started on opening if in single mode. diff --git a/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java deleted file mode 100644 index f8e4e17..0000000 --- a/main/src/cgeo/geocaching/maps/OtherCachersOverlay.java +++ /dev/null @@ -1,144 +0,0 @@ -package cgeo.geocaching.maps; - -import cgeo.geocaching.CacheDetailActivity; -import cgeo.geocaching.cgeoapplication; -import cgeo.geocaching.go4cache.Go4CacheUser; -import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl; -import cgeo.geocaching.maps.interfaces.MapViewImpl; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; -import cgeo.geocaching.utils.Log; - -import org.apache.commons.lang3.StringUtils; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.graphics.Canvas; - -import java.util.ArrayList; -import java.util.List; - -public class OtherCachersOverlay extends AbstractItemizedOverlay { - - private List<OtherCachersOverlayItemImpl> items = new ArrayList<OtherCachersOverlayItemImpl>(); - private Context context = null; - - public OtherCachersOverlay(ItemizedOverlayImpl ovlImplIn, Context contextIn) { - super(ovlImplIn); - populate(); - - context = contextIn; - } - - protected void updateItems(OtherCachersOverlayItemImpl item) { - final List<OtherCachersOverlayItemImpl> itemsPre = new ArrayList<OtherCachersOverlayItemImpl>(); - itemsPre.add(item); - - updateItems(itemsPre); - } - - public void updateItems(List<OtherCachersOverlayItemImpl> itemsPre) { - if (itemsPre == null) { - return; - } - - for (OtherCachersOverlayItemImpl item : itemsPre) { - item.setMarker(boundCenter(item.getMarker(0))); - } - - items.clear(); - - if (itemsPre.size() > 0) { - items = new ArrayList<OtherCachersOverlayItemImpl>(itemsPre); - } - - setLastFocusedItemIndex(-1); // to reset tap during data change - populate(); - } - - @Override - public boolean onTap(int index) { - try { - if (items.size() <= index) { - return false; - } - - final OtherCachersOverlayItemImpl item = items.get(index); - final Go4CacheUser user = item.getUser(); - - final String geocode = user.getGeocode(); - final int icon = user.getIconId(); - - final AlertDialog.Builder dialog = new AlertDialog.Builder(context); - if (icon > -1) { - dialog.setIcon(icon); - } - dialog.setTitle(user.getUsername()); - dialog.setMessage(user.getAction()); - dialog.setCancelable(true); - if (StringUtils.isNotBlank(geocode)) { - dialog.setPositiveButton(geocode, new cacheDetails(geocode)); - } - dialog.setNeutralButton(cgeoapplication.getInstance().getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - - dialog.create().show(); - - return true; - } catch (Exception e) { - Log.e("cgUsersOverlay.onTap: " + e.toString()); - } - - return false; - } - - @Override - public void draw(Canvas canvas, MapViewImpl mapView, boolean shadow) { - super.draw(canvas, mapView, false); - } - - @Override - public OtherCachersOverlayItemImpl createItem(int index) { - try { - return items.get(index); - } catch (Exception e) { - Log.e("cgUsersOverlay.createItem: " + e.toString()); - } - - return null; - } - - @Override - public int size() { - try { - return items.size(); - } catch (Exception e) { - Log.e("cgUsersOverlay.size: " + e.toString()); - } - - return 0; - } - - private class cacheDetails implements DialogInterface.OnClickListener { - - private String geocode = null; - - public cacheDetails(String geocodeIn) { - geocode = geocodeIn; - } - - @Override - public void onClick(DialogInterface dialog, int id) { - if (geocode != null) { - CacheDetailActivity.startActivity(context, geocode); - } - - dialog.cancel(); - } - } -} diff --git a/main/src/cgeo/geocaching/maps/OtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/OtherCachersOverlayItem.java deleted file mode 100644 index 9844e83..0000000 --- a/main/src/cgeo/geocaching/maps/OtherCachersOverlayItem.java +++ /dev/null @@ -1,36 +0,0 @@ -package cgeo.geocaching.maps; - -import cgeo.geocaching.R; -import cgeo.geocaching.go4cache.Go4CacheUser; - -import android.content.Context; -import android.graphics.drawable.Drawable; - -public class OtherCachersOverlayItem { - private final Context context; - private final Go4CacheUser user; - - public OtherCachersOverlayItem(Context contextIn, Go4CacheUser userIn) { - context = contextIn; - user = userIn; - } - - public Drawable getMarker() { - Drawable marker; - - if (user != null && user.getDate() != null && user.getDate().getTime() >= (System.currentTimeMillis() - (20 * 60 * 1000))) { - marker = context.getResources().getDrawable(R.drawable.user_location_active); - } else { - marker = context.getResources().getDrawable(R.drawable.user_location); - } - - marker.setBounds(0, 0, marker.getIntrinsicWidth(), marker.getIntrinsicHeight()); - marker.setAlpha(190); - - return marker; - } - - public Go4CacheUser getUser() { - return user; - } -}
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java b/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java index 1a10023..f40c799 100644 --- a/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java +++ b/main/src/cgeo/geocaching/maps/google/GoogleMapItemFactory.java @@ -3,13 +3,9 @@ package cgeo.geocaching.maps.google; import cgeo.geocaching.IWaypoint; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4CacheUser; import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl; import cgeo.geocaching.maps.interfaces.GeoPointImpl; import cgeo.geocaching.maps.interfaces.MapItemFactory; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import android.content.Context; public class GoogleMapItemFactory implements MapItemFactory { @@ -22,9 +18,4 @@ public class GoogleMapItemFactory implements MapItemFactory { public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, final CacheType type) { return new GoogleCacheOverlayItem(coordinate, type); } - - @Override - public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) { - return new GoogleOtherCachersOverlayItem(context, userOne); - } } diff --git a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java index c575177..f43b6a4 100644 --- a/main/src/cgeo/geocaching/maps/google/GoogleMapView.java +++ b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java @@ -5,7 +5,6 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import cgeo.geocaching.Settings; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; -import cgeo.geocaching.maps.OtherCachersOverlay; import cgeo.geocaching.maps.PositionOverlay; import cgeo.geocaching.maps.ScaleOverlay; import cgeo.geocaching.maps.interfaces.GeneralOverlay; @@ -120,13 +119,6 @@ public class GoogleMapView extends MapView implements MapViewImpl { } @Override - public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) { - GoogleOtherCachersOverlay ovl = new GoogleOtherCachersOverlay(context, markerIn); - getOverlays().add(ovl); - return ovl.getBase(); - } - - @Override public PositionOverlay createAddPositionOverlay(Activity activity) { GoogleOverlay ovl = new GoogleOverlay(activity, overlayType.PositionOverlay); diff --git a/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java deleted file mode 100644 index 4c330c9..0000000 --- a/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java +++ /dev/null @@ -1,117 +0,0 @@ -package cgeo.geocaching.maps.google; - -import cgeo.geocaching.maps.OtherCachersOverlay; -import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl; -import cgeo.geocaching.maps.interfaces.MapProjectionImpl; -import cgeo.geocaching.maps.interfaces.MapViewImpl; - -import com.google.android.maps.ItemizedOverlay; -import com.google.android.maps.MapView; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Point; -import android.graphics.drawable.Drawable; - -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -public class GoogleOtherCachersOverlay extends ItemizedOverlay<GoogleOtherCachersOverlayItem> implements ItemizedOverlayImpl { - - private OtherCachersOverlay base; - private Lock lock = new ReentrantLock(); - - public GoogleOtherCachersOverlay(Context contextIn, Drawable markerIn) { - super(boundCenter(markerIn)); - base = new OtherCachersOverlay(this, contextIn); - } - - @Override - public OtherCachersOverlay getBase() { - return base; - } - - @Override - protected GoogleOtherCachersOverlayItem createItem(int i) { - if (base == null) { - return null; - } - - return (GoogleOtherCachersOverlayItem) base.createItem(i); - } - - @Override - public int size() { - if (base == null) { - return 0; - } - - return base.size(); - } - - @Override - protected boolean onTap(int arg0) { - if (base == null) { - return false; - } - - return base.onTap(arg0); - } - - @Override - public void draw(Canvas canvas, MapView mapView, boolean shadow) { - base.draw(canvas, (MapViewImpl) mapView, shadow); - } - - @Override - public void superPopulate() { - populate(); - } - - @Override - public Drawable superBoundCenter(Drawable markerIn) { - return super.boundCenter(markerIn); - } - - @Override - public Drawable superBoundCenterBottom(Drawable marker) { - return super.boundCenterBottom(marker); - } - - @Override - public void superSetLastFocusedItemIndex(int i) { - super.setLastFocusedIndex(i); - } - - @Override - public boolean superOnTap(int index) { - return super.onTap(index); - } - - @Override - public void superDraw(Canvas canvas, MapViewImpl mapView, boolean shadow) { - super.draw(canvas, (MapView) mapView, shadow); - } - - @Override - public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition, - MapProjectionImpl projection, byte drawZoomLevel) { - // Nothing to do here - } - - @Override - public void lock() { - lock.lock(); - } - - @Override - public void unlock() { - lock.unlock(); - } - - @Override - public MapViewImpl getMapViewImpl() { - throw new UnsupportedOperationException(); - } - -} diff --git a/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java deleted file mode 100644 index 0e3067a..0000000 --- a/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java +++ /dev/null @@ -1,32 +0,0 @@ -package cgeo.geocaching.maps.google; - -import cgeo.geocaching.go4cache.Go4CacheUser; -import cgeo.geocaching.maps.OtherCachersOverlayItem; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import com.google.android.maps.GeoPoint; -import com.google.android.maps.OverlayItem; - -import android.content.Context; -import android.graphics.drawable.Drawable; - -public class GoogleOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl { - final private OtherCachersOverlayItem item; - - public GoogleOtherCachersOverlayItem(Context context, Go4CacheUser user) { - super(new GeoPoint(user.getCoords().getLatitudeE6(), user.getCoords().getLongitudeE6()), user.getUsername(), ""); - item = new OtherCachersOverlayItem(context, user); - } - - @Override - public Drawable getMarker(int state) { - final Drawable marker = item.getMarker(); - setMarker(marker); - return marker; - } - - @Override - public Go4CacheUser getUser() { - return item.getUser(); - } -} diff --git a/main/src/cgeo/geocaching/maps/interfaces/MapItemFactory.java b/main/src/cgeo/geocaching/maps/interfaces/MapItemFactory.java index c38739d..e02d472 100644 --- a/main/src/cgeo/geocaching/maps/interfaces/MapItemFactory.java +++ b/main/src/cgeo/geocaching/maps/interfaces/MapItemFactory.java @@ -3,9 +3,6 @@ package cgeo.geocaching.maps.interfaces; import cgeo.geocaching.IWaypoint; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4CacheUser; - -import android.content.Context; public interface MapItemFactory { @@ -13,6 +10,4 @@ public interface MapItemFactory { public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint iWaypoint, final CacheType type); - public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, - Go4CacheUser userOne); } diff --git a/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java b/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java index 1bafc57..ad481cb 100644 --- a/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java +++ b/main/src/cgeo/geocaching/maps/interfaces/MapViewImpl.java @@ -2,7 +2,6 @@ package cgeo.geocaching.maps.interfaces; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; -import cgeo.geocaching.maps.OtherCachersOverlay; import cgeo.geocaching.maps.PositionOverlay; import cgeo.geocaching.maps.ScaleOverlay; @@ -48,8 +47,6 @@ public interface MapViewImpl { CachesOverlay createAddMapOverlay(Context context, Drawable drawable); - OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn); - ScaleOverlay createAddScaleOverlay(Activity activity); PositionOverlay createAddPositionOverlay(Activity activity); diff --git a/main/src/cgeo/geocaching/maps/interfaces/OtherCachersOverlayItemImpl.java b/main/src/cgeo/geocaching/maps/interfaces/OtherCachersOverlayItemImpl.java deleted file mode 100644 index 453c8a9..0000000 --- a/main/src/cgeo/geocaching/maps/interfaces/OtherCachersOverlayItemImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package cgeo.geocaching.maps.interfaces; - -import cgeo.geocaching.go4cache.Go4CacheUser; - -/** - * Common functions of the provider-specific - * UserOverlayItem implementations - */ -public interface OtherCachersOverlayItemImpl extends OverlayItemImpl { - - public Go4CacheUser getUser(); -} diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java index 0df7894..10fcb03 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapItemFactory.java @@ -3,13 +3,9 @@ package cgeo.geocaching.maps.mapsforge; import cgeo.geocaching.IWaypoint; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4CacheUser; import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl; import cgeo.geocaching.maps.interfaces.GeoPointImpl; import cgeo.geocaching.maps.interfaces.MapItemFactory; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import android.content.Context; public class MapsforgeMapItemFactory implements MapItemFactory { @@ -23,9 +19,4 @@ public class MapsforgeMapItemFactory implements MapItemFactory { return new MapsforgeCacheOverlayItem(coordinate, type); } - @Override - public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) { - return new MapsforgeOtherCachersOverlayItem(context, userOne); - } - } diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java index c24a798..3dd58a7 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapView.java @@ -5,7 +5,6 @@ import cgeo.geocaching.Settings; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; import cgeo.geocaching.maps.MapProviderFactory; -import cgeo.geocaching.maps.OtherCachersOverlay; import cgeo.geocaching.maps.PositionOverlay; import cgeo.geocaching.maps.ScaleOverlay; import cgeo.geocaching.maps.interfaces.GeneralOverlay; @@ -108,13 +107,6 @@ public class MapsforgeMapView extends MapView implements MapViewImpl { } @Override - public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) { - MapsforgeOtherCachersOverlay ovl = new MapsforgeOtherCachersOverlay(context, markerIn); - getOverlays().add(ovl); - return ovl.getBase(); - } - - @Override public PositionOverlay createAddPositionOverlay(Activity activity) { MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.PositionOverlay); getOverlays().add(ovl); diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java deleted file mode 100644 index 66aa13e..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlay.java +++ /dev/null @@ -1,120 +0,0 @@ -package cgeo.geocaching.maps.mapsforge; - -import cgeo.geocaching.maps.OtherCachersOverlay; -import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl; -import cgeo.geocaching.maps.interfaces.MapProjectionImpl; -import cgeo.geocaching.maps.interfaces.MapViewImpl; - -import org.mapsforge.android.maps.Projection; -import org.mapsforge.android.maps.overlay.ItemizedOverlay; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Point; -import android.graphics.drawable.Drawable; - -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -public class MapsforgeOtherCachersOverlay extends ItemizedOverlay<MapsforgeOtherCachersOverlayItem> implements ItemizedOverlayImpl { - - private OtherCachersOverlay base; - private Lock lock = new ReentrantLock(); - - public MapsforgeOtherCachersOverlay(Context contextIn, Drawable markerIn) { - super(boundCenter(markerIn)); - base = new OtherCachersOverlay(this, contextIn); - } - - @Override - public OtherCachersOverlay getBase() { - return base; - } - - @Override - protected MapsforgeOtherCachersOverlayItem createItem(int i) { - if (base == null) { - return null; - } - - return (MapsforgeOtherCachersOverlayItem) base.createItem(i); - } - - @Override - public int size() { - if (base == null) { - return 0; - } - - return base.size(); - } - - @Override - protected boolean onTap(int arg0) { - if (base == null) { - return false; - } - - return base.onTap(arg0); - } - - @Override - protected void drawOverlayBitmap(Canvas canvas, Point drawPosition, - Projection projection, byte drawZoomLevel) { - - base.drawOverlayBitmap(canvas, drawPosition, new MapsforgeMapProjection(projection), drawZoomLevel); - } - - @Override - public void superPopulate() { - populate(); - } - - @Override - public Drawable superBoundCenter(Drawable markerIn) { - return super.boundCenter(markerIn); - } - - @Override - public Drawable superBoundCenterBottom(Drawable marker) { - return super.boundCenterBottom(marker); - } - - @Override - public void superSetLastFocusedItemIndex(int i) { - // Nothing to do here - } - - @Override - public boolean superOnTap(int index) { - return super.onTap(index); - } - - @Override - public void superDraw(Canvas canvas, MapViewImpl mapView, boolean shadow) { - // Nothing to do here - } - - @Override - public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition, - MapProjectionImpl projection, byte drawZoomLevel) { - - super.drawOverlayBitmap(canvas, drawPosition, (Projection) projection.getImpl(), drawZoomLevel); - } - - @Override - public void lock() { - lock.lock(); - } - - @Override - public void unlock() { - lock.unlock(); - } - - @Override - public MapViewImpl getMapViewImpl() { - return (MapViewImpl) internalMapView; - } - -}
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java deleted file mode 100644 index f80664e..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeOtherCachersOverlayItem.java +++ /dev/null @@ -1,32 +0,0 @@ -package cgeo.geocaching.maps.mapsforge; - -import cgeo.geocaching.go4cache.Go4CacheUser; -import cgeo.geocaching.maps.OtherCachersOverlayItem; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import org.mapsforge.android.maps.overlay.OverlayItem; -import org.mapsforge.core.GeoPoint; - -import android.content.Context; -import android.graphics.drawable.Drawable; - -public class MapsforgeOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl { - private final OtherCachersOverlayItem item; - - public MapsforgeOtherCachersOverlayItem(Context context, Go4CacheUser user) { - super(new GeoPoint(user.getCoords().getLatitudeE6(), user.getCoords().getLongitudeE6()), user.getUsername(), ""); - item = new OtherCachersOverlayItem(context, user); - } - - @Override - public Drawable getMarker(int state) { - Drawable marker = item.getMarker(); - setMarker(marker); - return marker; - } - - @Override - public Go4CacheUser getUser() { - return item.getUser(); - } -} diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java index 863cbca..5c64592 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapItemFactory024.java @@ -3,13 +3,9 @@ package cgeo.geocaching.maps.mapsforge.v024; import cgeo.geocaching.IWaypoint; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; -import cgeo.geocaching.go4cache.Go4CacheUser; import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl; import cgeo.geocaching.maps.interfaces.GeoPointImpl; import cgeo.geocaching.maps.interfaces.MapItemFactory; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import android.content.Context; public class MapsforgeMapItemFactory024 implements MapItemFactory { @@ -22,10 +18,4 @@ public class MapsforgeMapItemFactory024 implements MapItemFactory { public CachesOverlayItemImpl getCachesOverlayItem(final IWaypoint coordinate, final CacheType type) { return new MapsforgeCacheOverlayItem(coordinate, type); } - - @Override - public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, Go4CacheUser userOne) { - return new MapsforgeOtherCachersOverlayItem(context, userOne); - } - } diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java index e53d976..a459804 100644 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java +++ b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeMapView024.java @@ -4,7 +4,6 @@ import cgeo.geocaching.R; import cgeo.geocaching.Settings; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.maps.CachesOverlay; -import cgeo.geocaching.maps.OtherCachersOverlay; import cgeo.geocaching.maps.PositionOverlay; import cgeo.geocaching.maps.ScaleOverlay; import cgeo.geocaching.maps.interfaces.GeneralOverlay; @@ -103,13 +102,6 @@ public class MapsforgeMapView024 extends MapView implements MapViewImpl { } @Override - public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) { - MapsforgeOtherCachersOverlay ovl = new MapsforgeOtherCachersOverlay(context, markerIn); - getOverlays().add(ovl); - return ovl.getBase(); - } - - @Override public PositionOverlay createAddPositionOverlay(Activity activity) { MapsforgeOverlay ovl = new MapsforgeOverlay(activity, overlayType.PositionOverlay); getOverlays().add(ovl); diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlay.java deleted file mode 100644 index 64ce8b0..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlay.java +++ /dev/null @@ -1,120 +0,0 @@ -package cgeo.geocaching.maps.mapsforge.v024; - -import cgeo.geocaching.maps.OtherCachersOverlay; -import cgeo.geocaching.maps.interfaces.ItemizedOverlayImpl; -import cgeo.geocaching.maps.interfaces.MapProjectionImpl; -import cgeo.geocaching.maps.interfaces.MapViewImpl; - -import org.mapsforge.android.mapsold.ItemizedOverlay; -import org.mapsforge.android.mapsold.Projection; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Point; -import android.graphics.drawable.Drawable; - -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -public class MapsforgeOtherCachersOverlay extends ItemizedOverlay<MapsforgeOtherCachersOverlayItem> implements ItemizedOverlayImpl { - - private OtherCachersOverlay base; - private Lock lock = new ReentrantLock(); - - public MapsforgeOtherCachersOverlay(Context contextIn, Drawable markerIn) { - super(boundCenter(markerIn)); - base = new OtherCachersOverlay(this, contextIn); - } - - @Override - public OtherCachersOverlay getBase() { - return base; - } - - @Override - protected MapsforgeOtherCachersOverlayItem createItem(int i) { - if (base == null) { - return null; - } - - return (MapsforgeOtherCachersOverlayItem) base.createItem(i); - } - - @Override - public int size() { - if (base == null) { - return 0; - } - - return base.size(); - } - - @Override - protected boolean onTap(int arg0) { - if (base == null) { - return false; - } - - return base.onTap(arg0); - } - - @Override - protected void drawOverlayBitmap(Canvas canvas, Point drawPosition, - Projection projection, byte drawZoomLevel) { - - base.drawOverlayBitmap(canvas, drawPosition, new MapsforgeMapProjection(projection), drawZoomLevel); - } - - @Override - public void superPopulate() { - populate(); - } - - @Override - public Drawable superBoundCenter(Drawable markerIn) { - return super.boundCenter(markerIn); - } - - @Override - public Drawable superBoundCenterBottom(Drawable marker) { - return super.boundCenterBottom(marker); - } - - @Override - public void superSetLastFocusedItemIndex(int i) { - // Nothing to do here - } - - @Override - public boolean superOnTap(int index) { - return super.onTap(index); - } - - @Override - public void superDraw(Canvas canvas, MapViewImpl mapView, boolean shadow) { - // Nothing to do here - } - - @Override - public void superDrawOverlayBitmap(Canvas canvas, Point drawPosition, - MapProjectionImpl projection, byte drawZoomLevel) { - - super.drawOverlayBitmap(canvas, drawPosition, (Projection) projection.getImpl(), drawZoomLevel); - } - - @Override - public void lock() { - lock.lock(); - } - - @Override - public void unlock() { - lock.unlock(); - } - - @Override - public MapViewImpl getMapViewImpl() { - return (MapViewImpl) internalMapView; - } - -}
\ No newline at end of file diff --git a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlayItem.java deleted file mode 100644 index ec38500..0000000 --- a/main/src/cgeo/geocaching/maps/mapsforge/v024/MapsforgeOtherCachersOverlayItem.java +++ /dev/null @@ -1,32 +0,0 @@ -package cgeo.geocaching.maps.mapsforge.v024; - -import cgeo.geocaching.go4cache.Go4CacheUser; -import cgeo.geocaching.maps.OtherCachersOverlayItem; -import cgeo.geocaching.maps.interfaces.OtherCachersOverlayItemImpl; - -import org.mapsforge.android.mapsold.GeoPoint; -import org.mapsforge.android.mapsold.OverlayItem; - -import android.content.Context; -import android.graphics.drawable.Drawable; - -public class MapsforgeOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl { - private final OtherCachersOverlayItem item; - - public MapsforgeOtherCachersOverlayItem(Context context, Go4CacheUser user) { - super(new GeoPoint(user.getCoords().getLatitudeE6(), user.getCoords().getLongitudeE6()), user.getUsername(), ""); - item = new OtherCachersOverlayItem(context, user); - } - - @Override - public Drawable getMarker(int state) { - Drawable marker = item.getMarker(); - setMarker(marker); - return marker; - } - - @Override - public Go4CacheUser getUser() { - return item.getUser(); - } -} diff --git a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java index ef198dd..22ee0fb 100644 --- a/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java +++ b/main/src/cgeo/geocaching/twitter/TwitterAuthorizationActivity.java @@ -10,6 +10,7 @@ import cgeo.geocaching.utils.Log; import ch.boye.httpclientandroidlib.client.entity.UrlEncodedFormEntity; import ch.boye.httpclientandroidlib.util.EntityUtils; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -90,9 +91,6 @@ public class TwitterAuthorizationActivity extends AbstractActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // init - app.setAction("setting up"); - setTheme(); setContentView(R.layout.auth); setTitle(res.getString(R.string.auth_twitter)); |