Skip to content

Commit 1b8e5bf

Browse files
subsymbolicsubsymbolic
committed
Merge branch 'release/5.1.0'
2 parents d70a362 + 8c7abbf commit 1b8e5bf

File tree

99 files changed

+1893
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1893
-492
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DuckDuckGo Android
22

3-
Welcome to our new android prototype. While it is still too early to accept contributions, we are excited to engage the community in development and will open up this project to contributions in the future.
3+
Welcome to our android application. While it is still too early to accept contributions, we are excited to engage the community in development and will open up this project to contributions in the future.
44

55
If you are trying to contribute in other ways, that happens over at [DuckDuckHack](http://duckduckhack.com) or on [GitHub](http://github.com/duckduckgo).
66

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
66
apply from: '../versioning.gradle'
77

88
ext {
9-
VERSION_NAME = "5.0.2"
9+
VERSION_NAME = "5.1.0"
1010
USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
1111
}
1212

@@ -79,7 +79,7 @@ android {
7979
ext {
8080
supportLibrary = "27.1.0"
8181
architectureComponents = "1.0.0"
82-
architectureComponentsExtensions = "1.1.0"
82+
architectureComponentsExtensions = "1.1.1"
8383
dagger = "2.14.1"
8484
retrofit = "2.3.0"
8585
ankoVersion = "0.10.4"

‎app/lint.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<lint>
33
<issue id="IconColors">
44
<ignore path="src/main/res/drawable*/privacygrade_icon_*" />
5-
<ignore path="src/main/res/drawable*/icon_fire*" />
65
</issue>
76
<issue id="IconExpectedSize">
87
<ignore path="src/main/res/drawable-*/privacygrade_icon_*" />

‎app/schemas/com.duckduckgo.app.global.db.AppDatabase/3.json‎

Lines changed: 264 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 3,
5+
"identityHash": "51d38b4978b0d42571d5f065292cff42",
6+
"entities": [
7+
{
8+
"tableName": "https_upgrade_domain",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`domain` TEXT NOT NULL, PRIMARY KEY(`domain`))",
10+
"fields": [
11+
{
12+
"fieldPath": "domain",
13+
"columnName": "domain",
14+
"affinity": "TEXT",
15+
"notNull": true
16+
}
17+
],
18+
"primaryKey": {
19+
"columnNames": [
20+
"domain"
21+
],
22+
"autoGenerate": false
23+
},
24+
"indices": [],
25+
"foreignKeys": []
26+
},
27+
{
28+
"tableName": "disconnect_tracker",
29+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`url` TEXT NOT NULL, `category` TEXT NOT NULL, `networkName` TEXT NOT NULL, `networkUrl` TEXT NOT NULL, PRIMARY KEY(`url`))",
30+
"fields": [
31+
{
32+
"fieldPath": "url",
33+
"columnName": "url",
34+
"affinity": "TEXT",
35+
"notNull": true
36+
},
37+
{
38+
"fieldPath": "category",
39+
"columnName": "category",
40+
"affinity": "TEXT",
41+
"notNull": true
42+
},
43+
{
44+
"fieldPath": "networkName",
45+
"columnName": "networkName",
46+
"affinity": "TEXT",
47+
"notNull": true
48+
},
49+
{
50+
"fieldPath": "networkUrl",
51+
"columnName": "networkUrl",
52+
"affinity": "TEXT",
53+
"notNull": true
54+
}
55+
],
56+
"primaryKey": {
57+
"columnNames": [
58+
"url"
59+
],
60+
"autoGenerate": false
61+
},
62+
"indices": [],
63+
"foreignKeys": []
64+
},
65+
{
66+
"tableName": "network_leaderboard",
67+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`networkName` TEXT NOT NULL, `domainVisited` TEXT NOT NULL, PRIMARY KEY(`networkName`, `domainVisited`))",
68+
"fields": [
69+
{
70+
"fieldPath": "networkName",
71+
"columnName": "networkName",
72+
"affinity": "TEXT",
73+
"notNull": true
74+
},
75+
{
76+
"fieldPath": "domainVisited",
77+
"columnName": "domainVisited",
78+
"affinity": "TEXT",
79+
"notNull": true
80+
}
81+
],
82+
"primaryKey": {
83+
"columnNames": [
84+
"networkName",
85+
"domainVisited"
86+
],
87+
"autoGenerate": false
88+
},
89+
"indices": [],
90+
"foreignKeys": []
91+
},
92+
{
93+
"tableName": "site_visited",
94+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`domain` TEXT NOT NULL, PRIMARY KEY(`domain`))",
95+
"fields": [
96+
{
97+
"fieldPath": "domain",
98+
"columnName": "domain",
99+
"affinity": "TEXT",
100+
"notNull": true
101+
}
102+
],
103+
"primaryKey": {
104+
"columnNames": [
105+
"domain"
106+
],
107+
"autoGenerate": false
108+
},
109+
"indices": [],
110+
"foreignKeys": []
111+
},
112+
{
113+
"tableName": "app_configuration",
114+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `appConfigurationDownloaded` INTEGER NOT NULL, PRIMARY KEY(`key`))",
115+
"fields": [
116+
{
117+
"fieldPath": "key",
118+
"columnName": "key",
119+
"affinity": "TEXT",
120+
"notNull": true
121+
},
122+
{
123+
"fieldPath": "appConfigurationDownloaded",
124+
"columnName": "appConfigurationDownloaded",
125+
"affinity": "INTEGER",
126+
"notNull": true
127+
}
128+
],
129+
"primaryKey": {
130+
"columnNames": [
131+
"key"
132+
],
133+
"autoGenerate": false
134+
},
135+
"indices": [],
136+
"foreignKeys": []
137+
},
138+
{
139+
"tableName": "tabs",
140+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`tabId` TEXT NOT NULL, `url` TEXT, `title` TEXT, PRIMARY KEY(`tabId`))",
141+
"fields": [
142+
{
143+
"fieldPath": "tabId",
144+
"columnName": "tabId",
145+
"affinity": "TEXT",
146+
"notNull": true
147+
},
148+
{
149+
"fieldPath": "url",
150+
"columnName": "url",
151+
"affinity": "TEXT",
152+
"notNull": false
153+
},
154+
{
155+
"fieldPath": "title",
156+
"columnName": "title",
157+
"affinity": "TEXT",
158+
"notNull": false
159+
}
160+
],
161+
"primaryKey": {
162+
"columnNames": [
163+
"tabId"
164+
],
165+
"autoGenerate": false
166+
},
167+
"indices": [
168+
{
169+
"name": "index_tabs_tabId",
170+
"unique": false,
171+
"columnNames": [
172+
"tabId"
173+
],
174+
"createSql": "CREATE INDEX `index_tabs_tabId` ON `${TABLE_NAME}` (`tabId`)"
175+
}
176+
],
177+
"foreignKeys": []
178+
},
179+
{
180+
"tableName": "tab_selection",
181+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `tabId` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`tabId`) REFERENCES `tabs`(`tabId`) ON UPDATE NO ACTION ON DELETE SET NULL )",
182+
"fields": [
183+
{
184+
"fieldPath": "id",
185+
"columnName": "id",
186+
"affinity": "INTEGER",
187+
"notNull": true
188+
},
189+
{
190+
"fieldPath": "tabId",
191+
"columnName": "tabId",
192+
"affinity": "TEXT",
193+
"notNull": false
194+
}
195+
],
196+
"primaryKey": {
197+
"columnNames": [
198+
"id"
199+
],
200+
"autoGenerate": false
201+
},
202+
"indices": [
203+
{
204+
"name": "index_tab_selection_tabId",
205+
"unique": false,
206+
"columnNames": [
207+
"tabId"
208+
],
209+
"createSql": "CREATE INDEX `index_tab_selection_tabId` ON `${TABLE_NAME}` (`tabId`)"
210+
}
211+
],
212+
"foreignKeys": [
213+
{
214+
"table": "tabs",
215+
"onDelete": "SET NULL",
216+
"onUpdate": "NO ACTION",
217+
"columns": [
218+
"tabId"
219+
],
220+
"referencedColumns": [
221+
"tabId"
222+
]
223+
}
224+
]
225+
},
226+
{
227+
"tableName": "bookmarks",
228+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT, `url` TEXT NOT NULL)",
229+
"fields": [
230+
{
231+
"fieldPath": "id",
232+
"columnName": "id",
233+
"affinity": "INTEGER",
234+
"notNull": true
235+
},
236+
{
237+
"fieldPath": "title",
238+
"columnName": "title",
239+
"affinity": "TEXT",
240+
"notNull": false
241+
},
242+
{
243+
"fieldPath": "url",
244+
"columnName": "url",
245+
"affinity": "TEXT",
246+
"notNull": true
247+
}
248+
],
249+
"primaryKey": {
250+
"columnNames": [
251+
"id"
252+
],
253+
"autoGenerate": true
254+
},
255+
"indices": [],
256+
"foreignKeys": []
257+
}
258+
],
259+
"setupQueries": [
260+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
261+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"51d38b4978b0d42571d5f065292cff42\")"
262+
]
263+
}
264+
}

0 commit comments

Comments
 (0)