Skip to content

Commit 69926fe

Browse files
subsymbolicsubsymbolic
committed
Merge branch 'release/0.9.0'
2 parents 914d427 + 6474d78 commit 69926fe

File tree

313 files changed

+3216
-498
lines changed

Some content is hidden

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

313 files changed

+3216
-498
lines changed

‎app/build.gradle‎

Lines changed: 22 additions & 10 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 = "0.8.0"
9+
VERSION_NAME = "0.9.0"
1010
}
1111

1212
android {
@@ -20,6 +20,12 @@ android {
2020
versionName VERSION_NAME
2121
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2222
archivesBaseName = "duckduckgo-$versionName"
23+
24+
javaCompileOptions {
25+
annotationProcessorOptions {
26+
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
27+
}
28+
}
2329
}
2430
signingConfigs {
2531
release
@@ -79,7 +85,7 @@ android {
7985
ext {
8086
supportLibrary = "27.0.2"
8187
architectureComponents = "1.0.0"
82-
dagger = "2.13"
88+
dagger = "2.14.1"
8389
retrofit = "2.3.0"
8490
}
8591

@@ -94,29 +100,35 @@ dependencies {
94100
implementation "com.squareup.retrofit2:retrofit:$retrofit"
95101
implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
96102
implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
97-
implementation "io.reactivex.rxjava2:rxjava:2.1.7"
103+
implementation "io.reactivex.rxjava2:rxjava:2.1.8"
98104
implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
99105
implementation "com.jakewharton.timber:timber:4.6.0"
100-
implementation "android.arch.lifecycle:extensions:$architectureComponents"
101-
implementation "android.arch.lifecycle:reactivestreams:$architectureComponents"
102-
implementation "android.arch.persistence.room:runtime:$architectureComponents"
103106
implementation "com.google.dagger:dagger-android:$dagger"
104107
implementation "com.google.dagger:dagger-android-support:$dagger"
105108
releaseImplementation 'com.faendir:acra:4.10.0'
106109

110+
// ViewModel and LiveData
111+
implementation "android.arch.lifecycle:extensions:$architectureComponents"
112+
kapt "android.arch.lifecycle:compiler:$architectureComponents"
113+
testImplementation "android.arch.core:core-testing:$architectureComponents"
114+
androidTestImplementation "android.arch.core:core-testing:$architectureComponents"
115+
116+
// Room
117+
implementation "android.arch.persistence.room:runtime:$architectureComponents"
118+
kapt "android.arch.persistence.room:compiler:$architectureComponents"
119+
testImplementation "android.arch.persistence.room:testing:$architectureComponents"
120+
121+
// Dagger
107122
kapt "com.google.dagger:dagger-android-processor:$dagger"
108123
kapt "com.google.dagger:dagger-compiler:$dagger"
109-
kapt "android.arch.persistence.room:compiler:$architectureComponents"
110124

111125
testImplementation "org.mockito:mockito-core:2.13.0"
112126
testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
113127
testImplementation "junit:junit:4.12"
114-
testImplementation "android.arch.core:core-testing:$architectureComponents"
115-
testImplementation "android.arch.persistence.room:testing:$architectureComponents"
116128

117129
androidTestImplementation "com.android.support.test:runner:1.0.1"
118130
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
119131
androidTestImplementation "org.mockito:mockito-android:2.13.0"
120132
androidTestImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
121-
androidTestImplementation "android.arch.core:core-testing:$architectureComponents"
133+
122134
}

‎app/lint.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<lint>
33
<issue id="IconColors">
44
<ignore path="src/main/res/drawable*/privacygrade_icon_*" />
5+
<ignore path="src/main/res/drawable*/icon_fire*" />
56
</issue>
67
<issue id="IconExpectedSize">
78
<ignore path="src/main/res/drawable-*/privacygrade_icon_*" />
89
</issue>
910
<issue id="UnusedResources">
1011
<ignore path="src/main/res/drawable-*/network_pill_*" />
12+
<ignore path="src/main/res/drawable-*/network_logo_*" />
1113
</issue>
1214
</lint>

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

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 2,
5+
"identityHash": "e91e82a2b5c652807026be5f72a6c56e",
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+
"setupQueries": [
67+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
68+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"e91e82a2b5c652807026be5f72a6c56e\")"
69+
]
70+
}
71+
}

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 3,
5+
"identityHash": "edcb0f51325e54c85c931334898d7916",
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+
"setupQueries": [
94+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
95+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"edcb0f51325e54c85c931334898d7916\")"
96+
]
97+
}
98+
}

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

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 4,
5+
"identityHash": "df2202389ba5b11018b57a417457b11b",
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": "app_configuration",
94+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `appConfigurationDownloaded` INTEGER NOT NULL, PRIMARY KEY(`key`))",
95+
"fields": [
96+
{
97+
"fieldPath": "key",
98+
"columnName": "key",
99+
"affinity": "TEXT",
100+
"notNull": true
101+
},
102+
{
103+
"fieldPath": "appConfigurationDownloaded",
104+
"columnName": "appConfigurationDownloaded",
105+
"affinity": "INTEGER",
106+
"notNull": true
107+
}
108+
],
109+
"primaryKey": {
110+
"columnNames": [
111+
"key"
112+
],
113+
"autoGenerate": false
114+
},
115+
"indices": [],
116+
"foreignKeys": []
117+
}
118+
],
119+
"setupQueries": [
120+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
121+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"df2202389ba5b11018b57a417457b11b\")"
122+
]
123+
}
124+
}

0 commit comments

Comments
 (0)