diff -ur zxing-BS-4.7.3.orig/android/res/values/strings.xml zxing-BS-4.7.3/android/res/values/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values/strings.xml	2015-08-23 22:04:07.434262216 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">No continuous focus</string>
   <string name="preferences_disable_exposure_title">No exposure</string>
   <string name="preferences_disable_metering_title">No metering</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
   <string name="preferences_front_light_title">Use front light</string>
   <string name="preferences_front_light_auto">Automatic</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-ar/strings.xml zxing-BS-4.7.3/android/res/values-ar/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-ar/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-ar/strings.xml	2015-08-23 22:27:21.280032281 +0200
@@ -105,6 +105,7 @@
   <string name="preferences_disable_continuous_focus_summary">استخدام وضع معيار التركيز فقط</string>
   <string name="preferences_disable_continuous_focus_title">لا التركيز المستمر</string>
   <string name="preferences_disable_exposure_title">لا تعرض</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_disable_metering_title">لا القياس</string>
   <string name="preferences_front_light_auto">أوتوماتيكي</string>
   <string name="preferences_front_light_off">غير فعال</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-bg/strings.xml zxing-BS-4.7.3/android/res/values-bg/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-bg/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-bg/strings.xml	2015-08-23 22:27:33.126599408 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Без непрекъснат фокус</string>
   <string name="preferences_disable_exposure_title">Никоя експозиция</string>
   <string name="preferences_disable_metering_title">Не измерване</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Автоматичен</string>
   <string name="preferences_front_light_off">Неактивен</string>
   <string name="preferences_front_light_on">Активен</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-ca/strings.xml zxing-BS-4.7.3/android/res/values-ca/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-ca/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-ca/strings.xml	2015-08-23 22:27:44.804158445 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">No enfocament continu</string>
   <string name="preferences_disable_exposure_title">No hi ha exposició</string>
   <string name="preferences_disable_metering_title">No dosificadora</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automàtic</string>
   <string name="preferences_front_light_off">Inactiu</string>
   <string name="preferences_front_light_on">Actiu</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-cs/strings.xml zxing-BS-4.7.3/android/res/values-cs/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-cs/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-cs/strings.xml	2015-08-23 22:27:58.858831284 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Soustavné ostření</string>
   <string name="preferences_disable_exposure_title">Vypnuta expozice</string>
   <string name="preferences_disable_metering_title">Vypnuto měření</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatický</string>
   <string name="preferences_front_light_off">Neaktivní</string>
   <string name="preferences_front_light_on">Aktivní</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-da/strings.xml zxing-BS-4.7.3/android/res/values-da/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-da/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-da/strings.xml	2015-08-23 22:28:09.759353124 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Ingen løbende fokus</string>
   <string name="preferences_disable_exposure_title">Ingen eksponering</string>
   <string name="preferences_disable_metering_title">Ingen måling</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatisk</string>
   <string name="preferences_front_light_off">Inaktiv</string>
   <string name="preferences_front_light_on">Aktiv</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-de/strings.xml zxing-BS-4.7.3/android/res/values-de/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-de/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-de/strings.xml	2015-08-23 22:28:20.637873905 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Kein kontinuierlicher Fokus</string>
   <string name="preferences_disable_exposure_title">Keine Belichtungsmessung</string>
   <string name="preferences_disable_metering_title">Keine Dosierung</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatisch</string>
   <string name="preferences_front_light_off">Aus</string>
   <string name="preferences_front_light_on">Ein</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-el/strings.xml zxing-BS-4.7.3/android/res/values-el/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-el/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-el/strings.xml	2015-08-23 22:28:30.344338580 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Δεν συνεχής εστίαση</string>
   <string name="preferences_disable_exposure_title">Δεν έκθεση</string>
   <string name="preferences_disable_metering_title">Δεν μέτρησης</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Αυτόματο</string>
   <string name="preferences_front_light_off">Αδρανής</string>
   <string name="preferences_front_light_on">Ενεργός</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-es/strings.xml zxing-BS-4.7.3/android/res/values-es/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-es/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-es/strings.xml	2015-08-23 22:28:40.272813896 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">No enfoque continuo</string>
   <string name="preferences_disable_exposure_title">No exposición</string>
   <string name="preferences_disable_metering_title">No dosificadora</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automático</string>
   <string name="preferences_front_light_off">Inactivo</string>
   <string name="preferences_front_light_on">Activo</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-eu/strings.xml zxing-BS-4.7.3/android/res/values-eu/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-eu/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-eu/strings.xml	2015-08-23 22:28:50.444300820 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Etengabeko foku No</string>
   <string name="preferences_disable_exposure_title">Esposizio No</string>
   <string name="preferences_disable_metering_title">Neurtzeko No</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatikoa</string>
   <string name="preferences_front_light_off">Ezgaitutako</string>
   <string name="preferences_front_light_on">Aktiboak</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-fi/strings.xml zxing-BS-4.7.3/android/res/values-fi/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-fi/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-fi/strings.xml	2015-08-23 22:29:00.642789050 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Ei jatkuvaa tarkennusta</string>
   <string name="preferences_disable_exposure_title">Ei valotusta</string>
   <string name="preferences_disable_metering_title">Ei mittausta</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automaattinen</string>
   <string name="preferences_front_light_off">Pois</string>
   <string name="preferences_front_light_on">Päällä</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-fr/strings.xml zxing-BS-4.7.3/android/res/values-fr/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-fr/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-fr/strings.xml	2015-08-23 22:29:11.043286951 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Pas de mise au point continue</string>
   <string name="preferences_disable_exposure_title">Pas d\'exposition</string>
   <string name="preferences_disable_metering_title">Pas de mesure</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatique</string>
   <string name="preferences_front_light_off">Éteinte</string>
   <string name="preferences_front_light_on">Allumée</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-he/strings.xml zxing-BS-4.7.3/android/res/values-he/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-he/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-he/strings.xml	2015-08-23 22:30:07.115971262 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">המיקוד לא רציפה</string>
   <string name="preferences_disable_exposure_title">אין חשיפה</string>
   <string name="preferences_disable_metering_title">אין מדידה</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">אוטומטי</string>
   <string name="preferences_front_light_off">לא פעיל</string>
   <string name="preferences_front_light_on">פעיל</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-hi/strings.xml zxing-BS-4.7.3/android/res/values-hi/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-hi/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-hi/strings.xml	2015-08-23 22:29:25.289968978 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">कोई निरंतर ध्यान</string>
   <string name="preferences_disable_exposure_title">कोई जोखिम</string>
   <string name="preferences_disable_metering_title">कोई पैमाइश</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">स्वचालित</string>
   <string name="preferences_front_light_off">निष्क्रिय</string>
   <string name="preferences_front_light_on">सक्रिय</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-hu/strings.xml zxing-BS-4.7.3/android/res/values-hu/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-hu/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-hu/strings.xml	2015-08-23 22:29:35.074437381 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Nincs folyamatos fókusz</string>
   <string name="preferences_disable_exposure_title">No expozíció</string>
   <string name="preferences_disable_metering_title">No mérés</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatikus</string>
   <string name="preferences_front_light_off">Tétlen</string>
   <string name="preferences_front_light_on">Aktív</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-id/strings.xml zxing-BS-4.7.3/android/res/values-id/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-id/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-id/strings.xml	2015-08-23 22:29:45.069915899 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Jangan gunakan fokus terus menerus</string>
   <string name="preferences_disable_exposure_title">Tanpa eksposur</string>
   <string name="preferences_disable_metering_title">Tanpa pengukuran</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Otomatis</string>
   <string name="preferences_front_light_off">Non-aktif</string>
   <string name="preferences_front_light_on">Aktif</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-it/strings.xml zxing-BS-4.7.3/android/res/values-it/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-it/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-it/strings.xml	2015-08-23 22:29:55.866432771 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">No messa a fuoco continua</string>
   <string name="preferences_disable_exposure_title">Nessuna esposizione</string>
   <string name="preferences_disable_metering_title">Nessuna misurazione</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatico</string>
   <string name="preferences_front_light_off">Inattivo</string>
   <string name="preferences_front_light_on">Attivo</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-iw/strings.xml zxing-BS-4.7.3/android/res/values-iw/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-iw/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-iw/strings.xml	2015-08-23 22:30:07.115971262 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">המיקוד לא רציפה</string>
   <string name="preferences_disable_exposure_title">אין חשיפה</string>
   <string name="preferences_disable_metering_title">אין מדידה</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">אוטומטי</string>
   <string name="preferences_front_light_off">לא פעיל</string>
   <string name="preferences_front_light_on">פעיל</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-ja/strings.xml zxing-BS-4.7.3/android/res/values-ja/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-ja/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-ja/strings.xml	2015-08-23 22:30:18.651523543 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">追従フォーカスしない</string>
   <string name="preferences_disable_exposure_title">露出しない</string>
   <string name="preferences_disable_metering_title">測光しない</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">自動</string>
   <string name="preferences_front_light_off">ライトOFF</string>
   <string name="preferences_front_light_on">ライトON</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-ko/strings.xml zxing-BS-4.7.3/android/res/values-ko/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-ko/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-ko/strings.xml	2015-08-23 22:30:29.108024125 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">아무 연속 초점 없음</string>
   <string name="preferences_disable_exposure_title">더 노출하지</string>
   <string name="preferences_disable_metering_title">더 측광 없습니다</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">자동적 인</string>
   <string name="preferences_front_light_off">비활성</string>
   <string name="preferences_front_light_on">활동적인</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-nl/strings.xml zxing-BS-4.7.3/android/res/values-nl/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-nl/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-nl/strings.xml	2015-08-23 22:30:42.286655023 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Niet doorlopend scherpstellen</string>
   <string name="preferences_disable_exposure_title">Geen blootstelling</string>
   <string name="preferences_disable_metering_title">Geen metingen</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatisch</string>
   <string name="preferences_front_light_off">Inactieve</string>
   <string name="preferences_front_light_on">Actief</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-pl/strings.xml zxing-BS-4.7.3/android/res/values-pl/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-pl/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-pl/strings.xml	2015-08-23 22:30:51.438093128 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Ostrość</string>
   <string name="preferences_disable_exposure_title">Bez ekspozycji</string>
   <string name="preferences_disable_metering_title">Nr pomiaru</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatyczny</string>
   <string name="preferences_front_light_off">Nieaktywny</string>
   <string name="preferences_front_light_on">Aktywny</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-pt/strings.xml zxing-BS-4.7.3/android/res/values-pt/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-pt/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-pt/strings.xml	2015-08-23 22:31:01.274563996 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">No foco contínuo</string>
   <string name="preferences_disable_exposure_title">Nenhuma exposição</string>
   <string name="preferences_disable_metering_title">Sem medição</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automático</string>
   <string name="preferences_front_light_off">Inativo</string>
   <string name="preferences_front_light_on">Ativo</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-ro/strings.xml zxing-BS-4.7.3/android/res/values-ro/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-ro/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-ro/strings.xml	2015-08-23 22:31:10.886024099 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Dezactivează focalizarea continuă</string>
   <string name="preferences_disable_exposure_title">Nicio expunere</string>
   <string name="preferences_disable_metering_title">Nicio contorizare</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Iluminare automată</string>
   <string name="preferences_front_light_off">Oprește</string>
   <string name="preferences_front_light_on">Pornește</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-ru/strings.xml zxing-BS-4.7.3/android/res/values-ru/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-ru/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-ru/strings.xml	2015-08-23 22:31:21.317523536 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Не использовать непрерывную фокусировку</string>
   <string name="preferences_disable_exposure_title">Не использовать экспозицию</string>
   <string name="preferences_disable_metering_title">Не использовать измерение</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Автоматически</string>
   <string name="preferences_front_light_off">Выключен</string>
   <string name="preferences_front_light_on">Включен</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-sk/strings.xml zxing-BS-4.7.3/android/res/values-sk/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-sk/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-sk/strings.xml	2015-08-23 22:31:31.941032114 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Bez nepretržitého zaostrovania</string>
   <string name="preferences_disable_exposure_title">Bez expozície</string>
   <string name="preferences_disable_metering_title">Bez úpravy jasu</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatický</string>
   <string name="preferences_front_light_off">Neaktívne</string>
   <string name="preferences_front_light_on">Aktívne</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-sl/strings.xml zxing-BS-4.7.3/android/res/values-sl/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-sl/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-sl/strings.xml	2015-08-23 22:31:41.283479373 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Št stalna osredotočenost</string>
   <string name="preferences_disable_exposure_title">Nobena izpostavljenost</string>
   <string name="preferences_disable_metering_title">Št merjenje</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Samodejno</string>
   <string name="preferences_front_light_off">Neaktivno</string>
   <string name="preferences_front_light_on">Aktivna</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-sv/strings.xml zxing-BS-4.7.3/android/res/values-sv/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-sv/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-sv/strings.xml	2015-08-23 22:31:53.154047645 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Ingen kontinuerlig fokus</string>
   <string name="preferences_disable_exposure_title">Ingen exponering</string>
   <string name="preferences_disable_metering_title">Ingen mätning</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Automatisk</string>
   <string name="preferences_front_light_off">Inaktiv</string>
   <string name="preferences_front_light_on">Aktiv</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-th/strings.xml zxing-BS-4.7.3/android/res/values-th/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-th/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-th/strings.xml	2015-08-23 22:32:07.619740147 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">ไม่มีการโฟกัสอย่างต่อเนื่อง</string>
   <string name="preferences_disable_exposure_title">ไม่มีการการเปิดรับแสง</string>
   <string name="preferences_disable_metering_title">ไม่มีการวัดแสง</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">อัตโนมัติ</string>
   <string name="preferences_front_light_off">ปิด</string>
   <string name="preferences_front_light_on">เปิด</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-tr/strings.xml zxing-BS-4.7.3/android/res/values-tr/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-tr/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-tr/strings.xml	2015-08-23 22:32:20.262345388 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Hayır sürekli odak</string>
   <string name="preferences_disable_exposure_title">Maruziyet</string>
   <string name="preferences_disable_metering_title">Hiçbir ölçüm</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Otomatik</string>
   <string name="preferences_front_light_off">Atıl</string>
   <string name="preferences_front_light_on">Aktif</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-uk/strings.xml zxing-BS-4.7.3/android/res/values-uk/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-uk/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-uk/strings.xml	2015-08-23 22:32:30.095816144 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">Відклюти безперервне фокусування</string>
   <string name="preferences_disable_exposure_title">Відключити експозицію</string>
   <string name="preferences_disable_metering_title">Немає обліку</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">Автоматично</string>
   <string name="preferences_front_light_off">Вимкнено</string>
   <string name="preferences_front_light_on">Увімкнено</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-zh-rCN/strings.xml zxing-BS-4.7.3/android/res/values-zh-rCN/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-zh-rCN/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-zh-rCN/strings.xml	2015-08-23 22:32:40.227301166 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">没有持续关注</string>
   <string name="preferences_disable_exposure_title">无曝光</string>
   <string name="preferences_disable_metering_title">无计量</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">自动</string>
   <string name="preferences_front_light_off">待用</string>
   <string name="preferences_front_light_on">活跃</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-zh-rHK/strings.xml zxing-BS-4.7.3/android/res/values-zh-rHK/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-zh-rHK/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-zh-rHK/strings.xml	2015-08-23 22:27:07.401367871 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">取消連續對焦</string>
   <string name="preferences_disable_exposure_title">取消曝光</string>
   <string name="preferences_disable_metering_title">取消測光</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">自動</string>
   <string name="preferences_front_light_off">關</string>
   <string name="preferences_front_light_on">開</string>
diff -ur zxing-BS-4.7.3.orig/android/res/values-zh-rTW/strings.xml zxing-BS-4.7.3/android/res/values-zh-rTW/strings.xml
--- zxing-BS-4.7.3.orig/android/res/values-zh-rTW/strings.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/values-zh-rTW/strings.xml	2015-08-23 22:27:07.401367871 +0200
@@ -106,6 +106,7 @@
   <string name="preferences_disable_continuous_focus_title">取消連續對焦</string>
   <string name="preferences_disable_exposure_title">取消曝光</string>
   <string name="preferences_disable_metering_title">取消測光</string>
+  <string name="preferences_extract_url_title">Extract URL</string>
   <string name="preferences_front_light_auto">自動</string>
   <string name="preferences_front_light_off">關</string>
   <string name="preferences_front_light_on">開</string>
diff -ur zxing-BS-4.7.3.orig/android/res/xml/preferences.xml zxing-BS-4.7.3/android/res/xml/preferences.xml
--- zxing-BS-4.7.3.orig/android/res/xml/preferences.xml	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/res/xml/preferences.xml	2015-08-23 22:46:20.152525388 +0200
@@ -55,6 +55,10 @@
         android:defaultValue="true"
         android:title="@string/preferences_copy_to_clipboard_title"/>
     <CheckBoxPreference
+        android:key="preferences_extract_url"
+        android:defaultValue="false"
+        android:title="@string/preferences_extract_url_title"/>
+    <CheckBoxPreference
         android:key="preferences_auto_open_web"
         android:defaultValue="false"
         android:title="@string/preferences_auto_open_web_title"/>
diff -ur zxing-BS-4.7.3.orig/android/src/com/google/zxing/client/android/CaptureActivity.java zxing-BS-4.7.3/android/src/com/google/zxing/client/android/CaptureActivity.java
--- zxing-BS-4.7.3.orig/android/src/com/google/zxing/client/android/CaptureActivity.java	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/src/com/google/zxing/client/android/CaptureActivity.java	2015-08-24 08:22:45.140694205 +0200
@@ -69,6 +69,10 @@
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.net.URLEncoder;
 
 /**
  * This activity opens the camera and does the actual scanning on a background thread. It draws a
@@ -104,6 +108,7 @@
   private Result lastResult;
   private boolean hasSurface;
   private boolean copyToClipboard;
+  private boolean extractURL;
   private IntentSource source;
   private String sourceUrl;
   private ScanFromWebPageManager scanFromWebPageManager;
@@ -197,6 +202,8 @@
     copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true)
         && (intent == null || intent.getBooleanExtra(Intents.Scan.SAVE_HISTORY, true));
 
+    extractURL = prefs.getBoolean(PreferencesActivity.KEY_EXTRACT_URL, true);
+
     source = IntentSource.NONE;
     sourceUrl = null;
     scanFromWebPageManager = null;
@@ -424,6 +431,204 @@
 
   }
 
+  private String extractGS1(String data) {
+    String fields[] = data.split("\u001d");
+    if (fields == null || fields.length == 0) {
+      return null;
+    }
+    List<String> l = new ArrayList<String>();
+    for (String f : fields) {
+      while (f.length() > 0) {
+        int len = 0;
+        if (f.length() >= 2) {
+          String ai = f.substring(0, 2);
+          if (ai.equals("00")) {
+            len = 20;
+          } else if (ai.equals("20")) {
+            len = 4;
+          } else if (ai.equals("11")) {
+            len = 8;
+          } else if (ai.equals("12")) {
+            len = 8;
+          } else if (ai.equals("13")) {
+            len = 8;
+          } else if (ai.equals("14")) {
+            len = 8;
+          } else if (ai.equals("15")) {
+            len = 8;
+          } else if (ai.equals("16")) {
+            len = 8;
+          } else if (ai.equals("17")) {
+            len = 8;
+          } else if (ai.equals("18")) {
+            len = 8;
+          } else if (ai.equals("19")) {
+            len = 8;
+          } else if (ai.equals("31")) {
+            len = 10;
+          } else if (ai.equals("32")) {
+            len = 10;
+          } else if (ai.equals("33")) {
+            len = 10;
+          } else if (ai.equals("34")) {
+            len = 10;
+          } else if (ai.equals("35")) {
+            len = 10;
+          } else if (ai.equals("36")) {
+            len = 10;
+          } else if (ai.equals("01")) {
+            len = 16;
+          } else if (ai.equals("02")) {
+            len = 16;
+          } else if (ai.equals("03")) {
+            len = 16;
+          } else if (ai.equals("41")) {
+            len = 16;
+          } else if (ai.equals("04")) {
+            len = 18;
+          }
+        }
+        if (len > 0) {
+           l.add(f.substring(0, len));
+           f = f.substring(len);
+        } else {
+           l.add(f);
+           break;
+        }
+      }
+    }
+    return urlGS1(l);
+  }
+
+  private String urlGS1(List<String> l) {
+    String gtin = null;
+    String serial = null;
+    for (String f : l) {
+      int len = f.length();
+      if (len >= 2 && f.substring(0, 2).equals("01")) {
+        gtin = f.substring(2);
+      } else if (len >= 2 && f.substring(0, 2).equals("21")) {
+        serial = f.substring(2);
+      } else if (len >= 4 && f.substring(0, 4).equals("8200")) {
+        if (gtin == null) {
+            return null;
+        }
+        StringBuilder url = new StringBuilder(f.substring(4));
+        if (url.charAt(url.length() - 1) != '/') {
+           url.append("/");
+        }
+        url.append(gtin);
+        url.append("/");
+        if (serial != null) {
+            url.append(serial);
+            url.append("/");
+        }
+        return url.toString();
+      }
+    }
+    return null;
+  }
+
+  private String urlASC(String[] l) {
+    int i = 0;
+    for (String f : l) {
+      int len = f.length();
+      if (len >= 3 && f.substring(0, 3).equals("33L")) {
+        return f.substring(3);
+      } else if (len >= 3 && f.substring(0, 3).equals("34L")) {
+        String url = f.substring(3);
+        StringBuilder data = new StringBuilder();
+        if (i > 0) {
+          for (int k = 0; k < i; k++) {
+            if (k != 0) {
+              data.append('\u001d');
+            }
+            data.append(l[k]);
+          }
+        }
+        if (i + 1 < l.length) {
+          if (data.length() > 0) {
+            data.append('\u001d');
+          }
+          for (int k = i + 1; k < l.length; k++) {
+            if (k != i + 1) {
+              data.append('\u001d');
+            }
+            data.append(l[k]);
+          }
+        }
+        try {
+          return url + URLEncoder.encode(data.toString(), "UTF-8");
+        } catch (Exception e) {
+          return null;
+        }
+      }
+      i++;
+    }
+    return null;
+  }
+
+  private String extractADC(String data) {
+    if (data.charAt(0) != '[' || data.charAt(1) != ')' ||
+        data.charAt(2) != '>' || data.charAt(3) != '\u001e' ||
+        data.charAt(data.length() - 1) != '\u0004') {
+      return null;
+    }
+    data = data.substring(4, data.length() - 1);
+    while (data.length() > 0) {
+      String fmtind = data.substring(0, 2);
+      if (fmtind.equals("02") || fmtind.equals("08")) {
+        return null;
+      }
+      int rs = data.indexOf('\u001e', 2);
+      if (rs < 0) {
+        return null;
+      }
+      String fmtdata = data.substring(2, rs);
+      if (rs >= data.length() - 1) {
+        data = "";
+      } else {
+        data = data.substring(rs + 1);
+      }
+      if (fmtind.equals("05") || fmtind.equals("06")) {
+        if (fmtdata.charAt(0) != '\u001d') {
+          return null;
+        }
+        String fields[] = fmtdata.substring(1).split("\u001d");
+        String url = null;
+        if (fmtind.equals("05")) {
+          List<String> ls = Arrays.asList(fields);
+          try {
+            url = urlGS1(ls);
+          } catch (Exception e) {
+          }
+        } else {
+          try {
+            url = urlASC(fields);
+          } catch (Exception e) {
+          }
+        }
+        if (url != null) {
+          return url;
+        }
+      }
+    }
+    return null;
+  }
+
+  private String p2pDecode(BarcodeFormat fmt, String data) {
+    String result = null;
+    if (fmt == BarcodeFormat.DATA_MATRIX && data.length() > 1 &&
+        data.charAt(0) == '\u001d') {
+      try {
+         result = extractGS1(data.substring(1));
+      } catch (Exception e) {
+      }
+      return result;
+    }
+    return extractADC(data);
+  }
+
   /**
    * A valid barcode has been found, so give an indication of success and show the results.
    *
@@ -433,10 +638,18 @@
    */
   public void handleDecode(Result rawResult, Bitmap barcode, float scaleFactor) {
     inactivityTimer.onActivity();
+    boolean fromLiveScan = barcode != null;
+    if (fromLiveScan && extractURL) {
+      Result r = rawResult;
+      String url = p2pDecode(r.getBarcodeFormat(), r.getText());
+      if (url != null) {
+        rawResult = new Result(url, r.getRawBytes(), r.getResultPoints(), r.getBarcodeFormat(), r.getTimestamp());
+        rawResult.putAllMetadata(r.getResultMetadata());
+      }
+    }
     lastResult = rawResult;
     ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
 
-    boolean fromLiveScan = barcode != null;
     if (fromLiveScan) {
       historyManager.addHistoryItem(rawResult, resultHandler);
       // Then not from history, so beep/vibrate and we have an image to draw on
diff -ur zxing-BS-4.7.3.orig/android/src/com/google/zxing/client/android/PreferencesActivity.java zxing-BS-4.7.3/android/src/com/google/zxing/client/android/PreferencesActivity.java
--- zxing-BS-4.7.3.orig/android/src/com/google/zxing/client/android/PreferencesActivity.java	2015-02-15 13:48:15.000000000 +0100
+++ zxing-BS-4.7.3/android/src/com/google/zxing/client/android/PreferencesActivity.java	2015-08-23 21:44:33.333004913 +0200
@@ -54,6 +54,7 @@
   public static final String KEY_DISABLE_METERING = "preferences_disable_metering";
   public static final String KEY_DISABLE_BARCODE_SCENE_MODE = "preferences_disable_barcode_scene_mode";
   public static final String KEY_AUTO_OPEN_WEB = "preferences_auto_open_web";
+  public static final String KEY_EXTRACT_URL = "preferences_extract_url";
 
   @Override
   protected void onCreate(Bundle icicle) {
