Removed menuItem from class property to local variable in onCreateMen…

…uOptions. Also the same with searchView in FolderPickerActivity
owncloud · Mar 15, 2024 · d51b707 · d51b707
1 parent 508de23
commit d51b707
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt
@@ -57,9 +57,6 @@ open class FolderPickerActivity : FileActivity(),
 
     private var isInSpacesScreen: Boolean = false
 
-    private lateinit var menuItem: MenuItem
-
-    private lateinit var searchView: SearchView
 
     override fun onCreate(savedInstanceState: Bundle?) {
         Timber.d("onCreate() start")
@@ -162,8 +159,8 @@ open class FolderPickerActivity : FileActivity(),
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.main_menu, menu)
-        menuItem = menu!!.findItem(R.id.action_search)
-        searchView = menuItem.getActionView() as SearchView
+        val menuItem = menu!!.findItem(R.id.action_search)
+        val searchView = menuItem.getActionView() as SearchView
         searchView.maxWidth = Int.MAX_VALUE
         searchView.queryHint = resources.getString(R.string.actionbar_search)
         if (isInSpacesScreen) {

diff --git a/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/owncloudApp/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -181,8 +181,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
     private boolean isInSpacesList;
 
-    private MenuItem menuItem;
-
     Pattern pattern = Pattern.compile("[/\\\\]");
 
     private ReceiveExternalFilesViewModel mReceiveExternalFilesViewModel;
@@ -758,7 +756,7 @@ private void initTargetFolder() {
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main_menu, menu);
-        menuItem = menu.findItem(R.id.action_search);
+        MenuItem menuItem = menu.findItem(R.id.action_search);
         mSearchView = (SearchView) menuItem.getActionView();
         mSearchView.setMaxWidth(Integer.MAX_VALUE);
         mSearchView.setQueryHint(getResources().getString(R.string.actionbar_search));