Merge branch 'master' into fullscreen

README.md

@@ -8,6 +8,9 @@ Features:
 * Install and uninstall like a regular app.
 * No root required.
 
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on F-Droid"
+    height="80">](https://f-droid.org/packages/tech.ula)
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
      alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=tech.ula)

app/build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'jacoco'
 apply plugin: 'de.undercouch.download'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 29
 
     defaultConfig {
         // Version code is generated as time since June 1, 2019. These allows for constantly
@@ -22,9 +22,9 @@ android {
 
         applicationId "tech.ula"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 29
         versionCode vcode
-        versionName "2.8.3"
+        versionName "2.8.2"
         
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -205,7 +205,7 @@ ext.architectures = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]
 ext.libDir = "$project.projectDir/src/main/jniLibs"
 
 task downloadAssets(type: Download) {
-    def assetVersion = "v1.2.7"
+    def assetVersion = "v1.2.6"
     def baseUrl = "https://github.com/CypherpunkArmory/UserLAnd-Assets-Support/releases/download/$assetVersion"
     for (arch in architectures) {
         src "$baseUrl/$arch-assets.zip"
@@ -245,12 +245,12 @@ preBuild.dependsOn checkIfAssetsMissing
 
 dependencies {
     def moshi_version = '1.8.0'
-    def okhttp_version = '3.14.7'
+    def okhttp_version = '3.13.1'
     def sentry_version = '1.7.22'
     def slf4j_version = '1.7.26'
 
     def kotlinx_coroutines_version = '1.0.0'
-    def kotlin_jdk_version = '1.3.61'
+    def kotlin_jdk_version = '1.3.31'
 
     // Androidx versions
     def room_version = '2.1.0-beta01'
@@ -258,7 +258,7 @@ dependencies {
     def support_library_version = '1.1.0-alpha06'
     def preference_version = '1.1.0-alpha05'
     def ktx_version = '1.0.2'
-    def billing_version = '3.0.3'
+    def billing_version = '2.2.1'
 
     implementation project(':terminal-term')
 

app/src/main/AndroidManifest.xml

@@ -13,21 +13,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="vnc" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="x11" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="ssh" />
-        </intent>
-    </queries>
-
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/tech/ula/utils/BillingManager.kt

@@ -13,8 +13,6 @@ import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.SkuDetails
 import com.android.billingclient.api.SkuDetailsParams
-import java.util.* // ktlint-disable no-wildcard-imports
-import kotlin.collections.HashMap
 
 /**
  * When using this class:
@@ -95,7 +93,7 @@ class BillingManager(
         if (isSubscriptionPurchaseSupported()) {
             val purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.SUBS)
             if (purchasesResult.responseCode == BillingResponseCode.OK) {
-                onEntitledSubPurchases(Collections.unmodifiableList(purchasesResult.purchasesList))
+                onEntitledSubPurchases(purchasesResult.purchasesList)
             } else {
                 log("Error trying to query purchases: $purchasesResult")
             }
@@ -105,7 +103,7 @@ class BillingManager(
     fun queryInAppPurchases() {
         val purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
         if (purchasesResult.responseCode == BillingResponseCode.OK) {
-            onEntitledInAppPurchases(Collections.unmodifiableList(purchasesResult.purchasesList))
+            onEntitledInAppPurchases(purchasesResult.purchasesList)
         } else {
             log("Error trying to query purchases: $purchasesResult")
         }

build.gradle

@@ -7,8 +7,8 @@ buildscript {
     }
 
     ext {
-        kotlin_version = '1.3.61'
-        android_plugin = '3.4.3'
+        kotlin_version = '1.3.41'
+        android_plugin = '3.4.2'
         jacoco_version = '0.8.4'
         navigation_version = '2.1.0-alpha05'
     }