From 0010c5df2585c26e68d59d8daeb6cf74636596f8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 7 Aug 2019 16:14:25 +0200
Subject: [PATCH] updating commons with the sideloading check

---
 app/build.gradle                                              | 2 +-
 .../calendar/pro/activities/EventActivity.kt                  | 4 ++++
 .../calendar/pro/activities/SplashActivity.kt                 | 2 --
 app/src/main/res/values/donottranslate.xml                    | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 651dceff5..9cb9bb953 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.9'
+    implementation 'com.simplemobiletools:commons:5.15.23'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index a15438cc9..48aec00bb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -90,6 +90,10 @@ class EventActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_event)
 
+        if (checkAppSideloading()) {
+            return
+        }
+
         supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
         val intent = intent ?: return
         mDialogTheme = getDialogTheme()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt
index 506520e21..3cb6b6ad4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SplashActivity.kt
@@ -7,8 +7,6 @@ import com.simplemobiletools.commons.activities.BaseSplashActivity
 import org.joda.time.DateTime
 
 class SplashActivity : BaseSplashActivity() {
-    override fun getAppPackageName() = packageName
-
     override fun initActivity() {
         when {
             intent.extras?.containsKey(DAY_CODE) == true -> Intent(this, MainActivity::class.java).apply {
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 51d323a29..b48cf4953 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="package_name">com.simplemobiletools.calendar.pro</string>
 
     <!-- Release notes -->
     <string name="release_155">Allow customizing the bottom navigation bar color</string>