Skip to content

Commit 12841ec

Browse files
committed
fix lint
Signed-off-by: alperozturk <[email protected]>
1 parent 9eb4dd3 commit 12841ec

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public abstract class DrawerActivity extends ToolbarActivity
176176
*/
177177
public static int menuItemId = Menu.NONE;
178178

179-
public static int previousMenuItemId = Menu.NONE;
179+
private static int previousMenuItemId = Menu.NONE;
180180

181181
/**
182182
* container layout of the quota view.
@@ -279,7 +279,7 @@ private void openMediaTab(int menuItemId) {
279279
@SuppressFBWarnings("RV")
280280
private void handleBottomNavigationViewClicks() {
281281
bottomNavigationView.setOnItemSelectedListener(menuItem -> {
282-
previousMenuItemId = menuItemId;
282+
setPreviousMenuItemId(menuItemId);
283283
menuItemId = menuItem.getItemId();
284284

285285
exitSelectionMode();
@@ -548,7 +548,7 @@ private void filterDrawerMenu(final Menu menu, @NonNull final User user) {
548548
}
549549

550550
private void onNavigationItemClicked(final MenuItem menuItem) {
551-
previousMenuItemId = menuItemId;
551+
setPreviousMenuItemId(menuItemId);
552552
int itemId = menuItem.getItemId();
553553

554554
// Settings screen cannot display drawer menu thus no need to highlight
@@ -1468,4 +1468,12 @@ public static boolean isToolbarStyleSearch() {
14681468
menuItemId == R.id.nav_all_files ||
14691469
menuItemId == R.id.nav_personal_files;
14701470
}
1471+
1472+
public static int getPreviousMenuItemId() {
1473+
return previousMenuItemId;
1474+
}
1475+
1476+
public static void setPreviousMenuItemId(int menuItemId) {
1477+
previousMenuItemId = menuItemId;
1478+
}
14711479
}

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public void onAttach(@NonNull Context context) {
304304
}
305305

306306
private void setSearchArgs(Bundle state) {
307-
SearchType argSearchType = null;
307+
SearchType argSearchType = NO_SEARCH;
308308
SearchEvent argSearchEvent = null;
309309

310310
if (state != null) {

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class TrashbinActivity :
293293
}
294294

295295
override fun onPause() {
296-
menuItemId = previousMenuItemId
296+
menuItemId = getPreviousMenuItemId()
297297
setNavigationViewItemChecked()
298298
super.onPause()
299299
active = false

0 commit comments

Comments
 (0)