Merge branch 'develop'

cbd7ebc0 · John Carlson · 35eba923 · e31b881c · cbd7ebc0 · cbd7ebc0
Commit cbd7ebc0 authored 7 years ago by John Carlson
--- a/app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt
@@ -13,12 +13,12 @@ import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.R.string.labels
 import com.commit451.gitlab.adapter.LabelAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Label
 import com.commit451.gitlab.navigation.Navigator
@@ -76,7 +76,7 @@ class AddLabelActivity : BaseActivity() {
        adapterLabel = LabelAdapter(object : LabelAdapter.Listener {
            override fun onLabelClicked(label: Label, viewHolder: LabelViewHolder) {
                val data = Intent()
-                data.putParcelParcelableExtra(KEY_LABEL, label)
+                data.putParcelerParcelableExtra(KEY_LABEL, label)
                setResult(Activity.RESULT_OK, data)
                finish()
            }
@@ -94,7 +94,7 @@ class AddLabelActivity : BaseActivity() {
        super.onActivityResult(requestCode, resultCode, data)
        when (requestCode) {
            REQUEST_NEW_LABEL -> if (resultCode == Activity.RESULT_OK) {
-                val newLabel = data?.getParcelerParcelable<Label>(AddNewLabelActivity.KEY_NEW_LABEL)!!
+                val newLabel = data?.getParcelerParcelableExtra<Label>(AddNewLabelActivity.KEY_NEW_LABEL)!!
                adapterLabel.addLabel(newLabel)
            }
        }

--- a/app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt
@@ -13,14 +13,15 @@ import android.widget.FrameLayout
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
+import com.commit451.gitlab.api.converter.DashDateAdapter
 import com.commit451.gitlab.event.MilestoneChangedEvent
 import com.commit451.gitlab.event.MilestoneCreatedEvent
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -41,7 +42,7 @@ class AddMilestoneActivity : MorphActivity() {
            val intent = Intent(context, AddMilestoneActivity::class.java)
            intent.putExtra(KEY_PROJECT_ID, projectId)
            if (milestone != null) {
-                intent.putParcelParcelableExtra(KEY_MILESTONE, milestone)
+                intent.putParcelerParcelableExtra(KEY_MILESTONE, milestone)
            }
            return intent
        }
@@ -93,7 +94,7 @@ class AddMilestoneActivity : MorphActivity() {
        morph(root)
        teleprinter = Teleprinter(this)
        projectId = intent.getLongExtra(KEY_PROJECT_ID, -1)
-        milestone = intent.getParcelerParcelable<Milestone>(KEY_MILESTONE)
+        milestone = intent.getParcelerParcelableExtra<Milestone>(KEY_MILESTONE)
        if (milestone != null) {
            bind(milestone!!)
            toolbar.inflateMenu(R.menu.edit)
@@ -122,7 +123,7 @@ class AddMilestoneActivity : MorphActivity() {
        progress.visibility = View.VISIBLE
        var dueDate: String? = null
        if (currentDate != null) {
-            dueDate = Milestone.DUE_DATE_FORMAT.format(currentDate)
+            dueDate = DashDateAdapter.format.format(currentDate)
        }
  
        if (milestone == null) {
@@ -168,7 +169,7 @@ class AddMilestoneActivity : MorphActivity() {
    }
  
    fun bind(date: Date) {
-        buttonDueDate.text = Milestone.DUE_DATE_FORMAT.format(date)
+        buttonDueDate.text = DashDateAdapter.format.format(date)
    }
  
    fun bind(milestone: Milestone) {

--- a/app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt
@@ -17,17 +17,16 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
 import com.afollestad.materialdialogs.color.ColorChooserDialog
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.text
 import com.commit451.gitlab.model.api.Label
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.ColorUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.parceler.Parcels
 import retrofit2.HttpException
 import retrofit2.Response
 import timber.log.Timber
@@ -139,7 +138,7 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
  
                        override fun responseNonNullSuccess(label: Label) {
                            val data = Intent()
-                            data.putParcelParcelableExtra(KEY_NEW_LABEL, label)
+                            data.putParcelerParcelableExtra(KEY_NEW_LABEL, label)
                            setResult(Activity.RESULT_OK, data)
                            finish()
                        }

--- a/app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt
@@ -13,14 +13,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import butterknife.*
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.HideRunnable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.UserAdapter
 import com.commit451.gitlab.dialog.AccessDialog
 import com.commit451.gitlab.event.MemberAddedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.model.api.Member
@@ -52,7 +52,7 @@ class AddUserActivity : MorphActivity() {
  
        fun newIntent(context: Context, group: Group): Intent {
            val intent = Intent(context, AddUserActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_GROUP, group)
+            intent.putParcelerParcelableExtra(KEY_GROUP, group)
            return intent
        }
    }
@@ -112,7 +112,7 @@ class AddUserActivity : MorphActivity() {
        ButterKnife.bind(this)
        teleprinter = Teleprinter(this)
        projectId = intent.getLongExtra(KEY_PROJECT_ID, -1)
-        group = intent.getParcelerParcelable<Group>(KEY_GROUP)
+        group = intent.getParcelerParcelableExtra<Group>(KEY_GROUP)
        dialogAccess = AccessDialog(this, object : AccessDialog.Listener {
            override fun onAccessApplied(accessLevel: Int) {
                dialogAccess.showLoading()

--- a/app/src/main/java/com/commit451/gitlab/activity/AttachActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/AttachActivity.kt
 package com.commit451.gitlab.activity
  
  
-import android.animation.TimeInterpolator
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.ViewAnimationUtils
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
+import com.commit451.alakazam.kotlin.fadeIn
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.extension.toPart
 import com.commit451.gitlab.model.api.FileUploadResponse
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
-import io.codetail.animation.ViewAnimationUtils
 import pl.aprilapps.easyphotopicker.DefaultCallback
 import pl.aprilapps.easyphotopicker.EasyImage
 import timber.log.Timber
@@ -40,7 +41,7 @@ class AttachActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project): Intent {
            val intent = Intent(context, AttachActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
            return intent
        }
    }
@@ -58,7 +59,7 @@ class AttachActivity : BaseActivity() {
  
    @OnClick(R.id.button_choose_photo)
    fun onChoosePhotoClicked() {
-        EasyImage.openGallery(this, 0, false)
+        EasyImage.openGallery(this, 0)
    }
  
    @OnClick(R.id.button_take_photo)
@@ -76,20 +77,9 @@ class AttachActivity : BaseActivity() {
        setContentView(R.layout.activity_attach)
        ButterKnife.bind(this)
  
-        //Run the runnable after the view has been measured
-        card.post {
-            //we need the radius of the animation circle, which is the diagonal of the view
-            val finalRadius = Math.hypot(card.width.toDouble(), card.height.toDouble()).toFloat()
-
-            //it's using a 3rd-party ViewAnimationUtils class for compat reasons (up to API 14)
-            val animator = ViewAnimationUtils
-                    .createCircularReveal(card, 0, card.height, 0f, finalRadius)
-            animator.duration = 500
-            animator.interpolator = AccelerateDecelerateInterpolator() as TimeInterpolator?
-            animator.start()
-        }
+        reveal()
  
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)
    }
  
    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -118,6 +108,25 @@ class AttachActivity : BaseActivity() {
        overridePendingTransition(R.anim.do_nothing, R.anim.fade_out)
    }
  
+    fun reveal() {
+        if (Build.VERSION.SDK_INT >= 21) {
+            //Run the runnable after the view has been measured
+            card.post {
+                //we need the radius of the animation circle, which is the diagonal of the view
+                val finalRadius = Math.hypot(card.width.toDouble(), card.height.toDouble()).toFloat()
+
+                //it's using a 3rd-party ViewAnimationUtils class for compat reasons (up to API 14)
+                val animator = ViewAnimationUtils
+                        .createCircularReveal(card, 0, card.height, 0f, finalRadius)
+                animator.duration = 500
+                animator.interpolator = AccelerateDecelerateInterpolator()
+                animator.start()
+            }
+        } else {
+            card.fadeIn()
+        }
+    }
+
    fun onPhotoReturned(photo: File) {
        progress.visibility = View.VISIBLE
        rootButtons.visibility = View.INVISIBLE
@@ -128,7 +137,7 @@ class AttachActivity : BaseActivity() {
  
                    override fun success(fileUploadResponse: FileUploadResponse) {
                        val data = Intent()
-                        data.putParcelParcelableExtra(KEY_FILE_UPLOAD_RESPONSE, fileUploadResponse)
+                        data.putParcelerParcelableExtra(KEY_FILE_UPLOAD_RESPONSE, fileUploadResponse)
                        setResult(Activity.RESULT_OK, data)
                        finish()
                    }

--- a/app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt
@@ -16,13 +16,13 @@ import android.view.View
 import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.BuildSectionsPagerAdapter
 import com.commit451.gitlab.event.BuildChangedEvent
 import com.commit451.gitlab.extension.getDownloadBuildUrl
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.api.Build
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -45,8 +45,8 @@ class BuildActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, build: Build): Intent {
            val intent = Intent(context, BuildActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
-            intent.putParcelParcelableExtra(KEY_BUILD, build)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_BUILD, build)
            return intent
        }
    }
@@ -149,8 +149,8 @@ class BuildActivity : BaseActivity() {
        setContentView(R.layout.activity_build)
        ButterKnife.bind(this)
  
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        build = intent.getParcelerParcelable<Build>(KEY_BUILD)!!
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        build = intent.getParcelerParcelableExtra<Build>(KEY_BUILD)!!
  
        toolbar.title = String.format(getString(R.string.build_number), build.id)
        toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

--- a/app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt
@@ -12,11 +12,11 @@ import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DiffAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Diff
 import com.commit451.gitlab.model.api.Project
@@ -36,8 +36,8 @@ class DiffActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, commit: RepositoryCommit): Intent {
            val intent = Intent(context, DiffActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
-            intent.putParcelParcelableExtra(EXTRA_COMMIT, commit)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_COMMIT, commit)
            return intent
        }
    }
@@ -58,8 +58,8 @@ class DiffActivity : BaseActivity() {
        setContentView(R.layout.activity_diff)
        ButterKnife.bind(this)
  
-        project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)!!
-        commit = intent.getParcelerParcelable<RepositoryCommit>(EXTRA_COMMIT)!!
+        project = intent.getParcelerParcelableExtra<Project>(EXTRA_PROJECT)!!
+        commit = intent.getParcelerParcelableExtra<RepositoryCommit>(EXTRA_COMMIT)!!
  
        toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
        toolbar.setNavigationOnClickListener { onBackPressed() }

--- a/app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt
@@ -7,10 +7,10 @@ import android.support.v7.widget.Toolbar
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.api.Project
 import com.github.chrisbanes.photoview.PhotoView
  
@@ -26,7 +26,7 @@ class FullscreenImageActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, url: String): Intent {
            val intent = Intent(context, FullscreenImageActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
            intent.putExtra(KEY_URL, url)
            return intent
        }
@@ -42,7 +42,7 @@ class FullscreenImageActivity : BaseActivity() {
        setContentView(R.layout.activity_fullscreen_image)
        ButterKnife.bind(this)
  
-        project = intent.getParcelerParcelable(KEY_PROJECT)!!
+        project = intent.getParcelerParcelableExtra(KEY_PROJECT)!!
  
        toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
        toolbar.setNavigationOnClickListener {

--- a/app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt
@@ -17,13 +17,13 @@ import android.view.View
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.Alakazam
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.GroupPagerAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.model.api.GroupDetail
@@ -43,7 +43,7 @@ class GroupActivity : BaseActivity() {
  
        fun newIntent(context: Context, group: Group): Intent {
            val intent = Intent(context, GroupActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_GROUP, group)
+            intent.putParcelerParcelableExtra(KEY_GROUP, group)
            return intent
        }
  
@@ -73,7 +73,7 @@ class GroupActivity : BaseActivity() {
        toolbar.setNavigationOnClickListener { onBackPressed() }
  
        if (intent.hasExtra(KEY_GROUP)) {
-            val group = intent.getParcelerParcelable<Group>(KEY_GROUP)!!
+            val group = intent.getParcelerParcelableExtra<Group>(KEY_GROUP)!!
            bind(group)
        } else {
            progress.visibility = View.VISIBLE

--- a/app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt
@@ -18,13 +18,14 @@ import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.IssueDetailsAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueReloadEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
+import com.commit451.gitlab.extension.getUrl
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.FileUploadResponse
 import com.commit451.gitlab.model.api.Issue
@@ -61,8 +62,8 @@ class IssueActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, issue: Issue): Intent {
            val intent = Intent(context, IssueActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
-            intent.putParcelParcelableExtra(EXTRA_SELECTED_ISSUE, issue)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_SELECTED_ISSUE, issue)
            return intent
        }
  
@@ -111,7 +112,7 @@ class IssueActivity : BaseActivity() {
    val onMenuItemClickListener = Toolbar.OnMenuItemClickListener { item ->
        when (item.itemId) {
            R.id.action_share -> {
-                IntentUtil.share(root, issue!!.getUrl(project))
+                IntentUtil.share(root, issue!!.getUrl(project!!))
                return@OnMenuItemClickListener true
            }
            R.id.action_close -> {
@@ -119,7 +120,7 @@ class IssueActivity : BaseActivity() {
                return@OnMenuItemClickListener true
            }
            R.id.action_delete -> {
-                App.get().gitLab.deleteIssue(project!!.id, issue!!.id)
+                App.get().gitLab.deleteIssue(project!!.id, issue!!.iid)
                        .setup(bindToLifecycle())
                        .subscribe(object : CustomSingleObserver<String>() {
  
@@ -179,8 +180,8 @@ class IssueActivity : BaseActivity() {
        swipeRefreshLayout.setOnRefreshListener { loadNotes() }
  
        if (intent.hasExtra(EXTRA_SELECTED_ISSUE)) {
-            project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)
-            issue = intent.getParcelerParcelable<Issue>(EXTRA_SELECTED_ISSUE)
+            project = intent.getParcelerParcelableExtra<Project>(EXTRA_PROJECT)
+            issue = intent.getParcelerParcelableExtra<Issue>(EXTRA_SELECTED_ISSUE)
            adapterIssueDetails = IssueDetailsAdapter(this@IssueActivity, issue, project!!)
            listNotes.adapter = adapterIssueDetails
            bindIssue()
@@ -194,7 +195,7 @@ class IssueActivity : BaseActivity() {
            App.get().gitLab.getProject(projectNamespace, projectName)
                    .flatMap { project ->
                        this@IssueActivity.project = project
-                        App.get().gitLab.getIssuesByIid(project.id, issueIid!!)
+                        App.get().gitLab.getIssuesByIid(project.id)
                    }
                    .compose(this.bindToLifecycle<List<Issue>>())
                    .subscribeOn(Schedulers.io())
@@ -231,7 +232,7 @@ class IssueActivity : BaseActivity() {
        when (requestCode) {
            REQUEST_ATTACH ->
                if (resultCode == Activity.RESULT_OK) {
-                    val response = data?.getParcelerParcelable<FileUploadResponse>(AttachActivity.KEY_FILE_UPLOAD_RESPONSE)!!
+                    val response = data?.getParcelerParcelableExtra<FileUploadResponse>(AttachActivity.KEY_FILE_UPLOAD_RESPONSE)!!
                    progress.visibility = View.GONE
                    sendMessageView.appendText(response.markdown)
                } else {
@@ -263,7 +264,7 @@ class IssueActivity : BaseActivity() {
    fun loadNotes() {
        swipeRefreshLayout.isRefreshing = true
        loading = true
-        App.get().gitLab.getIssueNotes(project!!.id, issue!!.id)
+        App.get().gitLab.getIssueNotes(project!!.id, issue!!.iid)
                .compose(this.bindToLifecycle<Response<List<Note>>>())
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
@@ -323,7 +324,7 @@ class IssueActivity : BaseActivity() {
        teleprinter.hideKeyboard()
        sendMessageView.clearText()
  
-        App.get().gitLab.addIssueNote(project!!.id, issue!!.id, message)
+        App.get().gitLab.addIssueNote(project!!.id, issue!!.iid, message)
                .setup(bindToLifecycle())
                .subscribe(object : CustomSingleObserver<Note>() {
  
@@ -345,9 +346,9 @@ class IssueActivity : BaseActivity() {
    fun closeOrOpenIssue() {
        progress.visibility = View.VISIBLE
        if (issue!!.state == Issue.STATE_CLOSED) {
-            updateIssueStatus(App.get().gitLab.updateIssueStatus(project!!.id, issue!!.id, Issue.STATE_REOPEN))
+            updateIssueStatus(App.get().gitLab.updateIssueStatus(project!!.id, issue!!.iid, Issue.STATE_REOPEN))
        } else {
-            updateIssueStatus(App.get().gitLab.updateIssueStatus(project!!.id, issue!!.id, Issue.STATE_CLOSE))
+            updateIssueStatus(App.get().gitLab.updateIssueStatus(project!!.id, issue!!.iid, Issue.STATE_CLOSE))
        }
    }
  

--- a/app/src/main/java/com/commit451/gitlab/activity/LoginActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/LoginActivity.kt
@@ -19,11 +19,12 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
 import butterknife.OnEditorAction
-import com.bluelinelabs.logansquare.LoganSquare
 import com.commit451.gitlab.App
 import com.commit451.gitlab.BuildConfig
 import com.commit451.gitlab.R
+import com.commit451.gitlab.api.GitLab
 import com.commit451.gitlab.api.GitLabFactory
+import com.commit451.gitlab.api.MoshiProvider
 import com.commit451.gitlab.api.OkHttpClientFactory
 import com.commit451.gitlab.api.request.SessionRequest
 import com.commit451.gitlab.data.Prefs
@@ -52,7 +53,6 @@ import retrofit2.Response
 import timber.log.Timber
 import java.io.IOException
 import java.net.ConnectException
-import java.security.cert.CertificateEncodingException
 import java.util.*
 import java.util.regex.Pattern
 import javax.net.ssl.SSLHandshakeException
@@ -66,9 +66,8 @@ class LoginActivity : BaseActivity() {
        private val EXTRA_SHOW_CLOSE = "show_close"
  
        private val REQUEST_PRIVATE_TOKEN = 123
-        private val sTokenPattern = Pattern.compile("^[A-Za-z0-9-_]*$")
  
-        @JvmOverloads fun newIntent(context: Context, showClose: Boolean = false): Intent {
+        fun newIntent(context: Context, showClose: Boolean = false): Intent {
            val intent = Intent(context, LoginActivity::class.java)
            intent.putExtra(EXTRA_SHOW_CLOSE, showClose)
            return intent
@@ -92,10 +91,14 @@ class LoginActivity : BaseActivity() {
    lateinit var teleprinter: Teleprinter
  
    var isNormalLogin = true
-    val emailPattern : Pattern by lazy {
+    val emailPattern: Pattern by lazy {
        Patterns.EMAIL_ADDRESS
    }
+    val tokenPattern: Pattern by lazy {
+        Pattern.compile("^[A-Za-z0-9-_]*$")
+    }
    var account: Account = Account()
+    var gitLab: GitLab? = null
  
    @OnEditorAction(R.id.password_input, R.id.token_input)
    fun onPasswordEditorAction(): Boolean {
@@ -114,7 +117,7 @@ class LoginActivity : BaseActivity() {
        if (!verifyUrl()) {
            return
        }
-        val uri = Uri.parse(textInputLayoutUrl.editText!!.text.toString())
+        val uri = textInputLayoutUrl.text()
  
        if (isNormalLogin) {
            val valid = textInputLayoutUser.checkValid() and textInputLayoutPassword.checkValid()
@@ -125,7 +128,7 @@ class LoginActivity : BaseActivity() {
            if (!textInputLayoutToken.checkValid()) {
                return
            }
-            if (!sTokenPattern.matcher(textToken.text).matches()) {
+            if (!tokenPattern.matcher(textToken.text).matches()) {
                textInputLayoutToken.error = getString(R.string.not_a_valid_private_token)
                return
            } else {
@@ -222,23 +225,25 @@ class LoginActivity : BaseActivity() {
  
    fun connectByAuth() {
        val request = SessionRequest()
-        request.setPassword(textInputLayoutPassword.text())
+        request.password = textInputLayoutPassword.text()
        val usernameOrEmail = textInputLayoutUser.text()
        if (emailPattern.matcher(usernameOrEmail).matches()) {
-            request.setEmail(usernameOrEmail)
+            request.email = usernameOrEmail
        } else {
-            request.setLogin(usernameOrEmail)
+            request.login = usernameOrEmail
        }
        attemptLogin(request)
    }
  
    fun attemptLogin(request: SessionRequest) {
-        val gitlabClientBuilder = OkHttpClientFactory.create(account)
+        val clientBuilder = OkHttpClientFactory.create(account)
        if (BuildConfig.DEBUG) {
-            gitlabClientBuilder.addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
+            clientBuilder.addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
        }
-        val gitLab = GitLabFactory.create(account, gitlabClientBuilder.build())
-        gitLab.login(request)
+
+        gitLab = GitLabFactory.createGitLab(account, clientBuilder)
+
+        gitLab!!.login(request)
                .setup(bindToLifecycle())
                .subscribe(object : CustomResponseSingleObserver<UserLogin>() {
  
@@ -264,6 +269,7 @@ class LoginActivity : BaseActivity() {
    }
  
    fun loginWithPrivateToken() {
+        val serverUri = Uri.parse(account.serverUrl)
        KeyChain.choosePrivateKeyAlias(this, { alias ->
            account.privateKeyAlias = alias
  
@@ -283,7 +289,7 @@ class LoginActivity : BaseActivity() {
                    runOnUiThread { login() }
                }
            }
-        }, null, null, account.serverUrl.host, account.serverUrl.port, null)
+        }, null, null, serverUri.host, serverUri.port, null)
    }
  
    fun verifyUrl(): Boolean {
@@ -370,12 +376,7 @@ class LoginActivity : BaseActivity() {
  
        if (t is SSLHandshakeException && t.cause is X509CertificateException) {
            account.trustedCertificate = null
-            var fingerprint: String? = null
-            try {
-                fingerprint = X509Util.getFingerPrint((t.cause as X509CertificateException).chain[0])
-            } catch (e: CertificateEncodingException) {
-                Timber.e(e)
-            }
+            val fingerprint = X509Util.getFingerPrint((t.cause as X509CertificateException).chain[0])
  
            val finalFingerprint = fingerprint
  
@@ -383,20 +384,18 @@ class LoginActivity : BaseActivity() {
                    .setTitle(R.string.certificate_title)
                    .setMessage(String.format(resources.getString(R.string.certificate_message), finalFingerprint))
                    .setPositiveButton(R.string.ok_button) { dialog, _ ->
-                        if (finalFingerprint != null) {
-                            account.trustedCertificate = finalFingerprint
-                            login()
-                        }
-
+                        account.trustedCertificate = finalFingerprint
+                        login()
                        dialog.dismiss()
                    }
                    .setNegativeButton(R.string.cancel_button) { dialog, _ -> dialog.dismiss() }
                    .show()
  
-            (d.findViewById(android.R.id.message) as TextView).movementMethod = LinkMovementMethod.getInstance()
+            d.findViewById<TextView>(android.R.id.message).movementMethod = LinkMovementMethod.getInstance()
        } else if (t is SSLPeerUnverifiedException && t.message?.toLowerCase()!!.contains("hostname")) {
            account.trustedHostname = null
-            val finalHostname = CustomHostnameVerifier.lastFailedHostname
+            val hostNameVerifier = gitLab?.client?.hostnameVerifier() as CustomHostnameVerifier
+            val finalHostname = hostNameVerifier.lastFailedHostname
            val d = AlertDialog.Builder(this)
                    .setTitle(R.string.hostname_title)
                    .setMessage(R.string.hostname_message)
@@ -411,7 +410,7 @@ class LoginActivity : BaseActivity() {
                    .setNegativeButton(R.string.cancel_button) { dialog, _ -> dialog.dismiss() }
                    .show()
  
-            (d.findViewById(android.R.id.message) as TextView).movementMethod = LinkMovementMethod.getInstance()
+            d.findViewById<TextView>(android.R.id.message).movementMethod = LinkMovementMethod.getInstance()
        } else if (t is ConnectException) {
            Snackbar.make(root, t.message!!, Snackbar.LENGTH_LONG)
                    .show()
@@ -434,7 +433,9 @@ class LoginActivity : BaseActivity() {
                }
                var errorMessage = getString(R.string.login_unauthorized)
                try {
-                    val message = LoganSquare.parse(response.errorBody()!!.byteStream(), Message::class.java)
+
+                    val adapter = MoshiProvider.moshi.adapter<Message>(Message::class.java)
+                    val message = adapter.fromJson(response.errorBody()!!.string())
                    if (message != null && message.message != null) {
                        errorMessage = message.message
                    }
@@ -484,15 +485,10 @@ class LoginActivity : BaseActivity() {
  
    fun isAlreadySignedIn(url: String, usernameOrEmailOrPrivateToken: String): Boolean {
        val accounts = Prefs.getAccounts()
-        for (account in accounts) {
-            if (account.serverUrl == Uri.parse(url)) {
-                if (usernameOrEmailOrPrivateToken == account.user.username
-                        || usernameOrEmailOrPrivateToken.equals(account.user.email, ignoreCase = true)
-                        || usernameOrEmailOrPrivateToken.equals(account.privateToken, ignoreCase = true)) {
-                    return true
-                }
-            }
+        return accounts.any {
+            it.serverUrl == url && (usernameOrEmailOrPrivateToken == it.user.username
+                    || usernameOrEmailOrPrivateToken.equals(it.user.email, ignoreCase = true)
+                    || usernameOrEmailOrPrivateToken.equals(it.privateToken, ignoreCase = true))
        }
-        return false
    }
 }
--- a/app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.kt
@@ -11,12 +11,12 @@ import android.view.View
 import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.MergeRequestSectionsPagerAdapter
 import com.commit451.gitlab.event.MergeRequestChangedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.MergeRequest
 import com.commit451.gitlab.model.api.Project
@@ -36,8 +36,8 @@ class MergeRequestActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, mergeRequest: MergeRequest): Intent {
            val intent = Intent(context, MergeRequestActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
-            intent.putParcelParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
            return intent
        }
    }
@@ -56,8 +56,8 @@ class MergeRequestActivity : BaseActivity() {
        setContentView(R.layout.activity_merge_request)
        ButterKnife.bind(this)
  
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        mergeRequest = intent.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        mergeRequest = intent.getParcelerParcelableExtra<MergeRequest>(KEY_MERGE_REQUEST)!!
  
        toolbar.title = getString(R.string.merge_request_number) + mergeRequest.iid
        toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

--- a/app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.kt
@@ -16,13 +16,13 @@ import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.MilestoneIssueAdapter
 import com.commit451.gitlab.event.MilestoneChangedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.model.api.Milestone
@@ -44,8 +44,8 @@ class MilestoneActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, milestone: Milestone): Intent {
            val intent = Intent(context, MilestoneActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
-            intent.putParcelParcelableExtra(EXTRA_MILESTONE, milestone)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_MILESTONE, milestone)
            return intent
        }
    }
@@ -94,8 +94,8 @@ class MilestoneActivity : BaseActivity() {
        ButterKnife.bind(this)
        App.bus().register(this)
  
-        project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)!!
-        milestone = intent.getParcelerParcelable<Milestone>(EXTRA_MILESTONE)!!
+        project = intent.getParcelerParcelableExtra<Project>(EXTRA_PROJECT)!!
+        milestone = intent.getParcelerParcelableExtra<Milestone>(EXTRA_MILESTONE)!!
  
        toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
        toolbar.setNavigationOnClickListener { onBackPressed() }

--- a/app/src/main/java/com/commit451/gitlab/activity/PickBranchOrTagActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/PickBranchOrTagActivity.kt
@@ -9,10 +9,10 @@ import android.support.v7.app.AppCompatActivity
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.PickBranchOrTagPagerAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.Ref
  
  
@@ -31,7 +31,7 @@ class PickBranchOrTagActivity : AppCompatActivity() {
        fun newIntent(context: Context, projectId: Long, currentRef: Ref?): Intent {
            val intent = Intent(context, PickBranchOrTagActivity::class.java)
            intent.putExtra(EXTRA_PROJECT_ID, projectId)
-            intent.putParcelParcelableExtra(EXTRA_CURRENT_REF, currentRef)
+            intent.putParcelerParcelableExtra(EXTRA_CURRENT_REF, currentRef)
            return intent
        }
    }
@@ -49,7 +49,7 @@ class PickBranchOrTagActivity : AppCompatActivity() {
        setContentView(R.layout.activity_pick_branch_or_tag)
        ButterKnife.bind(this)
        val projectId = intent.getLongExtra(EXTRA_PROJECT_ID, -1)
-        val currentRef = intent.getParcelerParcelable<Ref>(EXTRA_CURRENT_REF)
+        val currentRef = intent.getParcelerParcelableExtra<Ref>(EXTRA_CURRENT_REF)
        viewPager.adapter = PickBranchOrTagPagerAdapter(this, supportFragmentManager, projectId, currentRef)
        tabLayout.setupWithViewPager(viewPager)
        if (currentRef != null) {

--- a/app/src/main/java/com/commit451/gitlab/activity/PipelineActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/PipelineActivity.kt
@@ -11,12 +11,12 @@ import android.view.View
 import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.PipelineSectionsPagerAdapter
 import com.commit451.gitlab.event.PipelineChangedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.api.Pipeline
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -38,8 +38,8 @@ class PipelineActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project, pipeline: Pipeline): Intent {
            val intent = Intent(context, PipelineActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
-            intent.putParcelParcelableExtra(KEY_PIPELINE, pipeline)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PIPELINE, pipeline)
            return intent
        }
    }
@@ -112,8 +112,8 @@ class PipelineActivity : BaseActivity() {
        setContentView(R.layout.activity_pipeline)
        ButterKnife.bind(this)
  
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        pipeline = intent.getParcelerParcelable<Pipeline>(KEY_PIPELINE)!!
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        pipeline = intent.getParcelerParcelableExtra<Pipeline>(KEY_PIPELINE)!!
  
        toolbar.title = String.format(getString(R.string.pipeline_number), pipeline.id)
        toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

--- a/app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.kt
@@ -5,6 +5,7 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TabLayout
@@ -15,14 +16,16 @@ import android.view.ViewGroup
 import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelable
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelable
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.HideRunnable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.ProjectSectionsPagerAdapter
 import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.fragment.BaseFragment
 import com.commit451.gitlab.model.Ref
@@ -49,7 +52,7 @@ class ProjectActivity : BaseActivity() {
  
        fun newIntent(context: Context, project: Project): Intent {
            val intent = Intent(context, ProjectActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
            return intent
        }
  
@@ -88,7 +91,7 @@ class ProjectActivity : BaseActivity() {
            }
            R.id.action_share -> {
                if (project != null) {
-                    IntentUtil.share(root, project!!.webUrl)
+                    IntentUtil.share(root, Uri.parse(project!!.webUrl))
                }
                return@OnMenuItemClickListener true
            }
@@ -119,7 +122,7 @@ class ProjectActivity : BaseActivity() {
        Prefs.startingView = Prefs.STARTING_VIEW_PROJECTS
        setContentView(R.layout.activity_project)
        ButterKnife.bind(this)
-        var project: Project? = intent.getParcelerParcelable(EXTRA_PROJECT)
+        var project: Project? = intent.getParcelerParcelableExtra(EXTRA_PROJECT)
  
        if (savedInstanceState != null) {
            project = savedInstanceState.getParcelerParcelable<Project>(STATE_PROJECT)
@@ -150,7 +153,7 @@ class ProjectActivity : BaseActivity() {
        super.onActivityResult(requestCode, resultCode, data)
        when (requestCode) {
            REQUEST_BRANCH_OR_TAG -> if (resultCode == Activity.RESULT_OK) {
-                ref = data?.getParcelerParcelable<Ref>(PickBranchOrTagActivity.EXTRA_REF)
+                ref = data?.getParcelerParcelableExtra<Ref>(PickBranchOrTagActivity.EXTRA_REF)
                broadcastLoad()
            }
        }
@@ -158,8 +161,8 @@ class ProjectActivity : BaseActivity() {
  
    override fun onSaveInstanceState(outState: Bundle) {
        super.onSaveInstanceState(outState)
-        outState.putParcelParcelableExtra(STATE_REF, ref)
-        outState.putParcelParcelableExtra(STATE_PROJECT, project)
+        outState.putParcelerParcelable(STATE_REF, ref)
+        outState.putParcelerParcelable(STATE_PROJECT, project)
    }
  
    override fun onBackPressed() {
@@ -216,7 +219,7 @@ class ProjectActivity : BaseActivity() {
    }
  
    fun broadcastLoad() {
-        App.bus().post(ProjectReloadEvent(project!!, ref!!.ref))
+        App.bus().post(ProjectReloadEvent(project!!, ref!!.ref!!))
    }
  
    fun getRefRef(): String? {

--- a/app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt
+++ b/app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt
@@ -13,12 +13,12 @@ import android.support.v7.widget.Toolbar
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.Alakazam
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.fragment.FeedFragment
 import com.commit451.gitlab.model.api.UserBasic
 import com.commit451.gitlab.transformation.PaletteTransformation
@@ -35,7 +35,7 @@ class UserActivity : BaseActivity() {
  
        fun newIntent(context: Context, user: UserBasic): Intent {
            val intent = Intent(context, UserActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_USER, user)
+            intent.putParcelerParcelableExtra(KEY_USER, user)
            return intent
        }
    }
@@ -50,7 +50,7 @@ class UserActivity : BaseActivity() {
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_user)
        ButterKnife.bind(this)
-        user = intent.getParcelerParcelable<UserBasic>(KEY_USER)!!
+        user = intent.getParcelerParcelableExtra<UserBasic>(KEY_USER)!!
  
        // Default content and scrim colors
        collapsingToolbarLayout.setCollapsedTitleTextColor(Color.WHITE)

--- a/app/src/main/java/com/commit451/gitlab/adapter/IssueDetailsAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/IssueDetailsAdapter.kt
 package com.commit451.gitlab.adapter
  
-import `in`.uncod.android.bypass.Bypass
 import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.model.api.Note
 import com.commit451.gitlab.model.api.Project
-import com.commit451.gitlab.util.BypassFactory
 import com.commit451.gitlab.viewHolder.IssueHeaderViewHolder
 import com.commit451.gitlab.viewHolder.IssueLabelsViewHolder
 import com.commit451.gitlab.viewHolder.LoadingFooterViewHolder
@@ -33,8 +31,6 @@ class IssueDetailsAdapter(context: Context, private var issue: Issue?, private v
    private val notes: LinkedList<Note> = LinkedList()
    private var loading = false
  
-    private val bypass: Bypass = BypassFactory.create(context, project)
-
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
        if (viewType == TYPE_HEADER) {
            return IssueHeaderViewHolder.inflate(parent)
@@ -50,12 +46,12 @@ class IssueDetailsAdapter(context: Context, private var issue: Issue?, private v
  
    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        if (holder is IssueHeaderViewHolder) {
-            holder.bind(issue!!, bypass, project)
+            holder.bind(issue!!, project)
        } else if (holder is IssueLabelsViewHolder) {
            holder.bind(issue!!.labels)
        } else if (holder is NoteViewHolder) {
            val note = getNoteAt(position)
-            holder.bind(note, bypass, project)
+            holder.bind(note, project)
        } else if (holder is LoadingFooterViewHolder) {
            holder.bind(loading)
        }

--- a/app/src/main/java/com/commit451/gitlab/adapter/MergeRequestDetailAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/MergeRequestDetailAdapter.kt
 package com.commit451.gitlab.adapter
  
-import `in`.uncod.android.bypass.Bypass
 import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
 import com.commit451.gitlab.model.api.MergeRequest
 import com.commit451.gitlab.model.api.Note
 import com.commit451.gitlab.model.api.Project
-import com.commit451.gitlab.util.BypassFactory
 import com.commit451.gitlab.viewHolder.LoadingFooterViewHolder
 import com.commit451.gitlab.viewHolder.MergeRequestHeaderViewHolder
 import com.commit451.gitlab.viewHolder.NoteViewHolder
@@ -31,8 +29,6 @@ class MergeRequestDetailAdapter(context: Context, private val mergeRequest: Merg
    private val notes: LinkedList<Note> = LinkedList()
    private var loading = false
  
-    private val bypass: Bypass = BypassFactory.create(context, project)
-
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
        if (viewType == TYPE_HEADER) {
            return MergeRequestHeaderViewHolder.inflate(parent)
@@ -46,10 +42,10 @@ class MergeRequestDetailAdapter(context: Context, private val mergeRequest: Merg
  
    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
        if (holder is MergeRequestHeaderViewHolder) {
-            holder.bind(mergeRequest, bypass, project)
+            holder.bind(mergeRequest, project)
        } else if (holder is NoteViewHolder) {
            val note = getNoteAt(position)
-            holder.bind(note, bypass, project)
+            holder.bind(note, project)
        } else if (holder is LoadingFooterViewHolder) {
            holder.bind(loading)
        }

--- a/app/src/main/java/com/commit451/gitlab/adapter/ProjectSectionsPagerAdapter.kt
+++ b/app/src/main/java/com/commit451/gitlab/adapter/ProjectSectionsPagerAdapter.kt
@@ -5,6 +5,7 @@ import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.ProjectActivity
+import com.commit451.gitlab.extension.getFeedUrl
 import com.commit451.gitlab.fragment.*
 import com.commit451.gitlab.model.api.Project
 import timber.log.Timber
@@ -35,21 +36,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 +66,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 {
@@ -76,7 +74,7 @@ class ProjectSectionsPagerAdapter(context: ProjectActivity, fm: FragmentManager)
  
        when (correctPosition) {
            PROJECT_POS -> return ProjectFragment.newInstance()
-            ACTIVITY_POS -> return FeedFragment.newInstance(project.feedUrl)
+            ACTIVITY_POS -> return FeedFragment.newInstance(project.getFeedUrl())
            FILES_POS -> return FilesFragment.newInstance()
            COMMITS_POS -> return CommitsFragment.newInstance()
            PIPELINES_POS -> return PipelinesFragment.newInstance()
@@ -91,6 +89,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 +104,6 @@ class ProjectSectionsPagerAdapter(context: ProjectActivity, fm: FragmentManager)
            }
        }
  
-        return position
+        return correctPosition
    }
 }