Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

Redundant construct cleanup 2: kotlin boogaloo

This commit is contained in:
TacoTheDank 2020-05-31 02:53:41 -04:00
parent 20fad6b917
commit 537aa5dbb4
41 changed files with 21 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
twidere/src/main/kotlin/androidx/loader/app/LoaderManagerExtensions.kt
View File

@ -1,8 +1,5 @@
package androidx.loader.app
import androidx.loader.app.LoaderManager
import androidx.loader.app.LoaderManagerImpl
/**
* Created by mariotaku on 2016/11/26.
*/

1
twidere/src/main/kotlin/androidx/loader/content/FixedAsyncTaskLoader.kt
View File

@ -2,7 +2,6 @@ package androidx.loader.content
import android.content.Context
import android.os.AsyncTask
import androidx.loader.content.AsyncTaskLoader
import org.mariotaku.twidere.extension.set
import org.mariotaku.twidere.util.Analyzer

2
twidere/src/main/kotlin/androidx/recyclerview/widget/RecyclerViewAccessor.kt
View File

@ -19,6 +19,4 @@
package androidx.recyclerview.widget
import androidx.recyclerview.widget.RecyclerView
val RecyclerView.LayoutManager.recyclerView: RecyclerView? get() = mRecyclerView

1
twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt
View File

@ -34,7 +34,6 @@ import org.mariotaku.twidere.R
import org.mariotaku.twidere.TwidereConstants.*
import org.mariotaku.twidere.adapter.AccountDetailsAdapter
import org.mariotaku.twidere.annotation.AccountType
import org.mariotaku.twidere.app.TwidereApplication
import org.mariotaku.twidere.extension.model.isOAuth
import org.mariotaku.twidere.model.UserKey
import org.mariotaku.twidere.model.util.AccountUtils

1
twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt
View File

@ -26,7 +26,6 @@ import android.os.Build
import android.os.Bundle
import android.os.Environment
import android.os.Parcelable
import android.provider.MediaStore
import androidx.annotation.RequiresApi
import androidx.fragment.app.DialogFragment
import androidx.fragment.app.Fragment

1
twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserListSelectorActivity.kt
View File

@ -28,7 +28,6 @@ import android.view.View
import android.widget.AdapterView.OnItemClickListener
import android.widget.TextView
import androidx.loader.app.hasRunningLoadersSafe
import com.bumptech.glide.Glide
import kotlinx.android.synthetic.main.layout_list_with_empty_view.*
import org.mariotaku.ktextension.Bundle
import org.mariotaku.ktextension.contains

3
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/MessagesConversationAdapter.kt
View File

@ -120,8 +120,7 @@ class MessagesConversationAdapter(
}
ITEM_LOAD_OLDER_INDICATOR -> {
val view = inflater.inflate(LoadIndicatorViewHolder.layoutResource, parent, false)
val holder = LoadIndicatorViewHolder(view)
return holder
return LoadIndicatorViewHolder(view)
}
}
throw UnsupportedOperationException()

3
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SelectableUsersAdapter.kt
View File

@ -70,8 +70,7 @@ class SelectableUsersAdapter(
when (viewType) {
ITEM_VIEW_TYPE_USER -> {
val view = inflater.inflate(R.layout.list_item_simple_user, parent, false)
val holder = SelectableUserViewHolder(view, this)
return holder
return SelectableUserViewHolder(view, this)
}
ITEM_VIEW_TYPE_LOAD_INDICATOR -> {
val view = inflater.inflate(R.layout.list_item_load_indicator, parent, false)

3
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SimpleParcelableUserListsAdapter.kt
View File

@ -67,8 +67,7 @@ class SimpleParcelableUserListsAdapter(
return view
}
1 -> {
val view = createViewFromResource(position, convertView, parent, R.layout.list_item_load_indicator)
return view
return createViewFromResource(position, convertView, parent, R.layout.list_item_load_indicator)
}
}
throw UnsupportedOperationException()

2
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt
View File

@ -306,7 +306,7 @@ class StatusDetailsAdapter(
when (holder.itemViewType) {
VIEW_TYPE_DETAIL_STATUS -> {
holder as DetailStatusViewHolder
payloads.forEach { it ->
payloads.forEach {
when (it) {
is StatusFragment.StatusActivity -> {
holder.updateStatusActivity(it)

1
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt
View File

@ -26,7 +26,6 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.viewpager.widget.PagerAdapter
import android.view.View
import android.view.ViewGroup
import org.mariotaku.twidere.fragment.iface.RefreshScrollTopInterface
import org.mariotaku.twidere.fragment.iface.SupportFragmentCallback
import org.mariotaku.twidere.model.SupportTabSpec

3
twidere/src/main/kotlin/org/mariotaku/twidere/adapter/VariousItemsAdapter.kt
View File

@ -57,8 +57,7 @@ class VariousItemsAdapter(
}
VIEW_TYPE_HASHTAG -> {
val view = inflater.inflate(R.layout.list_item_two_line_small, parent, false)
val holder = HashtagViewHolder(view, hashtagClickListener)
return holder
return HashtagViewHolder(view, hashtagClickListener)
}
}
throw UnsupportedOperationException()

2
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt
View File

@ -38,7 +38,7 @@ fun Account.getCredentials(am: AccountManager): Credentials {
if (token != null) return@run token
}
return@run null
} ?: throw NullPointerException("AuthToken is null for ${this}")
} ?: throw NullPointerException("AuthToken is null for $this")
return parseCredentials(authToken, getCredentialsType(am))
}

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/APIEditorDialogFragment.kt
View File

@ -10,7 +10,6 @@ import androidx.appcompat.app.AlertDialog
import android.view.View
import android.view.ViewGroup
import android.widget.*
import com.bumptech.glide.Glide
import com.rengwuxian.materialedittext.MaterialEditText
import org.mariotaku.twidere.R
import org.mariotaku.twidere.adapter.ArrayAdapter

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
View File

@ -272,7 +272,7 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment<Parcelab
val firstLoad = adapterData.isNullOrEmpty()
var lastReadId: Long = -1
var lastReadViewTop: Int = 0
var lastReadViewTop = 0
var loadMore = false
var wasAtTop = false
// 1. Save current read position if not first load

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AccountsDashboardFragment.kt
View File

@ -46,7 +46,6 @@ import androidx.appcompat.view.SupportMenuInflater
import androidx.appcompat.widget.ActionMenuView.OnMenuItemClickListener
import androidx.core.content.ContextCompat
import androidx.core.view.MenuItemCompat
import androidx.core.view.isVisible
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.FixedAsyncTaskLoader
import androidx.loader.content.Loader

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/BaseDialogFragment.kt
View File

@ -30,7 +30,6 @@ import okhttp3.Dns
import org.mariotaku.kpreferences.KPreferences
import org.mariotaku.restfu.http.RestHttpClient
import org.mariotaku.twidere.util.AsyncTwitterWrapper
import org.mariotaku.twidere.util.DebugModeUtils
import org.mariotaku.twidere.util.KeyboardShortcutsHandler
import org.mariotaku.twidere.util.UserColorNameManager
import org.mariotaku.twidere.util.dagger.GeneralComponent

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt
View File

@ -3,7 +3,6 @@ package org.mariotaku.twidere.fragment
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.FixedAsyncTaskLoader
import androidx.loader.content.Loader

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableGroupsFragment.kt
View File

@ -23,7 +23,6 @@ import android.content.Context
import android.os.Bundle
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.content.Loader
import androidx.recyclerview.widget.RecyclerView
import android.view.KeyEvent
import androidx.loader.app.hasRunningLoadersSafe
import com.bumptech.glide.RequestManager

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
View File

@ -232,7 +232,7 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() {
private fun updateRetweetedStatuses(status: ParcelableStatus?) {
val data = adapterData
if (status == null || status.retweet_id == null || data == null) return
if (status?.retweet_id == null || data == null) return
data.forEach { orig ->
if (orig.account_key == status.account_key && TextUtils.equals(orig.id, status.retweet_id)) {
orig.my_retweet_id = status.my_retweet_id

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableUserListsFragment.kt
View File

@ -24,7 +24,6 @@ import android.os.Bundle
import androidx.loader.app.LoaderManager.LoaderCallbacks
import androidx.loader.app.hasRunningLoadersSafe
import androidx.loader.content.Loader
import androidx.recyclerview.widget.RecyclerView
import android.view.KeyEvent
import com.bumptech.glide.RequestManager
import kotlinx.android.synthetic.main.fragment_content_recyclerview.*

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt
View File

@ -50,7 +50,6 @@ import org.mariotaku.twidere.TwidereConstants.*
import org.mariotaku.twidere.activity.ColorPickerDialogActivity
import org.mariotaku.twidere.activity.ThemedMediaPickerActivity
import org.mariotaku.twidere.annotation.AccountType
import org.mariotaku.twidere.annotation.ImageShapeStyle
import org.mariotaku.twidere.extension.loadProfileBanner
import org.mariotaku.twidere.extension.loadProfileImage
import org.mariotaku.twidere.extension.model.api.mastodon.toParcelable

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ImagePageFragment.kt
View File

@ -24,7 +24,6 @@ import android.content.Context
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.net.Uri
import android.os.Bundle
import com.davemorrissey.labs.subscaleview.ImageSource
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.davemorrissey.labs.subscaleview.decoder.SkiaImageDecoder

1
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/status/TranslationDestinationDialogFragment.kt
View File

@ -21,7 +21,6 @@ package org.mariotaku.twidere.fragment.status
import android.app.Dialog
import android.os.Bundle
import android.os.Parcel
import android.os.Parcelable
import androidx.appcompat.app.AlertDialog
import kotlinx.android.parcel.Parcelize

2
twidere/src/main/kotlin/org/mariotaku/twidere/provider/CacheProvider.kt
View File

@ -8,14 +8,12 @@ import android.database.Cursor
import android.graphics.BitmapFactory
import android.net.Uri
import android.os.ParcelFileDescriptor
import okio.ByteString
import okio.ByteString.Companion.decodeBase64
import okio.ByteString.Companion.encodeUtf8
import org.mariotaku.mediaviewer.library.FileCache
import org.mariotaku.twidere.TwidereConstants.AUTHORITY_TWIDERE_CACHE
import org.mariotaku.twidere.TwidereConstants.QUERY_PARAM_TYPE
import org.mariotaku.twidere.annotation.CacheFileType
import org.mariotaku.twidere.extension.get
import org.mariotaku.twidere.model.CacheMetadata
import org.mariotaku.twidere.task.SaveFileTask
import org.mariotaku.twidere.util.JsonSerializer

5
twidere/src/main/kotlin/org/mariotaku/twidere/task/AbsFriendshipOperationTask.kt
View File

@ -38,10 +38,9 @@ abstract class AbsFriendshipOperationTask(
val event = FriendshipTaskEvent(action, params.accountKey, params.userKey)
event.isFinished = true
if (result != null) {
val user = result
showSucceededMessage(params, user)
showSucceededMessage(params, result)
event.isSucceeded = true
event.user = user
event.user = result
} else if (exception != null) {
showErrorMessage(params, exception)
}

3
twidere/src/main/kotlin/org/mariotaku/twidere/task/DestroyFavoriteTask.kt
View File

@ -72,8 +72,7 @@ class DestroyFavoriteTask(
val taskEvent = FavoriteTaskEvent(FavoriteTaskEvent.Action.DESTROY, accountKey, statusId)
taskEvent.isFinished = true
if (result != null) {
val status = result
taskEvent.status = status
taskEvent.status = result
taskEvent.isSucceeded = true
Toast.makeText(context, R.string.message_toast_status_unfavorited, Toast.LENGTH_SHORT).show()
} else {

2
twidere/src/main/kotlin/org/mariotaku/twidere/task/SaveFileTask.kt
View File

@ -54,7 +54,7 @@ abstract class SaveFileTask(
override fun onPostExecute(result: SaveFileResult?) {
dismissProgress()
if (result != null && result.savedFile != null) {
if (result?.savedFile != null) {
onFileSaved(result.savedFile!!, result.mimeType)
} else {
onFileSaveFailed()

3
twidere/src/main/kotlin/org/mariotaku/twidere/task/twitter/message/GetMessagesTask.kt
View File

@ -146,9 +146,8 @@ class GetMessagesTask(
val sincePagination = param.pagination?.elementAtOrNull(accountsCount + index) as? SinceMaxPagination
val firstFetch by lazy {
val noConversationsBefore = context.contentResolver.queryCount(Conversations.CONTENT_URI,
return@lazy context.contentResolver.queryCount(Conversations.CONTENT_URI,
Expression.equalsArgs(Conversations.ACCOUNT_KEY).sql, arrayOf(accountKey.toString())) <= 0
return@lazy noConversationsBefore
}
val updateLastRead = param.hasMaxIds || firstFetch

3
twidere/src/main/kotlin/org/mariotaku/twidere/util/ThemeUtils.kt
View File

@ -408,8 +408,7 @@ object ThemeUtils {
if (icon != null && item.groupId !in excludedGroups) {
icon.mutate()
if (info is TwidereMenuInfo) {
val sInfo = info
val stateColor = if (sInfo.isHighlight) sInfo.getHighlightColor(highlightColor) else color
val stateColor = if (info.isHighlight) info.getHighlightColor(highlightColor) else color
if (stateColor != 0) {
icon.setColorFilter(stateColor, mode)
}

4
twidere/src/main/kotlin/org/mariotaku/twidere/util/Utils.kt
View File

@ -513,7 +513,7 @@ object Utils {
}
internal fun isExtensionUseJSON(info: ResolveInfo?): Boolean {
if (info == null || info.activityInfo == null) return false
if (info?.activityInfo == null) return false
val activityInfo = info.activityInfo
if (activityInfo.metaData != null && activityInfo.metaData.containsKey(METADATA_KEY_EXTENSION_USE_JSON))
return activityInfo.metaData.getBoolean(METADATA_KEY_EXTENSION_USE_JSON)
@ -606,7 +606,7 @@ object Utils {
fun copyStream(input: InputStream, output: OutputStream, length: Int) {
val buffer = ByteArray(1024)
var bytesRead: Int = 0
var bytesRead = 0
do {
val read = input.read(buffer)
if (read == -1) {

3
twidere/src/main/kotlin/org/mariotaku/twidere/util/cache/DiskLRUFileCache.kt vendored
View File

@ -21,7 +21,6 @@ package org.mariotaku.twidere.util.cache
import android.net.Uri
import com.bumptech.glide.disklrucache.DiskLruCache
import okio.ByteString
import okio.ByteString.Companion.encode
import org.mariotaku.mediaviewer.library.FileCache
import org.mariotaku.twidere.BuildConfig
@ -65,7 +64,7 @@ class DiskLRUFileCache(val cacheDir: File) : FileCache {
try {
editor.getFile(0).outputStream().use {
var bytesCopied: Int = 0
var bytesCopied = 0
val buffer = ByteArray(8192)
var bytes = stream.read(buffer)
while (bytes >= 0) {

1
twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/AuthenticatedUriLoader.kt
View File

@ -24,7 +24,6 @@ import android.content.Context
import android.net.Uri
import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher
import com.bumptech.glide.load.Options
import com.bumptech.glide.load.data.DataFetcher
import com.bumptech.glide.load.model.*
import com.bumptech.glide.load.model.ModelLoader.LoadData
import com.bumptech.glide.signature.ObjectKey

1
twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/NoThumborUrlLoader.kt
View File

@ -22,7 +22,6 @@ package org.mariotaku.twidere.util.glide
import android.content.Context
import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher
import com.bumptech.glide.load.Options
import com.bumptech.glide.load.data.DataFetcher
import com.bumptech.glide.load.model.*
import com.bumptech.glide.signature.ObjectKey
import okhttp3.OkHttpClient

1
twidere/src/main/kotlin/org/mariotaku/twidere/util/glide/TwidereGlideModule.kt
View File

@ -27,7 +27,6 @@ import com.bumptech.glide.Registry
import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
import com.bumptech.glide.load.model.GlideUrl
import com.bumptech.glide.module.AppGlideModule
import com.bumptech.glide.module.GlideModule
import okhttp3.OkHttpClient
import okhttp3.Request
import org.mariotaku.twidere.model.media.AuthenticatedUri

1
twidere/src/main/kotlin/org/mariotaku/twidere/util/refresh/JobSchedulerAutoRefreshController.kt
View File

@ -13,7 +13,6 @@ import org.mariotaku.twidere.service.JobTaskService
import org.mariotaku.twidere.service.JobTaskService.Companion.JOB_ID_REFRESH_FILTERS_SUBSCRIPTIONS
import org.mariotaku.twidere.service.JobTaskService.Companion.JOB_ID_REFRESH_LAUNCH_PRESENTATIONS
import java.util.concurrent.TimeUnit
import android.Manifest.permission as AndroidPermissions
/**
* Created by mariotaku on 2016/12/17.

1
twidere/src/main/kotlin/org/mariotaku/twidere/util/sync/TimelineSyncManager.kt
View File

@ -24,7 +24,6 @@ import android.net.Uri
import androidx.collection.ArrayMap
import nl.komponents.kovenant.Promise
import nl.komponents.kovenant.then
import okio.ByteString
import okio.ByteString.Companion.encodeUtf8
import org.mariotaku.twidere.TwidereConstants.TIMELINE_SYNC_CACHE_PREFERENCES_NAME
import org.mariotaku.twidere.annotation.ReadPositionTag

2
twidere/src/main/kotlin/org/mariotaku/twidere/util/twitter/card/TwitterCardViewFactory.kt
View File

@ -52,7 +52,7 @@ abstract class TwitterCardViewFactory {
private fun createCardFragment(status: ParcelableStatus): ContainerView.ViewController? {
val card = status.card
if (card == null || card.name == null) return null
if (card?.name == null) return null
if (TwitterCardUtils.CARD_NAME_PLAYER == card.name) {
return createGenericPlayerFragment(card)
} else if (TwitterCardUtils.CARD_NAME_AUDIO == card.name) {

5
twidere/src/main/kotlin/org/mariotaku/twidere/util/view/ViewAnimator.kt
View File

@ -62,8 +62,7 @@ class ViewAnimator {
animator.end()
}
}
val newView = view
currentInAnimator = managedViews[newView]?.inAnimator?.also { animator ->
currentInAnimator = managedViews[view]?.inAnimator?.also { animator ->
animator.addListener(object : SimpleAnimatorListener() {
override fun onAnimationEnd(animation: Animator) {
animator.removeListener(this)
@ -74,7 +73,7 @@ class ViewAnimator {
}
override fun onAnimationStart(animation: Animator) {
newView?.visibility = View.VISIBLE
view?.visibility = View.VISIBLE
}
})
if (animate) {

5
twidere/src/main/kotlin/org/mariotaku/twidere/view/MediaViewPager.kt
View File

@ -21,8 +21,5 @@ package org.mariotaku.twidere.view
import android.content.Context
import android.util.AttributeSet
import android.view.View
class MediaViewPager(context: Context, attrs: AttributeSet? = null) : ExtendedViewPager(context, attrs) {
}
class MediaViewPager(context: Context, attrs: AttributeSet? = null) : ExtendedViewPager(context, attrs)

1
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/compose/MediaPreviewViewHolder.kt
View File

@ -31,7 +31,6 @@ import org.mariotaku.twidere.R
import org.mariotaku.twidere.adapter.MediaPreviewAdapter
import org.mariotaku.twidere.model.ParcelableMedia
import org.mariotaku.twidere.model.ParcelableMediaUpdate
import java.lang.Exception
class MediaPreviewViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnLongClickListener, View.OnClickListener {