Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ GEM
httpclient (2.8.3)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
jmespath (1.4.0)
jmespath (1.6.1)
json (2.3.0)
jwt (2.1.0)
memoist (0.16.2)
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ 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)
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply plugin: 'jacoco'
apply plugin: 'de.undercouch.download'

android {
compileSdkVersion 29
compileSdkVersion 30

defaultConfig {
// Version code is generated as time since June 1, 2019. These allows for constantly
Expand All @@ -22,9 +22,9 @@ android {

applicationId "tech.ula"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
versionCode vcode
versionName "2.8.2"
versionName "2.8.3"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
Expand Down Expand Up @@ -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.6"
def assetVersion = "v1.2.7"
def baseUrl = "https://github.com/CypherpunkArmory/UserLAnd-Assets-Support/releases/download/$assetVersion"
for (arch in architectures) {
src "$baseUrl/$arch-assets.zip"
Expand Down Expand Up @@ -245,20 +245,20 @@ preBuild.dependsOn checkIfAssetsMissing

dependencies {
def moshi_version = '1.8.0'
def okhttp_version = '3.13.1'
def okhttp_version = '3.14.7'
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.31'
def kotlin_jdk_version = '1.3.61'

// Androidx versions
def room_version = '2.1.0-beta01'
def lifecycle_version = '2.2.0-alpha01'
def support_library_version = '1.1.0-alpha06'
def preference_version = '1.1.0-alpha05'
def ktx_version = '1.0.2'
def billing_version = '2.2.1'
def billing_version = '3.0.3'

implementation project(':terminal-term')

Expand Down
15 changes: 15 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,21 @@
<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"
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/tech/ula/utils/BillingManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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:
Expand Down Expand Up @@ -93,7 +95,7 @@ class BillingManager(
if (isSubscriptionPurchaseSupported()) {
val purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.SUBS)
if (purchasesResult.responseCode == BillingResponseCode.OK) {
onEntitledSubPurchases(purchasesResult.purchasesList)
onEntitledSubPurchases(Collections.unmodifiableList(purchasesResult.purchasesList))
} else {
log("Error trying to query purchases: $purchasesResult")
}
Expand All @@ -103,7 +105,7 @@ class BillingManager(
fun queryInAppPurchases() {
val purchasesResult = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
if (purchasesResult.responseCode == BillingResponseCode.OK) {
onEntitledInAppPurchases(purchasesResult.purchasesList)
onEntitledInAppPurchases(Collections.unmodifiableList(purchasesResult.purchasesList))
} else {
log("Error trying to query purchases: $purchasesResult")
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
}

ext {
kotlin_version = '1.3.41'
android_plugin = '3.4.2'
kotlin_version = '1.3.61'
android_plugin = '3.4.3'
jacoco_version = '0.8.4'
navigation_version = '2.1.0-alpha05'
}
Expand Down