diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt index 94d45b06e..3df7ca4a6 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt @@ -395,7 +395,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener REQUEST_TAKE_PHOTO, REQUEST_PICK_MEDIA -> { if (resultCode == Activity.RESULT_OK && data != null) { val src = MediaPickerActivity.getMediaUris(data) - TaskStarter.execute(AddMediaTask(this, src, null, false, false)) + TaskStarter.execute(AddMediaTask(this, src, null, + copySrc = false, + deleteSrc = false + )) val extras = data.getBundleExtra(MediaPickerActivity.EXTRA_EXTRAS) if (extras?.getBoolean(EXTRA_IS_POSSIBLY_SENSITIVE) == true) { possiblySensitive = true diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt index b562e4948..da4e0ff4d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/UserSelectorActivity.kt @@ -114,7 +114,10 @@ class UserSelectorActivity : BaseActivity(), OnItemClickListener, LoaderManager. if (!fromCache) { showProgress() } - return CacheUserSearchLoader(this, accountKey, query, !fromCache, true, true) + return CacheUserSearchLoader(this, accountKey, query, !fromCache, + fromCache = true, + fromUser = true + ) } override fun onLoaderReset(loader: Loader>) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt index 42e8f87f4..d16def41d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/api/StatusExtensions.kt @@ -220,7 +220,11 @@ fun Status.applyTo(accountKey: UserKey, accountType: String, profileImageSize: S fun Status.formattedTextWithIndices(): StatusTextWithIndices { val source = CodePointArray(this.fullText ?: this.text!!) - val builder = HtmlBuilder(source, false, true, false) + val builder = HtmlBuilder(source, + throwExceptions = false, + sourceIsEscaped = true, + shouldReEscape = false + ) builder.addEntities(this) val textWithIndices = StatusTextWithIndices() val (text, spans) = builder.buildWithIndices() diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt index 668488237..551bb68be 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt @@ -103,8 +103,10 @@ abstract class AbsActivitiesFragment protected constructor() : registerForContextMenu(recyclerView) navigationHelper = RecyclerViewNavigationHelper(recyclerView, layoutManager, adapter, this) - pauseOnScrollListener = PauseRecyclerViewOnScrollListener(false, false, - requestManager) + pauseOnScrollListener = PauseRecyclerViewOnScrollListener( + pauseOnScroll = false, pauseOnFling = false, + requestManager = requestManager + ) val loaderArgs = Bundle(arguments) loaderArgs.putBoolean(EXTRA_FROM_USER, true) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt index 0a299a2c8..0e05da6a0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt @@ -147,8 +147,10 @@ abstract class AbsStatusesFragment : AbsContentListRecyclerViewFragment(), L override fun onItemClick(view: AdapterView<*>, child: View, position: Int, id: Long) { if (multiSelectManager.isActive) return - val trend: String? = if (view is ListView) { + val trend: String = (if (view is ListView) { adapter.getItem(position - view.headerViewsCount) } else { adapter.getItem(position) - } - if (trend == null) return + }) + ?: return activity?.let { openTweetSearch(it, accountKey, trend) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt index 6d9f53dda..10f73a78c 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt @@ -131,7 +131,10 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, override fun onCreateLoader(id: Int, args: Bundle?): Loader> { progressContainer.visibility = View.VISIBLE editProfileContent.visibility = View.GONE - return ParcelableUserLoader(requireActivity(), accountKey, accountKey, null, arguments, false, false) + return ParcelableUserLoader(requireActivity(), accountKey, accountKey, null, arguments, + omitIntentExtra = false, + loadFromCache = false + ) } override fun onLoadFinished(loader: Loader>, @@ -242,7 +245,8 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, val task = currentTask if (task != null && !task.isFinished) return currentTask = UpdateProfileBackgroundImageTaskInternal(this, accountKey, - data.data!!, false, true) + data.data!!, tile = false, deleteImage = true + ) } REQUEST_UPLOAD_PROFILE_IMAGE -> { val task = currentTask diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt index 63c370efe..0b065cd66 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/message/MessagesConversationFragment.kt @@ -231,7 +231,10 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment if (data != null) { val mediaUris = MediaPickerActivity.getMediaUris(data) val types = data.getBundleExtra(MediaPickerActivity.EXTRA_EXTRAS)?.getIntArray(EXTRA_TYPES) - TaskStarter.execute(AddMediaTask(this, mediaUris, types, false, false)) + TaskStarter.execute(AddMediaTask(this, mediaUris, types, + copySrc = false, + deleteSrc = false + )) } RESULT_SEARCH_GIF -> { val provider = gifShareProvider ?: return @@ -543,8 +546,10 @@ class MessagesConversationFragment : AbsContentListRecyclerViewFragment( override fun onExecute(account: AccountDetails, params: Any?): ParcelableUser { val microBlog = account.newMicroBlogInstance(context, MicroBlog::class.java) try { - UpdateStatusTask.getBodyFromMedia(context, imageUri, ParcelableMedia.Type.IMAGE, true, - true, null, false, null).use { + UpdateStatusTask.getBodyFromMedia(context, imageUri, ParcelableMedia.Type.IMAGE, + isDeleteAlways = true, + isDeleteOnSuccess = true, + sizeLimit = null, + chucked = false, + readListener = null + ).use { microBlog.updateProfileBackgroundImage(it.body, tile) } } catch (e: IOException) { diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlBuilder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlBuilder.kt index b431de58d..8fa6d2bf8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlBuilder.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/util/HtmlBuilder.kt @@ -157,7 +157,7 @@ class HtmlBuilder( if (display != null) { sb.append(display, false, displayIsHtml) } else { - sb.append(link, false, false) + sb.append(link, escapeText = false, textEscaped = false) } }