Wrap and unwrap parcelabler parcels in extensions

app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TextInputLayout
 import android.support.v7.app.AlertDialog
@@ -27,6 +26,8 @@ import com.commit451.gitlab.adapter.MilestoneSpinnerAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueCreatedEvent
 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.*
 import com.commit451.gitlab.navigation.Navigator
@@ -36,7 +37,6 @@ import com.commit451.teleprinter.Teleprinter
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.parceler.Parcels
 import retrofit2.Response
 import timber.log.Timber
 import java.util.*
@@ -54,9 +54,9 @@ class AddIssueActivity : MorphActivity() {
         fun newIntent(context: Context, project: Project, issue: Issue?): Intent {
             val intent = Intent(context, AddIssueActivity::class.java)
-            intent.putExtra(KEY_PROJECT, Parcels.wrap(project))
+            intent.putParcelParcelableExtra(KEY_PROJECT, project)
             if (issue != null) {
-                intent.putExtra(KEY_ISSUE, Parcels.wrap(issue))
+                intent.putParcelParcelableExtra(KEY_ISSUE, issue)
             }
             return intent
         }
@@ -96,8 +96,8 @@ class AddIssueActivity : MorphActivity() {
         morph(root)
         teleprinter = Teleprinter(this)
-        project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(KEY_PROJECT))
-        issue = Parcels.unwrap<Issue>(intent.getParcelableExtra<Parcelable>(KEY_ISSUE))
+        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        issue = intent.getParcelerParcelable<Issue>(KEY_ISSUE)
         members = HashSet<Member>()
         adapterLabels = AddIssueLabelAdapter(object : AddIssueLabelAdapter.Listener {
             override fun onLabelClicked(label: Label) {
@@ -255,15 +255,16 @@ class AddIssueActivity : MorphActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            REQUEST_LABEL -> if (resultCode == Activity.RESULT_OK) {
-                val label = Parcels.unwrap<Label>(data?.getParcelableExtra<Parcelable>(AddLabelActivity.KEY_LABEL))
-                if (adapterLabels.containsLabel(label)) {
-                    Snackbar.make(root, R.string.label_already_added, Snackbar.LENGTH_SHORT)
-                            .show()
-                } else {
-                    adapterLabels.addLabel(label)
+            REQUEST_LABEL ->
+                if (resultCode == Activity.RESULT_OK) {
+                    val label = data?.getParcelerParcelable<Label>(AddLabelActivity.KEY_LABEL)!!
+                    if (adapterLabels.containsLabel(label)) {
+                        Snackbar.make(root, R.string.label_already_added, Snackbar.LENGTH_SHORT)
+                                .show()
+                    } else {
+                        adapterLabels.addLabel(label)
+                    }
                 }
-            }
         }
     }

app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@@ -18,12 +17,13 @@ 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
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.viewHolder.LabelViewHolder
-import org.parceler.Parcels
 import timber.log.Timber
 /**
@@ -76,7 +76,7 @@ class AddLabelActivity : BaseActivity() {
         adapterLabel = LabelAdapter(object : LabelAdapter.Listener {
             override fun onLabelClicked(label: Label, viewHolder: LabelViewHolder) {
                 val data = Intent()
-                data.putExtra(KEY_LABEL, Parcels.wrap(label))
+                data.putParcelParcelableExtra(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 = Parcels.unwrap<Label>(data?.getParcelableExtra<Parcelable>(AddNewLabelActivity.KEY_NEW_LABEL))
+                val newLabel = data?.getParcelerParcelable<Label>(AddNewLabelActivity.KEY_NEW_LABEL)!!
                 adapterLabel.addLabel(newLabel)
             }
         }

app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt

@@ -3,7 +3,6 @@ package com.commit451.gitlab.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TextInputLayout
 import android.support.v7.widget.Toolbar
@@ -20,13 +19,14 @@ import com.commit451.gitlab.R
 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
 import com.commit451.teleprinter.Teleprinter
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
 import io.reactivex.Single
-import org.parceler.Parcels
 import timber.log.Timber
 import java.util.*
@@ -41,7 +41,7 @@ class AddMilestoneActivity : MorphActivity() {
             val intent = Intent(context, AddMilestoneActivity::class.java)
             intent.putExtra(KEY_PROJECT_ID, projectId)
             if (milestone != null) {
-                intent.putExtra(KEY_MILESTONE, Parcels.wrap(milestone))
+                intent.putParcelParcelableExtra(KEY_MILESTONE, milestone)
             }
             return intent
         }
@@ -93,7 +93,7 @@ class AddMilestoneActivity : MorphActivity() {
         morph(root)
         teleprinter = Teleprinter(this)
         projectId = intent.getLongExtra(KEY_PROJECT_ID, -1)
-        milestone = Parcels.unwrap<Milestone>(intent.getParcelableExtra<Parcelable>(KEY_MILESTONE))
+        milestone = intent.getParcelerParcelable<Milestone>(KEY_MILESTONE)
         if (milestone != null) {
             bind(milestone!!)
             toolbar.inflateMenu(R.menu.edit)

app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt

@@ -20,6 +20,7 @@ import com.afollestad.materialdialogs.color.ColorChooserDialog
 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
@@ -138,7 +139,7 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
                         override fun responseNonNullSuccess(label: Label) {
                             val data = Intent()
-                            data.putExtra(KEY_NEW_LABEL, Parcels.wrap(label))
+                            data.putParcelParcelableExtra(KEY_NEW_LABEL, label)
                             setResult(Activity.RESULT_OK, data)
                             finish()
                         }

app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.GridLayoutManager
@@ -20,6 +19,8 @@ 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
@@ -29,7 +30,6 @@ import com.commit451.gitlab.util.LinkHeaderParser
 import com.commit451.gitlab.viewHolder.UserViewHolder
 import com.commit451.teleprinter.Teleprinter
 import io.reactivex.Single
-import org.parceler.Parcels
 import retrofit2.HttpException
 import retrofit2.Response
 import timber.log.Timber
@@ -52,7 +52,7 @@ class AddUserActivity : MorphActivity() {
         fun newIntent(context: Context, group: Group): Intent {
             val intent = Intent(context, AddUserActivity::class.java)
-            intent.putExtra(KEY_GROUP, Parcels.wrap(group))
+            intent.putParcelParcelableExtra(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 = Parcels.unwrap<Group>(intent.getParcelableExtra<Parcelable>(KEY_GROUP))
+        group = intent.getParcelerParcelable<Group>(KEY_GROUP)
         dialogAccess = AccessDialog(this, object : AccessDialog.Listener {
             override fun onAccessApplied(accessLevel: Int) {
                 dialogAccess.showLoading()

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.Bundle
-import android.os.Parcelable
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
@@ -14,13 +14,14 @@ import butterknife.ButterKnife
 import butterknife.OnClick
 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 org.parceler.Parcels
 import pl.aprilapps.easyphotopicker.DefaultCallback
 import pl.aprilapps.easyphotopicker.EasyImage
 import timber.log.Timber
@@ -39,7 +40,7 @@ class AttachActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project): Intent {
             val intent = Intent(context, AttachActivity::class.java)
-            intent.putExtra(KEY_PROJECT, Parcels.wrap(project))
+            intent.putParcelParcelableExtra(KEY_PROJECT, project)
             return intent
         }
     }
@@ -84,11 +85,11 @@ class AttachActivity : BaseActivity() {
             val animator = ViewAnimationUtils
                     .createCircularReveal(card, 0, card.height, 0f, finalRadius)
             animator.duration = 500
-            animator.interpolator = AccelerateDecelerateInterpolator()
+            animator.interpolator = AccelerateDecelerateInterpolator() as TimeInterpolator?
             animator.start()
         }
-        project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(KEY_PROJECT))
+        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)
     }
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -127,7 +128,7 @@ class AttachActivity : BaseActivity() {
                     override fun success(fileUploadResponse: FileUploadResponse) {
                         val data = Intent()
-                        data.putExtra(KEY_FILE_UPLOAD_RESPONSE, Parcels.wrap(fileUploadResponse))
+                        data.putParcelParcelableExtra(KEY_FILE_UPLOAD_RESPONSE, fileUploadResponse)
                         setResult(Activity.RESULT_OK, data)
                         finish()
                     }

app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt

 package com.commit451.gitlab.activity
 import android.Manifest
-import android.annotation.TargetApi
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TabLayout
 import android.support.v4.content.ContextCompat
@@ -15,22 +14,19 @@ import android.support.v7.widget.Toolbar
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-
+import butterknife.BindView
+import butterknife.ButterKnife
 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.model.Account
+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
 import com.commit451.gitlab.util.DownloadUtil
-
-import org.parceler.Parcels
-
-import butterknife.BindView
-import butterknife.ButterKnife
-import com.commit451.gitlab.extension.getDownloadBuildUrl
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
@@ -49,8 +45,8 @@ class BuildActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, build: Build): Intent {
             val intent = Intent(context, BuildActivity::class.java)
-            intent.putExtra(KEY_PROJECT, Parcels.wrap(project))
-            intent.putExtra(KEY_BUILD, Parcels.wrap(build))
+            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelParcelableExtra(KEY_BUILD, build)
             return intent
         }
     }
@@ -153,8 +149,8 @@ class BuildActivity : BaseActivity() {
         setContentView(R.layout.activity_build)
         ButterKnife.bind(this)
-        project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(KEY_PROJECT))
-        build = Parcels.unwrap<Build>(intent.getParcelableExtra<Parcelable>(KEY_BUILD))
+        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        build = intent.getParcelerParcelable<Build>(KEY_BUILD)!!
         toolbar.title = String.format(getString(R.string.build_number), build.id)
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
@@ -191,7 +187,7 @@ class BuildActivity : BaseActivity() {
         tabLayout.setupWithViewPager(viewPager)
     }
-    @TargetApi(23)
+    @SuppressLint("NewApi")
     private fun checkDownloadBuild() {
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
             downloadBuild()

app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt

@@ -3,7 +3,6 @@ package com.commit451.gitlab.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@@ -16,12 +15,13 @@ import butterknife.ButterKnife
 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
 import com.commit451.gitlab.model.api.RepositoryCommit
 import com.commit451.gitlab.rx.CustomSingleObserver
-import org.parceler.Parcels
 import timber.log.Timber
 /**
@@ -36,8 +36,8 @@ class DiffActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, commit: RepositoryCommit): Intent {
             val intent = Intent(context, DiffActivity::class.java)
-            intent.putExtra(EXTRA_PROJECT, Parcels.wrap(project))
-            intent.putExtra(EXTRA_COMMIT, Parcels.wrap(commit))
+            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelParcelableExtra(EXTRA_COMMIT, commit)
             return intent
         }
     }
@@ -58,8 +58,8 @@ class DiffActivity : BaseActivity() {
         setContentView(R.layout.activity_diff)
         ButterKnife.bind(this)
-        project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(EXTRA_PROJECT))
-        commit = Parcels.unwrap<RepositoryCommit>(intent.getParcelableExtra<Parcelable>(EXTRA_COMMIT))
+        project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)!!
+        commit = intent.getParcelerParcelable<RepositoryCommit>(EXTRA_COMMIT)!!
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener { onBackPressed() }

app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt

@@ -10,9 +10,9 @@ import butterknife.ButterKnife
 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
-import org.parceler.Parcels
 /**
  * A full-screen activity that opens the clicked images
@@ -26,7 +26,7 @@ class FullscreenImageActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, url: String): Intent {
             val intent = Intent(context, FullscreenImageActivity::class.java)
-            intent.putExtra(KEY_PROJECT, Parcels.wrap(project))
+            intent.putParcelParcelableExtra(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.getParcelerParcelable(KEY_PROJECT)!!
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener {

app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.CollapsingToolbarLayout
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TabLayout
@@ -23,12 +22,13 @@ 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
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.transformation.PaletteTransformation
-import org.parceler.Parcels
 import timber.log.Timber
 /**
@@ -43,7 +43,7 @@ class GroupActivity : BaseActivity() {
         fun newIntent(context: Context, group: Group): Intent {
             val intent = Intent(context, GroupActivity::class.java)
-            intent.putExtra(KEY_GROUP, Parcels.wrap(group))
+            intent.putParcelParcelableExtra(KEY_GROUP, group)
             return intent
         }
@@ -73,7 +73,7 @@ class GroupActivity : BaseActivity() {
         toolbar.setNavigationOnClickListener { onBackPressed() }
         if (intent.hasExtra(KEY_GROUP)) {
-            val group = Parcels.unwrap<Group>(intent.getParcelableExtra<Parcelable>(KEY_GROUP))
+            val group = intent.getParcelerParcelable<Group>(KEY_GROUP)!!
             bind(group)
         } else {
             progress.visibility = View.VISIBLE

app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
@@ -24,6 +23,8 @@ 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.setup
 import com.commit451.gitlab.model.api.FileUploadResponse
 import com.commit451.gitlab.model.api.Issue
@@ -40,7 +41,6 @@ import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import org.greenrobot.eventbus.Subscribe
-import org.parceler.Parcels
 import retrofit2.Response
 import timber.log.Timber
@@ -61,8 +61,8 @@ class IssueActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, issue: Issue): Intent {
             val intent = Intent(context, IssueActivity::class.java)
-            intent.putExtra(EXTRA_PROJECT, Parcels.wrap(project))
-            intent.putExtra(EXTRA_SELECTED_ISSUE, Parcels.wrap(issue))
+            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelParcelableExtra(EXTRA_SELECTED_ISSUE, issue)
             return intent
         }
@@ -179,8 +179,8 @@ class IssueActivity : BaseActivity() {
         swipeRefreshLayout.setOnRefreshListener { loadNotes() }
         if (intent.hasExtra(EXTRA_SELECTED_ISSUE)) {
-            project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(EXTRA_PROJECT))
-            issue = Parcels.unwrap<Issue>(intent.getParcelableExtra<Parcelable>(EXTRA_SELECTED_ISSUE))
+            project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)
+            issue = intent.getParcelerParcelable<Issue>(EXTRA_SELECTED_ISSUE)
             adapterIssueDetails = IssueDetailsAdapter(this@IssueActivity, issue, project!!)
             listNotes.adapter = adapterIssueDetails
             bindIssue()
@@ -229,14 +229,15 @@ class IssueActivity : BaseActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            REQUEST_ATTACH -> if (resultCode == Activity.RESULT_OK) {
-                val response = Parcels.unwrap<FileUploadResponse>(data?.getParcelableExtra<Parcelable>(AttachActivity.KEY_FILE_UPLOAD_RESPONSE))
-                progress.visibility = View.GONE
-                sendMessageView.appendText(response.markdown)
-            } else {
-                Snackbar.make(root, R.string.failed_to_upload_file, Snackbar.LENGTH_LONG)
-                        .show()
-            }
+            REQUEST_ATTACH ->
+                if (resultCode == Activity.RESULT_OK) {
+                    val response = data?.getParcelerParcelable<FileUploadResponse>(AttachActivity.KEY_FILE_UPLOAD_RESPONSE)!!
+                    progress.visibility = View.GONE
+                    sendMessageView.appendText(response.markdown)
+                } else {
+                    Snackbar.make(root, R.string.failed_to_upload_file, Snackbar.LENGTH_LONG)
+                            .show()
+                }
         }
     }

app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.kt

@@ -3,7 +3,6 @@ package com.commit451.gitlab.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TabLayout
 import android.support.v4.view.ViewPager
@@ -16,11 +15,12 @@ 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
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
-import org.parceler.Parcels
 import retrofit2.HttpException
 import timber.log.Timber
@@ -36,8 +36,8 @@ class MergeRequestActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, mergeRequest: MergeRequest): Intent {
             val intent = Intent(context, MergeRequestActivity::class.java)
-            intent.putExtra(KEY_PROJECT, Parcels.wrap(project))
-            intent.putExtra(KEY_MERGE_REQUEST, Parcels.wrap(mergeRequest))
+            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
             return intent
         }
     }
@@ -56,8 +56,8 @@ class MergeRequestActivity : BaseActivity() {
         setContentView(R.layout.activity_merge_request)
         ButterKnife.bind(this)
-        project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(KEY_PROJECT))
-        mergeRequest = Parcels.unwrap<MergeRequest>(intent.getParcelableExtra<Parcelable>(KEY_MERGE_REQUEST))
+        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        mergeRequest = intent.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
         toolbar.title = getString(R.string.merge_request_number) + mergeRequest.iid
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.widget.LinearLayoutManager
@@ -22,6 +21,8 @@ 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
@@ -32,7 +33,6 @@ import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.LinkHeaderParser
 import io.reactivex.Single
 import org.greenrobot.eventbus.Subscribe
-import org.parceler.Parcels
 import timber.log.Timber
 class MilestoneActivity : BaseActivity() {
@@ -44,8 +44,8 @@ class MilestoneActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, milestone: Milestone): Intent {
             val intent = Intent(context, MilestoneActivity::class.java)
-            intent.putExtra(EXTRA_PROJECT, Parcels.wrap(project))
-            intent.putExtra(EXTRA_MILESTONE, Parcels.wrap(milestone))
+            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelParcelableExtra(EXTRA_MILESTONE, milestone)
             return intent
         }
     }
@@ -94,8 +94,8 @@ class MilestoneActivity : BaseActivity() {
         ButterKnife.bind(this)
         App.bus().register(this)
-        project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(EXTRA_PROJECT))
-        milestone = Parcels.unwrap<Milestone>(intent.getParcelableExtra<Parcelable>(EXTRA_MILESTONE))
+        project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)!!
+        milestone = intent.getParcelerParcelable<Milestone>(EXTRA_MILESTONE)!!
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener { onBackPressed() }

app/src/main/java/com/commit451/gitlab/activity/PickBranchOrTagActivity.kt

@@ -3,7 +3,6 @@ package com.commit451.gitlab.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.TabLayout
 import android.support.v4.view.ViewPager
 import android.support.v7.app.AppCompatActivity
@@ -12,8 +11,9 @@ import butterknife.ButterKnife
 import butterknife.OnClick
 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
-import org.parceler.Parcels
 /**
@@ -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.putExtra(EXTRA_CURRENT_REF, Parcels.wrap<Ref>(currentRef))
+            intent.putParcelParcelableExtra(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 = Parcels.unwrap<Ref>(intent.getParcelableExtra<Parcelable>(EXTRA_CURRENT_REF))
+        val currentRef = intent.getParcelerParcelable<Ref>(EXTRA_CURRENT_REF)
         viewPager.adapter = PickBranchOrTagPagerAdapter(this, supportFragmentManager, projectId, currentRef)
         tabLayout.setupWithViewPager(viewPager)
         if (currentRef != null) {

app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.kt

@@ -6,7 +6,6 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.design.widget.TabLayout
 import android.support.v4.view.ViewPager
@@ -23,6 +22,7 @@ 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
@@ -31,7 +31,6 @@ import com.commit451.gitlab.navigation.Navigator
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.IntentUtil
 import io.reactivex.Single
-import org.parceler.Parcels
 import timber.log.Timber
 class ProjectActivity : BaseActivity() {
@@ -50,7 +49,7 @@ class ProjectActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project): Intent {
             val intent = Intent(context, ProjectActivity::class.java)
-            intent.putExtra(EXTRA_PROJECT, Parcels.wrap(project))
+            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
             return intent
         }
@@ -123,8 +122,8 @@ class ProjectActivity : BaseActivity() {
         var project: Project? = intent.getParcelerParcelable(EXTRA_PROJECT)
         if (savedInstanceState != null) {
-            project = Parcels.unwrap<Project>(savedInstanceState.getParcelable<Parcelable>(STATE_PROJECT))
-            ref = Parcels.unwrap<Ref>(savedInstanceState.getParcelable<Parcelable>(STATE_REF))
+            project = savedInstanceState.getParcelerParcelable<Project>(STATE_PROJECT)
+            ref = savedInstanceState.getParcelerParcelable<Ref>(STATE_REF)
         }
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener { finish() }
@@ -151,7 +150,7 @@ class ProjectActivity : BaseActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
             REQUEST_BRANCH_OR_TAG -> if (resultCode == Activity.RESULT_OK) {
-                ref = Parcels.unwrap<Ref>(data?.getParcelableExtra<Parcelable>(PickBranchOrTagActivity.EXTRA_REF))
+                ref = data?.getParcelerParcelable<Ref>(PickBranchOrTagActivity.EXTRA_REF)
                 broadcastLoad()
             }
         }
@@ -159,8 +158,8 @@ class ProjectActivity : BaseActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putParcelable(STATE_REF, Parcels.wrap<Ref>(ref))
-        outState.putParcelable(STATE_PROJECT, Parcels.wrap<Project>(project))
+        outState.putParcelParcelableExtra(STATE_REF, ref)
+        outState.putParcelParcelableExtra(STATE_PROJECT, project)
     }
     override fun onBackPressed() {

app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.CollapsingToolbarLayout
 import android.support.v7.graphics.Palette
 import android.support.v7.widget.Toolbar
@@ -18,11 +17,12 @@ 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
 import com.commit451.gitlab.util.ImageUtil
-import org.parceler.Parcels
 /**
  * User activity, which shows the user!
@@ -35,7 +35,7 @@ class UserActivity : BaseActivity() {
         fun newIntent(context: Context, user: UserBasic): Intent {
             val intent = Intent(context, UserActivity::class.java)
-            intent.putExtra(KEY_USER, Parcels.wrap(user))
+            intent.putParcelParcelableExtra(KEY_USER, user)
             return intent
         }
     }
@@ -50,7 +50,7 @@ class UserActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_user)
         ButterKnife.bind(this)
-        user = Parcels.unwrap<UserBasic>(intent.getParcelableExtra<Parcelable>(KEY_USER))
+        user = intent.getParcelerParcelable<UserBasic>(KEY_USER)!!
         // Default content and scrim colors
         collapsingToolbarLayout.setCollapsedTitleTextColor(Color.WHITE)

app/src/main/java/com/commit451/gitlab/extension/Bundle.kt

 package com.commit451.gitlab.extension
 import android.os.Bundle
+import org.parceler.Parcels
 //Bundle extensions
 fun Bundle.putParcelParcelableExtra(key: String, thing: Any?) {
     this.putParcelable(key, org.parceler.Parcels.wrap(thing))
+}
+
+/**
+ * Get Parcelable that was put in the bundle using Parceler
+ */
+fun <T> Bundle.getParcelerParcelable(key: String): T? {
+    return Parcels.unwrap<T>(getParcelable(key))
 }
\ No newline at end of file

app/src/main/java/com/commit451/gitlab/extension/Intent.kt

@@ -6,6 +6,10 @@ import org.parceler.Parcels
 /**
  * Get Parcelable that was put in the intent using Parceler
  */
-fun <T> Intent.getParcelerParcelable(key: String): T {
+fun <T> Intent.getParcelerParcelable(key: String): T? {
     return Parcels.unwrap<T>(getParcelableExtra(key))
 }
+
+fun Intent.putParcelParcelableExtra(key: String, thing: Any?) {
+    this.putExtra(key, org.parceler.Parcels.wrap(thing))
+}

app/src/main/java/com/commit451/gitlab/fragment/BuildDescriptionFragment.kt

 package com.commit451.gitlab.fragment
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.SwipeRefreshLayout
 import android.view.LayoutInflater
@@ -12,12 +11,10 @@ import butterknife.BindView
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.BuildChangedEvent
+import com.commit451.gitlab.extension.getParcelerParcelable
+import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
-import com.commit451.gitlab.model.api.Build
-import com.commit451.gitlab.model.api.Project
-import com.commit451.gitlab.model.api.RepositoryCommit
-import com.commit451.gitlab.model.api.Runner
-import com.commit451.gitlab.model.api.Pipeline
+import com.commit451.gitlab.model.api.*
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.DateUtil
 import com.trello.rxlifecycle2.android.FragmentEvent
@@ -39,8 +36,8 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
         fun newInstance(project: Project, build: Build): BuildDescriptionFragment {
             val fragment = BuildDescriptionFragment()
             val args = Bundle()
-            args.putParcelable(KEY_PROJECT, Parcels.wrap(project))
-            args.putParcelable(KEY_BUILD, Parcels.wrap(build))
+            args.putParcelParcelableExtra(KEY_PROJECT, project)
+            args.putParcelParcelableExtra(KEY_BUILD, build)
             fragment.arguments = args
             return fragment
         }
@@ -65,8 +62,8 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = Parcels.unwrap<Project>(arguments.getParcelable<Parcelable>(KEY_PROJECT))
-        build = Parcels.unwrap<Build>(arguments.getParcelable<Parcelable>(KEY_BUILD))
+        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        build = arguments.getParcelerParcelable<Build>(KEY_BUILD)!!
     }
     override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {

app/src/main/java/com/commit451/gitlab/fragment/BuildLogFragment.kt

 package com.commit451.gitlab.fragment
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.v4.widget.SwipeRefreshLayout
 import android.view.LayoutInflater
 import android.view.View
@@ -11,7 +10,9 @@ import butterknife.BindView
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.BuildChangedEvent
+import com.commit451.gitlab.extension.getParcelerParcelable
 import com.commit451.gitlab.extension.getRawBuildUrl
+import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Build
 import com.commit451.gitlab.model.api.Project
@@ -34,8 +35,8 @@ class BuildLogFragment : ButterKnifeFragment() {
         fun newInstance(project: Project, build: Build): BuildLogFragment {
             val fragment = BuildLogFragment()
             val args = Bundle()
-            args.putParcelable(KEY_PROJECT, Parcels.wrap(project))
-            args.putParcelable(KEY_BUILD, Parcels.wrap(build))
+            args.putParcelParcelableExtra(KEY_PROJECT, project)
+            args.putParcelParcelableExtra(KEY_BUILD, build)
             fragment.arguments = args
             return fragment
         }
@@ -50,8 +51,8 @@ class BuildLogFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = Parcels.unwrap<Project>(arguments.getParcelable<Parcelable>(KEY_PROJECT))
-        build = Parcels.unwrap<Build>(arguments.getParcelable<Parcelable>(KEY_BUILD))
+        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        build = arguments.getParcelerParcelable<Build>(KEY_BUILD)!!
     }
     override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {