Merge branch 'tytydraco:main' into main

Author: kairusds

app/build.gradle

@@ -37,16 +37,18 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1-native-mt'
 
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'androidx.activity:activity-ktx:1.2.4'
+    implementation 'androidx.fragment:fragment-ktx:1.3.6'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
 
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.github.javiersantos:PiracyChecker:1.2.8'
+
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
 }

app/src/main/java/com/draco/ladb/viewmodels/MainActivityViewModel.kt

@@ -1,6 +1,8 @@
 package com.draco.ladb.viewmodels
 
+import android.app.Activity
 import android.app.Application
+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
@@ -10,20 +12,31 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.draco.ladb.BuildConfig
 import com.draco.ladb.R
 import com.draco.ladb.utils.ADB
+import com.github.javiersantos.piracychecker.PiracyChecker
+import com.github.javiersantos.piracychecker.piracyChecker
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.File
 
 class MainActivityViewModel(application: Application) : AndroidViewModel(application) {
-    private val context = getApplication<Application>().applicationContext
-
     private val _outputText = MutableLiveData<String>()
     val outputText: LiveData<String> = _outputText
 
-    val adb = ADB.getInstance(context).also {
+    var checker: PiracyChecker? = null
+    private val sharedPreferences = application
+        .applicationContext
+        .getSharedPreferences(
+            application
+                .applicationContext
+                .getString(R.string.pref_file),
+            Context.MODE_PRIVATE
+        )
+
+    val adb = ADB.getInstance(getApplication<Application>().applicationContext).also {
         viewModelScope.launch(Dispatchers.IO) {
             it.initializeClient()
         }
@@ -33,6 +46,30 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
         startOutputThread()
     }
 
+    /**
+     * Start the piracy checker if it is not setup yet (release builds only)
+     *
+     * @param activity Activity to use when showing the error
+     */
+    fun piracyCheck(activity: Activity) {
+        if (checker != null || BuildConfig.DEBUG)
+            return
+
+        val context = getApplication<Application>().applicationContext
+
+        checker = activity.piracyChecker {
+            enableGooglePlayLicensing("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRTOoEZ/IFfA/JkBFIrZqLq7N66JtJFTn/5C2QMO2EIY6hG4yZ5YTA3JrbJuuGVzQE8j29s6Lwu+19KKZcITTkZjfgl2Zku8dWQKZFt46f7mh8s1spzzc6rmSWIBPZUxN6fIIz8ar+wzyZdu3z+Iiy31dUa11Pyh82oOsWH7514AYGeIDDlvB1vSfNF/9ycEqTv5UAOgHxqZ205C1VVydJyCEwWWVJtQ+Z5zRaocI6NGaYRopyZteCEdKkBsZ69vohk4zr2SpllM5+PKb1yM7zfsiFZZanp4JWDJ3jRjEHC4s66elWG45yQi+KvWRDR25MPXhdQ9+DMfF2Ao1NTrgQIDAQAB")
+            saveResultToSharedPreferences(
+                sharedPreferences,
+                context.getString(R.string.pref_key_verified)
+            )
+        }
+
+        val verified = sharedPreferences.getBoolean(context.getString(R.string.pref_key_verified), false)
+        if (!verified)
+            checker?.start()
+    }
+
     /**
      * Continuously update shell output
      */
@@ -59,6 +96,8 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
      * Check if the user should be prompted to pair
      */
     fun shouldWePair(sharedPreferences: SharedPreferences): Boolean {
+        val context = getApplication<Application>().applicationContext
+
         if (!sharedPreferences.getBoolean(context.getString(R.string.paired_key), false)) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
                 return true
@@ -71,6 +110,8 @@ class MainActivityViewModel(application: Application) : AndroidViewModel(applica
      * Return the contents of the script from the intent
      */
     fun getScriptFromIntent(intent: Intent): String? {
+        val context = getApplication<Application>().applicationContext
+
         return when (intent.type) {
             "text/x-sh" -> {
                 val uri = Uri.parse(intent.getParcelableExtra<Parcelable>(Intent.EXTRA_STREAM).toString())

app/src/main/java/com/draco/ladb/views/MainActivity.kt

@@ -128,6 +128,8 @@ class MainActivity : AppCompatActivity() {
                 }
             }
         }
+
+        viewModel.piracyCheck(this)
     }
 
     /**

app/src/main/res/values/strings.xml

@@ -75,4 +75,7 @@
     <string name="licenses_title">Licenses</string>
     <string name="licenses_summary">View the open source licenses</string>
     <string name="licenses_key">licenses</string>
+
+    <string name="pref_file" translatable="false">preferences</string>
+    <string name="pref_key_verified" translatable="false">verified</string>
 </resources>

build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.5.0"
+    ext.kotlin_version = "1.5.20"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-beta03'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
 
@@ -19,6 +19,7 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Mar 06 16:41:44 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME