improve first app start

nextcloud · Jan 4, 2019 · f02b2e7 · f02b2e7
1 parent e755400
commit f02b2e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 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
@@ -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
@@ -965,6 +965,7 @@ public void loginSucceeded() {
     }
 
     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
@@ -153,10 +153,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         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 void onDetach() {
 		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) {