move onOptionsItemSelected to BaseActivity (#2059)

* move onOptionsItemSelected to BaseActivity

* revert change in ComposeActivity

app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt

@@ -8,7 +8,6 @@ import android.text.SpannableStringBuilder
 import android.text.method.LinkMovementMethod
 import android.text.style.URLSpan
 import android.text.util.Linkify
-import android.view.MenuItem
 import android.widget.TextView
 import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.util.CustomURLSpan
@@ -50,16 +49,6 @@ class AboutActivity : BottomSheetActivity(), Injectable {
 
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
 }
 
 private fun TextView.setClickableTextWithoutUnderlines(@StringRes textId: Int) {

app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt

@@ -801,10 +801,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
             R.id.action_mention -> {
                 mention()
                 return true

app/src/main/java/com/keylesspalace/tusky/AccountListActivity.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import com.keylesspalace.tusky.fragment.AccountListFragment
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasAndroidInjector
@@ -68,16 +67,6 @@ class AccountListActivity : BaseActivity(), HasAndroidInjector {
                 .commit()
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun androidInjector() = dispatchingAndroidInjector
 
     companion object {

app/src/main/java/com/keylesspalace/tusky/BaseActivity.java

@@ -24,6 +24,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -127,6 +128,15 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
         overridePendingTransition(R.anim.slide_from_right, R.anim.slide_to_left);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     public void finish() {
         super.finish();

app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt

@@ -296,10 +296,6 @@ class EditProfileActivity : BaseActivity(), Injectable {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
             R.id.action_save -> {
                 save()
                 return true

app/src/main/java/com/keylesspalace/tusky/FiltersActivity.kt

@@ -1,7 +1,6 @@
 package com.keylesspalace.tusky
 
 import android.os.Bundle
-import android.view.MenuItem
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Toast
@@ -205,14 +204,4 @@ class FiltersActivity: BaseActivity() {
         }
     }
 
-    // Activate back arrow in toolbar
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
 }

app/src/main/java/com/keylesspalace/tusky/LicenseActivity.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky
 import android.os.Bundle
 import androidx.annotation.RawRes
 import android.util.Log
-import android.view.MenuItem
 import android.widget.TextView
 import com.keylesspalace.tusky.util.IOUtils
 import kotlinx.android.extensions.CacheImplementation
@@ -48,16 +47,6 @@ class LicenseActivity : BaseActivity() {
 
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     private fun loadFileIntoTextView(@RawRes fileId: Int, textView: TextView) {
 
         val sb = StringBuilder()

app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt

@@ -21,7 +21,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
@@ -135,7 +134,7 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector {
 
         val positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE)
         editText.onTextChanged { s, _, _, _ ->
-            positiveButton.isEnabled = !s.isBlank()
+            positiveButton.isEnabled = s.isNotBlank()
         }
         editText.setText(list?.title)
         editText.text?.let { editText.setSelection(it.length) }
@@ -218,14 +217,6 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector {
 
     override fun androidInjector() = dispatchingAndroidInjector
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
-        return false
-    }
-
     private object ListsDiffer : DiffUtil.ItemCallback<MastoList>() {
         override fun areItemsTheSame(oldItem: MastoList, newItem: MastoList): Boolean {
             return oldItem.id == newItem.id

app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt

@@ -23,7 +23,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.util.Log
-import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
@@ -111,14 +110,6 @@ class LoginActivity : BaseActivity(), Injectable {
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     /**
      * Obtain the oauth client credentials for this app. This is only necessary the first time the
      * app is run on a given server instance. So, after the first authentication, they are

app/src/main/java/com/keylesspalace/tusky/ModalTimelineActivity.kt

@@ -3,7 +3,6 @@ package com.keylesspalace.tusky
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.keylesspalace.tusky.fragment.TimelineFragment
 import com.keylesspalace.tusky.interfaces.ActionButtonActivity
@@ -56,14 +55,6 @@ class ModalTimelineActivity : BottomSheetActivity(), ActionButtonActivity, HasAn
 
     override fun getActionButton(): FloatingActionButton? = null
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
-        return false
-    }
-
     override fun androidInjector() = dispatchingAndroidInjector
 
 }

app/src/main/java/com/keylesspalace/tusky/SavedTootActivity.java

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.view.MenuItem;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -118,17 +117,6 @@ public final class SavedTootActivity extends BaseActivity implements SavedTootAd
         if (asyncTask != null) asyncTask.cancel(true);
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home: {
-                onBackPressed();
-                return true;
-            }
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     private void fetchToots() {
         asyncTask = new FetchPojosTask(this, database.tootDao())
                 .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);

app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import androidx.fragment.app.commit
 
 import com.keylesspalace.tusky.fragment.TimelineFragment
@@ -66,14 +65,6 @@ class StatusListActivity : BottomSheetActivity(), HasAndroidInjector {
 
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home){
-            onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun androidInjector() = dispatchingAndroidInjector
 
     companion object {

app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
-import android.view.MenuItem
 import android.view.View
 import android.widget.FrameLayout
 import androidx.appcompat.app.AlertDialog
@@ -345,14 +344,6 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressed()
-            return true
-        }
-        return false
-    }
-
     override fun onPause() {
         super.onPause()
         if (tabsChanged) {

app/src/main/java/com/keylesspalace/tusky/ViewTagActivity.java

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.MenuItem;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
@@ -72,17 +71,6 @@ public class ViewTagActivity extends BottomSheetActivity implements HasAndroidIn
         fragmentTransaction.commit();
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home: {
-                onBackPressed();
-                return true;
-            }
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     @Override
     public AndroidInjector<Object> androidInjector() {
         return dispatchingAndroidInjector;

app/src/main/java/com/keylesspalace/tusky/ViewThreadActivity.java

@@ -110,10 +110,6 @@ public class ViewThreadActivity extends BottomSheetActivity implements HasAndroi
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case android.R.id.home: {
-                onBackPressed();
-                return true;
-            }
             case R.id.action_open_in_web: {
                 LinkHelper.openLink(getIntent().getStringExtra(URL_EXTRA), this);
                 return true;

app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt

@@ -19,7 +19,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.view.MenuItem
 import android.view.View
 import android.widget.PopupWindow
 import androidx.activity.viewModels
@@ -123,16 +122,6 @@ class AnnouncementsActivity : BottomSheetActivity(), AnnouncementActionListener,
         progressBar.show()
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     private fun refreshAnnouncements() {
         viewModel.load()
         swipeRefreshLayout.isRefreshing = true

app/src/main/java/com/keylesspalace/tusky/components/instancemute/InstanceListActivity.kt

@@ -1,7 +1,6 @@
 package com.keylesspalace.tusky.components.instancemute
 
 import android.os.Bundle
-import android.view.MenuItem
 import com.keylesspalace.tusky.BaseActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.instancemute.fragment.InstanceListFragment
@@ -32,16 +31,6 @@ class InstanceListActivity: BaseActivity(), HasAndroidInjector {
                 .commit()
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     override fun androidInjector() = androidInjector
 
 }

app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt

@@ -20,7 +20,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.util.Log
-import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import com.keylesspalace.tusky.BaseActivity
@@ -101,16 +100,6 @@ class PreferencesActivity : BaseActivity(), SharedPreferences.OnSharedPreference
         PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     private fun saveInstanceState(outState: Bundle) {
         outState.putBoolean("restart", restartActivitiesOnExit)
     }

app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.report
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import androidx.activity.viewModels
 import com.keylesspalace.tusky.BottomSheetActivity
 import com.keylesspalace.tusky.R
@@ -30,7 +29,6 @@ import kotlinx.android.synthetic.main.activity_report.*
 import kotlinx.android.synthetic.main.toolbar_basic.*
 import javax.inject.Inject
 
-
 class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
 
     @Inject
@@ -120,16 +118,6 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
         wizard.currentItem = 0
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                closeScreen()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     companion object {
         private const val ACCOUNT_ID = "account_id"
         private const val ACCOUNT_USERNAME = "account_username"

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt

@@ -18,7 +18,6 @@ package com.keylesspalace.tusky.components.scheduled
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.MenuItem
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -104,16 +103,6 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
     private fun refreshStatuses() {
         viewModel.reload()
     }

app/src/main/java/com/keylesspalace/tusky/components/search/SearchActivity.kt

@@ -20,7 +20,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
-import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.appcompat.widget.SearchView
 import com.google.android.material.tabs.TabLayoutMediator
@@ -82,17 +81,7 @@ class SearchActivity : BottomSheetActivity(), HasAndroidInjector {
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    private fun getPageTitle(position: Int): CharSequence {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun getPageTitle(position: Int): CharSequence? {
         return when (position) {
             0 -> getString(R.string.title_statuses)
             1 -> getString(R.string.title_accounts)