From 55186e43ed31589b9a4633f5ad8d0e15ad34f944 Mon Sep 17 00:00:00 2001
From: magda-woj <103784938+magda-woj@users.noreply.github.com>
Date: Fri, 20 Sep 2024 01:33:37 +0200
Subject: [PATCH] Demo app: don't start the main activity again, just finish
 the current one (#604)

* just finish the current activity instead of starting the main activity before that

* unused imports
---
 .../io/opentelemetry/android/demo/about/AboutActivity.kt     | 5 -----
 .../android/demo/shop/ui/AstronomyShopActivity.kt            | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/demo-app/src/main/java/io/opentelemetry/android/demo/about/AboutActivity.kt b/demo-app/src/main/java/io/opentelemetry/android/demo/about/AboutActivity.kt
index f01c42ee7..75cf7fb56 100644
--- a/demo-app/src/main/java/io/opentelemetry/android/demo/about/AboutActivity.kt
+++ b/demo-app/src/main/java/io/opentelemetry/android/demo/about/AboutActivity.kt
@@ -1,10 +1,8 @@
 package io.opentelemetry.android.demo.about
 
-import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.bottomnavigation.BottomNavigationView
-import io.opentelemetry.android.demo.MainActivity
 import io.opentelemetry.android.demo.R
 
 class AboutActivity : AppCompatActivity() {
@@ -25,9 +23,6 @@ class AboutActivity : AppCompatActivity() {
         bottomNavigationView.setOnItemSelectedListener { item ->
             when (item.itemId) {
                 R.id.navigation_exit -> {
-                    val intent = Intent(this, MainActivity::class.java)
-                    intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
-                    startActivity(intent)
                     finish()
                     true
                 }
diff --git a/demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/AstronomyShopActivity.kt b/demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/AstronomyShopActivity.kt
index 66be7a043..107c8c3e5 100644
--- a/demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/AstronomyShopActivity.kt
+++ b/demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/AstronomyShopActivity.kt
@@ -6,7 +6,6 @@
 package io.opentelemetry.android.demo.shop.ui
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
@@ -23,7 +22,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import io.opentelemetry.android.demo.MainActivity
 import io.opentelemetry.android.demo.shop.clients.ProductCatalogClient
 import io.opentelemetry.android.demo.theme.DemoAppTheme
 import io.opentelemetry.android.demo.shop.ui.cart.CartScreen
@@ -70,8 +68,6 @@ fun AstronomyShopScreen() {
                             }
                         },
                         onExitClicked = {
-                            val intent = Intent(context, MainActivity::class.java)
-                            context.startActivity(intent)
                             (context as? Activity)?.finish()
                         }
                     )