Skip to content

Commit 0219513

Browse files
Fr4gorSoftwareFr4gorSoftware
authored
Merge pull request #75 from Fr4gorSoftware/add-Startpage-search-engine
Add startpage search engine
2 parents 5b0f754 + 44fcec4 commit 0219513

File tree

9 files changed

+23
-8
lines changed

9 files changed

+23
-8
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The QR-Code Scanner/Generator that cares about your privacy, based on [XZing Lib
2424

2525
## Translators
2626
- Portuguese (last change: 1.1.9): [Andre-Gloria](https://github.com/Andre-Gloria)
27-
- German (last change: 1.1.9): [Thore Dankworth](https://github.com/Fr4gorSoftware)
27+
- German (last change: 1.2.0): [Thore Dankworth](https://github.com/Fr4gorSoftware)
2828
- Chinese (last change: 1.1.9): [linsui](https://github.com/linsui)
2929
- Italian (last change: 1.1.8): [abonte](https://github.com/abonte)
3030
- Russian (last change: 1.1.8): [Vladimir Kosolapov](https://github.com/0x264f)
@@ -34,6 +34,8 @@ The QR-Code Scanner/Generator that cares about your privacy, based on [XZing Lib
3434
## Donating
3535
[PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A98V4N7DX232C)
3636

37+
[Bitcoin](https://www.blockchain.com/btc/address/1NppzAZ7nLDXwvYK7vgJJUZBbkzHS6S6zX)
38+
3739
## Designer
3840
Logo: [s-yous](https://github.com/s-yous)
3941

‎app/app.iml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9493
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -99,7 +98,6 @@
9998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
10099
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
101100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
103101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
104102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
105103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "de.t_dankworth.secscanqr"
88
minSdkVersion 17
99
targetSdkVersion 23
10-
versionCode 12
11-
versionName "1.1.9"
10+
versionCode 13
11+
versionName "1.2.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
vectorDrawables.useSupportLibrary = true
1414
}

‎app/src/main/java/de/t_dankworth/secscanqr/util/ButtonHandler.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,12 @@ public static void openInWeb(String qrcode, Activity activity){
109109
tempUrl = "https://lite.qwant.com/?q=";
110110
break;
111111
case "6":
112-
tempUrl = "https://search.yahoo.com/search?p=";
112+
tempUrl = "https://www.startpage.com/do/dsearch?query=";
113113
break;
114114
case "7":
115+
tempUrl = "https://search.yahoo.com/search?p=";
116+
break;
117+
case "8":
115118
tempUrl = "https://www.yandex.ru/search/?text=";
116119
break;
117120
default:
@@ -162,9 +165,12 @@ public static void openInWeb(String qrcode, String format, Activity activity){
162165
tempUrl = "https://lite.qwant.com/?q=";
163166
break;
164167
case "6":
165-
tempUrl = "https://search.yahoo.com/search?p=";
168+
tempUrl = "https://www.startpage.com/do/dsearch?query=";
166169
break;
167170
case "7":
171+
tempUrl = "https://search.yahoo.com/search?p=";
172+
break;
173+
case "8":
168174
tempUrl = "https://www.yandex.ru/search/?text=";
169175
break;
170176
default:
@@ -190,9 +196,12 @@ public static void openInWeb(String qrcode, String format, Activity activity){
190196
tempUrl = "https://lite.qwant.com/?q=";
191197
break;
192198
case "6":
193-
tempUrl = "https://search.yahoo.com/search?p=";
199+
tempUrl = "https://www.startpage.com/do/dsearch?query=";
194200
break;
195201
case "7":
202+
tempUrl = "https://search.yahoo.com/search?p=";
203+
break;
204+
case "8":
196205
tempUrl = "https://www.yandex.ru/search/?text=";
197206
break;
198207
default:

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
<item>Google</item>
137137
<item>Qwant</item>
138138
<item>Qwant Lite</item>
139+
<item>Startpage</item>
139140
<item>Yahoo</item>
140141
<item>Yandex (RUS)</item>
141142
</string-array>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<item>Google</item>
141141
<item>Qwant</item>
142142
<item>Qwant Lite</item>
143+
<item>Startpage</item>
143144
<item>Yahoo</item>
144145
<item>Yandex</item>
145146
</string-array>

‎app/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
<item>Google</item>
142142
<item>Qwant</item>
143143
<item>Qwant Lite</item>
144+
<item>Startpage</item>
144145
<item>Yahoo</item>
145146
<item>Yandex (俄)</item>
146147
</string-array>

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
<item>Google</item>
192192
<item>Qwant</item>
193193
<item>Qwant Lite</item>
194+
<item>Startpage</item>
194195
<item>Yahoo</item>
195196
<item>Yandex (RUS)</item>
196197
</string-array>
@@ -202,6 +203,7 @@
202203
<item>5</item>
203204
<item>6</item>
204205
<item>7</item>
206+
<item>8</item>
205207
</string-array>
206208

207209
<string name="pref_title_barcode_search_enigne">Barcode Search Engine</string>

‎app/src/main/res/xml/pref_search_engine.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
33

44
<ListPreference
5+
android:defaultValue="3"
56
android:entries="@array/pref_search_engine_entries"
67
android:entryValues="@array/pref_search_engine_values"
78
android:key="pref_search_engine"

0 commit comments

Comments
 (0)