Merge branch 'gp_branch'

tordnscrypt/build.gradle

@@ -7,23 +7,10 @@ android {
     flavorDimensions "version", "processor"
 
     productFlavors {
-        lite {
-            applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "3.0.1"
-            dimension = 'version'
-            resValue 'string', 'package_name', applicationId
-        }
-
-        pro {
-            applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "3.0.1"
-            dimension = 'version'
-            resValue 'string', 'package_name', applicationId
-        }
 
-        beta{
+        fdroid{
             applicationId "pan.alexander.tordnscrypt"
-            versionName "0.6.1"
+            versionName "0.6.2"
             dimension = 'version'
             resValue 'string', 'package_name', applicationId
         }
@@ -53,7 +40,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 61
+        versionCode 62
 
         resConfigs "en", "ru-rRU" , "ru-rUA", "pl"
 
@@ -131,7 +118,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.0-alpha04'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     //noinspection GradleDynamicVersion

tordnscrypt/owner.gradle

@@ -29,28 +29,38 @@ android {
     productFlavors {
         lite {
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "3.0.1"
+            versionName "4.0.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
         }
 
         pro {
             applicationId "pan.alexander.tordnscrypt.stable"
-            versionName "3.0.1"
+            versionName "4.0.0"
             dimension = 'version'
             signingConfig signingConfigs.stablesign
             resValue 'string', 'package_name', applicationId
         }
 
         beta {
             applicationId "pan.alexander.tordnscrypt"
-            versionName "0.6.1"
+            versionName "0.6.2"
             dimension = 'version'
             signingConfig signingConfigs.betasign
             resValue 'string', 'package_name', applicationId
         }
 
+        google_play {
+            minSdkVersion 22
+            applicationId "pan.alexander.tordnscrypt.gp"
+            versionName "4.0.0"
+            dimension = 'version'
+            signingConfig signingConfigs.stablesign
+            resValue 'string', 'package_name', applicationId
+            resValue 'string', 'gp_property', keystoreProperties['gpPublicKey']
+        }
+
         armv7a {
             dimension = 'processor'
             resValue 'string', 'appProcVersion', 'armv7a'
@@ -76,7 +86,7 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 61
+        versionCode 62
 
         resConfigs "en", "ru-rRU", "ru-rUA", "pl"
 
@@ -155,7 +165,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.0-alpha04'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    testImplementation 'junit:junit:4.12'
+    google_playImplementation 'com.android.billingclient:billing:2.1.0'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     //noinspection GradleDynamicVersion

tordnscrypt/proguard-rules.pro

@@ -22,4 +22,5 @@
 
 -keep public class pan.alexander.tordnscrypt.vpn.** {
   public *;
-}
+}
+-keep class com.android.vending.billing.**

tordnscrypt/src/beta/java/pan/alexander/tordnscrypt/assistance/AccelerateDevelop.java

@@ -0,0 +1,37 @@
+package pan.alexander.tordnscrypt.assistance;
+
+/*
+    This file is part of InviZible Pro.
+
+    InviZible Pro is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    InviZible Pro is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with InviZible Pro.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 by Garmatin Oleksandr [email protected]
+*/
+
+import pan.alexander.tordnscrypt.MainActivity;
+
+public class AccelerateDevelop {
+    public final static String mSkuId = "";
+
+    public static boolean accelerated = true;
+
+    public AccelerateDevelop(MainActivity activity) {
+    }
+
+    public void initBilling() {
+    }
+
+    public void launchBilling(String skuId) {
+    }
+}

tordnscrypt/src/fdroid/java/pan/alexander/tordnscrypt/assistance/AccelerateDevelop.java

@@ -0,0 +1,37 @@
+package pan.alexander.tordnscrypt.assistance;
+
+/*
+    This file is part of InviZible Pro.
+
+    InviZible Pro is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    InviZible Pro is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with InviZible Pro.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2019-2020 by Garmatin Oleksandr [email protected]
+*/
+
+import pan.alexander.tordnscrypt.MainActivity;
+
+public class AccelerateDevelop {
+    public final static String mSkuId = "";
+
+    public static boolean accelerated = true;
+
+    public AccelerateDevelop(MainActivity activity) {
+    }
+
+    public void initBilling() {
+    }
+
+    public void launchBilling(String skuId) {
+    }
+}

tordnscrypt/src/fdroid/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

tordnscrypt/src/fdroid/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

tordnscrypt/src/fdroid/res/values/encoded.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="encoded" translatable="false">cGFuLmFsZXhhbmRlci50b3JkbnNjcnlwdC5hY3Rpb24uVE9QX0JST0FEQ0FTVA==</string>
+    <string name="appVersion" translatable="false">fd</string>
+    <string name="main_activity_label" translatable="false">InviZible Pro</string>
+</resources>

tordnscrypt/src/fdroid/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#64B5F6</color>
+</resources>

tordnscrypt/src/google_play/AndroidManifest.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="pan.alexander.tordnscrypt"
+    android:installLocation="internalOnly"
+    android:targetSandboxVersion="1"
+    tools:targetApi="o">
+
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"
+        tools:node="remove"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission
+        android:name="android.permission.WRITE_SETTINGS"
+        tools:node="remove"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission
+        android:name="android.permission.MANAGE_USERS"
+        tools:node="remove"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission
+        android:name="android.permission.INTERACT_ACROSS_USERS"
+        tools:node="remove"
+        tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
+
+    <application
+        android:allowBackup="true"
+        android:hardwareAccelerated="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme"
+        android:banner="@drawable/banner_tv"
+        android:extractNativeLibs="true"
+        android:requestLegacyExternalStorage="true"
+        tools:ignore="AllowBackup"
+        tools:targetApi="q">
+
+        <service
+            android:name=".utils.AppExitDetectService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name=".update.UpdateService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <activity android:name=".help.HelpActivity" />
+
+        <service
+            android:name=".utils.RootExecService"
+            android:enabled="true"
+            android:exported="false" />
+        <service
+            android:name=".modules.ModulesService"
+            android:enabled="true"
+            android:exported="false"/>
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/main_activity_label"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="www.invizible.net"
+                    android:scheme="https" />
+                <data
+                    android:host="invizible.net"
+                    android:scheme="http" />
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name=".BootCompleteReceiver"
+            android:enabled="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="android.intent.action.REBOOT" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".backup.BackupActivity"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:theme="@style/AppTheme" />
+        <activity android:name=".AboutActivity" />
+
+        <service
+            android:name=".utils.GetIPsJobService"
+            android:enabled="true"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name=".vpn.service.ServiceVPN"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_VPN_SERVICE">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
+    </application>
+
+</manifest>