Bug-Fix: App crashing at Add Hotel [HS, HM, PJ]

sw20-tug · Jun 3, 2020 · e283daf · e283daf
1 parent a18a731
commit e283daf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -39,19 +39,21 @@
                 android:name=".HotelDetailActivity"
                 android:label="@string/app_name"
                 android:parentActivityName=".MainActivity"
-                android:theme="@style/AppTheme.NoActionBar"> <!-- todo change MainActivity to ListAcitvity -->
+                android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
-                    android:value="com.example.asd.hotels.MainActivity" /> <!-- todo change MainActivity to ListAcitvity -->
+                    android:value="com.example.asd.hotels.MainActivity" />
         </activity>
         <activity android:name=".InsertHotelActivity"
                 android:label="@string/app_name">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.example.asd.hotels.MainActivity" />
         </activity>
         <uses-library
                 android:name="android.test.runner"

diff --git a/app/src/main/java/com/example/asd/hotels/MainActivity.kt b/app/src/main/java/com/example/asd/hotels/MainActivity.kt
@@ -321,8 +321,8 @@ class MainActivity : AppCompatActivity() {
                 true
             }
            R.id.add_hotel -> {
-                val insertHotel = Intent(this.applicationContext, InsertHotelActivity::class.java)
-                this.applicationContext.startActivity(insertHotel)
+                val insertHotel = Intent(this@MainActivity, InsertHotelActivity::class.java)
+                this@MainActivity.startActivity(insertHotel)
                 true
             }
             else -> super.onOptionsItemSelected(item)