From 3399ba5265095f332154f24446dbb458c0d5fdd0 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 1 Mar 2021 18:25:52 +0800 Subject: [PATCH 1/8] version 4.1.7 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1212dc3b1..34d2bf5c8 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { allprojects { ext { projectGroupId = 'org.mariotaku.twidere' - projectVersionCode = 515 - projectVersionName = '4.1.6' + projectVersionCode = 516 + projectVersionName = '4.1.7' globalCompileSdkVersion = 30 globalBuildToolsVersion = "30.0.3" From 4a7d5a99af49cc85f649c416bebd58649094dc9b Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 22 Mar 2021 11:06:11 +0800 Subject: [PATCH 2/8] fix crash when update refresh progress offset --- .../mariotaku/twidere/fragment/AbsContentListViewFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt index 45d6ffc1d..92c0cb91d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsContentListViewFragment.kt @@ -213,7 +213,9 @@ abstract class AbsContentListViewFragment : BaseFragment(), val density = resources.displayMetrics.density val progressCircleDiameter = swipeLayout.progressCircleDiameter val controlBarOffsetPixels = - (activity.controlBarHeight * (1 - activity.controlBarOffset)).roundToInt() + ((activity.controlBarHeight * (1 - activity.controlBarOffset)).takeIf { !it.isNaN() } + ?: 0f) + .roundToInt() val swipeStart = systemWindowsInsets.top - controlBarOffsetPixels - progressCircleDiameter // 64: SwipeRefreshLayout.DEFAULT_CIRCLE_TARGET val swipeDistance = (64 * density).roundToInt() From 205424735b929d9f9451171925db214013fc09e2 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 22 Mar 2021 10:54:48 +0800 Subject: [PATCH 3/8] fix crash when sharing file for android 11 --- .../org/mariotaku/twidere/activity/MediaViewerActivity.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index 78a12544d..c352fece7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -624,8 +624,12 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos intent.addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION) } activity.processShareIntent(intent) - activity.startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.action_share)), - REQUEST_SHARE_MEDIA) + val shareIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + Intent.createChooser(intent, activity.getString(R.string.action_share)) + } else { + Intent.createChooser(intent, activity.getString(R.string.action_share)) + } + activity.startActivityForResult(shareIntent, REQUEST_SHARE_MEDIA) } override fun onFileSaveFailed() { From 94a73bf4b94a252268fbcb6d8c663b76fcce0d62 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 22 Mar 2021 13:32:50 +0800 Subject: [PATCH 4/8] ensure idx is in data indices --- .../twidere/adapter/StatusDetailsAdapter.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt index e8671932c..27e6c4848 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -128,8 +128,12 @@ class StatusDetailsAdapter( ITEM_IDX_CONVERSATION -> { data?.let { data -> var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - if (data[idx].is_filtered) idx++ - return data[idx] + if (idx !in data.indices) { + if (data[idx].is_filtered) { + idx++ + } + return data[idx] + } } } ITEM_IDX_REPLY -> { @@ -137,8 +141,12 @@ class StatusDetailsAdapter( var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_STATUS) + replyStart - if (data[idx].is_filtered) idx++ - return data[idx] + if (idx !in data.indices) { + if (data[idx].is_filtered) { + idx++ + } + return data[idx] + } } } ITEM_IDX_STATUS -> { From 6d4404bf571ec40eb92bf5dc2fad2954aa3d9efb Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 22 Mar 2021 10:54:48 +0800 Subject: [PATCH 5/8] Revert "fix crash when sharing file for android 11" This reverts commit 205424735b929d9f9451171925db214013fc09e2. --- .../org/mariotaku/twidere/activity/MediaViewerActivity.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt index c352fece7..78a12544d 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/MediaViewerActivity.kt @@ -624,12 +624,8 @@ class MediaViewerActivity : BaseActivity(), IMediaViewerActivity, MediaSwipeClos intent.addFlags(Intent.FLAG_GRANT_PREFIX_URI_PERMISSION) } activity.processShareIntent(intent) - val shareIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - Intent.createChooser(intent, activity.getString(R.string.action_share)) - } else { - Intent.createChooser(intent, activity.getString(R.string.action_share)) - } - activity.startActivityForResult(shareIntent, REQUEST_SHARE_MEDIA) + activity.startActivityForResult(Intent.createChooser(intent, activity.getString(R.string.action_share)), + REQUEST_SHARE_MEDIA) } override fun onFileSaveFailed() { From 21dd2dde454eabb5b6a31bb9b5bee2d46871d5c4 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Mon, 22 Mar 2021 13:46:50 +0800 Subject: [PATCH 6/8] fix crash when sharing file for android 11 --- twidere/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml index c310bf191..7a0f27b07 100644 --- a/twidere/src/main/AndroidManifest.xml +++ b/twidere/src/main/AndroidManifest.xml @@ -703,6 +703,7 @@ Date: Tue, 23 Mar 2021 10:22:47 +0800 Subject: [PATCH 7/8] fix wrong if --- .../org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt index 27e6c4848..415bd69a8 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/StatusDetailsAdapter.kt @@ -128,7 +128,7 @@ class StatusDetailsAdapter( ITEM_IDX_CONVERSATION -> { data?.let { data -> var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - if (idx !in data.indices) { + if (idx in data.indices) { if (data[idx].is_filtered) { idx++ } @@ -141,7 +141,7 @@ class StatusDetailsAdapter( var idx = position - getIndexStart(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_CONVERSATION) - getTypeCount(ITEM_IDX_STATUS) + replyStart - if (idx !in data.indices) { + if (idx in data.indices) { if (data[idx].is_filtered) { idx++ } From 6615244847d31fa30259bedc8df31cabe8ef50d5 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Wed, 21 Apr 2021 15:27:12 +0800 Subject: [PATCH 8/8] version 4.1.8 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 34d2bf5c8..b3e5b0810 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ buildscript { allprojects { ext { projectGroupId = 'org.mariotaku.twidere' - projectVersionCode = 516 - projectVersionName = '4.1.7' + projectVersionCode = 517 + projectVersionName = '4.1.8' globalCompileSdkVersion = 30 globalBuildToolsVersion = "30.0.3"