Dependency update

dkrivoruchko · dkrivoruchko · commit 7cb0ee903ad5 · 2020-12-02T12:19:33.000+02:00
Bug fixes
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"
+apply plugin: "kotlin-parcelize"
 apply plugin: "com.google.gms.google-services"
 apply plugin: "com.google.firebase.crashlytics"
 
@@ -12,8 +12,8 @@ android {
         applicationId = "info.dvkr.screenstream"
         minSdkVersion(21)
         targetSdkVersion(30)
-        versionCode = 30501
-        versionName = "3.5.1"
+        versionCode = 30502
+        versionName = "3.5.2"
         resConfigs("en", "ru", "pt-rBR", "zh-rTW", "fr-rFR", "fa", "it", "pl", "hi", "de", "sk", "es", "ar", "ja", "gl", "cat")
 
         vectorDrawables.useSupportLibrary = true
@@ -70,15 +70,14 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-//        freeCompilerArgs += ["-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"]
     }
 }
 
 dependencies {
     implementation(project(":data"))
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2")
 
     implementation("com.google.android.material:material:1.2.1")
     implementation("androidx.appcompat:appcompat:1.2.0")
@@ -99,16 +98,16 @@ dependencies {
     implementation(fileTree("libs/bottomsheets-release.aar"))
 //    implementation("com.afollestad.material-dialogs:bottomsheets:3.3.0")
 
-    implementation("org.koin:koin-android:2.1.6")
+    implementation("org.koin:koin-android:2.2.1")
     implementation("com.github.iamironz:binaryprefs:1.0.1")
-    implementation("com.elvishew:xlog:1.7.0")
+    implementation('com.elvishew:xlog:1.7.2')
 
-    firebaseImplementation("com.google.android.play:core:1.8.3")
+    firebaseImplementation('com.google.android.play:core:1.9.0')
     firebaseImplementation("com.google.android.play:core-ktx:1.8.1") {
         exclude group: "org.jetbrains.kotlin", module: "kotlin-stdlib-jdk7"
     }
     firebaseReleaseImplementation("com.google.firebase:firebase-analytics:18.0.0")
-    firebaseReleaseImplementation("com.google.firebase:firebase-crashlytics:17.2.2")
+    firebaseReleaseImplementation('com.google.firebase:firebase-crashlytics:17.3.0')
 
     debugImplementation("com.squareup.leakcanary:leakcanary-android:2.5")
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -24,7 +24,9 @@
 -repackageclasses
 
 -keepnames class info.dvkr.screenstream.** { *; }
-
+-keep class **.R$* {
+    <fields>;
+}
 #Crashlytics
 -keepattributes *Annotation*
 -keepattributes SourceFile,LineNumberTable
diff --git a/app/src/main/kotlin/info/dvkr/screenstream/receiver/BootReceiver.kt b/app/src/main/kotlin/info/dvkr/screenstream/receiver/BootReceiver.kt
@@ -8,8 +8,8 @@ import com.elvishew.xlog.XLog
 import info.dvkr.screenstream.data.other.getLog
 import info.dvkr.screenstream.data.settings.SettingsReadOnly
 import info.dvkr.screenstream.service.helper.IntentAction
-import org.koin.core.KoinComponent
-import org.koin.core.inject
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 class BootReceiver : BroadcastReceiver(), KoinComponent {
 
diff --git a/app/src/main/kotlin/info/dvkr/screenstream/service/AppService.kt b/app/src/main/kotlin/info/dvkr/screenstream/service/AppService.kt
@@ -35,11 +35,9 @@ class AppService : Service() {
     companion object {
         var isRunning: Boolean = false
 
-        fun getAppServiceIntent(context: Context): Intent =
-            Intent(context.applicationContext, AppService::class.java)
+        fun getAppServiceIntent(context: Context): Intent = Intent(context.applicationContext, AppService::class.java)
 
-        fun startForeground(context: Context, intent: Intent = getAppServiceIntent(context)) =
-            ContextCompat.startForegroundService(context, intent)
+        fun startForeground(context: Context, intent: Intent) = context.startService(intent)
     }
 
     inner class AppServiceBinder : Binder() {
diff --git a/app/src/main/kotlin/info/dvkr/screenstream/service/helper/IntentAction.kt b/app/src/main/kotlin/info/dvkr/screenstream/service/helper/IntentAction.kt
@@ -7,7 +7,7 @@ import com.elvishew.xlog.XLog
 import info.dvkr.screenstream.data.other.getLog
 import info.dvkr.screenstream.service.AppService
 import info.dvkr.screenstream.ui.activity.AppActivity
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 sealed class IntentAction : Parcelable {
     internal companion object {
diff --git a/app/src/main/kotlin/info/dvkr/screenstream/ui/fragment/AboutFragment.kt b/app/src/main/kotlin/info/dvkr/screenstream/ui/fragment/AboutFragment.kt
@@ -1,14 +1,11 @@
 package info.dvkr.screenstream.ui.fragment
 
-import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.lifecycle.lifecycleOwner
 import com.elvishew.xlog.XLog
 import info.dvkr.screenstream.R
 import info.dvkr.screenstream.data.other.getLog
@@ -28,99 +25,48 @@ class AboutFragment : Fragment(R.layout.fragment_about) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        with(requireActivity()) {
-            try {
-                version = packageManager.getPackageInfo(packageName, 0).versionName
-                binding.tvFragmentAboutVersion.text = getString(R.string.about_fragment_app_version, version)
-            } catch (t: Throwable) {
-                XLog.e(getLog("onViewCreated", "getPackageInfo"), t)
-            }
+        val packageName = requireContext().packageName
 
-            binding.tvFragmentAboutVersion.setOnClickListener {
-                settingsLoggingVisibleCounter++
-                if (settingsLoggingVisibleCounter >= 5) {
-                    settings.loggingVisible = true
-                    Toast.makeText(requireContext().applicationContext, "Logging option enabled", Toast.LENGTH_LONG)
-                        .show()
-                }
-            }
+        runCatching {
+            version = requireContext().packageManager.getPackageInfo(packageName, 0).versionName
+            binding.tvFragmentAboutVersion.text = getString(R.string.about_fragment_app_version, version)
+        }.onFailure {
+            XLog.e(getLog("onViewCreated", "getPackageInfo"), it)
+        }
 
-            binding.bFragmentAboutRate.setOnClickListener {
-                try {
-                    startActivity(
-                        Intent(
-                            Intent.ACTION_VIEW,
-                            Uri.parse("market://details?id=$packageName")
-                        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    )
-                } catch (ignore: ActivityNotFoundException) {
-                    startActivity(
-                        Intent(
-                            Intent.ACTION_VIEW,
-                            Uri.parse("https://play.google.com/store/apps/details?id=$packageName")
-                        ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    )
-                }
+        binding.tvFragmentAboutVersion.setOnClickListener {
+            settingsLoggingVisibleCounter++
+            if (settingsLoggingVisibleCounter >= 5) {
+                settings.loggingVisible = true
+                Toast.makeText(requireContext(), "Logging option enabled", Toast.LENGTH_LONG).show()
             }
         }
 
-        binding.bFragmentAboutDeveloperEmail.setOnClickListener {
-            MaterialDialog(requireActivity()).show {
-                lifecycleOwner(viewLifecycleOwner)
-                title(R.string.about_fragment_write_email_dialog)
-                icon(R.drawable.ic_about_feedback_24dp)
-                positiveButton(android.R.string.cancel)
-                negativeButton(android.R.string.yes) {
-                    val emailIntent = Intent(Intent.ACTION_SENDTO)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .setData(Uri.Builder().scheme("mailto").build())
-                        .putExtra(Intent.EXTRA_EMAIL, arrayOf("Dmitriy Krivoruchko <dkrivoruchko@gmail.com>"))
-                        .putExtra(Intent.EXTRA_SUBJECT, "Screen Stream Feedback ($version)")
-                    startActivity(
-                        Intent.createChooser(emailIntent, getString(R.string.about_fragment_email_chooser_header))
-                    )
-                }
+        binding.bFragmentAboutRate.setOnClickListener {
+            openStringUrl("market://details?id=$packageName") {
+                openStringUrl("https://play.google.com/store/apps/details?id=$packageName")
             }
         }
 
         binding.bFragmentAboutSources.setOnClickListener {
-            try {
-                startActivity(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("https://github.com/dkrivoruchko/ScreenStream")
-                    ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                )
-
-            } catch (ignore: ActivityNotFoundException) {
-            }
+            openStringUrl("https://github.com/dkrivoruchko/ScreenStream")
         }
 
         binding.bFragmentPrivacyPolicy.setOnClickListener {
-            try {
-                startActivity(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("https://github.com/dkrivoruchko/ScreenStream/blob/master/PrivacyPolicy.md")
-                    ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                )
-
-            } catch (ignore: ActivityNotFoundException) {
-            }
+            openStringUrl("https://github.com/dkrivoruchko/ScreenStream/blob/master/PrivacyPolicy.md")
         }
 
         binding.bFragmentLicense.setOnClickListener {
-            try {
-                startActivity(
-                    Intent(
-                        Intent.ACTION_VIEW,
-                        Uri.parse("https://github.com/dkrivoruchko/ScreenStream/blob/master/LICENSE")
-                    ).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                )
-
-            } catch (ignore: ActivityNotFoundException) {
-            }
+            openStringUrl("https://github.com/dkrivoruchko/ScreenStream/blob/master/LICENSE")
         }
 
     }
+
+    private fun openStringUrl(url: String, onFailure: () -> Unit = {}) {
+        runCatching {
+            startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+        }.onFailure {
+            runCatching { onFailure.invoke() }
+        }
+    }
 }
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -64,20 +64,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_fragment_about_developer" />
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/b_fragment_about_developer_email"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Dialog.Icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:text="@string/about_fragment_write_email"
-            app:icon="@drawable/ic_about_feedback_24dp"
-            app:iconPadding="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/b_fragment_about_rate" />
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/b_fragment_about_sources"
             style="@style/Widget.MaterialComponents.Button.TextButton.Dialog.Icon"
@@ -90,7 +76,7 @@
             app:iconPadding="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/b_fragment_about_developer_email" />
+            app:layout_constraintTop_toBottomOf="@+id/b_fragment_about_rate" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/b_fragment_privacy_policy"
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -110,7 +110,7 @@
     <string name="pref_fps_summary">设置最大帧率</string>
     <string name="pref_fps_dialog">设置最大同步率\n值: 1–60 (默认: 30)</string>
     <string name="pref_jpeg_quality">JPEG 压缩质量</string>
-    <string name="pref_jpeg_quality_summary">设置 JPEG 压缩画质</string>
+    <string name="pref_jpeg_quality_summary">设置JPEG压缩画质</string>
     <string name="pref_jpeg_quality_dialog">顺时针旋转方向.\n值: 10–100 (默认: 80)</string>
     <string name="pref_settings_security">安全</string>
     <string name="pref_enable_pin">启用 pin 码</string>
diff --git a/build.gradle b/build.gradle
@@ -5,10 +5,10 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:4.0.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
+        classpath("com.android.tools.build:gradle:4.1.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20")
         classpath("com.google.gms:google-services:4.3.4")
-        classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0")
+        classpath("com.google.firebase:firebase-crashlytics-gradle:2.4.1")
     }
 }
 
diff --git a/data/build.gradle b/data/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion(21)
         targetSdkVersion(30)
-        versionCode = 30501
-        versionName = "3.5.1"
+        versionCode = 30502
+        versionName = "3.5.2"
     }
 
     compileOptions {
@@ -23,13 +23,11 @@ android {
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
-//        freeCompilerArgs += ["-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"]
     }
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.4.10")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
 
     implementation("androidx.core:core-ktx:1.3.2")
     implementation("androidx.arch.core:core-common:2.1.0")
@@ -40,12 +38,12 @@ dependencies {
     implementation("io.reactivex:rxjava:1.3.8")
     implementation("com.jakewharton.rxrelay:rxrelay:1.2.0")
 
-    implementation("io.netty:netty-codec-http:4.1.34.Final")
-    implementation("io.netty:netty-handler:4.1.34.Final")
+    implementation("io.netty:netty-codec-http:4.1.54.Final")
+    implementation("io.netty:netty-handler:4.1.54.Final")
     implementation("io.reactivex:rxnetty-common:0.5.3")
     implementation("io.reactivex:rxnetty-http:0.5.3")
  
     implementation("com.google.zxing:core:3.3.3")
     implementation("com.github.iamironz:binaryprefs:1.0.1")
-    implementation("com.elvishew:xlog:1.7.0")
+    implementation('com.elvishew:xlog:1.7.2')
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath("com.android.tools.build:gradle:4.0.1")`
`9`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")`
	`8`	`+ classpath("com.android.tools.build:gradle:4.1.1")`
	`9`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20")`
`10`	`10`	`classpath("com.google.gms:google-services:4.3.4")`
`11`		`- classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0")`
	`11`	`+ classpath("com.google.firebase:firebase-crashlytics-gradle:2.4.1")`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`