From f02b2e7cf3fdf436842343b794f5b5d70482ef29 Mon Sep 17 00:00:00 2001
From: David Luhmer <david-dev@live.de>
Date: Fri, 4 Jan 2019 15:03:18 +0100
Subject: improve first app start

---
 .../main/java/de/luhmer/owncloudnewsreader/Constants.java  |  7 ++++---
 .../luhmer/owncloudnewsreader/NewsReaderListActivity.java  |  1 +
 .../luhmer/owncloudnewsreader/NewsReaderListFragment.java  | 14 +++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/Constants.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/Constants.java
index 8d2d34af..9578b459 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/Constants.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/Constants.java
@@ -21,10 +21,11 @@ public class Constants {
     protected static boolean isNextCloud(Context context) {
         SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(context);
         int[] version = extractVersionNumberFromString(mPrefs.getString(Constants.NEWS_WEB_VERSION_NUMBER_STRING, ""));
-        if(version[0] >= 9) {
-            return true;
+        if(version[0] == 0) {
+            // not initialized yet..
+            return true; // let's assume that it is nextcloud..
         }
-        return false;
+        return version[0] >= 9;
     }
 
     private static int[] extractVersionNumberFromString(String appVersion) {
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 b9982e2d..c7148dd3 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
@@ -965,6 +965,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
     }
 
     private void resetUiAndStartSync() {
+        getSlidingListFragment().loadOwncloudOrNextcloudBanner();
         getSlidingListFragment().reloadAdapter();
         updateCurrentRssView();
         startSync();
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java
index 6981719b..d4b29774 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java
@@ -153,10 +153,7 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM
 
         ButterKnife.bind(this, view);
 
-        if(!Constants.isNextCloud(getContext())) {
-            // Set ownCloud view
-            headerView.setBackgroundResource(R.drawable.left_drawer_header_background);
-        }
+        loadOwncloudOrNextcloudBanner();
 
         lvAdapter = new SubscriptionExpandableListAdapter(getActivity(), new DatabaseConnectionOrm(getActivity()), eListView);
         lvAdapter.setHandlerListener(expListTextClickedListener);
@@ -203,7 +200,14 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM
 		mCallbacks = null;
 	}
 
-	ExpListTextClicked expListTextClickedListener = new ExpListTextClicked() {
+	protected void loadOwncloudOrNextcloudBanner() {
+        if(!Constants.isNextCloud(getContext())) {
+            // Set ownCloud view
+            headerView.setBackgroundResource(R.drawable.left_drawer_header_background);
+        }
+    }
+
+	private ExpListTextClicked expListTextClickedListener = new ExpListTextClicked() {
 
 		@Override
 		public void onTextClicked(long idFeed, boolean isFolder, Long optional_folder_id) {
-- 
cgit v1.2.3