Merge pull request #4209 from khushal1707/CATROID-1121

CATROID-1121 Refactor MainMenuActivity and related files to Kotlin
Catrobat · Aug 2, 2022 · 00a2865 · 00a2865
2 parents 138dfa1 + 1d321f5
commit 00a2865
Show file tree

Hide file tree

Showing 8 changed files with 564 additions and 518 deletions.
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/BaseActivity.kt b/catroid/src/main/java/org/catrobat/catroid/ui/BaseActivity.kt
@@ -40,7 +40,7 @@ import com.google.android.gms.analytics.HitBuilders.ScreenViewBuilder
 import org.catrobat.catroid.CatroidApplication
 import org.catrobat.catroid.R
 import org.catrobat.catroid.cast.CastManager
-import org.catrobat.catroid.ui.MainMenuActivity.surveyCampaign
+import org.catrobat.catroid.ui.MainMenuActivity.Companion.surveyCampaign
 import org.catrobat.catroid.ui.runtimepermissions.PermissionHandlingActivity
 import org.catrobat.catroid.ui.runtimepermissions.PermissionRequestActivityExtension
 import org.catrobat.catroid.ui.runtimepermissions.RequiresPermissionTask
@@ -159,8 +159,8 @@ abstract class BaseActivity : AppCompatActivity(), PermissionHandlingActivity {
     override fun onPause() {
         super.onPause()
         val pm = getSystemService(POWER_SERVICE) as PowerManager
-        if (surveyCampaign != null && (isApplicationSentToBackground(this) || !pm.isInteractive)) {
-            surveyCampaign.endAppTime(this)
+        if (isApplicationSentToBackground(this) || !pm.isInteractive) {
+            surveyCampaign?.endAppTime(this)
         }
     }
 

diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/MainMenuActivity.java