Clear up some lint warnings related to unused params and nullability

.gitignore

@@ -85,4 +85,7 @@ gradle-app.setting
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-*.DS_Store
\ No newline at end of file
+*.DS_Store
+
+# Custom
+app/gradle.properties

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

@@ -104,8 +104,8 @@ class AddIssueActivity : MorphActivity() {
                 AlertDialog.Builder(this@AddIssueActivity)
                         .setTitle(R.string.remove)
                         .setMessage(R.string.are_you_sure_you_want_to_remove)
-                        .setPositiveButton(android.R.string.yes) { dialog, which -> adapterLabels.removeLabel(label) }
-                        .setNegativeButton(android.R.string.no) { dialog, which -> dialog.dismiss() }
+                        .setPositiveButton(android.R.string.yes) { _, _ -> adapterLabels.removeLabel(label) }
+                        .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.dismiss() }
                         .show()
             }
         })
@@ -272,8 +272,8 @@ class AddIssueActivity : MorphActivity() {
         AlertDialog.Builder(this)
                 .setTitle(R.string.discard)
                 .setMessage(R.string.are_you_sure_you_want_to_discard)
-                .setPositiveButton(android.R.string.yes) { dialog, which -> dismiss() }
-                .setNegativeButton(android.R.string.no) { dialog, which -> dialog.dismiss() }
+                .setPositiveButton(android.R.string.yes) { _, _ -> dismiss() }
+                .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.dismiss() }
                 .show()
     }

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

@@ -61,7 +61,7 @@ class AddMilestoneActivity : MorphActivity() {
     var milestone: Milestone? = null
     var currentDate: Date? = null
-    val onDateSetListener = DatePickerDialog.OnDateSetListener { view, year, monthOfYear, dayOfMonth ->
+    val onDateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
         val calendar = Calendar.getInstance()
         calendar.set(Calendar.YEAR, year)
         calendar.set(Calendar.MONTH, monthOfYear)

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

@@ -150,13 +150,11 @@ class FileActivity : BaseActivity() {
     private fun bindBlob(blob: ByteArray) {
         this.blob = blob
         val content: String
-        var mimeType: String? = null
+        var mimeType: String?
         val extension = fileExtension(fileName!!)
-        if (extension != null) {
-            mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            if (mimeType != null) {
-                mimeType = mimeType.toLowerCase()
-            }
+        mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+        if (mimeType != null) {
+            mimeType = mimeType.toLowerCase()
         }
         if (mimeType != null && mimeType.startsWith("image/")) {

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

@@ -382,7 +382,7 @@ class LoginActivity : BaseActivity() {
             val d = AlertDialog.Builder(this)
                     .setTitle(R.string.certificate_title)
                     .setMessage(String.format(resources.getString(R.string.certificate_message), finalFingerprint))
-                    .setPositiveButton(R.string.ok_button) { dialog, which ->
+                    .setPositiveButton(R.string.ok_button) { dialog, _ ->
                         if (finalFingerprint != null) {
                             account.trustedCertificate = finalFingerprint
                             login()
@@ -390,7 +390,7 @@ class LoginActivity : BaseActivity() {
                         dialog.dismiss()
                     }
-                    .setNegativeButton(R.string.cancel_button) { dialog, which -> dialog.dismiss() }
+                    .setNegativeButton(R.string.cancel_button) { dialog, _ -> dialog.dismiss() }
                     .show()
             (d.findViewById(android.R.id.message) as TextView).movementMethod = LinkMovementMethod.getInstance()
@@ -400,7 +400,7 @@ class LoginActivity : BaseActivity() {
             val d = AlertDialog.Builder(this)
                     .setTitle(R.string.hostname_title)
                     .setMessage(R.string.hostname_message)
-                    .setPositiveButton(R.string.ok_button) { dialog, which ->
+                    .setPositiveButton(R.string.ok_button) { dialog, _ ->
                         if (finalHostname != null) {
                             account.trustedHostname = finalHostname
                             login()
@@ -408,7 +408,7 @@ class LoginActivity : BaseActivity() {
                         dialog.dismiss()
                     }
-                    .setNegativeButton(R.string.cancel_button) { dialog, which -> dialog.dismiss() }
+                    .setNegativeButton(R.string.cancel_button) { dialog, _ -> dialog.dismiss() }
                     .show()
             (d.findViewById(android.R.id.message) as TextView).movementMethod = LinkMovementMethod.getInstance()

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

 package com.commit451.gitlab.activity
-import android.Manifest
-import android.annotation.TargetApi
 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
 import android.support.v4.view.ViewPager
 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.PipelineSectionsPagerAdapter
 import com.commit451.gitlab.event.PipelineChangedEvent
-import com.commit451.gitlab.model.Account
+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.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 com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
-
-import butterknife.BindView
-import butterknife.ButterKnife
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
@@ -123,7 +110,7 @@ class PipelineActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_pipeline)
-        val bind = ButterKnife.bind(this)
+        ButterKnife.bind(this)
         project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
         pipeline = intent.getParcelerParcelable<Pipeline>(KEY_PIPELINE)!!

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

@@ -4,7 +4,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.widget.Toast
-import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.Account
 import com.commit451.gitlab.navigation.DeepLinker
@@ -98,7 +97,7 @@ class RoutingActivity : BaseActivity() {
         //okay so last thing, if the user has followed a link, but the user
         //is not actually signed in, we want to direct them to signin
-        if (App.get().getAccount() == null && Account.getAccounts().isEmpty()) {
+        if (Account.getAccounts().isEmpty()) {
             Navigator.navigateToLogin(this)
             finish()
             return

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

@@ -47,6 +47,10 @@ class WebLoginActivity : BaseActivity() {
     lateinit var url: String
+    val isExtracting: Boolean by lazy {
+        intent.getBooleanExtra(KEY_EXTRACTING_PRIVATE_TOKEN, false)
+    }
+
     val webChromeClient = object : WebChromeClient() {
         override fun onProgressChanged(view: WebView, newProgress: Int) {
             super.onProgressChanged(view, newProgress)
@@ -83,25 +87,27 @@ class WebLoginActivity : BaseActivity() {
         webView.clearFormData()
         webView.clearHistory()
+        clearCookies()
+
+        webView.loadUrl(url + "/users/sign_in")
+    }
+
+    @Suppress("DEPRECATION")
+    fun clearCookies() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
             CookieManager.getInstance().removeAllCookies(null)
             CookieManager.getInstance().flush()
         } else {
-            val cookieSyncMngr = CookieSyncManager.createInstance(this)
-            cookieSyncMngr.startSync()
+            val cookieSyncManager = CookieSyncManager.createInstance(this)
+            cookieSyncManager.startSync()
             val cookieManager = CookieManager.getInstance()
             cookieManager.removeAllCookie()
             cookieManager.removeSessionCookie()
-            cookieSyncMngr.stopSync()
-            cookieSyncMngr.sync()
+            cookieSyncManager.stopSync()
+            cookieSyncManager.sync()
         }
-
-        webView.loadUrl(url + "/users/sign_in")
     }
-    val isExtracting: Boolean
-        get() = intent.getBooleanExtra(KEY_EXTRACTING_PRIVATE_TOKEN, false)
-
     inner class ExtractionWebClient : WebViewClient() {
         override fun onPageFinished(view: WebView, url: String) {
             var modifiedUrl = url

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

@@ -28,7 +28,7 @@ class IssueAdapter(private val listener: IssueAdapter.Listener) : RecyclerView.A
         when (viewType) {
             TYPE_ITEM -> {
                 val holder = IssueViewHolder.inflate(parent)
-                holder.itemView.setOnClickListener { v ->
+                holder.itemView.setOnClickListener {
                     val position = holder.adapterPosition
                     listener.onIssueClicked(getValueAt(position))
                 }

app/src/main/java/com/commit451/gitlab/dialog/AccessDialog.kt

@@ -21,7 +21,7 @@ import java.util.*
  */
 class AccessDialog private constructor(context: Context, internal var member: Member?, internal var group: Group?, projectId: Long) : MaterialDialog(MaterialDialog.Builder(context)
         .items(if (group == null) R.array.project_role_names else R.array.group_role_names)
-        .itemsCallbackSingleChoice(-1) { materialDialog, view, i, charSequence -> true }
+        .itemsCallbackSingleChoice(-1) { _, _, _, _ -> true }
         .theme(Theme.DARK)
         .progress(true, 0) // So we can later show loading progress
         .positiveText(R.string.action_apply)
@@ -109,12 +109,7 @@ class AccessDialog private constructor(context: Context, internal var member: Me
             return
         }
         val accessLevel = roleNames[selectedIndex]
-        if (accessLevel == null) {
-            Toast.makeText(context, R.string.please_select_access_level, Toast.LENGTH_LONG)
-                    .show()
-        } else {
-            changeAccess(Member.getAccessLevel(accessLevel))
-        }
+        changeAccess(Member.getAccessLevel(accessLevel))
     }
     fun onCancel() {

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

 package com.commit451.gitlab.extension
+import android.os.Build
+import android.text.Html
+import android.text.Spanned
 import android.util.Base64
 import io.reactivex.Single
@@ -10,3 +13,15 @@ fun String.base64Decode(): Single<ByteArray> {
         Base64.decode(this, Base64.DEFAULT)
     }
 }
+
+/**
+ * Assures HTML is formatted the same way pre and post Android N
+ */
+@Suppress("DEPRECATION")
+fun String.formatAsHtml(): Spanned {
+    if (Build.VERSION.SDK_INT >= 24) {
+        return Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
+    } else {
+        return Html.fromHtml(this)
+    }
+}
\ No newline at end of file

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

@@ -115,7 +115,7 @@ class FilesFragment : ButterKnifeFragment() {
     override fun onBackPressed(): Boolean {
         if (adapterBreadcrumb.itemCount > 1) {
             val breadcrumb = adapterBreadcrumb.getValueAt(adapterBreadcrumb.itemCount - 2)
-            if (breadcrumb != null && breadcrumb.listener != null) {
+            if (breadcrumb != null) {
                 breadcrumb.listener.onClick()
                 return true
             }

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

@@ -157,10 +157,6 @@ class GroupMembersFragment : ButterKnifeFragment() {
         if (view == null) {
             return
         }
-        if (group == null) {
-            swipeRefreshLayout.isRefreshing = false
-            return
-        }
         textMessage.visibility = View.GONE
         swipeRefreshLayout.isRefreshing = true
         loadGroupMembers(App.get().gitLab.getGroupMembers(group.id))
@@ -218,7 +214,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
     @Subscribe
     fun onMemberAdded(event: MemberAddedEvent) {
-        if (adapterGroupMembers != null) {
+        if (view != null) {
             adapterGroupMembers.addMember(event.member)
             textMessage.visibility = View.GONE
         }

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

@@ -5,7 +5,6 @@ import android.os.Bundle
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.SwipeRefreshLayout
 import android.support.v7.app.AlertDialog
-import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +16,7 @@ import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.ProjectActivity
 import com.commit451.gitlab.event.ProjectReloadEvent
 import com.commit451.gitlab.extension.base64Decode
+import com.commit451.gitlab.extension.formatAsHtml
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryFile
@@ -84,7 +84,7 @@ class ProjectFragment : ButterKnifeFragment() {
                     .setTitle(R.string.project_fork_title)
                     .setMessage(R.string.project_fork_message)
                     .setNegativeButton(android.R.string.cancel, null)
-                    .setPositiveButton(android.R.string.ok) { dialog, which ->
+                    .setPositiveButton(android.R.string.ok) { _, _ ->
                         App.get().gitLab.forkProject(it.id)
                                 .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
                                 .subscribe(object : CustomSingleObserver<String>() {
@@ -226,7 +226,7 @@ class ProjectFragment : ButterKnifeFragment() {
                                                     App.get().getAccount().serverUrl.toString(),
                                                     project!!))
                                 }
-                                README_TYPE_HTML -> textOverview.text = Html.fromHtml(text)
+                                README_TYPE_HTML -> textOverview.text = text.formatAsHtml()
                                 README_TYPE_TEXT -> textOverview.text = text
                                 README_TYPE_NO_EXTENSION -> textOverview.text = text
                             }

app/src/main/java/com/commit451/gitlab/view/SendMessageView.kt

@@ -63,7 +63,7 @@ class SendMessageView : LinearLayout {
             elevation = resources.getDimensionPixelSize(R.dimen.toolbar_elevation).toFloat()
         }
-        textNote.setOnEditorActionListener { v, actionId, event ->
+        textNote.setOnEditorActionListener { _, _, _ ->
             onSend()
             true
         }

app/src/main/java/com/commit451/gitlab/viewHolder/FeedEntryViewHolder.kt

 package com.commit451.gitlab.viewHolder
 import android.support.v7.widget.RecyclerView
-import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,6 +10,7 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
+import com.commit451.gitlab.extension.formatAsHtml
 import com.commit451.gitlab.model.rss.Entry
 import com.commit451.gitlab.transformation.CircleTransformation
@@ -42,7 +42,7 @@ class FeedEntryViewHolder(view: View) : RecyclerView.ViewHolder(view) {
                 .transform(CircleTransformation())
                 .into(image)
-        textTitle.text = Html.fromHtml(entry.title)
-        textSummary.text = Html.fromHtml(entry.summary)
+        textTitle.text = entry.title.formatAsHtml()
+        textSummary.text = entry.summary.formatAsHtml()
     }
 }

app/src/main/java/com/commit451/gitlab/viewHolder/IssueViewHolder.kt

@@ -69,7 +69,7 @@ class IssueViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         if (issue.author != null) {
             author += issue.author.username
         }
-        var id = ""
+        val id: String
         var issueId = issue.iid
         if (issueId < 1) {
             issueId = issue.id

app/src/main/java/com/commit451/gitlab/widget/ProjectFeedWidgetConfigureActivity.kt

@@ -63,7 +63,7 @@ class ProjectFeedWidgetConfigureActivity : BaseActivity() {
         toolbar.setTitle(R.string.widget_choose_account)
         adapterAccounts = AccountsAdapter()
-        adapterAccounts.setOnItemClickListener { adapter, view, position ->
+        adapterAccounts.setOnItemClickListener { adapter, _, position ->
             account = adapter.get(position)
             moveAlongToChooseProject(account!!)
         }