Fix for tabs being off for a project with disabled sections

app/src/main/java/com/commit451/gitlab/adapter/ProjectSectionsPagerAdapter.kt

@@ -35,21 +35,21 @@ class ProjectSectionsPagerAdapter(context: ProjectActivity, fm: FragmentManager)
     init {
-        val project = context.project
-        if (!project!!.isBuildEnabled) {
+        val project = context.project!!
+        if (isDisabled(project.isBuildEnabled)) {
             Timber.d("Builds are disabled")
             disabledSections.add(BUILDS_POS)
             disabledSections.add(PIPELINES_POS)
         }
-        if (!project.isIssuesEnabled) {
+        if (isDisabled(project.isIssuesEnabled)) {
             Timber.d("Issues are disabled")
             disabledSections.add(ISSUES_POS)
         }
-        if (!project.isMergeRequestsEnabled) {
+        if (isDisabled(project.isMergeRequestsEnabled)) {
             Timber.d("Merge requests are disabled")
             disabledSections.add(MERGE_REQUESTS_POS)
         }
-        if (!project.isIssuesEnabled && !project.isMergeRequestsEnabled) {
+        if (isDisabled(project.isIssuesEnabled) && isDisabled(project.isMergeRequestsEnabled)) {
             Timber.d("Milestones are disabled")
             disabledSections.add(MILESTONES_POS)
         }
@@ -65,10 +65,7 @@ class ProjectSectionsPagerAdapter(context: ProjectActivity, fm: FragmentManager)
     }
     override fun getPageTitle(position: Int): CharSequence {
-        var position = position
-        position = getCorrectPosition(position)
-
-        return titles[position]
+        return titles[getCorrectPosition(position)]
     }
     override fun getItem(position: Int): Fragment {
@@ -91,6 +88,13 @@ class ProjectSectionsPagerAdapter(context: ProjectActivity, fm: FragmentManager)
         throw IllegalStateException("Position exceeded on view pager")
     }
+    private fun isDisabled(enabledState: Boolean?) : Boolean{
+        if (enabledState != null && !enabledState) {
+            return true
+        }
+        return false
+    }
+
     private fun getCorrectPosition(position: Int): Int {
         var correctPosition = position
         for (i in 0..position) {
@@ -99,6 +103,6 @@ class ProjectSectionsPagerAdapter(context: ProjectActivity, fm: FragmentManager)
             }
         }
-        return position
+        return correctPosition
     }
 }

app/src/main/java/com/commit451/gitlab/model/api/Project.java

@@ -45,15 +45,15 @@ public class Project {
     @JsonField(name = "path_with_namespace")
     String pathWithNamespace;
     @JsonField(name = "issues_enabled")
-    boolean issuesEnabled;
+    Boolean issuesEnabled;
     @JsonField(name = "merge_requests_enabled")
-    boolean mergeRequestsEnabled;
+    Boolean mergeRequestsEnabled;
     @JsonField(name = "wiki_enabled")
-    boolean wikiEnabled;
+    Boolean wikiEnabled;
     @JsonField(name = "builds_enabled")
-    boolean buildEnabled;
+    Boolean buildEnabled;
     @JsonField(name = "snippets_enabled")
-    boolean snippetsEnabled;
+    Boolean snippetsEnabled;
     @JsonField(name = "created_at")
     Date createdAt;
     @JsonField(name = "last_activity_at")
@@ -135,23 +135,23 @@ public class Project {
         return pathWithNamespace;
     }
-    public boolean isIssuesEnabled() {
+    public Boolean isIssuesEnabled() {
         return issuesEnabled;
     }
-    public boolean isMergeRequestsEnabled() {
+    public Boolean isMergeRequestsEnabled() {
         return mergeRequestsEnabled;
     }
-    public boolean isWikiEnabled() {
+    public Boolean isWikiEnabled() {
         return wikiEnabled;
     }
-    public boolean isBuildEnabled() {
+    public Boolean isBuildEnabled() {
         return buildEnabled;
     }
-    public boolean isSnippetsEnabled() {
+    public Boolean isSnippetsEnabled() {
         return snippetsEnabled;
     }