From b84318bd6c267793011a5d3b0187b09968967797 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Sat, 28 Oct 2023 11:36:07 +0200
Subject: [PATCH] move code around

Signed-off-by: David Luhmer <david-dev@live.de>
---
 .../NewsReaderListActivity.java               | 121 +++++++++---------
 1 file changed, 61 insertions(+), 60 deletions(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
index eb091be67..320a91de8 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
@@ -200,66 +200,6 @@ private boolean isUserLoggedIn() {
 		return (mPrefs.getString(SettingsActivity.EDT_OWNCLOUDROOTPATH_STRING, null) != null);
 	}
 
-	@Override
-	protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-		restoreInstanceState(savedInstanceState);
-		super.onRestoreInstanceState(savedInstanceState);
-	}
-
-	@Override
-	protected void onSaveInstanceState(@NonNull Bundle outState) {
-		saveInstanceState(outState);
-		super.onSaveInstanceState(outState);
-	}
-
-	private void saveInstanceState(Bundle outState) {
-		NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
-		if (ndf != null) {
-			outState.putLong(OPTIONAL_FOLDER_ID, ndf.getIdFolder());
-			outState.putBoolean(IS_FOLDER_BOOLEAN, ndf.getIdFeed() == null);
-			outState.putLong(ID_FEED_STRING, ndf.getIdFeed() != null ? ndf.getIdFeed() : ndf.getIdFolder());
-
-			NewsListRecyclerAdapter adapter = (NewsListRecyclerAdapter) ndf.getRecyclerView().getAdapter();
-			if (adapter != null) {
-				outState.putInt(LIST_ADAPTER_TOTAL_COUNT, adapter.getTotalItemCount());
-				outState.putInt(LIST_ADAPTER_PAGE_COUNT, adapter.getCachedPages());
-			}
-		}
-		if (mSearchView != null) {
-			mSearchString = mSearchView.getQuery().toString();
-			outState.putString(SEARCH_KEY, mSearchString);
-        }
-    }
-
-    private void restoreInstanceState(Bundle savedInstanceState) {
-        if (savedInstanceState.containsKey(ID_FEED_STRING) &&
-                savedInstanceState.containsKey(IS_FOLDER_BOOLEAN) &&
-                savedInstanceState.containsKey(OPTIONAL_FOLDER_ID)) {
-
-			NewsListRecyclerAdapter adapter = new NewsListRecyclerAdapter(this, getNewsReaderDetailFragment().binding.list, this, mPostDelayHandler, mPrefs);
-
-			adapter.setTotalItemCount(savedInstanceState.getInt(LIST_ADAPTER_TOTAL_COUNT));
-			adapter.setCachedPages(savedInstanceState.getInt(LIST_ADAPTER_PAGE_COUNT));
-
-			getNewsReaderDetailFragment()
-					.getRecyclerView()
-					.setAdapter(adapter);
-
-			updateDetailFragment(savedInstanceState.getLong(ID_FEED_STRING),
-					savedInstanceState.getBoolean(IS_FOLDER_BOOLEAN),
-					savedInstanceState.getLong(OPTIONAL_FOLDER_ID),
-					false);
-		}
-		mSearchString = savedInstanceState.getString(SEARCH_KEY, null);
-	}
-
-	@Override
-	public void onConfigurationChanged(@NonNull Configuration newConfig) {
-		super.onConfigurationChanged(newConfig);
-		if (drawerToggle != null) {
-			drawerToggle.onConfigurationChanged(newConfig);
-		}
-	}
 	SlidingUpPanelLayout.PanelSlideListener panelSlideListener = new SlidingUpPanelLayout.PanelSlideListener() {
 		@Override
 		public void onPanelSlide(View panel, float slideOffset) {
@@ -381,6 +321,67 @@ public void onDrawerOpened(View drawerView) {
 		showChangelogIfNecessary();
 	}
 
+	@Override
+	protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+		restoreInstanceState(savedInstanceState);
+		super.onRestoreInstanceState(savedInstanceState);
+	}
+
+	@Override
+	protected void onSaveInstanceState(@NonNull Bundle outState) {
+		saveInstanceState(outState);
+		super.onSaveInstanceState(outState);
+	}
+
+	private void saveInstanceState(Bundle outState) {
+		NewsReaderDetailFragment ndf = getNewsReaderDetailFragment();
+		if (ndf != null) {
+			outState.putLong(OPTIONAL_FOLDER_ID, ndf.getIdFolder());
+			outState.putBoolean(IS_FOLDER_BOOLEAN, ndf.getIdFeed() == null);
+			outState.putLong(ID_FEED_STRING, ndf.getIdFeed() != null ? ndf.getIdFeed() : ndf.getIdFolder());
+
+			NewsListRecyclerAdapter adapter = (NewsListRecyclerAdapter) ndf.getRecyclerView().getAdapter();
+			if (adapter != null) {
+				outState.putInt(LIST_ADAPTER_TOTAL_COUNT, adapter.getTotalItemCount());
+				outState.putInt(LIST_ADAPTER_PAGE_COUNT, adapter.getCachedPages());
+			}
+		}
+		if (mSearchView != null) {
+			mSearchString = mSearchView.getQuery().toString();
+			outState.putString(SEARCH_KEY, mSearchString);
+		}
+	}
+
+	private void restoreInstanceState(Bundle savedInstanceState) {
+		if (savedInstanceState.containsKey(ID_FEED_STRING) &&
+				savedInstanceState.containsKey(IS_FOLDER_BOOLEAN) &&
+				savedInstanceState.containsKey(OPTIONAL_FOLDER_ID)) {
+
+			NewsListRecyclerAdapter adapter = new NewsListRecyclerAdapter(this, getNewsReaderDetailFragment().binding.list, this, mPostDelayHandler, mPrefs);
+
+			adapter.setTotalItemCount(savedInstanceState.getInt(LIST_ADAPTER_TOTAL_COUNT));
+			adapter.setCachedPages(savedInstanceState.getInt(LIST_ADAPTER_PAGE_COUNT));
+
+			getNewsReaderDetailFragment()
+					.getRecyclerView()
+					.setAdapter(adapter);
+
+			updateDetailFragment(savedInstanceState.getLong(ID_FEED_STRING),
+					savedInstanceState.getBoolean(IS_FOLDER_BOOLEAN),
+					savedInstanceState.getLong(OPTIONAL_FOLDER_ID),
+					false);
+		}
+		mSearchString = savedInstanceState.getString(SEARCH_KEY, null);
+	}
+
+	@Override
+	public void onConfigurationChanged(@NonNull Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		if (drawerToggle != null) {
+			drawerToggle.onConfigurationChanged(newConfig);
+		}
+	}
+
 	void showChangelogIfNecessary() {
 		// on first app start with new version - always show the changelog
 		int currentVersionCode = BuildConfig.VERSION_CODE;