Skip to content

Commit e192c8d

Browse files
Ginder-SinghGinder-Singh
authored
Merge pull request #45 from Windscribe/v3.82
Payment upgrade changes. added json logging.
2 parents f9f8c0c + b2b966c commit e192c8d

201 files changed

Lines changed: 8659 additions & 1431 deletions

File tree

Some content is hidden

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

‎base/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ dependencies {
112112
//Logging
113113
api 'org.slf4j:slf4j-api:1.7.36'
114114
api 'com.github.tony19:logback-android:2.0.0'
115+
implementation ('net.logstash.logback:logstash-logback-encoder:5.0') {
116+
exclude group: 'ch.qos.logback', module: 'logback-core'
117+
}
115118
//Room
116119
api "androidx.room:room-rxjava2:$room"
117120
api "androidx.room:room-runtime:$room"

‎base/schemas/com.windscribe.vpn.localdatabase.WindscribeDatabase/34.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 34,
5-
"identityHash": "3a598c80b4a2b71fa6d9d85c139ccf19",
5+
"identityHash": "5e159935e39a27894dd80222509ad820",
66
"entities": [
77
{
88
"tableName": "ping_results",
@@ -411,7 +411,7 @@
411411
},
412412
{
413413
"tableName": "StaticRegion",
414-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cityName` TEXT, `countryCode` TEXT, `deviceName` TEXT, `id` INTEGER, `ipId` INTEGER, `name` TEXT, `ovpnX509` TEXT, `serverId` INTEGER, `shortName` TEXT, `staticIp` TEXT, `type` TEXT, `wgIp` TEXT, `wgPubKey` TEXT, `pingHost` TEXT, `passwordEncoded` TEXT, `userNameEncoded` TEXT, `nodecityName` TEXT, `nodednsHostname` TEXT, `nodehostname` TEXT, `nodeip` TEXT, `nodeip2` TEXT, `nodeip3` TEXT, PRIMARY KEY(`id`))",
414+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cityName` TEXT, `countryCode` TEXT, `deviceName` TEXT, `id` INTEGER, `ipId` INTEGER, `name` TEXT, `ovpnX509` TEXT, `serverId` INTEGER, `shortName` TEXT, `staticIp` TEXT, `type` TEXT, `wgIp` TEXT, `wgPubKey` TEXT, `pingHost` TEXT, `status` INTEGER, `passwordEncoded` TEXT, `userNameEncoded` TEXT, `nodecityName` TEXT, `nodednsHostname` TEXT, `nodehostname` TEXT, `nodeip` TEXT, `nodeip2` TEXT, `nodeip3` TEXT, PRIMARY KEY(`id`))",
415415
"fields": [
416416
{
417417
"fieldPath": "cityName",
@@ -497,6 +497,12 @@
497497
"affinity": "TEXT",
498498
"notNull": false
499499
},
500+
{
501+
"fieldPath": "status",
502+
"columnName": "status",
503+
"affinity": "INTEGER",
504+
"notNull": false
505+
},
500506
{
501507
"fieldPath": "credentials.passwordEncoded",
502508
"columnName": "passwordEncoded",
@@ -739,7 +745,7 @@
739745
"views": [],
740746
"setupQueries": [
741747
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
742-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '3a598c80b4a2b71fa6d9d85c139ccf19')"
748+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5e159935e39a27894dd80222509ad820')"
743749
]
744750
}
745751
}

‎base/schemas/com.windscribe.vpn.localdatabase.WindscribeDatabase/35.json‎

Lines changed: 76 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"formatVersion": 1,
33
"database": {
44
"version": 35,
5-
"identityHash": "f84f9d3820d9fab9e07c87398d9e2596",
5+
"identityHash": "5e159935e39a27894dd80222509ad820",
66
"entities": [
77
{
88
"tableName": "ping_results",
@@ -28,10 +28,10 @@
2828
}
2929
],
3030
"primaryKey": {
31+
"autoGenerate": false,
3132
"columnNames": [
3233
"node_name"
33-
],
34-
"autoGenerate": false
34+
]
3535
},
3636
"indices": [],
3737
"foreignKeys": []
@@ -60,10 +60,10 @@
6060
}
6161
],
6262
"primaryKey": {
63+
"autoGenerate": false,
6364
"columnNames": [
6465
"user_name"
65-
],
66-
"autoGenerate": false
66+
]
6767
},
6868
"indices": [],
6969
"foreignKeys": []
@@ -86,10 +86,10 @@
8686
}
8787
],
8888
"primaryKey": {
89+
"autoGenerate": false,
8990
"columnNames": [
9091
"user_name"
91-
],
92-
"autoGenerate": false
92+
]
9393
},
9494
"indices": [],
9595
"foreignKeys": []
@@ -118,10 +118,10 @@
118118
}
119119
],
120120
"primaryKey": {
121+
"autoGenerate": false,
121122
"columnNames": [
122123
"notification_id"
123-
],
124-
"autoGenerate": false
124+
]
125125
},
126126
"indices": [],
127127
"foreignKeys": []
@@ -210,10 +210,10 @@
210210
}
211211
],
212212
"primaryKey": {
213+
"autoGenerate": true,
213214
"columnNames": [
214215
"primaryKey"
215-
],
216-
"autoGenerate": true
216+
]
217217
},
218218
"indices": [
219219
{
@@ -222,14 +222,15 @@
222222
"columnNames": [
223223
"region_id"
224224
],
225+
"orders": [],
225226
"createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Region_region_id` ON `${TABLE_NAME}` (`region_id`)"
226227
}
227228
],
228229
"foreignKeys": []
229230
},
230231
{
231232
"tableName": "City",
232-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`city_id` INTEGER NOT NULL, `nodes` TEXT, `primaryKey` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `region_id` INTEGER NOT NULL, `gps` TEXT, `nick` TEXT, `city` TEXT, `ping_ip` TEXT DEFAULT '', `pro` INTEGER NOT NULL, `wg_pubkey` TEXT, `tz` TEXT, `ovpn_x509` TEXT, `link_speed` TEXT, `health` INTEGER NOT NULL)",
233+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`city_id` INTEGER NOT NULL, `nodes` TEXT, `primaryKey` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `region_id` INTEGER NOT NULL, `gps` TEXT, `health` INTEGER NOT NULL, `link_speed` TEXT, `nick` TEXT, `city` TEXT, `ovpn_x509` TEXT, `ping_ip` TEXT DEFAULT '', `pro` INTEGER NOT NULL, `wg_pubkey` TEXT, `tz` TEXT, `ping_host` TEXT)",
233234
"fields": [
234235
{
235236
"fieldPath": "id",
@@ -261,6 +262,18 @@
261262
"affinity": "TEXT",
262263
"notNull": false
263264
},
265+
{
266+
"fieldPath": "health",
267+
"columnName": "health",
268+
"affinity": "INTEGER",
269+
"notNull": true
270+
},
271+
{
272+
"fieldPath": "linkSpeed",
273+
"columnName": "link_speed",
274+
"affinity": "TEXT",
275+
"notNull": false
276+
},
264277
{
265278
"fieldPath": "nickName",
266279
"columnName": "nick",
@@ -273,6 +286,12 @@
273286
"affinity": "TEXT",
274287
"notNull": false
275288
},
289+
{
290+
"fieldPath": "ovpnX509",
291+
"columnName": "ovpn_x509",
292+
"affinity": "TEXT",
293+
"notNull": false
294+
},
276295
{
277296
"fieldPath": "pingIp",
278297
"columnName": "ping_ip",
@@ -299,29 +318,17 @@
299318
"notNull": false
300319
},
301320
{
302-
"fieldPath": "ovpnX509",
303-
"columnName": "ovpn_x509",
321+
"fieldPath": "pingHost",
322+
"columnName": "ping_host",
304323
"affinity": "TEXT",
305324
"notNull": false
306-
},
307-
{
308-
"fieldPath": "linkSpeed",
309-
"columnName": "link_speed",
310-
"affinity": "TEXT",
311-
"notNull": false
312-
},
313-
{
314-
"fieldPath": "health",
315-
"columnName": "health",
316-
"affinity": "INTEGER",
317-
"notNull": true
318325
}
319326
],
320327
"primaryKey": {
328+
"autoGenerate": true,
321329
"columnNames": [
322330
"primaryKey"
323-
],
324-
"autoGenerate": true
331+
]
325332
},
326333
"indices": [],
327334
"foreignKeys": []
@@ -338,17 +345,17 @@
338345
}
339346
],
340347
"primaryKey": {
348+
"autoGenerate": false,
341349
"columnNames": [
342350
"favourite_id"
343-
],
344-
"autoGenerate": false
351+
]
345352
},
346353
"indices": [],
347354
"foreignKeys": []
348355
},
349356
{
350357
"tableName": "PingTime",
351-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`static` INTEGER NOT NULL, `ping_time` INTEGER NOT NULL, `ping_id` INTEGER NOT NULL, `isPro` INTEGER NOT NULL, `region_id` INTEGER NOT NULL, PRIMARY KEY(`ping_id`))",
358+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`static` INTEGER NOT NULL, `ping_time` INTEGER NOT NULL, `ping_id` INTEGER NOT NULL, `isPro` INTEGER NOT NULL, `region_id` INTEGER NOT NULL, `updated_at` INTEGER NOT NULL, `ip` TEXT, PRIMARY KEY(`ping_id`))",
352359
"fields": [
353360
{
354361
"fieldPath": "isStatic",
@@ -379,20 +386,32 @@
379386
"columnName": "region_id",
380387
"affinity": "INTEGER",
381388
"notNull": true
389+
},
390+
{
391+
"fieldPath": "updatedAt",
392+
"columnName": "updated_at",
393+
"affinity": "INTEGER",
394+
"notNull": true
395+
},
396+
{
397+
"fieldPath": "ip",
398+
"columnName": "ip",
399+
"affinity": "TEXT",
400+
"notNull": false
382401
}
383402
],
384403
"primaryKey": {
404+
"autoGenerate": false,
385405
"columnNames": [
386406
"ping_id"
387-
],
388-
"autoGenerate": false
407+
]
389408
},
390409
"indices": [],
391410
"foreignKeys": []
392411
},
393412
{
394413
"tableName": "StaticRegion",
395-
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cityName` TEXT, `countryCode` TEXT, `deviceName` TEXT, `id` INTEGER, `ipId` INTEGER, `name` TEXT, `serverId` INTEGER, `shortName` TEXT, `staticIp` TEXT, `type` TEXT, `wgIp` TEXT, `wgPubKey` TEXT, `ovpnX509` TEXT, `passwordEncoded` TEXT, `userNameEncoded` TEXT, `nodecityName` TEXT, `nodednsHostname` TEXT, `nodehostname` TEXT, `nodeip` TEXT, `nodeip2` TEXT, `nodeip3` TEXT, PRIMARY KEY(`id`))",
414+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`cityName` TEXT, `countryCode` TEXT, `deviceName` TEXT, `id` INTEGER, `ipId` INTEGER, `name` TEXT, `ovpnX509` TEXT, `serverId` INTEGER, `shortName` TEXT, `staticIp` TEXT, `type` TEXT, `wgIp` TEXT, `wgPubKey` TEXT, `pingHost` TEXT, `status` INTEGER, `passwordEncoded` TEXT, `userNameEncoded` TEXT, `nodecityName` TEXT, `nodednsHostname` TEXT, `nodehostname` TEXT, `nodeip` TEXT, `nodeip2` TEXT, `nodeip3` TEXT, PRIMARY KEY(`id`))",
396415
"fields": [
397416
{
398417
"fieldPath": "cityName",
@@ -430,6 +449,12 @@
430449
"affinity": "TEXT",
431450
"notNull": false
432451
},
452+
{
453+
"fieldPath": "ovpnX509",
454+
"columnName": "ovpnX509",
455+
"affinity": "TEXT",
456+
"notNull": false
457+
},
433458
{
434459
"fieldPath": "serverId",
435460
"columnName": "serverId",
@@ -467,11 +492,17 @@
467492
"notNull": false
468493
},
469494
{
470-
"fieldPath": "ovpnX509",
471-
"columnName": "ovpnX509",
495+
"fieldPath": "pingHost",
496+
"columnName": "pingHost",
472497
"affinity": "TEXT",
473498
"notNull": false
474499
},
500+
{
501+
"fieldPath": "status",
502+
"columnName": "status",
503+
"affinity": "INTEGER",
504+
"notNull": false
505+
},
475506
{
476507
"fieldPath": "credentials.passwordEncoded",
477508
"columnName": "passwordEncoded",
@@ -522,10 +553,10 @@
522553
}
523554
],
524555
"primaryKey": {
556+
"autoGenerate": false,
525557
"columnNames": [
526558
"id"
527-
],
528-
"autoGenerate": false
559+
]
529560
},
530561
"indices": [],
531562
"foreignKeys": []
@@ -566,10 +597,10 @@
566597
}
567598
],
568599
"primaryKey": {
600+
"autoGenerate": false,
569601
"columnNames": [
570602
"networkName"
571-
],
572-
"autoGenerate": false
603+
]
573604
},
574605
"indices": [],
575606
"foreignKeys": []
@@ -616,10 +647,10 @@
616647
}
617648
],
618649
"primaryKey": {
650+
"autoGenerate": false,
619651
"columnNames": [
620652
"primary_key"
621-
],
622-
"autoGenerate": false
653+
]
623654
},
624655
"indices": [],
625656
"foreignKeys": []
@@ -702,10 +733,10 @@
702733
}
703734
],
704735
"primaryKey": {
736+
"autoGenerate": false,
705737
"columnNames": [
706738
"id"
707-
],
708-
"autoGenerate": false
739+
]
709740
},
710741
"indices": [],
711742
"foreignKeys": []
@@ -714,7 +745,7 @@
714745
"views": [],
715746
"setupQueries": [
716747
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
717-
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f84f9d3820d9fab9e07c87398d9e2596')"
748+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '5e159935e39a27894dd80222509ad820')"
718749
]
719750
}
720751
}

‎base/src/google/java/com.windscribe.vpn/billing/AmazonBillingManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class AmazonBillingManager implements PurchasingListener, LifecycleObserv
5151

5252
private final Application app;
5353

54-
private final Logger logger = LoggerFactory.getLogger("Amazon:Billing_m");
54+
private final Logger logger = LoggerFactory.getLogger("billing");
5555

5656
public AmazonBillingManager(Application app) {
5757
this.app = app;

‎base/src/google/java/com.windscribe.vpn/billing/GoogleBillingManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class GoogleBillingManager implements PurchasesUpdatedListener, Lifecycle
5858

5959
private final Application app;
6060

61-
private final Logger logger = LoggerFactory.getLogger("Billing manager");
61+
private final Logger logger = LoggerFactory.getLogger("billing");
6262

6363
// private BillingManagerResponseListener mListener;
6464
private BillingClient mBillingClient;

0 commit comments

Comments
 (0)