Merged in develop (pull request #15)

Develop

Author: AlexKorvin

.github/CONTRIBUTING.md

@@ -32,4 +32,31 @@ Follow these steps when you want to submit a pull request:
 
 1. Go over installation guides in the [README](/README.md#installation)
 2. Follow all instructions in the [PR template](/.github/PULL_REQUEST_TEMPLATE.md)
-3. Update the [README](/README.md) file with details of changes if applicable
+3. Update the [README](/README.md) file with details of changes if applicable
+
+<a name="git"></a>
+## Git Workflow
+
+This project is using [Gitflow Workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow).
+
+### Branch naming guidelines
+
+Naming for branches is made with following structure:
+
+```
+<type>/<issue ID>-<short-summary-or-description>
+```
+
+In case when there is no issue:
+
+```
+<type>/<short-summary-or-description>
+```
+
+Where <type> can be `epic`, `feature`, `task`, `bugfix`, `hotfix` or `release`.
+
+### Branches
+
+`master` - The production branch. Clone or fork this repository for the latest copy.
+`develop` - The active development branch. Pull requests should be directed to this branch.
+`<feature branch>` - The feature of fix branch. Pull requests should be made from this branch into `develop` brach.

.github/PULL_REQUEST_TEMPLATE.md

@@ -17,6 +17,7 @@ Please check if your PR fulfills the following requirements:
 
 - [ ] I have read the CONTRIBUTING.md doc
 - [ ] I have added necessary documentation (if appropriate)
+- [ ] The Git workflow follows our guidelines: CONTRIBUTING.md#git
 
 ## What is the current behavior?
 

.gitignore

@@ -9,4 +9,6 @@
 /captures
 .externalNativeBuild
 keystore.properties
-/keystore.properties
+/keystore.properties
+/app/storeProduction
+/app/siteProduction

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+##Version 1.65 - 2020-02-27
+
+[NEW] Option to enable/disable sending crash reports
+[IMPROVED] Migrated Android SDK to androidx
+[IMPROVED] Logic for start on boot. Feature is now disabled for Android 10, due to OS restrictions. Please use Always-on VPN
+[IMPROVED] Logic of all services for Android 10
+[IMPROVED] WireGuard library was upgraded to the latest version
+[IMPROVED] Subscription logic for edge cases
+[IMPROVED] Overall stability
+[FIXED] Network protection for some cases
+[FIXED] Always-on VPN for Android 10
+[FIXED] Logic for sending crashes for Android 10
+[FIXED] UI issues for devices with small screen
+
 ##Version 1.64 - 2020-01-20
 
 [IMPROVED] Overall stability

app/build.gradle

@@ -3,7 +3,11 @@ apply plugin: 'io.sentry.android.gradle'
 apply plugin: 'kotlin-android'
 
 def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(rootProject.file("keystore.properties")))
+if (new File("keystore.properties").exists()) {
+    keystoreProperties.load(new FileInputStream(rootProject.file("keystore.properties")))
+} else {
+    keystoreProperties.load(new FileInputStream(rootProject.file("fakekeystore.properties")))
+}
 
 android {
     signingConfigs {
@@ -101,12 +105,12 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
 
-    implementation "com.android.support:appcompat-v7:$supportLibsVersion"
-    implementation "com.android.support:support-annotations:$supportLibsVersion"
-    implementation "com.android.support:support-v4:$supportLibsVersion"
-    implementation "com.android.support:design:$supportLibsVersion"
-    implementation "com.android.support:cardview-v7:$supportLibsVersion"
-    implementation "com.android.support:preference-v14:$supportLibsVersion"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
 
     //Used to support stream API from JAVA8 and JAVA9
     implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
@@ -117,8 +121,9 @@ dependencies {
 
     //For crash logging
     implementation 'io.sentry:sentry-android-core:2.0.+'
+
     //Powerful library for logging
-    implementation 'org.slf4j:slf4j-api:1.7.0'
+    implementation 'org.slf4j:slf4j-api:1.7.24'
     implementation 'org.slf4j:jul-to-slf4j:1.7.0'
     implementation 'com.github.tony19:logback-android:2.0.0'
 

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
     <application
         android:name=".IVPNApplication"
         android:allowBackup="false"
-        android:debuggable="true"
+        android:debuggable="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
@@ -183,7 +183,7 @@
         </receiver>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="net.ivpn.client"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/java/com/todtenkopf/mvvm/Command.java

@@ -1,7 +1,7 @@
 package com.todtenkopf.mvvm;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 public abstract class Command extends BaseObservable
 {

app/src/main/java/com/todtenkopf/mvvm/MenuCommandBindings.java

@@ -1,6 +1,6 @@
 package com.todtenkopf.mvvm;
 
-import android.databinding.Observable;
+import androidx.databinding.Observable;
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/com/todtenkopf/mvvm/ViewModelActivity.java

@@ -1,9 +1,9 @@
 package com.todtenkopf.mvvm;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 

app/src/main/java/com/wireguard/android/backend/GoBackend.java

@@ -11,7 +11,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.wireguard.android.config.Config;
 import com.wireguard.android.config.InetNetwork;