From: srowen Date: Thu, 26 Nov 2009 02:47:44 +0000 (+0000) Subject: Issue 274, for consideration X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=419298649bcec3818b5189a18ae68c365507b05d Issue 274, for consideration git-svn-id: http://zxing.googlecode.com/svn/trunk@1129 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index fea05338..33557890 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -66,6 +66,7 @@ Erzeuge Barcode\u2026 Die gewünschte Applikation kann nicht geöffnet werden. Der Barcode könnte ungültig sein. Laden einer Liste von Anwendungen + Sie verlassen diese Anwendung. Die Suchergebnisse, die Sie sind nicht auf diese Anwendung in Zusammenhang stehen. Das Buch kann nicht durchsucht werden. Bei der Suche ist ein Fehler aufgetreten. Keine Seite zurückgeliefert. diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index 789c126a..872bf637 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -66,6 +66,7 @@ Generando un código de barras\u2026 Lo sentimos, la aplicación solicitada no pudo ser lanzada. El contenido de código de barras puede ser inválida. Cargando una lista de aplicaciones + Usted está saliendo de esta aplicación. Los resultados de búsqueda que se ver, no están relacionados con esta aplicación. Lo sentimos, no se puede buscar en este libro. Lo sentimos, la búsqueda ha detectado un problema. Página no encontrada diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 737092f6..6e8248c0 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -66,6 +66,7 @@ Génération du code barre\u2026 Désolé, l\'application demandée n\'a pas pu être lancé. Le contenu du code barre peut être invalide. Chargement d'une liste d'applications + Vous quittez cette application. Les résultats de recherche qui vous voir ne sont pas liées à cette application. Désolé, ce livre n\'est pas trouvable. Désolé, la recherche a rencontrée un problème. Page non trouvée diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index f1438e2e..d7b855ef 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -66,6 +66,7 @@ Generazione codice a barre\u2026 Spiacenti, l\'applicazione richiesta non può essere avviata. Il contenuto del codice a barre può essere non valido. Carico della lista delle applicazioni + Si sta lasciando questa applicazione. I risultati della ricerca che verrà vedi non sono collegati a questa domanda. Spiacenti, questo libro non è ricercabile. Spiacenti, la ricerca ha avuto un problema. Nessuna pagina restitiuta diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml index a3df5bac..c90eb3ec 100644 --- a/android/res/values-ja-rJP/strings.xml +++ b/android/res/values-ja-rJP/strings.xml @@ -66,6 +66,7 @@ バーコード作成中\u2026 指定されたアプリケーションを起動できませんでした。バーコードの内容が無効である可能性があります。 適用のリストの負荷 + このアプリケーションを残している。検索結果が必要になります。このアプリケーションに関連していないことがわかります。 この書籍は検索できません。 検索中に問題が発生しました。 検索結果はありません diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 5b169c96..0449c9ca 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -66,6 +66,7 @@ Генерация штрих-кода\u2026 К сожалению, запрошенное приложение не может быть запущенно. Содержимое штрих-кода может быть повреждено. Нагружать список применений + Вы покидаете это приложение. Результаты поиска, которую вы видите, не связанным с этим приложением. К сожалению, поиск книги не удался. К сожалению, у поиска возникли проблемы. Ни одна страница не возвращена diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml index eb3e08f6..1e2287b7 100644 --- a/android/res/values-zh-rCN/strings.xml +++ b/android/res/values-zh-rCN/strings.xml @@ -66,6 +66,7 @@ 正在生成条码\u2026 抱歉，无法打开所需软件。 条码内容可能无效。 装载应用名单 + 你离开此应用程序。搜索结果，您会看到的都没有涉及这个应用程序 抱歉，无法找到此图书。 抱歉，搜索时遇到错误。 没有返回页面 diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index cee57133..8bdf4b73 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -66,6 +66,7 @@ 正在生成條碼\u2026 抱歉，無法打開所需軟件。 條碼內容可能無效。 裝載應用名單 + 你離開此應用程序。搜索結果，您會看到的都沒有涉及這個應用程序。 抱歉，無法找到此圖書。 抱歉，搜索時遇到錯誤。 沒有返回頁面 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index e129c822..026db2e9 100755 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -66,6 +66,7 @@ Generating a barcode\u2026 Sorry, the requested application could not be launched. The barcode contents may be invalid. Loading list of applications + You are leaving this application. The search results you will see are not related to this application. Sorry, this book is not searchable. Sorry, the search encountered a problem. No page returned diff --git a/android/src/com/google/zxing/client/android/PreferencesActivity.java b/android/src/com/google/zxing/client/android/PreferencesActivity.java index b6ee0c7e..8054d90f 100755 --- a/android/src/com/google/zxing/client/android/PreferencesActivity.java +++ b/android/src/com/google/zxing/client/android/PreferencesActivity.java @@ -40,6 +40,7 @@ public final class PreferencesActivity extends PreferenceActivity static final String KEY_COPY_TO_CLIPBOARD = "preferences_copy_to_clipboard"; static final String KEY_HELP_VERSION_SHOWN = "preferences_help_version_shown"; + public static final String KEY_NOT_OUR_RESULTS_SHOWN = "preferences_not_out_results_shown"; private CheckBoxPreference decode1D; private CheckBoxPreference decodeQR; diff --git a/android/src/com/google/zxing/client/android/result/ISBNResultHandler.java b/android/src/com/google/zxing/client/android/result/ISBNResultHandler.java index 9b058428..bd80a260 100644 --- a/android/src/com/google/zxing/client/android/result/ISBNResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/ISBNResultHandler.java @@ -16,15 +16,16 @@ package com.google.zxing.client.android.result; +import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; import com.google.zxing.client.android.PreferencesActivity; import com.google.zxing.client.android.R; import com.google.zxing.client.result.ISBNParsedResult; import com.google.zxing.client.result.ParsedResult; -import android.app.Activity; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; - /** * Handles books encoded by their ISBN values. * @@ -58,23 +59,27 @@ public final class ISBNResultHandler extends ResultHandler { } @Override - public void handleButtonPress(int index) { - ISBNParsedResult isbnResult = (ISBNParsedResult) getResult(); - switch (index) { - case 0: - openProductSearch(isbnResult.getISBN()); - break; - case 1: - openBookSearch(isbnResult.getISBN()); - break; - case 2: - searchBookContents(isbnResult.getISBN()); - break; - case 3: - String url = customProductSearch.replace("%s", isbnResult.getISBN()); - openURL(url); - break; - } + public void handleButtonPress(final int index) { + showNotOurResults(index, new AlertDialog.OnClickListener() { + public void onClick(DialogInterface dialogInterface, int i) { + ISBNParsedResult isbnResult = (ISBNParsedResult) getResult(); + switch (index) { + case 0: + openProductSearch(isbnResult.getISBN()); + break; + case 1: + openBookSearch(isbnResult.getISBN()); + break; + case 2: + searchBookContents(isbnResult.getISBN()); + break; + case 3: + String url = customProductSearch.replace("%s", isbnResult.getISBN()); + openURL(url); + break; + } + } + }); } @Override diff --git a/android/src/com/google/zxing/client/android/result/ProductResultHandler.java b/android/src/com/google/zxing/client/android/result/ProductResultHandler.java index 0f1405f0..1c58da64 100644 --- a/android/src/com/google/zxing/client/android/result/ProductResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/ProductResultHandler.java @@ -16,15 +16,16 @@ package com.google.zxing.client.android.result; +import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; import com.google.zxing.client.android.PreferencesActivity; import com.google.zxing.client.android.R; import com.google.zxing.client.result.ParsedResult; import com.google.zxing.client.result.ProductParsedResult; -import android.app.Activity; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; - /** * Handles generic products which are not books. * @@ -56,20 +57,24 @@ public final class ProductResultHandler extends ResultHandler { } @Override - public void handleButtonPress(int index) { - ProductParsedResult productResult = (ProductParsedResult) getResult(); - switch (index) { - case 0: - openProductSearch(productResult.getNormalizedProductID()); - break; - case 1: - webSearch(productResult.getNormalizedProductID()); - break; - case 2: - String url = customProductSearch.replace("%s", productResult.getNormalizedProductID()); - openURL(url); - break; - } + public void handleButtonPress(final int index) { + showNotOurResults(index, new AlertDialog.OnClickListener() { + public void onClick(DialogInterface dialogInterface, int i) { + ProductParsedResult productResult = (ProductParsedResult) getResult(); + switch (index) { + case 0: + openProductSearch(productResult.getNormalizedProductID()); + break; + case 1: + webSearch(productResult.getNormalizedProductID()); + break; + case 2: + String url = customProductSearch.replace("%s", productResult.getNormalizedProductID()); + openURL(url); + break; + } + } + }); } @Override diff --git a/android/src/com/google/zxing/client/android/result/ResultHandler.java b/android/src/com/google/zxing/client/android/result/ResultHandler.java index d7bd354f..48a22b7e 100644 --- a/android/src/com/google/zxing/client/android/result/ResultHandler.java +++ b/android/src/com/google/zxing/client/android/result/ResultHandler.java @@ -16,21 +16,23 @@ package com.google.zxing.client.android.result; +import android.app.Activity; +import android.app.AlertDialog; +import android.content.ActivityNotFoundException; +import android.content.Intent; +import android.content.SharedPreferences; +import android.net.Uri; +import android.preference.PreferenceManager; +import android.provider.Contacts; import com.google.zxing.client.android.Contents; import com.google.zxing.client.android.Intents; import com.google.zxing.client.android.LocaleManager; +import com.google.zxing.client.android.PreferencesActivity; import com.google.zxing.client.android.R; import com.google.zxing.client.android.book.SearchBookContentsActivity; import com.google.zxing.client.result.ParsedResult; import com.google.zxing.client.result.ParsedResultType; -import android.app.Activity; -import android.app.AlertDialog; -import android.content.ActivityNotFoundException; -import android.content.Intent; -import android.net.Uri; -import android.provider.Contacts; - import java.text.DateFormat; import java.text.ParsePosition; import java.text.SimpleDateFormat; @@ -315,4 +317,20 @@ public abstract class ResultHandler { intent.putExtra(key, value); } } + + protected void showNotOurResults(int index, AlertDialog.OnClickListener proceedListener) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity); + if (prefs.getBoolean(PreferencesActivity.KEY_NOT_OUR_RESULTS_SHOWN, false)) { + // already seen it, just proceed + proceedListener.onClick(null, index); + } else { + // note the user has seen it + prefs.edit().putBoolean(PreferencesActivity.KEY_NOT_OUR_RESULTS_SHOWN, true); + AlertDialog.Builder builder = new AlertDialog.Builder(activity); + builder.setMessage(R.string.msg_not_our_results); + builder.setPositiveButton(R.string.button_ok, proceedListener); + builder.show(); + } + } + }